Skip to content
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.

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

Merge release/2.0-vs into release/2.0.0 #1600

Merged
merged 25 commits into from
Sep 22, 2017
Merged

Conversation

livarcocc
Copy link
Contributor

@dotnet/dotnet-cli

dsplaisted and others added 25 commits August 16, 2017 17:47
Update version to 2.0.2-vspre and update NuGet
Insert NuGet Build 4.4.0-preview1-4434 into sdk
This is already set in the build script, but setting it here will apply to scenarios such as running tests from VS
Update support libraries to those that are only lib.
Use correct target path for runtimeTargets items when resolving conflicts
Insert NuGet Build 4.4.0-preview3-4475 into sdk
* release/2.0-vs:
  Update CLI version
  Fix test issue with path separator character
  Fix perf regression with setting DestinationSubPath on items for conflict resolution
  Add build/test environment scripts
  Fix satellite assembly conflict resolution when targeting .NET Core
  Take locale portion of target path for satellite assemblies into account in conflict resolution
  Add comment clarifying test expectation
  Change log verbosity to normal when checking whether projects encounter conflicts
  Use correct target path for runtimeTargets items when resolving conflicts
  Disable multilevel lookup for Tests
  Disable multilevel lookup in build/test to prevent accidental machine dependencies
  Insert NuGet Build 4.4.0-preview3-4475 into sdk
  Update support libraries to those that are only lib.
  Update DotnetCLIVersion
  fix intermediate nuspec path
  Insert NuGet Build 4.4.0-preview1-4434 into sdk
  Insert NuGet Build 4.4.0-preview1-4365 and corresponding CLI version into SDK
@livarcocc
Copy link
Contributor Author

@dotnet-bot Test this please

@livarcocc
Copy link
Contributor Author

@dotnet-bot Test Ubuntu16.04 Debug

@livarcocc livarcocc merged commit fe87160 into release/2.0.0 Sep 22, 2017
@livarcocc livarcocc deleted the merge_release20_vs branch September 22, 2017 22:10
JL03-Yue pushed a commit that referenced this pull request Mar 19, 2024
[main] Update dependencies from dotnet/arcade
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants