PR feedback

dotnet · Jun 25, 2019 · 2bbc653 · 2bbc653
1 parent 202dabd
commit 2bbc653
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Microsoft.DotNet.CoreFxTesting/FileUtilities.cs b/src/Microsoft.DotNet.CoreFxTesting/FileUtilities.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// Copied from https://raw.githubusercontent.com/dotnet/core-setup/master/tools-local/tasks/FileUtilities.cs
+// Copied from https://github.com/dotnet/core-setup/blob/b73c0af268be449db317a7c0718012027cd8b173/tools-local/tasks/FileUtilities.cs
 
 using System;
 using System.Collections.Generic;

diff --git a/src/Microsoft.DotNet.CoreFxTesting/GenerateFileVersionProps.cs b/src/Microsoft.DotNet.CoreFxTesting/GenerateFileVersionProps.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// Copied and slightly modified from https://raw.githubusercontent.com/dotnet/core-setup/master/tools-local/tasks/GenerateFileVersionProps.cs
+// Copied and slightly modified from https://github.com/dotnet/core-setup/blob/b73c0af268be449db317a7c0718012027cd8b173/tools-local/tasks/GenerateFileVersionProps.cs
 
 using Microsoft.Build.Construction;
 using Microsoft.Build.Framework;

diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/Microsoft.DotNet.CoreFxTesting.targets b/src/Microsoft.DotNet.CoreFxTesting/build/Microsoft.DotNet.CoreFxTesting.targets
@@ -81,12 +81,8 @@
     <PlatformManifestFile>$(TestHostFrameworkPath)PlatformManifest.txt</PlatformManifestFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="Exists('$(PlatformManifestFile)')">
-    <PackageConflictPlatformManifests Include="$(PlatformManifestFile)" />
-  </ItemGroup>
-
   <UsingTask TaskName="GenerateFileVersionProps" AssemblyFile="$(CoreFxTestingAssemblyPath)"/>
-  <Target Name="GenerateFileVersionProps" Condition="'$(GenerateFileVersionProps)' == 'true'">
+  <Target Name="GenerateFileVersionProps" Condition="'$(UsePlatformManifestFile)' == 'true'">
     <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFiles)"
                               PackageId="Microsoft.NETCore.App"
                               PackageVersion="$(ProductVersion)"

diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props
@@ -14,6 +14,10 @@
     <RunScriptCommands Include="set DEVPATH=%RUNTIME_PATH%" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(UsePlatformManifestFile)' == 'true'">
+    <PackageConflictPlatformManifests Include="$(PlatformManifestFile)" />
+  </ItemGroup>
+
   <!--
     Unit/Functional/Integration test support.
     Supported runners: xunit.