Skip to content

Commit b7051ad

Browse files
committedNov 20, 2014
1. Increase version to 1.6
2. Work Items fixes 3. Change links.
1 parent 7cb3ef0 commit b7051ad

16 files changed

+80
-17
lines changed
 

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
CHANGE LOG
22
==========
3+
* 1.6
4+
- Add ability to connect to VisualStudio.com
5+
36
* 1.4
47
- Move to MonoDevelop 5.0
58

‎MonoDevelop.VersionControl.TFS.Tests/MonoDevelop.VersionControl.TFS.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RootNamespace>MonoDevelop.VersionControl.TFS.Tests</RootNamespace>
1111
<AssemblyName>MonoDevelop.VersionControl.TFS.Tests</AssemblyName>
1212
<UseMSBuildEngine>False</UseMSBuildEngine>
13-
<ReleaseVersion>1.5</ReleaseVersion>
13+
<ReleaseVersion>1.6</ReleaseVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1616
<DebugSymbols>true</DebugSymbols>

‎MonoDevelop.VersionControl.TFS.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Global
7979
$0.XmlFormattingPolicy = $6
8080
$6.inheritsSet = null
8181
$6.scope = application/x-addin+xml
82-
version = 1.5
82+
version = 1.6
8383
outputpath = Output
8484
EndGlobalSection
8585
EndGlobal

‎MonoDevelop.VersionControl.TFS/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Runtime.CompilerServices;
55
using System.Runtime.InteropServices;
66

7-
[assembly: AssemblyVersion("1.5.0.0")]
7+
[assembly: AssemblyVersion("1.6.0.0")]
88
[assembly: AssemblyTitle("MonoDevelop.VersionControl.TFS.dll")]
99
[assembly: AssemblyDescription("MonoDevelop.VersionControl.TFS.dll")]
1010
[assembly: AssemblyCopyright("(c) 2007 Joel W. Reed, 2013 Ventsislav Mladenov")]

‎MonoDevelop.VersionControl.TFS/GUI/Server/AddVisualStudioOnlineServerWidget.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void BuildGui()
2424
tableDetails.Add(_nameEntry, 1, 0);
2525
tableDetails.Add(new Label(GettextCatalog.GetString("Visual Studio Online Url") + ":"), 0, 1);
2626
tableDetails.Add(_urlEntry, 1, 1);
27-
tableDetails.Add(new Label(GettextCatalog.GetString("http://<<User Name>>.visualstudio.com")), 2, 1);
27+
tableDetails.Add(new Label(GettextCatalog.GetString("https://<<User Name>>.visualstudio.com")), 2, 1);
2828
tableDetails.Add(new Label(GettextCatalog.GetString("TFS User") + ":"), 0, 2);
2929
tableDetails.Add(_tfsNameEntry, 1, 2);
3030
tableDetails.Add(new Label(GettextCatalog.GetString("User name with access to TFS. Usually your Microsoft account.")), 2, 2);

‎MonoDevelop.VersionControl.TFS/Microsoft.TeamFoundation.WorkItemTracking.Client/Query/LexalParser.cs

+16-2
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,23 @@ private Tuple<string, int> GetNextWord(int i)
318318
private string ReadCondition(ref int i)
319319
{
320320
var word = GetNextWord(i);
321+
if (string.Equals(word.Item1, "IN", StringComparison.OrdinalIgnoreCase))
322+
{
323+
//Check for condition IN Group
324+
var nextWord = GetNextWord(word.Item2);
325+
if (string.Equals(nextWord.Item1, "GROUP", StringComparison.OrdinalIgnoreCase))
326+
{
327+
i = nextWord.Item2;
328+
return word.Item1 + " " + nextWord.Item1;
329+
}
330+
else
331+
{
332+
i = word.Item2;
333+
return word.Item1;
334+
}
335+
}
321336

322-
if (string.Equals(word.Item1, "in", StringComparison.OrdinalIgnoreCase) ||
323-
string.Equals(word.Item1, "under", StringComparison.OrdinalIgnoreCase))
337+
if (string.Equals(word.Item1, "under", StringComparison.OrdinalIgnoreCase))
324338
{
325339
i = word.Item2;
326340
return word.Item1;

‎MonoDevelop.VersionControl.TFS/Microsoft.TeamFoundation.WorkItemTracking.Client/Query/NodesToXml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void WriteExpression(ConditionNode node, XmlWriter writer)
4646
var fieldNode = ((FieldNode)node.Left);
4747
writer.WriteAttributeString("Column", fieldNode.Field);
4848
writer.WriteAttributeString("FieldType", fieldNode.FieldType.ToString());
49-
writer.WriteAttributeString("Operator", node.Condition.ToString().ToLowerInvariant());
49+
writer.WriteAttributeString("Operator", node.ToOperator());
5050
var constantNode = (ConstantNode)node.Right; //All Nodes to Right should be Constants.
5151
var strValue = Convert.ToString(constantNode.Value, CultureInfo.InvariantCulture);
5252
// if (node.Condition == Condition.NotEquals && string.IsNullOrEmpty(strValue))

‎MonoDevelop.VersionControl.TFS/Microsoft.TeamFoundation.WorkItemTracking.Client/Query/Where/Condition.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public enum Condition
3737
GreaterOrEquals,
3838
In,
3939
//Only for Project Id
40-
Under
40+
Under,
41+
InGroup
4142
//Not supported
4243
//Contains,
4344
}

‎MonoDevelop.VersionControl.TFS/Microsoft.TeamFoundation.WorkItemTracking.Client/Query/Where/ConditionNode.cs

+45
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public ConditionNode(string condition)
5757
Condition = Condition.In;
5858
else if (string.Equals(condition, "under", StringComparison.OrdinalIgnoreCase))
5959
Condition = Condition.Under;
60+
else if (string.Equals(condition, "IN GROUP", StringComparison.OrdinalIgnoreCase))
61+
Condition = Condition.InGroup;
6062
else
6163
Condition = Condition.None;
6264
break;
@@ -100,6 +102,9 @@ public override string ToString()
100102
case Condition.Under:
101103
val = "Under";
102104
break;
105+
case Condition.InGroup:
106+
val = "IN GROUP";
107+
break;
103108
default:
104109
val = "NONE";
105110
break;
@@ -108,5 +113,45 @@ public override string ToString()
108113
return Left + " " + val + " " + Right;
109114
return val;
110115
}
116+
117+
public string ToOperator()
118+
{
119+
120+
// public static String EQUALS = "equals";
121+
// public static String NOT_EQUALS = "notEquals";
122+
// public static String GREATER = "greater";
123+
// public static String LESS = "less";
124+
// public static String EQUALS_GREATER = "equalsGreater";
125+
// public static String EQUALS_LESS = "equalsLess";
126+
// public static String CONTAINS = "contains";
127+
// public static String NOT_CONTAINS = "notContains";
128+
// public static String EVER = "ever";
129+
// public static String NOT_EVER = "notEver";
130+
// public static String UNDER = "under";
131+
// public static String NOT_UNDER = "notUnder";
132+
switch (Condition)
133+
{
134+
case Condition.Equals:
135+
return "equals";
136+
case Condition.Greater:
137+
return "greater";
138+
case Condition.GreaterOrEquals:
139+
return "equalsGreater";
140+
case Condition.In:
141+
return "in";
142+
case Condition.Less:
143+
return "less";
144+
case Condition.LessOrEquals:
145+
return "equalsLess";
146+
case Condition.NotEquals:
147+
return "notEquals";
148+
case Condition.Under:
149+
return "under";
150+
case Condition.InGroup:
151+
return "equals";
152+
default:
153+
return string.Empty;
154+
}
155+
}
111156
}
112157
}

‎MonoDevelop.VersionControl.TFS/Microsoft.TeamFoundation.WorkItemTracking.Client/Query/Where/ConstantNode.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ConstantNode : Node
3232
{
3333
public ConstantNode(string value)
3434
{
35-
if (value.StartsWith("'", StringComparison.Ordinal))
35+
if (value.StartsWith("'", StringComparison.Ordinal) || value.EndsWith("Z", StringComparison.OrdinalIgnoreCase))
3636
{
3737
Value = value.Trim('\'');
3838
DataType = ValueDataType.String;

‎MonoDevelop.VersionControl.TFS/MonoDevelop.VersionControl.TFS.addin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
url = "https://bitbucket.org/ventsislav_mladenov/monodevelop-tfs-addin"
77
description = "TFS support for the Version Control Add-in"
88
category = "Version Control"
9-
version = "1.5">
9+
version = "1.6">
1010

1111
<Dependencies>
1212
<Addin id="Core" version="5.0"/>

‎MonoDevelop.VersionControl.TFS/MonoDevelop.VersionControl.TFS.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>MonoDevelop.VersionControl.TFS</RootNamespace>
1111
<AssemblyName>MonoDevelop.VersionControl.TFS</AssemblyName>
12-
<ReleaseVersion>1.5</ReleaseVersion>
12+
<ReleaseVersion>1.6</ReleaseVersion>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1515
<Optimize>false</Optimize>
16-
<OutputPath>..\Output</OutputPath>
16+
<OutputPath>..\Output</OutputPath>
1717
<WarningLevel>4</WarningLevel>
1818
<ConsolePause>false</ConsolePause>
1919
<CustomCommands>

‎Output/addin.info

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Addin id="VersionControl.TFS"
3-
version="1.5"
3+
version="1.6"
44
namespace="MonoDevelop"
55
name="TFS support"
66
author="Ventsislav Mladenov"
7-
url="https://bitbucket.org/ventsislav_mladenov/monodevelop-tfs-addin"
7+
url="http://indomitable.github.io/monodevelop-tfs-addin"
88
copyright="MIT X11"
99
description="TFS support for the Version Control Add-in"
1010
category="Version Control">

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ Note for Mac and Linux users:
2626

2727
More Info
2828
---------
29-
Visit: [Addin Home Page](https://bitbucket.org/ventsislav_mladenov/monodevelop-tfs-addin)
29+
Visit: [Addin Home Page](http://indomitable.github.io/monodevelop-tfs-addin)

‎TRACK_BUGS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ How to track bugs
33
[MonoDevelop]: http://monodevelop.com/ "Mono Develop"
44
[XamarinStudio]: http://xamarin.com/studio "Xamarin Studio"
55
### The best way to track bugs is using debugging.
6-
1. Go to [monodevelop-tfs-addin](https://bitbucket.org/ventsislav_mladenov/monodevelop-tfs-addin) and click on **Fork** button.
6+
1. Go to [monodevelop-tfs-addin](https://github.com/Indomitable/monodevelop-tfs-addin) and click on **Fork** button.
77
2. If you use Mac OS open the terminal and type `git clone url_to_you_repository`
88
3. `cd monodevelop-tfs-addin`
99
4. Download monodevelop and its submodules `git submodule update --init --recursive` - this will take some time.

‎addin-project.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<BuildFile>MonoDevelop.VersionControl.TFS.sln</BuildFile>
55
<BuildConfiguration>Debug</BuildConfiguration>
66
</Project>
7-
</AddinProject>
7+
</AddinProject>

0 commit comments

Comments
 (0)
Please sign in to comment.