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

Commit 8c0854a

Browse files
shanashana
committed
Normalize xaml prefixes for the resource cache
1 parent 98b9f33 commit 8c0854a

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎src/GitHub.VisualStudio/UI/Views/Controls/GistCreationControl.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
77
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
8-
xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
8+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
99
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
1010
xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
1111
mc:Ignorable="d"
@@ -14,8 +14,8 @@
1414
<UserControl.Resources>
1515
<ResourceDictionary>
1616
<ResourceDictionary.MergedDictionaries>
17-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
18-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
17+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
18+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
1919
</ResourceDictionary.MergedDictionaries>
2020
</ResourceDictionary>
2121
</UserControl.Resources>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<local:GenericRepositoryCreationControl x:Class="GitHub.VisualStudio.UI.Views.Controls.RepositoryCreationControl"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
4+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
@@ -25,8 +25,8 @@
2525
<UserControl.Resources>
2626
<ResourceDictionary>
2727
<ResourceDictionary.MergedDictionaries>
28-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
29-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
28+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
29+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
3030
</ResourceDictionary.MergedDictionaries>
3131
</ResourceDictionary>
3232
</UserControl.Resources>
@@ -111,7 +111,7 @@
111111
<ui:PromptTextBox x:Name="nameText"
112112
Grid.Row="0"
113113
Grid.Column="1"
114-
MaxLength="{x:Static GitHub:Constants.MaxRepositoryNameLength}"
114+
MaxLength="{x:Static cache:Constants.MaxRepositoryNameLength}"
115115
Text="{Binding RepositoryName, UpdateSourceTrigger=PropertyChanged}" />
116116

117117
<StackPanel Grid.Row="1" Grid.Column="1">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
99
xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
1010
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
11-
xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
11+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
1212
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
1313
mc:Ignorable="d"
1414
d:DesignWidth="414"
@@ -18,8 +18,8 @@
1818
<UserControl.Resources>
1919
<ResourceDictionary>
2020
<ResourceDictionary.MergedDictionaries>
21-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
22-
<GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
21+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
22+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
2323
</ResourceDictionary.MergedDictionaries>
2424
</ResourceDictionary>
2525
</UserControl.Resources>

‎src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:helpers="clr-namespace:GitHub.VisualStudio.Helpers"
5+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
66
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -28,10 +28,10 @@
2828
<UserControl.Resources>
2929
<ResourceDictionary>
3030
<ResourceDictionary.MergedDictionaries>
31-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/SharedDictionary.xaml" />
32-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
33-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
34-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubActionLink.xaml" />
31+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/SharedDictionary.xaml" />
32+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
33+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
34+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubActionLink.xaml" />
3535
</ResourceDictionary.MergedDictionaries>
3636

3737
<Style x:Key="CommitListItemContainerStyle" TargetType="{x:Type ListViewItem}">

‎src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:helpers="clr-namespace:GitHub.VisualStudio.Helpers"
5+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
66
xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
@@ -22,8 +22,8 @@
2222
<UserControl.Resources>
2323
<ResourceDictionary>
2424
<ResourceDictionary.MergedDictionaries>
25-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/SharedDictionary.xaml" />
26-
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
25+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/SharedDictionary.xaml" />
26+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2727
</ResourceDictionary.MergedDictionaries>
2828
</ResourceDictionary>
2929
</UserControl.Resources>

0 commit comments

Comments
 (0)