Skip to content

Merge dev/release/2.1 into master #577

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

Merged
merged 7 commits into from
Jun 5, 2018
Merged

Conversation

eerhardt
Copy link
Member

There were a few changes that went into 2.1 that should be ported to master.

crummel and others added 5 commits May 21, 2018 18:04
* Stabilize CLI.
* Use stable MSBuild.
* Fix MSBuild version to match prodcon build.
* Modify CLI build file to always ignore NU5104
* Add web to smoke-test, with and without dev certs

* Only reset caches when a test will run

Avoid conflicting with a hanging process if there's no need to delete the files anyway.
@eerhardt eerhardt requested review from dseefeld, crummel and dagood May 25, 2018 19:29
Copy link
Contributor

@crummel crummel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one small thing on the stabilization.

repos/cli.proj Outdated

<!-- Produce stable versions for RTM only. When https://github.com/dotnet/source-build/issues/550
is fixed we will be able to determine this automatically. -->
<EnvironmentVariables Include="DropSuffix=true" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we decided that master should not be stabilized (#571 (comment)). cc @weshaggard

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @crummel. I added a Condition to this line to only set it when UseStableVersions is set.

This version needs to be compatible with the current runtime being produced.
@eerhardt
Copy link
Member Author

test CentOS7.1 Tarball Release
test RHEL7.2 Tarball Release
test RHEL7.2 Unshared Release

Fedora 24 and OSX are expected to fail until the CI is updated with the new netci.groovy file.

@eerhardt
Copy link
Member Author

eerhardt commented Jun 4, 2018

test RHEL7.2 Unshared Release

@dseefeld dseefeld merged commit 55efb2e into dotnet:master Jun 5, 2018
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.

5 participants