Skip to content

Merge release/2.0.0 to master - #1269

Merged
livarcocc merged 31 commits into
dotnet:masterfrom
nguerrera:merge-release
May 31, 2017
Merged

livarcocc merged 31 commits into
dotnet:masterfrom
nguerrera:merge-release

Conversation

@nguerrera

@nguerrera nguerrera commented May 30, 2017

Copy link
Copy Markdown
Contributor

@livarcocc @dsplaisted Merging changes from release/2.0.0 to master

eerhardt and others added 30 commits May 23, 2017 17:31
When publishing for PreserveCompilationContext=true and filtering packages using a TargetManifest file, there is no need to copy assemblies that will be in the runtime store to the 'refs' folder.  They will be resolved from the runtime store.

Fix dotnet#1216
…tained apps but not shared framework apps or libraries

Fixes dotnet#983
PreserveCompilationContext should take into account runtime store assemblies
Add logic to roll forward to patch versions of .NET Core for self-contained apps but not shared framework apps or libraries
Update CLI version to 2.0.0-preview2-006189
Implement version cap for .NET Standard and .NET Core
…ttributes and CreateGeneratedAssemblyInfoInputsCacheFile targets.
Automatically set Link metadata on items outside the project folder
…mbly-attributes-using-lock-file

Incremental build improvements for generated AssemblyInfo.cs using inputs cache
Include log files in Jenkins archive
Don't pass duplicate items to conflict resolution if CopyLocalLockFileAssemblies is true
…-failure

Don't generate deps or runtimeconfig files when build has failed but _CleanRecordFileWrites is being run
@nguerrera nguerrera added this to the 2.1.0 milestone May 30, 2017
@nguerrera
nguerrera requested review from dsplaisted and livarcocc May 30, 2017 17:16
@livarcocc

Copy link
Copy Markdown
Contributor

@MattGertz Just merging branches.

@livarcocc
livarcocc merged commit a4bceb6 into dotnet:master May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants