From 5154abd336f944df82f8296a82a468213a3d48c8 Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Tue, 16 Mar 2021 19:25:02 +0100
Subject: [PATCH] MSBuild scripts fixed. (#801)

---
 scripts/build/TestFx.Settings.targets | 8 ++++----
 scripts/build/TestFx.targets          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/build/TestFx.Settings.targets b/scripts/build/TestFx.Settings.targets
index 5ceb3bacf0..2f53ecce34 100644
--- a/scripts/build/TestFx.Settings.targets
+++ b/scripts/build/TestFx.Settings.targets
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <TestFxRoot Condition="$(TestFxRoot) == ''">..\..\</TestFxRoot>
-    <RepoRoot Condition="$(RepoRoot) == ''">$(TestFxRoot)</RepoRoot>
+    <RepoRoot Condition="$(RepoRoot) == ''">$(MSBuildThisFileDirectory)..\..\</RepoRoot>
     <IncludeMicrosoftCommon Condition="$(IncludeMicrosoftCommon) == ''">true</IncludeMicrosoftCommon>
   </PropertyGroup>
 
@@ -17,7 +17,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <GenerateLCE>true</GenerateLCE>
-    <AssemblyOriginatorKeyFile>$(TestFxRoot)scripts\build\key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(IsLocalizedBuild)' == '' or '$(IsLocalizedBuild)' != 'true'">true</PublicSign>
     <!-- Temporarily turning on Delay signing for Localized builds because publickey = true is not passed on to the assembler to create resource assmblies.-->
@@ -34,7 +34,7 @@
   <!-- Code analysis settings -->
   <PropertyGroup>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-    <CodeAnalysisRuleSet>$(TestFxRoot)scripts/build/stylecop.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="$(IsTest) == 'true'">$(TestFxRoot)scripts/build/stylecop.test.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)stylecop.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="$(IsTest) == 'true'">$(MSBuildThisFileDirectory)stylecop.test.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index 29f227861d..3156375e22 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -15,10 +15,10 @@
   <Import Project="$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
 
   <!-- Import localization specific Targets if enabled. -->
-  <Import Project="$(RepoRoot)scripts\build\TestFx.Loc.targets" Condition="($(IsTest) == '' or $(IsTest) == 'false') and $(IsLocalizationEnabled) == 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)TestFx.Loc.targets" Condition="($(IsTest) == '' or $(IsTest) == 'false') and $(IsLocalizationEnabled) == 'true'"/>
 
   <ItemGroup>
-    <None Include="$(TestFxRoot)scripts\build\key.snk">
+    <None Include="$(MSBuildThisFileDirectory)key.snk">
       <!-- Do not have this show up in Solution Explorer in VS -->
       <InProject>false</InProject>
     </None>