Skip to content

Add conflict resolution #1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Apr 11, 2017
Merged

Add conflict resolution #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
bc7b4b9
Add conflict resolution and trimming tasks
dsplaisted Mar 16, 2017
7543da3
Add conflict resolution tasks to Microsoft.NET.Build.Tasks project
dsplaisted Mar 16, 2017
ab15112
Update namespace for conflict resolution
dsplaisted Mar 20, 2017
3bdd8e0
Update license header from conflict resolution code to match other files
dsplaisted Mar 20, 2017
ddfd332
Add conflict resolution .targets file to SDK
dsplaisted Mar 26, 2017
cd23629
Add tests for conflict resolution scenarios
dsplaisted Mar 28, 2017
01576d2
Add test for conflict resolution when targeting .NET Framework, updat…
dsplaisted Mar 28, 2017
660bca1
Create IConflictItem interface to make ConflictResolver more testable
dsplaisted Mar 31, 2017
9c7dae0
Fix incorrect logic (probably copy/paste error) in conflict resolver …
dsplaisted Apr 3, 2017
5d4ecd8
Add unit tests for conflict resolver
dsplaisted Apr 3, 2017
1e9d2cf
Don't report a conflict between two items that don't resolve to a fil…
dsplaisted Apr 4, 2017
e2debd1
Make conflict resolution strings localizable
dsplaisted Apr 4, 2017
0157d3f
Fix test failures: Don't resolve publish assemblies for a RID, and do…
dsplaisted Apr 4, 2017
0937875
Skip test asset path length check on non-Windows
dsplaisted Apr 4, 2017
09704ca
Add test for conflict resolution for RID specific shared framework app
dsplaisted Apr 4, 2017
2a446ab
Simplify conflict resolution targets since we don't need to support d…
dsplaisted Apr 4, 2017
6d9159f
Pass conflicts to remove to deps file generation task instead of read…
dsplaisted Apr 4, 2017
6e73517
Rename Conflicts property of GenerateDepsFile task to FilesToSkip
dsplaisted Apr 4, 2017
9ee2bfc
Rename conflict resolution targets file
dsplaisted Apr 4, 2017
481a498
Update to new version of CLI, enable RID specific shared framework co…
dsplaisted Apr 4, 2017
49695bf
Delete trimming and other files that were copied over from netstandar…
dsplaisted Apr 4, 2017
8a5e3df
Disable tests which depend on bundled versions of .NET Core / .NET St…
dsplaisted Apr 5, 2017
3c38586
Merge remote-tracking branch 'upstream/master' into resolve-conflicts…
dsplaisted Apr 5, 2017
5bc3735
Consolidate NuGetUtils and NuGetUtilities classes
dsplaisted Apr 6, 2017
b3712b5
Consolidate ITaskItemExtensions and ItemUtilities
dsplaisted Apr 6, 2017
ea4431a
Apply code review feedback
dsplaisted Apr 7, 2017
d525ece
Disable conflict resolution logic from Microsoft.Packaging.Tools package
dsplaisted Apr 7, 2017
4b04b4e
Add tests for deps.json conflict removal
dsplaisted Apr 7, 2017
5e4ca3a
Disable test on full framework until #1077 is fixed
dsplaisted Apr 7, 2017
d43b9a7
Remove out of date comments about how to disable conflict resolution
dsplaisted Apr 9, 2017
1ab0fb7
Add tests for running app from output folder, fix issues with conflic…
dsplaisted Apr 10, 2017
09c45a6
Make conflict resolution targets private
dsplaisted Apr 11, 2017
35e681b
Don't use Path metadata for destination path in conflict resolution
dsplaisted Apr 11, 2017
da7ad2e
Rename HandlePackageFileConflicts task to ResolvePackageFileConflicts…
dsplaisted Apr 11, 2017
77c53df
Merge remote-tracking branch 'upstream/master' into resolve-conflicts…
dsplaisted Apr 11, 2017
517b4d5
Update test merged from master to work with bundled .NET Core version
dsplaisted Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-preview1-005685
2.0.0-preview1-005722
6 changes: 5 additions & 1 deletion build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- This file is imported by all projects at the beginning of the project files -->

<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<PropertyGroup>
<MsBuildPackagesVersion>15.1.548</MsBuildPackagesVersion>
<DependencyModelVersion>1.0.3</DependencyModelVersion>
<PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
<NuGetVersion>4.3.0-beta1-2418</NuGetVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<NewtonsoftJsonSideBySideVersion>6.0.4</NewtonsoftJsonSideBySideVersion>
<SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
</PropertyGroup>

<!-- Dependencies from test projects -->
<PropertyGroup>
<MicrosoftNETCoreApp20Version>2.0.0-beta-001783-00</MicrosoftNETCoreApp20Version>
<xunitVersion>2.1.0</xunitVersion>
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
Expand Down
Loading