Skip to content

Merge master into release/2.0.0 - #1247

Merged
livarcocc merged 71 commits into
dotnet:release/2.0.0from
livarcocc:merge_master
May 24, 2017
Merged

livarcocc merged 71 commits into
dotnet:release/2.0.0from
livarcocc:merge_master

Conversation

@livarcocc

Copy link
Copy Markdown
Contributor

@dotnet/dotnet-cli

@MattGertz merging master into release/2.0.0 so that we can move our development to this 2.0 branch.

livarcocc and others added 30 commits April 21, 2017 15:52
Update to NuGet version 4.3.0-preview1-2500
…sent if the project's output has a runtime associated with it

_IsExecutable is set to true iff OutputType is Exe or WinExe. This is used to avoid bugs which does not consider WinExe output.

Replace the check for Executable using the new variable IsExecutable

HasRuntimeOutput is now used in places where we check to see if the project is an executable to
enable Auto Binding Redirect generation, deps.json and F5 run.
* release/2.0.0:
  Updating the runtime versions we download for 1.0.
  Updating the implicit package versions to 1.0.5 and 1.1.1.
Replace the check for Executable using the new variable HasRuntimeOutput and _IsExecutable
…error

Fix error message when TargetFramework contains semicolons.
Update sdk to support dotnet cli F# and VS F#
dsplaisted and others added 17 commits May 17, 2017 22:40
Return failure from build script if there are test failures
Use lowercase version of TargetFramework when constructing output path
Fix build break due to successful, but bad merge
Create profiling symbols by default.
Deploy copy-local package satellites correctly
Prepare localization handoff by running xlf converter
Provide a flag to indicate that Microsoft.NET.Sdk is used
Make HasRuntimeOutput change compatible with existing test sdk versions
@livarcocc

Copy link
Copy Markdown
Contributor Author

test ci please

@livarcocc

Copy link
Copy Markdown
Contributor Author

This is failing because we changed our format for our test results.

@mmitche how can I force this CI to run using the new configuration in the netci.groovy file?

@livarcocc

Copy link
Copy Markdown
Contributor Author

@dotnet-bot test CI

@eerhardt

Copy link
Copy Markdown
Member

how can I force this CI to run using the new configuration in the netci.groovy file?

What we did in core-setup for a similar situation was merged in the netci.groovy changes first. Then run the CI against the PR. Of course this breaks the branch for a while, but at least you get verification against your merge.

The other option is just merging the whole change into the branch and then running a "follow-up" PR that changes a .md file.

Either way there is a chance the branch is broken. In the first case, it for sure is broken because the .groovy file is not sync'd with what's in the branch. In the second case, you have a chance that the merge "just worked" and the branch isn't actually broken.

@livarcocc

Copy link
Copy Markdown
Contributor Author

Trying @eerhardt's approach here.

@livarcocc
livarcocc merged commit 9cd7443 into dotnet:release/2.0.0 May 24, 2017
@livarcocc
livarcocc deleted the merge_master branch May 24, 2017 15:39
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.