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

Commit d2b35ab

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge pull request #2093 from github/remove-fork-experimental-setting
Removing the experimental feature toggle for forking
2 parents 2a3664c + 98a1c09 commit d2b35ab

File tree

10 files changed

+18
-73
lines changed

10 files changed

+18
-73
lines changed

‎src/GitHub.Exports/Settings/generated/IPackageSettings.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
"type": "bool",
1313
"default": "false"
1414
},
15-
{
16-
"name": "ForkButton",
17-
"type": "bool",
18-
"default": "false"
19-
},
2015
{
2116
"name": "UIState",
2217
"type": "object",
@@ -46,7 +41,6 @@ public interface IPackageSettings : INotifyPropertyChanged
4641
void Save();
4742
bool CollectMetrics { get; set; }
4843
bool EditorComments { get; set; }
49-
bool ForkButton { get; set; }
5044
UIState UIState { get; set; }
5145
bool HideTeamExplorerWelcomeMessage { get; set; }
5246
bool EnableTraceLogging { get; set; }

‎src/GitHub.Resources/Resources.Designer.cs‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/GitHub.Resources/Resources.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,9 +674,6 @@ https://git-scm.com/download/win</value>
674674
<data name="BlendDialogText" xml:space="preserve">
675675
<value>The GitHub extension is not available inside Blend</value>
676676
</data>
677-
<data name="Options_ForkButtonLabel" xml:space="preserve">
678-
<value>Show Fork button in Team Explorer</value>
679-
</data>
680677
<data name="UpdateComment" xml:space="preserve">
681678
<value>Update comment</value>
682679
</data>

‎src/GitHub.Resources/Resources.zh-CN.resx‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,45 +60,45 @@
6060
: and then encoded with base64 encoding.
6161
-->
6262
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
63-
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6464
<xsd:element name="root" msdata:IsDataSet="true">
6565
<xsd:complexType>
6666
<xsd:choice maxOccurs="unbounded">
6767
<xsd:element name="metadata">
6868
<xsd:complexType>
6969
<xsd:sequence>
70-
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
7171
</xsd:sequence>
72-
<xsd:attribute name="name" use="required" type="xsd:string"/>
73-
<xsd:attribute name="type" type="xsd:string"/>
74-
<xsd:attribute name="mimetype" type="xsd:string"/>
75-
<xsd:attribute ref="xml:space"/>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
7676
</xsd:complexType>
7777
</xsd:element>
7878
<xsd:element name="assembly">
7979
<xsd:complexType>
80-
<xsd:attribute name="alias" type="xsd:string"/>
81-
<xsd:attribute name="name" type="xsd:string"/>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
8282
</xsd:complexType>
8383
</xsd:element>
8484
<xsd:element name="data">
8585
<xsd:complexType>
8686
<xsd:sequence>
87-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
88-
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
8989
</xsd:sequence>
90-
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
91-
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
92-
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
93-
<xsd:attribute ref="xml:space"/>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
9494
</xsd:complexType>
9595
</xsd:element>
9696
<xsd:element name="resheader">
9797
<xsd:complexType>
9898
<xsd:sequence>
99-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100100
</xsd:sequence>
101-
<xsd:attribute name="name" type="xsd:string" use="required"/>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102102
</xsd:complexType>
103103
</xsd:element>
104104
</xsd:choice>
@@ -673,9 +673,6 @@
673673
<data name="BlendDialogText" xml:space="preserve">
674674
<value>GitHub括在在Blend内部无效</value>
675675
</data>
676-
<data name="Options_ForkButtonLabel" xml:space="preserve">
677-
<value>在团队资源管理器中显示分叉按钮</value>
678-
</data>
679676
<data name="UpdateComment" xml:space="preserve">
680677
<value>更新注释</value>
681678
</data>
@@ -835,4 +832,4 @@
835832
<data name="YouHaveAlreadyClonedToThisLocation" xml:space="preserve">
836833
<value>您已经克隆到此位置。单击 "打开" 打开本地存储库。</value>
837834
</data>
838-
</root>
835+
</root>

‎src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class ForkNavigationItem : TeamExplorerNavigationItemBase
2727
public const string ForkNavigationItemId = "5245767A-B657-4F8E-BFEE-F04159F1DDA6";
2828

2929
readonly IDialogService dialogService;
30-
readonly IPackageSettings packageSettings;
3130
readonly IUsageTracker usageTracker;
3231

3332
IConnectionManager connectionManager;
@@ -37,25 +36,15 @@ public ForkNavigationItem(IGitHubServiceProvider serviceProvider,
3736
ISimpleApiClientFactory apiFactory,
3837
ITeamExplorerServiceHolder holder,
3938
IDialogService dialogService,
40-
IPackageSettings packageSettings,
4139
IUsageTracker usageTracker)
4240
: base(serviceProvider, apiFactory, holder, Octicon.repo_forked)
4341
{
4442
this.dialogService = dialogService;
45-
this.packageSettings = packageSettings;
4643
this.usageTracker = usageTracker;
4744

4845
Text = Resources.ForkNavigationItemText;
4946
ArgbColor = Colors.PurpleNavigationItem.ToInt32();
5047
ConnectionManager.Connections.CollectionChanged += ConnectionsChanged;
51-
52-
packageSettings.PropertyChanged += (sender, args) =>
53-
{
54-
if (args.PropertyName == nameof(packageSettings.ForkButton))
55-
{
56-
IsVisible = packageSettings.ForkButton;
57-
}
58-
};
5948
}
6049

6150
IConnectionManager ConnectionManager
@@ -97,7 +86,7 @@ public override async void Invalidate()
9786
{
9887
IsVisible = false;
9988

100-
if ((packageSettings?.ForkButton ?? false) && await IsAGitHubDotComRepo())
89+
if (await IsAGitHubDotComRepo())
10190
{
10291
var connection = await ConnectionManager.GetConnection(ActiveRepo);
10392
IsVisible = connection?.IsLoggedIn ?? false;

‎src/GitHub.VisualStudio/Settings/OptionsPage.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,13 @@ void LoadSettings()
5252
{
5353
child.CollectMetrics = packageSettings.CollectMetrics;
5454
child.EditorComments = packageSettings.EditorComments;
55-
child.ForkButton = packageSettings.ForkButton;
5655
child.EnableTraceLogging = packageSettings.EnableTraceLogging;
5756
}
5857

5958
void SaveSettings()
6059
{
6160
packageSettings.CollectMetrics = child.CollectMetrics;
6261
packageSettings.EditorComments = child.EditorComments;
63-
packageSettings.ForkButton = child.ForkButton;
6462
packageSettings.EnableTraceLogging = child.EnableTraceLogging;
6563
packageSettings.Save();
6664
}

‎src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
"type": "bool",
1313
"default": "false"
1414
},
15-
{
16-
"name": "ForkButton",
17-
"type": "bool",
18-
"default": "false"
19-
},
2015
{
2116
"name": "UIState",
2217
"type": "object",
@@ -93,7 +88,6 @@ void LoadSettings()
9388
{
9489
CollectMetrics = (bool)settingsStore.Read("CollectMetrics", true);
9590
EditorComments = (bool)settingsStore.Read("EditorComments", false);
96-
ForkButton = (bool)settingsStore.Read("ForkButton", false);
9791
UIState = SimpleJson.DeserializeObject<UIState>((string)settingsStore.Read("UIState", "{}"));
9892
HideTeamExplorerWelcomeMessage = (bool)settingsStore.Read("HideTeamExplorerWelcomeMessage", false);
9993
EnableTraceLogging = (bool)settingsStore.Read("EnableTraceLogging", false);
@@ -103,7 +97,6 @@ void SaveSettings()
10397
{
10498
settingsStore.Write("CollectMetrics", CollectMetrics);
10599
settingsStore.Write("EditorComments", EditorComments);
106-
settingsStore.Write("ForkButton", ForkButton);
107100
settingsStore.Write("UIState", SimpleJson.SerializeObject(UIState));
108101
settingsStore.Write("HideTeamExplorerWelcomeMessage", HideTeamExplorerWelcomeMessage);
109102
settingsStore.Write("EnableTraceLogging", EnableTraceLogging);

‎src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@
109109
<WrapPanel DockPanel.Dock="Top">
110110
<CheckBox x:Name="chkEditorComments" VerticalAlignment="Center" Content="{x:Static ghfvs:Resources.Options_EditorCommentsLabel}" />
111111
</WrapPanel>
112-
<WrapPanel DockPanel.Dock="Top">
113-
<CheckBox x:Name="chkForkButton" VerticalAlignment="Center" Content="{x:Static ghfvs:Resources.Options_ForkButtonLabel}" />
114-
</WrapPanel>
115112
<TextBlock DockPanel.Dock="Bottom" TextWrapping="Wrap">
116113
<LineBreak />
117114
<Italic>

‎src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ public bool EditorComments
3131
set { chkEditorComments.IsChecked = value; }
3232
}
3333

34-
public bool ForkButton
35-
{
36-
get { return chkForkButton.IsChecked ?? false; }
37-
set { chkForkButton.IsChecked = value; }
38-
}
39-
4034
private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
4135
{
4236
var browser = VisualStudio.Services.DefaultExportProvider.GetExportedValue<IVisualStudioBrowser>();

‎src/common/settings.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
"type": "bool",
1111
"default": "false"
1212
},
13-
{
14-
"name": "ForkButton",
15-
"type": "bool",
16-
"default": "false"
17-
},
1813
{
1914
"name": "UIState",
2015
"type": "object",

0 commit comments

Comments
 (0)