Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 0f6a3b8

Browse files
committed
Fix incorrect value returned from EnvDTE.Project.Kind.
1 parent c71ed32 commit 0f6a3b8

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectKind.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,18 @@ string GetProjectKind(Project project)
3232
{
3333
string type = ProjectType.GetProjectType(project);
3434
if (type == ProjectType.CSharp) {
35-
return SD.ProjectTypeGuids.CSharp.ToString();
35+
return GetProjectKind(SD.ProjectTypeGuids.CSharp);
3636
} else if (type == ProjectType.VB) {
37-
return SD.ProjectTypeGuids.VB.ToString();
37+
return GetProjectKind(SD.ProjectTypeGuids.VB);
3838
}
3939
return String.Empty;
4040
}
4141

42+
string GetProjectKind(Guid guid)
43+
{
44+
return "{" + guid.ToString().ToUpperInvariant() + "}";
45+
}
46+
4247
public string Kind { get; private set; }
4348
}
4449
}

src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
using ICSharpCode.Core;
2222
using ICSharpCode.PackageManagement;
2323
using ICSharpCode.PackageManagement.EnvDTE;
24-
using ICSharpCode.SharpDevelop.Dom;
2524
using ICSharpCode.SharpDevelop.Project;
2625
using NUnit.Framework;
2726
using PackageManagement.Tests.Helpers;
@@ -141,7 +140,7 @@ public void Kind_ProjectIsCSharpProject_ReturnsCSharpProjectTypeGuid()
141140

142141
string kind = dteProject.Kind;
143142

144-
Assert.AreEqual(ProjectTypeGuids.CSharp.ToString(), kind);
143+
Assert.AreEqual("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", kind);
145144
}
146145

147146
[Test]
@@ -151,7 +150,7 @@ public void Kind_ProjectIsVBNetProject_ReturnsVBProjectTypeGuid()
151150

152151
string kind = dteProject.Kind;
153152

154-
Assert.AreEqual(ProjectTypeGuids.VB.ToString(), kind);
153+
Assert.AreEqual("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", kind);
155154
}
156155

157156
[Test]

0 commit comments

Comments
 (0)