Skip to content

Ignore case for targetframework input. #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
singhsarab merged 1 commit into from
Feb 6, 2018
+25 −6
Merged

Ignore case for targetframework input. #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Microsoft.TestPlatform.ObjectModel/Framework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ public static Framework FromString(string frameworkString)
}
catch
{
switch (frameworkString.Trim())
switch (frameworkString.Trim().ToLower())
{
case "Framework35":
case "framework35":
frameworkName = new FrameworkName(Constants.DotNetFramework35);
break;
case "Framework40":
case "framework40":
frameworkName = new FrameworkName(Constants.DotNetFramework40);
break;
case "Framework45":
case "framework45":
frameworkName = new FrameworkName(Constants.DotNetFramework45);
break;
case "FrameworkCore10":
case "frameworkcore10":
frameworkName = new FrameworkName(Constants.DotNetFrameworkCore10);
break;
case "FrameworkUap10":
case "frameworkuap10":
frameworkName = new FrameworkName(Constants.DotNetFrameworkUap10);
break;
default:
Expand Down
19 changes: 19 additions & 0 deletions test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ public void FrameworkFromStringShouldReturnNullForEmptyString()
Assert.IsNull(Framework.FromString(string.Empty));
}

[TestMethod]
public void FrameworkFromStringShouldIgnoreCase()
{
var fx = Framework.FromString("framework35");
Assert.AreEqual(".NETFramework,Version=v3.5", fx.Name);

fx = Framework.FromString("FRAMEWORK40");
Assert.AreEqual(".NETFramework,Version=v4.0", fx.Name);

fx = Framework.FromString("Framework45");
Assert.AreEqual(".NETFramework,Version=v4.5", fx.Name);

fx = Framework.FromString("frameworKcore10");
Assert.AreEqual(".NETCoreApp,Version=v1.0", fx.Name);

fx = Framework.FromString("frameworkUAP10");
Assert.AreEqual("Uap,Version=v10.0", fx.Name);
}

[TestMethod]
public void FrameworkFromStringShouldTrimSpacesAroundFrameworkString()
{
Expand Down