Replace runtimepath for UWP

dotnet · Jun 24, 2019 · abc211b · abc211b
1 parent 202dabd
commit abc211b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/Resources.uap.targets b/src/Microsoft.DotNet.CoreFxTesting/build/Resources.uap.targets
@@ -4,12 +4,12 @@
 
   <PropertyGroup>
     <!-- We need to binplace the resources as resw files to create the runner's pri file. -->
-    <ResourcesFolderPath Condition="'$(ResourcesFolderPath)' == ''">$(RuntimePath)resw</ResourcesFolderPath>
+    <ResourcesFolderPath Condition="'$(ResourcesFolderPath)' == ''">$(UAPTestSharedFrameworkPath)resw</ResourcesFolderPath>
 
     <_MakePriExecutable>$(TestAssetsDir)makepri.exe</_MakePriExecutable>
     <_MakePriConfigTemplate>$(TestAssetsDir)MakePriConfigFile.xml</_MakePriConfigTemplate>
 
-    <_CommonPriFile Condition="'$(_CommonPriFile)' == ''">$(RuntimePath)resw/resources.pri</_CommonPriFile>
+    <_CommonPriFile Condition="'$(_CommonPriFile)' == ''">$(UAPTestSharedFrameworkPath)resw/resources.pri</_CommonPriFile>
     <_MakePriHelpersDir>$(IntermediateOutputPath)makepri</_MakePriHelpersDir>
     <_MakePriConfigFile>$(_MakePriHelpersDir)/ModifiedConfigFile.xml</_MakePriConfigFile>
     <_ReswListFile>$(_MakePriHelpersDir)/reswlist.RESFILES</_ReswListFile>
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <_AllRuntimeDllFiles Include="$(RuntimePath)*.dll" />
+    <_AllRuntimeDllFiles Include="$(UAPTestSharedFrameworkPath)*.dll" />
     <_ExternalReswFiles Include="$(_ExternalReswOutputPath)*.resw" />
 
     <!-- The first time the CreateReswFilesForExternalDependencies target is executed the itemgroup _ExternalReswFiles will be empty
@@ -40,7 +40,7 @@
     <PropertyGroup>
       <ProjectHasResources Condition="'@(_AllResxFiles)' != ''">true</ProjectHasResources>
       <TestProjectNeedsModifiedPriFile Condition="'$(IsTestProject)' == 'true' AND '$(ProjectHasResources)' == 'true'">true</TestProjectNeedsModifiedPriFile>
-      <TestResourcesFolderPath Condition="'$(TestProjectNeedsModifiedPriFile)' == 'true'">$(RuntimePath)$(AssemblyName).Resw</TestResourcesFolderPath>
+      <TestResourcesFolderPath Condition="'$(TestProjectNeedsModifiedPriFile)' == 'true'">$(UAPTestSharedFrameworkPath)$(AssemblyName).Resw</TestResourcesFolderPath>
       <_ResWDestinationPath Condition="'$(TestResourcesFolderPath)' != ''">$(TestResourcesFolderPath)</_ResWDestinationPath>
       <_ResWDestinationPath Condition="'$(TestResourcesFolderPath)' == ''">$(ResourcesFolderPath)</_ResWDestinationPath>
     </PropertyGroup>

diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.uap.targets b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.uap.targets
@@ -35,7 +35,7 @@
                       Overwrite="true" />
 
     <PropertyGroup Condition="'$(TestProjectNeedsModifiedPriFile)' == 'true'">
-      <_MakePriCommand>$(_MakePriExecutable) versioned /o /pr "$(RuntimePath)resw" /cf "$(_MakePriConfigFile)" /of "$(TestPath)" /if "$(_CommonPriFile)"</_MakePriCommand>
+      <_MakePriCommand>$(_MakePriExecutable) versioned /o /pr "$(UAPTestSharedFrameworkPath)resw" /cf "$(_MakePriConfigFile)" /of "$(TestPath)" /if "$(_CommonPriFile)"</_MakePriCommand>
     </PropertyGroup>
 
     <!-- We call MakePri.exe to create common resources.pri file only if this test project has its own resources. -->