Skip to content

Commit a43a940

Browse files
cltshivashcltshivash
authored
Merge branch 'master' into master
2 parents 9a6f307 + 46fc700 commit a43a940

File tree

32 files changed

+544
-258
lines changed

32 files changed

+544
-258
lines changed

‎Templates/CSharp/Desktop/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>DesktopTemplateLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.Desktop.UnitTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />

‎Templates/CSharp/UWP/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>UniversalTemplateLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.Templates.CS.MSTestv2.UWP.UnitTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />

‎Templates/VisualBasic/Desktop/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>DesktopTemplateLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.Desktop.UnitTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />

‎Templates/VisualBasic/UWP/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>UniversalTemplateLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.Templates.VB.MSTestv2.UWP.UnitTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Pro" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />

‎TestFx.sln‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DoNotParallelizeTestProject
174174
EndProject
175175
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeploymentTestProject", "test\E2ETests\TestAssets\DeploymentTestProject\DeploymentTestProject.csproj", "{3FCE3987-7C8C-4E12-B54A-C6EC2D9FC7A6}"
176176
EndProject
177-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompatTestProject", "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj", "{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}"
177+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompatTestProject", "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj", "{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}"
178+
EndProject
179+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestProjectForAssemblyResolution", "test\ComponentTests\TestAssets\TestProjectForAssemblyResolution\TestProjectForAssemblyResolution.csproj", "{0B057B99-DCDD-417A-BC19-3E63DDD86F24}"
178180
EndProject
179181
Global
180182
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -1013,6 +1015,30 @@ Global
10131015
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x64.Build.0 = Release|Any CPU
10141016
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x86.ActiveCfg = Release|Any CPU
10151017
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16}.Release|x86.Build.0 = Release|Any CPU
1018+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU
1019+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU
1020+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU
1021+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU
1022+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU
1023+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU
1024+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU
1025+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU
1026+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1027+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
1028+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|ARM.ActiveCfg = Debug|Any CPU
1029+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|ARM.Build.0 = Debug|Any CPU
1030+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x64.ActiveCfg = Debug|Any CPU
1031+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x64.Build.0 = Debug|Any CPU
1032+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x86.ActiveCfg = Debug|Any CPU
1033+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Debug|x86.Build.0 = Debug|Any CPU
1034+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
1035+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|Any CPU.Build.0 = Release|Any CPU
1036+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|ARM.ActiveCfg = Release|Any CPU
1037+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|ARM.Build.0 = Release|Any CPU
1038+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x64.ActiveCfg = Release|Any CPU
1039+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x64.Build.0 = Release|Any CPU
1040+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x86.ActiveCfg = Release|Any CPU
1041+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24}.Release|x86.Build.0 = Release|Any CPU
10161042
EndGlobalSection
10171043
GlobalSection(SolutionProperties) = preSolution
10181044
HideSolutionNode = FALSE
@@ -1071,6 +1097,7 @@ Global
10711097
{8080DE48-CFD9-4F33-908A-8B71108CA223} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
10721098
{3FCE3987-7C8C-4E12-B54A-C6EC2D9FC7A6} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
10731099
{2D2C5B73-F1F1-47C8-BC5C-A172E9BB3D16} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
1100+
{0B057B99-DCDD-417A-BC19-3E63DDD86F24} = {1899187D-8B9C-40C2-9F04-9E9A76C9A919}
10741101
EndGlobalSection
10751102
GlobalSection(ExtensibilityGlobals) = postSolution
10761103
SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}

‎WizardExtensions/MSTestv2IntelliTestExtensionPackage/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>IntelliTestExtensionLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.IntelliTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Community" />

‎WizardExtensions/MSTestv2UnitTestExtensionPackage/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<License>CreateUnitTestExtensionLicense.rtf</License>
88
<PackageId>Microsoft.VisualStudio.TestTools.MSTestV2.WizardExtension.UnitTest</PackageId>
99
</Metadata>
10-
<Installation AllUsers="true">
10+
<Installation AllUsers="true" SystemComponent="true">
1111
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0]" />
1212
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Enterprise" />
1313
<InstallationTarget Version="[15.0]" Id="Microsoft.VisualStudio.Community" />

‎src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumeratorWrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private ICollection<UnitTestElement> GetTestsInIsolation(string fullFilePath, IR
145145
typeof(AssemblyEnumerator), new object[] { MSTestSettings.CurrentSettings }) as AssemblyEnumerator;
146146

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

150150
return assemblyEnumerator.EnumerateAssembly(fullFilePath, out warnings);
151151
}

‎src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ private void ExecuteTestsInSource(IEnumerable<TestCase> tests, IRunContext runCo
223223
new object[] { MSTestSettings.CurrentSettings }) as UnitTestRunner;
224224

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

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

0 commit comments

Comments
 (0)