Merge dev15.7.x to dev15.7.x-vs-deps#24419
Merged
agocke merged 12 commits intodev15.7.x-vs-depsfrom Jan 24, 2018
Merged
Conversation
…rsions 7.2 and higher Fixes:#24306
Constrain availability of ref conditional expressions to language versions 7.2 and higher
This changes the reference assemblies we use for the CoreClr compiler compilation to be Net Standard 2.0 RTM. Previously they were a beta version. This did mean a number of tests had to be moved to be desktop specific again. This is primarily due to the presence of ValueTuple as a default type in Net Standard 2.0. Tests that relied on ValueTuple not being defined had to be moved to net461 which doesn't have that type defined by default.
Now that the netstandard2.0 references are available via the MS.CA.Test.Reosurces.Proprietary NuGet package we no longer need to copy them around on the file system (that's where they were previously being referenced from).
…0180123-080009 Merge dev15.6.x to dev15.7.x
It was still relying on the 'ref' directory. Changed it to use the resource image.
Move compiler core tests to use netstandard2.0 RTM
agocke
approved these changes
Jan 24, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from dev15.7.x into dev15.7.x-vs-deps.
git fetch --all git checkout merges/dev15.7.x-to-dev15.7.x-vs-deps-20180124-080026 git reset --hard upstream/dev15.7.x-vs-deps git merge upstream/dev15.7.x # Fix merge conflicts git commit git push merges/dev15.7.x-to-dev15.7.x-vs-deps-20180124-080026 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.