Fixed E2E tests

microsoft · Nov 23, 2020 · e60d779 · e60d779
1 parent 9abcf05
commit e60d779
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 41 deletions.
diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
@@ -127,7 +127,7 @@ function Locate-VsInstallPath($hasVsixExtension ="false"){
   $requiredPackageIds = @()
 
   $requiredPackageIds += "Microsoft.Component.MSBuild" 
-  $requiredPackageIds += "Microsoft.Net.Component.4.6.TargetingPack"
+  $requiredPackageIds += "Microsoft.Net.Component.4.5.2.TargetingPack"
   $requiredPackageIds += "Microsoft.VisualStudio.Windows.Build"
 
   if($hasVsixExtension -eq 'true')

diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-12.0.0.0" newVersion="15.0.0.0" />
+        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="11.0.0.0-12.0.0.0" newVersion="15.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+  </startup>
 </configuration>
diff --git a/.../PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj b/.../PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MSTestAdapter.PlatformServices.Desktop.ComponentTests</RootNamespace>
     <AssemblyName>PlatformServices.Desktop.ComponentTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/...Tests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj b/...Tests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(TestFxRoot)artifacts\TestAssets\ComponentTests</OutputPath>

diff --git a/test/E2ETests/Automation.CLI/Automation.CLI.csproj b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Automation.CLI</RootNamespace>
     <AssemblyName>Automation.CLI</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/test/E2ETests/Smoke.E2E.Tests/DeploymentTests.cs b/test/E2ETests/Smoke.E2E.Tests/DeploymentTests.cs
@@ -9,7 +9,8 @@ namespace MSTestAdapter.Smoke.E2ETests
     [TestClass]
     public class DeploymentTests : CLITestBase
     {
-        private const string TestAssembly = "DesktopDeployment\\DeploymentTestProject.dll";
+        private const string TestAssemblyDependency = "DesktopDeployment\\Never\\DeploymentTestProject.dll";
+        private const string TestAssemblyMSBuild = "DesktopDeployment\\PreserveNewest\\DeploymentTestProject.dll";
         private const string TestAssemblyNetCore10 = "netcoreapp1.0\\DeploymentTestProjectNetCore.dll";
         private const string TestAssemblyNetCore21 = "netcoreapp2.1\\DeploymentTestProjectNetCore.dll";
         private const string RunSetting =
@@ -22,17 +23,17 @@ public class DeploymentTests : CLITestBase
         [TestMethod]
         public void ValidateTestSourceDependencyDeployment()
         {
-            this.InvokeVsTestForExecution(new string[] { TestAssembly });
-            this.ValidatePassedTestsContain("DeploymentTestProject.UnitTest1.FailIfFilePresent", "DeploymentTestProject.UnitTest1.PassIfDeclaredFilesPresent");
-            this.ValidateFailedTestsContain("DeploymentTestProject.dll", true, "DeploymentTestProject.UnitTest1.PassIfFilePresent");
+            this.InvokeVsTestForExecution(new string[] { TestAssemblyDependency });
+            this.ValidatePassedTestsContain("DeploymentTestProject.DeploymentTestProject.FailIfFilePresent", "DeploymentTestProject.DeploymentTestProject.PassIfDeclaredFilesPresent");
+            this.ValidateFailedTestsContain(TestAssemblyMSBuild, true, "DeploymentTestProject.DeploymentTestProject.PassIfFilePresent");
         }
 
         [TestMethod]
         public void ValidateTestSourceLocationDeployment()
         {
-            this.InvokeVsTestForExecution(new string[] { TestAssembly }, RunSetting);
-            this.ValidatePassedTestsContain("DeploymentTestProject.UnitTest1.PassIfFilePresent", "DeploymentTestProject.UnitTest1.PassIfDeclaredFilesPresent");
-            this.ValidateFailedTestsContain("DeploymentTestProject.dll", true, "DeploymentTestProject.UnitTest1.FailIfFilePresent");
+            this.InvokeVsTestForExecution(new string[] { TestAssemblyMSBuild }, RunSetting);
+            this.ValidatePassedTestsContain("DeploymentTestProject.DeploymentTestProject.PassIfFilePresent", "DeploymentTestProject.DeploymentTestProject.PassIfDeclaredFilesPresent");
+            this.ValidateFailedTestsContain(TestAssemblyMSBuild, true, "DeploymentTestProject.DeploymentTestProject.FailIfFilePresent");
         }
 
         /*
@@ -50,9 +51,17 @@ public void ValidateTestSourceLocationDeploymentNetCore1_0()
         [TestMethod]
         public void ValidateTestSourceLocationDeploymentNetCore2_1()
         {
+            // StackTrace isn't included in release builds with netcoreapp2.1.
+            const bool validateStackTrace =
+#if DEBUG
+            true;
+#else
+            false;
+#endif
+
             this.InvokeVsTestForExecution(new string[] { TestAssemblyNetCore21 }, null);
             this.ValidatePassedTestsContain("DeploymentTestProjectNetCore.DeploymentTestProjectNetCore.FailIfFilePresent", "DeploymentTestProjectNetCore.DeploymentTestProjectNetCore.PassIfDeclaredFilesPresent");
-            this.ValidateFailedTestsContain("DeploymentTestProjectNetCore.dll", true, "DeploymentTestProjectNetCore.DeploymentTestProjectNetCore.PassIfFilePresent");
+            this.ValidateFailedTestsContain(TestAssemblyMSBuild, validateStackTrace, "DeploymentTestProjectNetCore.DeploymentTestProjectNetCore.PassIfFilePresent");
         }
     }
 }
diff --git a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MSTestAdapter.Smoke.E2ETests</RootNamespace>
     <AssemblyName>MSTestAdapter.Smoke.E2ETests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TestProjectType>UnitTest</TestProjectType>
@@ -22,17 +22,19 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants Condition=" '$(Configuration)' == 'Debug' ">DEBUG;TRACE</DefineConstants>
+    <DefineConstants Condition=" '$(Configuration)' == 'Release' ">TRACE</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />

diff --git a/...Assets/DeploymentTestProject/UnitTest1.cs → ...ymentTestProject/DeploymentTestProject.cs b/...Assets/DeploymentTestProject/UnitTest1.cs → ...ymentTestProject/DeploymentTestProject.cs
@@ -1,12 +1,12 @@
-using System;
-using System.IO;
+using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace DeploymentTestProject
 {
-    [DeploymentItem("DeploymentFile.xml")]
+
+    [DeploymentItem(@"..\..\..\..\test\E2ETests\TestAssets\DeploymentTestProject\DeploymentFile.xml")]
     [TestClass]
-    public class UnitTest1
+    public class DeploymentTestProject
     {
         [TestMethod]
         public void PassIfFilePresent()
@@ -20,7 +20,7 @@ public void FailIfFilePresent()
             Assert.IsFalse(File.Exists("EmptyDataFile.xml"));
         }
 
-        [DeploymentItem("TestCaseDeploymentFile.xml")]
+        [DeploymentItem(@"..\..\..\..\test\E2ETests\TestAssets\DeploymentTestProject\TestCaseDeploymentFile.xml")]
         [TestMethod]
         public void PassIfDeclaredFilesPresent()
         {

diff --git a/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj b/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj
@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TestFxRoot Condition="$(TestFxRoot) == ''">..\..\..\..\</TestFxRoot>
+    <DependencyCopyBehavior Condition="$(DependencyCopyBehavior) == ''">Never</DependencyCopyBehavior>
   </PropertyGroup>
-
+  <Import Project="$(TestFxRoot)scripts\build\TestFx.Versions.targets" />
+
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>$(TestFxRoot)artifacts\TestAssets\\DesktopDeployment\</OutputPath>
-
+    <OutputPath>$(TestFxRoot)artifacts\TestAssets\DesktopDeployment\$(DependencyCopyBehavior)\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
-    <ProjectReference Include="..\..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestPlatformVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,13 +27,20 @@
 
   <ItemGroup>
     <None Update="DeploymentFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>$(DependencyCopyBehavior)</CopyToOutputDirectory>
     </None>
     <None Update="EmptyDataFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>$(DependencyCopyBehavior)</CopyToOutputDirectory>
     </None>
     <None Update="TestCaseDeploymentFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>$(DependencyCopyBehavior)</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <Target Name="CleanWithPreserveNewest" AfterTargets="Clean" Condition="$(DependencyCopyBehavior) == 'Never'">
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Clean" Properties="DependencyCopyBehavior=PreserveNewest" />
+  </Target>
+  <Target Name="BuildWithPreserveNewest" AfterTargets="Rebuild;Build" Condition="$(DependencyCopyBehavior) == 'Never'">
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="DependencyCopyBehavior=PreserveNewest" />
+  </Target>
 </Project>
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-12.0.0.0" newVersion="15.0.0.0" />
+        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="11.0.0.0-12.0.0.0" newVersion="15.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+  </startup>
+</configuration>
diff --git a/.../UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj b/.../UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MSTestAdapter.PlatformServices.Desktop.UnitTests</RootNamespace>
     <AssemblyName>MSTestAdapter.PlatformServices.Desktop.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>