Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6fb66eb
depItemInNetcoreWithoutUT
ankit-arora12 Feb 8, 2019
16739e0
Merge branch 'master' into depItemNetCore
abhishkk Feb 8, 2019
48e4b7a
Resources file changes
ankit-arora12 Feb 12, 2019
536dfac
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Feb 12, 2019
e83349b
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Feb 12, 2019
fc9ec88
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Feb 12, 2019
928d8c6
Resources handling and renaming files
ankit-arora12 Feb 13, 2019
008fda4
Merge branch 'master' into depItemNetCore
ankit-arora12 Feb 13, 2019
42d3a81
Adding UT's
ankit-arora12 Feb 19, 2019
9eeaf02
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Feb 19, 2019
cfa90b8
PR comments
ankit-arora12 Mar 4, 2019
f40b346
PR comment variable assign
ankit-arora12 Mar 4, 2019
707ef00
Test Cases restructuring
ankit-arora12 Mar 7, 2019
62649d5
E2E and test context
ankit-arora12 Mar 12, 2019
ead5ea5
ut fix
ankit-arora12 Mar 12, 2019
3986e88
renaming and moving files
ankit-arora12 Mar 12, 2019
a1260cd
pragma File name must match first type name
ankit-arora12 Mar 12, 2019
ec9e3ae
remove duplicate reference
ankit-arora12 Mar 12, 2019
043a51a
testing to remove duplicacy by version change
ankit-arora12 Mar 12, 2019
47788cf
fix for issue occuring only in jenkins
ankit-arora12 Mar 13, 2019
24bc0f7
fix for issue occuring only in jenkins
ankit-arora12 Mar 13, 2019
54f15b1
netcore test version upgrade and file operations separate
ankit-arora12 Mar 18, 2019
df9df0f
Merge remote-tracking branch 'upstream/master' into depItemNetCore
ankit-arora12 Mar 25, 2019
aa23712
jenkins issue with duplicate libraries
ankit-arora12 Mar 26, 2019
2108a2d
jenkins issue with duplicate libraries
ankit-arora12 Mar 26, 2019
f6d969e
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Mar 26, 2019
3437d95
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Mar 26, 2019
7fcc434
jenkins duplicacy
ankit-arora12 Mar 26, 2019
2cf41d5
Merge branch 'depItemNetCore' of https://github.com/ankit-nitd/testfx…
ankit-arora12 Mar 26, 2019
0e666ca
smoke fix post debug changes
ankit-arora12 Mar 26, 2019
b7466e2
fix spacing
ankit-arora12 Mar 27, 2019
2e4c598
pragma
ankit-arora12 Mar 27, 2019
737abcb
removing comment and pubxml
ankit-arora12 Apr 1, 2019
a7c6883
testfx conflict resolve
ankit-arora12 Apr 1, 2019
6396799
changes in accordance with timeout commit
ankit-arora12 Apr 1, 2019
2989544
Merge remote-tracking branch 'upstream/master' into depItemNetCore
ankit-arora12 Apr 2, 2019
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
Prev Previous commit
Next Next commit
Adding UT's
  • Loading branch information
ankit-arora12 committed Feb 19, 2019
commit 42d3a8173f5accea2829e0df27c6c3b1b7ebad0c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<Link>Extensions\ns13ExceptionExtensions.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13DeploymentItem.cs">
<Link>Utilities\ns13DeploymentItem.cs</Link>
<Link>Deployment\ns13DeploymentItem.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13TestRunDirectories.cs">
<Link>Deployment\ns13TestRunDirectories.cs</Link>
Expand Down
1 change: 1 addition & 0 deletions src/Adapter/PlatformServices.NetCore/Friends.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("MSTestAdapter.PlatformServices.NetCore.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ internal virtual object[] GetCustomAttributes(MemberInfo attributeProvider, Type
return this.GetCustomAttributes(attributeProvider, type, true);
}

/// <summary>
/// Gets all the custom attributes adorned on a member.
/// </summary>
/// <param name="memberInfo"> The member. </param>
/// <param name="inherit"> True to inspect the ancestors of element; otherwise, false. </param>
/// <returns> The list of attributes on the member. Empty list if none found. </returns>
internal object[] GetCustomAttributes(MemberInfo memberInfo, bool inherit)
{
return this.GetCustomAttributes(memberInfo, type: null, inherit: inherit);
}

internal object[] GetCustomAttributes(MemberInfo memberInfo, Type type, bool inherit)
{
if (memberInfo == null)
Expand All @@ -41,5 +52,10 @@ internal object[] GetCustomAttributes(MemberInfo memberInfo, Type type, bool inh
return memberInfo.GetCustomAttributes(type, inherit).ToArray();
}
}

internal object[] GetCustomAttributes(Assembly assembly, Type type)
{
return assembly.GetCustomAttributes(type).ToArray<object>();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting
/// [DeploymentItem("file2.xml", "DataFiles")]
/// [DeploymentItem("bin\Debug")]
/// </example>
/// <remarks>
/// DeploymentItemAttribute is currently not supported in .Net Core. This is just a placehodler for support in the future.
/// </remarks>
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
public sealed class DeploymentItemAttribute : Attribute
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Deployment\ns10DeploymentItemTests.cs">
<Link>Deployment\ns10DeploymentItemTests.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Deployment\ns10TestRunDirectoriesTests.cs">
<Link>Deployment\ns10TestRunDirectoriesTests.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Extensions\ns10ExceptionExtensionsTests.cs">
<Link>Extensions\ns10ExceptionExtensionsTests.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Utilities\ns10FileUtilityTests.cs">
<Link>Utilities\ns10FileUtilityTests.cs</Link>
</Compile>
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.3\ns13TraceListenerManagerTests.cs">
<Link>Services\ns13TraceListenerManagerTests.cs</Link>
</Compile>
Expand All @@ -63,9 +75,6 @@
</Compile>
<Compile Include="AssemblyResolverTests.cs" />
<Compile Include="Deployment\AssemblyLoadWorkerTests.cs" />
<Compile Include="Deployment\DeploymentItemTests.cs" />
<Compile Include="Deployment\TestRunDirectoriesTests.cs" />
<Compile Include="Extensions\ExceptionExtensionsTests.cs" />
<Compile Include="Services\MSTestAdapterSettingsTests.cs" />
<Compile Include="Services\DesktopReflectionOperationsTests.cs" />
<Compile Include="Services\DesktopThreadOperationsTests.cs" />
Expand All @@ -80,7 +89,6 @@
<Compile Include="Services\DesktopFileOperationsTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\DeploymentUtilityTests.cs" />
<Compile Include="Utilities\FileUtilityTests.cs" />
<Compile Include="Utilities\ReflectionUtilityTests.cs" />
<Compile Include="Utilities\VSInstallationUtilitiesTests.cs" />
<Compile Include="Utilities\XmlUtilitiesTests.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using MSTestAdapter.PlatformServices.Tests.Services;
using MSTestAdapter.PlatformServices.Tests.Utilities;

[assembly: ReflectionUtilityTests.DummyAAttribute("a1")]
[assembly: ReflectionUtilityTests.DummyAAttribute("a2")]

[assembly: ReflectionOperationsTests.DummyAAttribute("a1")]
[assembly: ReflectionOperationsTests.DummyAAttribute("a2")]
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="..\MSTest.CoreAdapter.TestUtilities\ActionUtility.cs" Link="ActionUtility.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10AssemblyAttributes.cs" Link="ns10AssemblyAttributes.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Deployment\ns10DeploymentItemTests.cs" Link="Deployment\ns10DeploymentItemTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Deployment\ns10TestRunDirectoriesTests.cs" Link="Deployment\ns10TestRunDirectoriesTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Extensions\ns10ExceptionExtensionsTests.cs" Link="Extensions\ns10ExceptionExtensionsTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10FileOperationsTests.cs" Link="Services\ns10FileOperationsTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10DiaSessionOperationsTests.cs" Link="Services\ns10DiaSessionOperationsTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10ReflectionOperationsTests.cs" Link="Services\ns10ReflectionOperationsTests.cs" />
Expand All @@ -22,6 +24,7 @@
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10TestSourceHostTests.cs" Link="Services\ns10TestSourceHostTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10TestSourceTests.cs" Link="Services\ns10TestSourceTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\ns10ThreadOperationsTests.cs" Link="Services\ns10ThreadOperationsTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.0\Utilities\ns10FileUtilityTests.cs" Link="Utilities\ns10FileUtilityTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.3\ns13TraceListenerManagerTests.cs" Link="Services\ns13TraceListenerManagerTests.cs" />
<Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.3\ns13TraceListenerTests.cs" Link="Services\ns13TraceListenerTests.cs" />
</ItemGroup>
Expand All @@ -33,21 +36,18 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj">
<Private>true</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\src\TestFramework\Extension.Core\Extension.Core.csproj">
<Private>true</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Adapter\PlatformServices.Interface\PlatformServices.Interface.csproj">
<Private>true</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj">
<Private>true</Private>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<Folder Include="Services\" />
<Folder Include="Extensions\" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading