From 3e8e7f7ddf98830e6efdf2b2e5edfc8760ad570d Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Thu, 8 Feb 2018 18:34:47 -0600 Subject: [PATCH] Update assembly-conflict-resolution.md Commit migrated from https://github.com/dotnet/core-setup/commit/17401eeda3880d657a8949895ca90f7e8392cfd3 --- docs/installer/design-docs/assembly-conflict-resolution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installer/design-docs/assembly-conflict-resolution.md b/docs/installer/design-docs/assembly-conflict-resolution.md index 5234a08..f629b2a 100644 --- a/docs/installer/design-docs/assembly-conflict-resolution.md +++ b/docs/installer/design-docs/assembly-conflict-resolution.md @@ -57,6 +57,6 @@ Probe the app location before the framework's. This means flip (3) and (4) under Replace step 5 under **Algorithm** above with: * If the probing path is a framework, and no [minor] or [major] roll-forward occurred on that framework, then check its deps.json to see if it contains the exact package (by name and version). If so, then use the framework's location -* If the probing path is a framework, and a [minor] or [major] roll-forward occurred on that framework, then check its deps.json to see if it contains a newer version of the assembly (by File Version and \ or Assembly Version). If so, then use the framework's location +* If the probing path is a framework, and a [minor] or [major] roll-forward occurred on that framework, then check its deps.json to see if it contains a newer version of the assembly (by Assembly Version and then File Version if necessary). If so, then use the framework's location -In order to compare File Version and \ Assembly Version, additional metadata will need to be written to each deps.json file. If this metadata is not present (as in the case of applications published prior to 2.1) then the files will be considered older and will not replace any previously found locations. +In order to compare Assembly Version and File Version, additional metadata will need to be written to each deps.json file. If this metadata is not present (as in the case of applications published prior to 2.1) then the files will be considered older and will not replace any previously found locations. -- 2.7.4