Skip to content

Define MSTest to support managed sources only #399

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

Closed
mayankbansal018 wants to merge 32 commits into from
Closed

Define MSTest to support managed sources only #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
60e0550
Define MsTest to support managed sources only
mayankbansal018 Apr 10, 2018
84c0447
test log
mayankbansal018 Apr 10, 2018
664f4bb
logs
mayankbansal018 Apr 10, 2018
386f0e0
testfix
mayankbansal018 Apr 10, 2018
d240eb1
error
mayankbansal018 Apr 10, 2018
bfb5683
fail uri test
mayankbansal018 Apr 10, 2018
ed9808a
undo uri
mayankbansal018 Apr 10, 2018
cb6608b
fix
mayankbansal018 Apr 10, 2018
e8b0b0e
Merge branch 'master' into mstestcategory
mayankbansal018 Apr 11, 2018
bb9d44d
remove unnecessary changes
mayankbansal018 Apr 11, 2018
8fcd301
logs
mayankbansal018 Apr 11, 2018
d473ee0
possible test fix
mayankbansal018 Apr 11, 2018
8315a9d
log
mayankbansal018 Apr 11, 2018
d2f28fc
log
mayankbansal018 Apr 11, 2018
abf19c2
try to get attribute data
mayankbansal018 Apr 11, 2018
8c237c9
last
mayankbansal018 Apr 11, 2018
e6ee64e
Merge branch 'master' into mstestcategory
mayankbansal018 Apr 11, 2018
dd3233f
move to latest VS(15.6)
mayankbansal018 Apr 13, 2018
6dcca62
Merge branch 'master' into mstestcategory
mayankbansal018 Apr 13, 2018
92065c2
Merge branch 'mstestcategory' of https://github.com/mayankbansal018/t…
mayankbansal018 Apr 13, 2018
d013771
log
mayankbansal018 Apr 13, 2018
ff220a3
Step for adding archiving trx files
mayankbansal018 Apr 13, 2018
66654b7
logs
mayankbansal018 Apr 13, 2018
c3d31f6
remove category
mayankbansal018 Apr 13, 2018
18977ed
try
mayankbansal018 Apr 13, 2018
17182f1
Category
mayankbansal018 Apr 13, 2018
6ce0800
Merge branch 'master' into mstestcategory
mayankbansal018 Apr 19, 2018
8abc9dd
remove un-necessary changes
mayankbansal018 Apr 20, 2018
ab9ad2e
Merge branch 'mstestcategory' of https://github.com/mayankbansal018/t…
mayankbansal018 Apr 20, 2018
27f82f2
Merge branch 'master' into mstestcategory
mayankbansal018 Apr 20, 2018
eb06960
pass
mayankbansal018 Apr 20, 2018
616323d
Add test
mayankbansal018 Apr 23, 2018
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
3 changes: 2 additions & 1 deletion netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def branch = GithubBranchName
}
}

Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto-dev15-0')
// Move to latest VS(15.6) machines
Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto-dev15-0')
Copy link
Member

@jayaranigarg jayaranigarg Apr 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is same string only. We didn't update it to point to 15.6 machines?


// This call performs remaining common job setup on the newly created job.
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
Expand Down
3 changes: 3 additions & 0 deletions src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
<Reference Include="System.Collections.Concurrent">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Primitives, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.ComponentModel.Primitives.4.1.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Resource.resx">
Expand Down
2 changes: 2 additions & 0 deletions src/Adapter/MSTest.CoreAdapter/MSTestDiscoverer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter
{
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
Expand All @@ -20,6 +21,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter
[FileExtension(".appx")]
[FileExtension(".dll")]
[FileExtension(".exe")]
[Category("managed")]
Copy link
Contributor

@smadala smadala Apr 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment will be helpful.

public class MSTestDiscoverer : ITestDiscoverer
{
/// <summary>
Expand Down
1 change: 1 addition & 0 deletions src/Adapter/MSTest.CoreAdapter/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.ComponentModel.Primitives" version="4.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>
3 changes: 3 additions & 0 deletions src/Package/MSTest.TestAdapter.Enu.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
</group>
<group targetFramework="net45">
<dependency id="System.ComponentModel.Primitives" version="4.1.0" />
</group>
</dependencies>
</metadata>
<files>
Expand Down
5 changes: 4 additions & 1 deletion src/Package/MSTest.TestAdapter.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
<group targetFramework="netcoreapp1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
</group>
</group>
<group targetFramework="net45">
<dependency id="System.ComponentModel.Primitives" version=4.1.0" />
</group>
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 4 additions & 0 deletions test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ComponentModel.Primitives" Version="4.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
<ProjectReference Include="..\..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
Expand Down
9 changes: 9 additions & 0 deletions test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Reflection;

Expand Down Expand Up @@ -66,6 +67,14 @@ public void MSTestDiscovererHasMSTestAdapterAsExecutorUri()
Assert.AreEqual("executor://MSTestAdapter/v2", attribute.ExecutorUri);
}

[TestMethod]
public void MSTestDiscovererHasCategoryAttribute()
{
var attribute = typeof(MSTestDiscoverer).GetTypeInfo().GetCustomAttribute(typeof(CategoryAttribute));
Assert.IsNotNull(attribute);
Assert.AreEqual("managed", (attribute as CategoryAttribute).Category);
}

[TestMethod]
public void MSTestDiscovererHasXapAsFileExtension()
{
Expand Down