From 5f34610806d28f18f0eabee67c07253563033d13 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 20 Apr 2018 14:13:50 -0700
Subject: [PATCH] Include file versions in deps file by default when targeting
 .NET Core or .NET Standard

---
 .../targets/Microsoft.NET.Publish.targets                | 9 +--------
 .../targets/Microsoft.NET.Sdk.BeforeCommon.targets       | 4 ++++
 .../targets/Microsoft.NET.Sdk.targets                    | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
index 0ae0fb07ba04..903eaf707ddc 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -511,13 +511,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <PropertyGroup>
       <PublishDepsFilePath Condition=" '$(PublishDepsFilePath)' == '' ">$(PublishDir)$(ProjectDepsFileName)</PublishDepsFilePath>
-      <!--
-      If publishing a framework-dependent app, then include the assembly and file versions of files in the
-      deps.json to support rolling forward to a newer shared framework.  See https://github.com/dotnet/core-setup/pull/3704
-      Reading these versions could impact build perf, so we avoid doing it by default if we aren't publishing or if we are
-      publishing a self-contained app.
-      -->
-      <IncludeRuntimeFileVersions Condition =" '$(IncludeRuntimeFileVersions)' == '' And '$(SelfContained)' != 'true' ">true</IncludeRuntimeFileVersions>
     </PropertyGroup>
 
     <GenerateDepsFile ProjectPath="$(MSBuildProjectFullPath)"
@@ -540,7 +533,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       ExcludeFromPublishPackageReferences="@(_ExcludeFromPublishPackageReference)"
                       RuntimeStorePackages="@(RuntimeStorePackages)"
                       IsSelfContained="$(SelfContained)"
-                      IncludeRuntimeFileVersions="$(IncludeRuntimeFileVersions)" />
+                      IncludeRuntimeFileVersions="$(IncludeFileVersionsInDependencyFile)" />
 
   </Target>
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
index 711115cf929e..c42fa0bdcecb 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -56,6 +56,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Default settings for .NET Core and .NET Standard build logic -->
   <PropertyGroup Condition="'$(_IsNETCoreOrNETStandard)' == 'true'">
     <GenerateDependencyFile Condition=" '$(GenerateDependencyFile)' == '' ">true</GenerateDependencyFile>
+    
+    <!-- Assembly and file versions of runtime assets should be written to the deps.json by default, to support
+         runtime minor version roll-forward: https://github.com/dotnet/core-setup/issues/3546 -->
+    <IncludeFileVersionsInDependencyFile Condition="'$(IncludeFileVersionsInDependencyFile)' == ''">true</IncludeFileVersionsInDependencyFile>
 
     <!-- Force .dll extension for .NETCoreApp and .NETStandard projects even if output type is exe. -->
     <TargetExt Condition="'$(TargetExt)' == ''">.dll</TargetExt>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index 087b65e61b80..3033892825b7 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -143,7 +143,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       FilesToSkip="@(_ConflictPackageFiles)"
                       CompilerOptions="@(DependencyFileCompilerOptions)"
                       IsSelfContained="$(SelfContained)"
-                      IncludeRuntimeFileVersions="$(IncludeRuntimeFileVersions)">
+                      IncludeRuntimeFileVersions="$(IncludeFileVersionsInDependencyFile)">
     </GenerateDepsFile>
 
     <ItemGroup>