From: Steve Harter Date: Fri, 9 Feb 2018 00:29:50 +0000 (-0600) Subject: Update assembly-conflict-resolution.md X-Git-Tag: submit/tizen/20210909.063632~11032^2~890 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cde73d9e72ec72f1c034c2f39abd33505724238b;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Update assembly-conflict-resolution.md Commit migrated from https://github.com/dotnet/core-setup/commit/0568c193dd46b16e113772c7f8e5d076999a8c51 --- diff --git a/docs/installer/design-docs/assembly-conflict-resolution.md b/docs/installer/design-docs/assembly-conflict-resolution.md index 1e0b44b..5234a08 100644 --- a/docs/installer/design-docs/assembly-conflict-resolution.md +++ b/docs/installer/design-docs/assembly-conflict-resolution.md @@ -55,7 +55,7 @@ Note that for an app, its probing path comes *after* the framework, so intuitive ## Proposed changes for 2.1 Probe the app location before the framework's. This means flip (3) and (4) under **Probe Ordering** above and treat the app as the highest-level framework. The reason is that there may be frameworks that use OOB packages like apps, and we want to have "app wins" in such cases. -Replace step 6 under **Algorithm** above with: +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