diff --git a/scripts/build/TestFx.Loc.targets b/scripts/build/TestFx.Loc.targets
index 16b75c229d..196c0cebec 100644
--- a/scripts/build/TestFx.Loc.targets
+++ b/scripts/build/TestFx.Loc.targets
@@ -42,8 +42,8 @@
-
-
+
+
@@ -51,7 +51,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -71,7 +71,7 @@
- <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)
+ <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)
<_LocalizedFiles Include="$(_SourcePath)\**\*.*" />
diff --git a/scripts/build/TestFx.Settings.targets b/scripts/build/TestFx.Settings.targets
index 2f53ecce34..6b9d15caef 100644
--- a/scripts/build/TestFx.Settings.targets
+++ b/scripts/build/TestFx.Settings.targets
@@ -8,7 +8,7 @@
-
+
diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index 3156375e22..5a1c99894e 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -30,9 +30,9 @@
stylecop.json
-
-
-
+
+
+
@@ -48,14 +48,6 @@
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
diff --git a/scripts/test.ps1 b/scripts/test.ps1
index 7a153cc590..a2816625cb 100644
--- a/scripts/test.ps1
+++ b/scripts/test.ps1
@@ -197,6 +197,10 @@ function Get-VSTestPath
$TestPlatformVersion = (([XML](Get-Content $versionsFile)).Project.PropertyGroup.TestPlatformVersion).InnerText
$vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform.$TestPlatformVersion\"
+ if(-not (Test-Path $vsInstallPath)) {
+ $vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform\$TestPlatformVersion\"
+ }
+
$vstestPath = Join-Path -path $vsInstallPath "tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe"
return Resolve-Path -path $vstestPath
}
diff --git a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
index 0c04867a71..e73203bd07 100644
--- a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
+++ b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
@@ -29,35 +29,30 @@
4
true
+
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
@@ -165,7 +160,6 @@
-
@@ -176,6 +170,5 @@
Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Desktop/packages.config b/src/Adapter/PlatformServices.Desktop/packages.config
deleted file mode 100644
index ae181db396..0000000000
--- a/src/Adapter/PlatformServices.Desktop/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
index b7a861970b..93f8756548 100644
--- a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
+++ b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
@@ -30,6 +30,20 @@
4
true
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
@@ -48,7 +62,6 @@
-
@@ -62,22 +75,5 @@
False
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\netstandard1.0\System.ComponentModel.TypeConverter.dll
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Interface/packages.config b/src/Adapter/PlatformServices.Interface/packages.config
deleted file mode 100644
index 46673e74c6..0000000000
--- a/src/Adapter/PlatformServices.Interface/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
index 103ddb3173..4367305961 100644
--- a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
+++ b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
@@ -30,6 +30,20 @@
4
true
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
Constants.cs
@@ -101,24 +115,6 @@
-
-
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\netstandard1.0\System.ComponentModel.TypeConverter.dll
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Portable/packages.config b/src/Adapter/PlatformServices.Portable/packages.config
deleted file mode 100644
index 46673e74c6..0000000000
--- a/src/Adapter/PlatformServices.Portable/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
index cec9d7b559..cdfa378bdc 100644
--- a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
+++ b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
@@ -1,9 +1,10 @@
-
+
..\..\..\
+
{5D153CAA-80C2-4551-9549-6C406FCEEFB1}
Library
@@ -14,98 +15,53 @@
UAP
10.0.14393.0
10.0.10240.0
- 15
+ 14
+ 512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- ;2008
+ 2008
-
- AnyCPU
+
+
+ true
+ true
+ PackageReference
+
+
+
+ $(Platform)
true
full
false
DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
-
- AnyCPU
+
+ $(Platform)
pdbonly
true
TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
true
+ false
-
- ARM
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- ARM
- false
- prompt
- true
-
-
- ARM
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
-
-
- x64
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- x64
- false
- prompt
- true
-
-
- x64
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
- true
-
-
- x86
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- x86
- false
- prompt
- true
-
-
- x86
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
- true
-
+
-
-
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
Constants.cs
diff --git a/src/Adapter/PlatformServices.Universal/project.json b/src/Adapter/PlatformServices.Universal/project.json
deleted file mode 100644
index a459dfaf70..0000000000
--- a/src/Adapter/PlatformServices.Universal/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "dependencies": {
- "MicroBuild.Core": "0.2.0",
- "Microsoft.TestPlatform.ObjectModel": "16.9.0-preview-20201021-10",
- "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
-
- "StyleCop.Analyzers": "1.0.0"
- },
- "frameworks": {
- "uap10.0.10240": {}
- },
- "runtimes": {
- "win10-arm": {},
- "win10-arm-aot": {},
- "win10-x86": {},
- "win10-x86-aot": {},
- "win10-x64": {},
- "win10-x64-aot": {}
- }
-}
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
index e49ece17e3..56056c9bf5 100644
--- a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
+++ b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
@@ -18,6 +18,12 @@
false
true
+
+
+
+
+
+
Constants.cs
@@ -84,11 +90,6 @@
Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
-
-
-
-
-
diff --git a/src/TestFramework/Extension.Core/Extension.Core.csproj b/src/TestFramework/Extension.Core/Extension.Core.csproj
index 1fc52d1a70..eeed694313 100644
--- a/src/TestFramework/Extension.Core/Extension.Core.csproj
+++ b/src/TestFramework/Extension.Core/Extension.Core.csproj
@@ -34,6 +34,18 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\Core
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
@@ -46,8 +58,5 @@
False
-
-
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.Core/packages.config b/src/TestFramework/Extension.Core/packages.config
deleted file mode 100644
index 56e01ebc8f..0000000000
--- a/src/TestFramework/Extension.Core/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
index 078cd59ccb..628aee55b9 100644
--- a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
+++ b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
@@ -32,9 +32,18 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\Desktop
+
-
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
diff --git a/src/TestFramework/Extension.Desktop/packages.config b/src/TestFramework/Extension.Desktop/packages.config
deleted file mode 100644
index 631b26d47a..0000000000
--- a/src/TestFramework/Extension.Desktop/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.UWP/Extension.UWP.csproj b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
index 443acffef1..c043158436 100644
--- a/src/TestFramework/Extension.UWP/Extension.UWP.csproj
+++ b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
@@ -4,6 +4,7 @@
..\..\..\
+
{DF131865-84EE-4540-8112-E88ACEBDEA09}
Library
@@ -17,92 +18,54 @@
15
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 2008
-
- AnyCPU
+
+
+ true
+ true
+ PackageReference
+
+
+
+ $(Platform)
true
full
false
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
-
- AnyCPU
+
+ $(Platform)
pdbonly
true
- TRACE;NETFX_CORE;WINDOWS_UWP
+ TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
+ false
-
- x86
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x86
- false
- prompt
-
-
- x86
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
-
-
- ARM
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
-
-
- ARM
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
-
-
- x64
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x64
- false
- prompt
-
-
- x64
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
-
+
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\UWP
+
-
-
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
@@ -121,11 +84,4 @@
15.0
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.UWP/project.json b/src/TestFramework/Extension.UWP/project.json
deleted file mode 100644
index a739cd4b0b..0000000000
--- a/src/TestFramework/Extension.UWP/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "dependencies": {
- "MicroBuild.Core": "0.2.0",
- "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
-
- "StyleCop.Analyzers": "1.0.0"
- },
- "frameworks": {
- "uap10.0": {}
- },
- "runtimes": {
- "win10-arm": {},
- "win10-arm-aot": {},
- "win10-x86": {},
- "win10-x86-aot": {},
- "win10-x64": {},
- "win10-x64-aot": {}
- }
-}
\ No newline at end of file
diff --git a/src/TestFramework/MSTest.Core/MSTest.Core.csproj b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
index e21a2e33ef..d5bd5c71a3 100644
--- a/src/TestFramework/MSTest.Core/MSTest.Core.csproj
+++ b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
@@ -34,6 +34,18 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.XML
Core
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
@@ -69,9 +81,6 @@
-
-
-
ResXFileCodeGenerator
diff --git a/src/TestFramework/MSTest.Core/packages.config b/src/TestFramework/MSTest.Core/packages.config
deleted file mode 100644
index 56e01ebc8f..0000000000
--- a/src/TestFramework/MSTest.Core/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
index 046966f135..9c21941772 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
index 88975f66ad..b2b3a5f224 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
@@ -22,18 +22,6 @@ namespace PlatformServices.Desktop.ComponentTests
public class DesktopTestSourceHostTests
{
private TestSourceHost testSourceHost;
- private string testSource;
-
- public DesktopTestSourceHostTests()
- {
- var currentAssemblyPath = Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location);
- var testAssetPath =
- Path.Combine(
- Directory.GetParent(Directory.GetParent(Directory.GetParent(currentAssemblyPath).FullName).FullName).FullName,
- "artifacts",
- "TestAssets");
- this.testSource = Path.Combine(testAssetPath, "DesktopTestProjectx86Debug.dll");
- }
[TestMethod]
public void ParentDomainShouldHonourSearchDirectoriesSpecifiedInRunsettings()
@@ -52,7 +40,8 @@ public void ParentDomainShouldHonourSearchDirectoriesSpecifiedInRunsettings()
";
- this.testSourceHost = new TestSourceHost(this.testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
this.testSourceHost.SetupHost();
// Loading TestProjectForAssemblyResolution.dll should not throw.
@@ -77,19 +66,24 @@ public void ChildDomainResolutionPathsShouldHaveSearchDirectoriesSpecifiedInRuns
";
- this.testSourceHost = new TestSourceHost(this.testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
-
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
this.testSourceHost.SetupHost();
+ var assemblyResolution = "ComponentTests\\TestProjectForAssemblyResolution.dll";
+ var asm = Assembly.LoadFrom(assemblyResolution);
+ var type = asm.GetType("PlatformServices.Desktop.ComponentTests.TestProjectForAssemblyResolution");
+
// Creating instance of TestProjectForAssemblyResolution should not throw.
// It is present in specified in runsettings
- AppDomainUtilities.CreateInstance(this.testSourceHost.AppDomain, typeof(TestProjectForAssemblyResolution), null);
+ AppDomainUtilities.CreateInstance(this.testSourceHost.AppDomain, type, null);
}
[TestMethod]
public void DisposeShouldUnloadChildAppDomain()
{
- this.testSourceHost = new TestSourceHost(this.testSource, null, null);
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, null, null);
this.testSourceHost.SetupHost();
// Check that child appdomain was indeed created
@@ -100,6 +94,14 @@ public void DisposeShouldUnloadChildAppDomain()
Assert.IsNull(this.testSourceHost.AppDomain);
}
+ private static string GetTestAssemblyPath(string assemblyName)
+ {
+ var currentAssemblyPath = Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location);
+ var testAssetPath = Path.Combine(Directory.GetParent(Directory.GetParent(Directory.GetParent(currentAssemblyPath).FullName).FullName).FullName, "artifacts", "TestAssets");
+
+ return Path.Combine(testAssetPath, assemblyName);
+ }
+
private Mock GetMockedIRunSettings(string runSettingxml)
{
var mockRunSettings = new Mock();
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
index 05dbabd7e8..3e8edfe0af 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
@@ -38,55 +38,22 @@
4
-
- ..\..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.8.2\lib\net45\Moq.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
FrameworkV1
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
-
-
- ..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
+
{b0fce474-14bc-449a-91ea-a433342c0d63}
PlatformServices.Desktop
@@ -96,7 +63,7 @@
PlatformServices.Interface
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ {7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
FrameworkV2
@@ -104,18 +71,17 @@
{5c411bbf-fcc9-4430-ae08-07666d39fd04}
SampleFrameworkExtensions
-
- {0b057b99-dcdd-417a-bc19-3e63ddd86f24}
- TestProjectForAssemblyResolution
-
+
+
+
+
+
+
+
+
+ Designer
+
-
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
deleted file mode 100644
index 79fb921202..0000000000
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
index 205eca7442..6741422a2a 100644
--- a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
+++ b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
@@ -5,7 +5,7 @@ namespace PlatformServices.Desktop.ComponentTests
{
[TestClass]
[Serializable]
- public class TestProjectForAssemblyResolution
+ public class TestProjectForAssemblyResolution : MarshalByRefObject
{
[TestMethod]
public void TestMethod1()
diff --git a/test/E2ETests/Automation.CLI/Automation.CLI.csproj b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
index 83ee2a0787..ef4a311e8d 100644
--- a/test/E2ETests/Automation.CLI/Automation.CLI.csproj
+++ b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
@@ -31,48 +31,28 @@
prompt
4
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.Common.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
- True
-
@@ -98,7 +78,6 @@
-
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.common.cs b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
index 5fa0221792..c5241f57a8 100644
--- a/test/E2ETests/Automation.CLI/CLITestBase.common.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
@@ -19,7 +19,7 @@ public partial class CLITestBase
private const string PackagesFolder = "packages";
// This value is automatically updated by "build.ps1" script.
- private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.10.0-release-20210421-08";
+ private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\16.10.0-release-20210421-08";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";
///
diff --git a/test/E2ETests/Automation.CLI/packages.config b/test/E2ETests/Automation.CLI/packages.config
deleted file mode 100644
index 98803acf5a..0000000000
--- a/test/E2ETests/Automation.CLI/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
index c12fa7e130..e7ff217352 100644
--- a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
+++ b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
@@ -2,7 +2,7 @@
..\..\..\
false
- $(TestFxRoot)artifacts\$(Configuration)\
+ $(TestFxRoot)artifacts\$(Configuration)\
@@ -30,27 +30,27 @@
- $(SourcePath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
+ $(ArtifactsPath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
- $(SourcePath)MSTest.CoreAdapter\System.Collections.Concurrent.dll
+ $(ArtifactsPath)MSTest.CoreAdapter\System.Collections.Concurrent.dll
- $(SourcePath)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+ $(ArtifactsPath)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
- $(SourcePath)PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
+ $(ArtifactsPath)PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
- $(SourcePath)MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
+ $(ArtifactsPath)MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
- $(SourcePath)Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+ $(ArtifactsPath)Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
diff --git a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
index 1b8309dd68..8922c22f85 100644
--- a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
+++ b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
@@ -23,23 +23,30 @@
true
full
false
+ DEBUG;TRACE
prompt
4
pdbonly
true
+ TRACE
prompt
4
-
- DEBUG;TRACE
- TRACE
-
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
+
@@ -55,9 +62,6 @@
-
-
-
{9c1219e0-e775-47f9-9236-63f03f774801}
diff --git a/test/E2ETests/Smoke.E2E.Tests/packages.config b/test/E2ETests/Smoke.E2E.Tests/packages.config
deleted file mode 100644
index e0c6eb980b..0000000000
--- a/test/E2ETests/Smoke.E2E.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj b/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
index 8ffb1e2078..916003af1a 100644
--- a/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
+++ b/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
@@ -33,18 +33,20 @@
prompt
4
+
-
- $(TestFxRoot)packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- $(TestFxRoot)packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
+
{7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
@@ -60,8 +62,6 @@
FrameworkV1
-
-
@@ -73,9 +73,6 @@
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/packages.config b/test/UnitTests/MSTest.Core.Unit.Tests/packages.config
deleted file mode 100644
index 32d98fb3a2..0000000000
--- a/test/UnitTests/MSTest.Core.Unit.Tests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
index bc697765f9..ce6e55fe61 100644
--- a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
+++ b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
@@ -33,17 +33,22 @@
prompt
4
+
-
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
+
FrameworkV1
-
-
-
diff --git a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config
deleted file mode 100644
index 3644cdfa3c..0000000000
--- a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
index 666bbf7aea..022c8ac1ac 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
@@ -34,44 +34,23 @@
prompt
4
+
+
+
+
+
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
- $(TestFxRoot)packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\FluentAssertions.5.10.3\lib\net45\FluentAssertions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- $(TestFxRoot)packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
-
@@ -123,7 +102,6 @@
-
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
deleted file mode 100644
index f8236bbbc5..0000000000
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
index d477166232..fb3c2554dd 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
index 2eec8729e3..61c612cbc7 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
@@ -35,37 +35,24 @@
prompt
4
+
+
+
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
- ..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
FrameworkV1
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
@@ -132,7 +119,6 @@
Designer
-
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
deleted file mode 100644
index 75ac30848c..0000000000
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
index 24dfdede8a..63bc7a698f 100644
--- a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
@@ -51,10 +51,6 @@
-
-
-
-
diff --git a/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
index 0e00c1f40d..4e996e0932 100644
--- a/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
@@ -33,37 +33,23 @@
prompt
4
+
+
+
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
-
- ..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
FrameworkV1
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
@@ -97,7 +83,6 @@
-
diff --git a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
deleted file mode 100644
index b5d1923828..0000000000
--- a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
index 61f57ff3f6..463a7bfbd5 100644
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
@@ -2,6 +2,7 @@
..\..\..\
+ $(TestFxRoot)artifacts\$(Configuration)\
@@ -19,6 +20,13 @@
UnitTest
1685
+
+
+ true
+ true
+ PackageReference
+
+
true
full
@@ -34,48 +42,62 @@
prompt
4
+
-
- ..\..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\uap10.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
+
+
+
+
+
+
+
+
+ 1.0.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+
+
+
+ {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
+ MSTest.CoreAdapter.TestUtilities
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ FrameworkV2
+
+
+
+
+ $(ArtifactsPath)PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
+
+
+ $(ArtifactsPath)Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+
FrameworkV1
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.7.8\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- Designer
-
@@ -102,29 +124,7 @@
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
-
-
- {5D153CAA-80C2-4551-9549-6C406FCEEFB1}
- PlatformServices.Universal
-
-
- {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
- MSTest.CoreAdapter.TestUtilities
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- FrameworkV2
-
-
- {DF131865-84EE-4540-8112-E88ACEBDEA09}
- Extension.UWP
-
-
+
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
deleted file mode 100644
index 67cae056cf..0000000000
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file