From 2c646e81f6052b5d7232b383fcedd514ddc0026e Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Mon, 2 Nov 2020 23:07:43 +0100
Subject: [PATCH 1/2] Replaced deprecated certificate

* Microsoft402400 certificate is deprecated, replaced with Microsoft400
---
 scripts/build/TestFx.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index bcec617b7f..3eeed84813 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -38,7 +38,7 @@
   <!-- Signing and Localization. -->
   <ItemGroup Condition="$(IsTest) == '' or $(IsTest) == 'false'">
     <FilesToSign Include="$(OutDir)\$(AssemblyName).dll" Condition="'$(IsVsixProj)' == '' or '$(IsVsixProj)' != 'true'">
-      <Authenticode>Microsoft402400</Authenticode>
+      <Authenticode>Microsoft400</Authenticode>
       <StrongName>StrongName</StrongName>
     </FilesToSign>
 
@@ -59,7 +59,7 @@
   <Target Name="GatherLocalizedOutputsForSigning" DependsOnTargets="TestFxLocalization">
     <ItemGroup>
       <FilesToSign Include="$(OutDir)\**\$(AssemblyName).resources.dll">
-        <Authenticode>Microsoft402400</Authenticode>
+        <Authenticode>Microsoft400</Authenticode>
         <StrongName>StrongName</StrongName>
       </FilesToSign>
     </ItemGroup>

From 59901481956509a797b67d0925ab3423362ec4d7 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Tue, 3 Nov 2020 11:33:26 +0100
Subject: [PATCH 2/2] Failed tests fixed.

---
 scripts/Build.ps1                             | 23 ++++++++++++++++---
 .../PlatformServices.NetCore.csproj           |  2 ++
 .../DeploymentTestProjectNetCore.csproj       |  9 +++++---
 .../FSharpTestProject.fsproj                  |  9 ++++----
 .../TimeoutTestProjectNetCore.csproj          |  4 ++--
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index 3123bab535..f657cda7cb 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -80,9 +80,26 @@ $TFB_Full = $Full
 $TFB_Official = $Official
 $TFB_UpdateXlf = $UpdateXlf
 $TFB_IsLocalizedBuild = $IsLocalizedBuild -or $TFB_Official
-$TFB_Solutions = @("TestFx.sln")
-$TFB_NetCoreProjects =@("src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj",
-						"test\UnitTests\PlatformServices.NetCore.Unit.Tests\PlatformServices.NetCore.Unit.Tests.csproj")
+
+$TFB_Solutions = @(
+  "TestFx.sln"
+)
+
+$TFB_NetCoreProjects =@(
+  "src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj"
+
+  "test\ComponentTests\TestAssets\TestProjectForAssemblyResolution\TestProjectForAssemblyResolution.csproj"
+  "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj"
+  "test\E2ETests\TestAssets\DataRowTestProject\DataRowTestProject.csproj"
+  "test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj"
+  "test\E2ETests\TestAssets\DeploymentTestProject\DeploymentTestProject.csproj"
+  "test\E2ETests\TestAssets\DeploymentTestProjectNetCore\DeploymentTestProjectNetCore.csproj"
+  "test\E2ETests\TestAssets\DoNotParallelizeTestProject\DoNotParallelizeTestProject.csproj"
+  "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj"
+  "test\E2ETests\TestAssets\TimeoutTestProject\TimeoutTestProject.csproj"
+  "test\E2ETests\TestAssets\TimeoutTestProjectNetCore\TimeoutTestProjectNetCore.csproj"
+  "test\UnitTests\PlatformServices.NetCore.Unit.Tests\PlatformServices.NetCore.Unit.Tests.csproj"
+)
 
 #
 # Script Preferences
diff --git a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
index 30e7df20e0..04d7d17955 100644
--- a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
+++ b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
@@ -72,6 +72,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\PlatformServices.Interface\PlatformServices.Interface.csproj" />
+    <ProjectReference Include="..\..\TestFramework\Extension.Core\Extension.Core.csproj" />
+    <ProjectReference Include="..\..\TestFramework\MSTest.Core\MSTest.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
index be5a9e7536..524acc71f0 100644
--- a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
+++ b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestFxRoot Condition="$(TestFxRoot) == ''">..\..\..\..\</TestFxRoot>
+  </PropertyGroup>
   
   <PropertyGroup>
     <TargetFramework>netcoreapp1.1</TargetFramework>
@@ -6,7 +9,7 @@
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wpa81+wp8</PackageTargetFallback>
-    <OutputPath>..\..\..\..\artifacts\TestAssets\netcoreapp1.1\</OutputPath>
+    <OutputPath>$(TestFxRoot)artifacts\TestAssets\netcoreapp1.1\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\TestFramework\Extension.Core\Extension.Core.csproj" />
-    <ProjectReference Include="..\..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\Extension.Core\Extension.Core.csproj" />
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj b/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
index f0bf4d7c61..407544bcba 100644
--- a/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
+++ b/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
@@ -5,20 +5,21 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(TestFxRoot)artifacts\TestAssets\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
-    <ProjectReference Include="..\..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
+    <ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
   </ItemGroup>
   
   <ItemGroup>
     <Compile Include="Tests.fs" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
index fbebb3b499..a46dff5b28 100644
--- a/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
+++ b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
@@ -7,8 +7,8 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <FrameworkIdentifier>NetCore</FrameworkIdentifier>
     <IsPackable>false</IsPackable>
-    <!--<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>-->
-    <OutputPath>$(TestFxRoot)artifacts\TestAssets\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <OutputPath>$(TestFxRoot)artifacts\TestAssets\netcoreapp1.1\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>