Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@cltshivash
cltshivash authored May 9, 2018
2 parents 9a6f307 + 46fc700 commit a43a940
Show file tree
Hide file tree
Showing 32 changed files with 544 additions and 258 deletions.
2 changes: 1 addition & 1 deletion Templates/CSharp/Desktop/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>DesktopTemplateLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.Desktop.UnitTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
Expand Down
2 changes: 1 addition & 1 deletion Templates/CSharp/UWP/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>UniversalTemplateLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.UWP.UnitTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
Expand Down
2 changes: 1 addition & 1 deletion Templates/VisualBasic/Desktop/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>DesktopTemplateLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.Desktop.UnitTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
Expand Down
2 changes: 1 addition & 1 deletion Templates/VisualBasic/UWP/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>UniversalTemplateLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.UWP.UnitTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
Expand Down
29 changes: 28 additions & 1 deletion TestFx.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DoNotParallelizeTestProject
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeploymentTestProject", "test\E2ETests\TestAssets\DeploymentTestProject\DeploymentTestProject.csproj", "{3FCE3987-7C8C-4E12-B54A-C6EC2D9FC7A6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompatTestProject", "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj", "{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompatTestProject", "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj", "{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestProjectForAssemblyResolution", "test\ComponentTests\TestAssets\TestProjectForAssemblyResolution\TestProjectForAssemblyResolution.csproj", "{0B057B99-DCDD-417A-BC19-3E63DDD86F24}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand Down Expand Up @@ -1013,6 +1015,30 @@ Global
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x64.Build.0 = Release|Any CPU
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x86.ActiveCfg = Release|Any CPU
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x86.Build.0 = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|ARM.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x64.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x64.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x86.ActiveCfg = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x86.Build.0 = Debug|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|Any CPU.Build.0 = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|ARM.ActiveCfg = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|ARM.Build.0 = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x64.ActiveCfg = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x64.Build.0 = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x86.ActiveCfg = Release|Any CPU
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1071,6 +1097,7 @@ Global
{8080DE48-CFD9-4F33-908A-8B71108CA223} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
{3FCE3987-7C8C-4E12-B54A-C6EC2D9FC7A6} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
{0B057B99-DCDD-417A-BC19-3E63DDD86F24} = {1899187D-8B9C-40C2-9F04-9E9A76C9A919}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}
Expand Down
2 changes: 1 addition & 1 deletion WizardExtensions/MSTestv2IntelliTestExtensionPackage/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>IntelliTestExtensionLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.IntelliTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Community" />
Expand Down
2 changes: 1 addition & 1 deletion WizardExtensions/MSTestv2UnitTestExtensionPackage/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<License>CreateUnitTestExtensionLicense.rtf</License>
<PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.UnitTest</PackageId>
</Metadata>
<Installation AllUsers="true">
<Installation AllUsers="true" SystemComponent="true">
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Community" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private ICollection<UnitTestElement> GetTestsInIsolation(string fullFilePath, IR
typeof(AssemblyEnumerator), new object[] { MSTestSettings.CurrentSettings }) as AssemblyEnumerator;

// After loading adapter reset the child-domain's appbase to point to test source location
isolationHost.UpdateAppBaseToTestSourceLocationAndSetupAssemblyResolver();
isolationHost.UpdateAppBaseToTestSourceLocation();

return assemblyEnumerator.EnumerateAssembly(fullFilePath, out warnings);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ private void ExecuteTestsInSource(IEnumerable<TestCase> tests, IRunContext runCo
new object[] { MSTestSettings.CurrentSettings }) as UnitTestRunner;

// After loading adapter reset the chils-domain's appbase to point to test source location
isolationHost.UpdateAppBaseToTestSourceLocationAndSetupAssemblyResolver();
isolationHost.UpdateAppBaseToTestSourceLocation();

PlatformServiceProvider.Instance.AdapterTraceLogger.LogInfo("Created unit-test runner {0}", source);

Expand Down
Loading

0 comments on commit a43a940

Please sign in to comment.