Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Merge master into dev/api #11366

Merged
merged 337 commits into from
Sep 2, 2016
Merged

Merge master into dev/api #11366

merged 337 commits into from
Sep 2, 2016

Conversation

joperezr
Copy link
Member

@joperezr joperezr commented Sep 1, 2016

Merging branch master into dev/api

cc: @weshaggard @danmosemsft @stephentoub @ericstj
FYI: @tarekgh @sepidehms

stephentoub and others added 30 commits August 19, 2016 07:23
RegistryKey.OpenSubKey should remove multiple/trailing slashes
Add some tests to System.Reflection.Emit
And cleanup existing tests
Consume Roslyn Compiler 2.0.0-beta3
…cies

Update CoreFx to beta-24419-02 (master)
Update build tools to pick up fix for Linux tests.
Cleanup System.Reflection.TypeExtensions.ConstructorInfo tests
RegistryKey's name fix-up implementation uses a mark-and-sweep
approach. If there are multiple slashes, any extra slash chars will be
replaced with a marker char ('\uffff'), and then all '\uffff' chars
will be removed, including any pre-existing '\uffff' chars.

If there aren't multiple slashes, any '\uffff' chars should remain.

This commit adds new tests to pin this behavior.
Also cleans up EditableAttribute and EmailAddressAttribute tests
…-tests

Add and cleanup CustomValidationAttribute tests
…cies

Update CoreClr to beta-24419-03 (master)
…#10940)

* Add some tests for invalid inputs to MemberAccess expressions

* Address PR feedback

* Add test for no accessors in ProperyInfo
* Add tests for invalid inputs to Expression.New

Also adds some param names that were brought up from these tests
Add and cleanup tests for DataTypeAttribute
Fixed incorrect x64 #import for ol.7.0 RID
set __CrossBuild in src/Native/build-native.sh automatically
ARM-CI : Check a device is already mounted while mounting a device.
@joperezr
Copy link
Member Author

joperezr commented Sep 1, 2016

Changes that I had to do in order to get this building are in bf7911a

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

Looking into the non-Windows test failures...

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

After analyzing the tests failures in an OSX and an Ubuntu machine, looks like the 8 test projects that have failures are all because of the same reason: They are missing System.Security.Cryptography.Native.OpenSsl native binary in the test folder. I checked and it looks like that package doesn't exist yet in the dev/api myget feed, and I can't seem to get it to work by adding a .pkgproj reference to the native project that drops that binary. Any help is appreciated.

@stephentoub
Copy link
Member

I checked and it looks like that package doesn't exist yet in the dev/api myget feed

Could the one from the core feed be manually pushed to dev-api feed for bootstrapping?

@steveharter
Copy link
Contributor

FWIW diff on master vs dev\api from https://github.com/dotnet/versions/tree/master/build-info/dotnet/corefx shows these as missing (not just OpenSsl):

runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.native.System.Security.Cryptography.OpenSsl
runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.opensuse.42.1-x64.runtime.native.System
runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression
runtime.opensuse.42.1-x64.runtime.native.System.Net.Http
runtime.opensuse.42.1-x64.runtime.native.System.Net.Security
runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography
runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl
runtime.ubuntu.16.10-x64.runtime.native.System
runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression
runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http
runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security
runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography
runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl

Here's the new ones:
System.Diagnostics.Debug.SymbolReader
System.Json
System.Private.Xml
System.Private.Xml.Linq
System.Security.Permissions
System.Transactions

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

Could the one from the core feed be manually pushed to dev-api feed for bootstrapping?

we could, but I believe that wouldn't be enough as we would also need to push an update for Microsoft.NETCore.Targets package since this is the one that pulls the openSsl native package in. Given there is already one of these in our feed with the matching prerelease, I believe we would have to remove the one that's there and then push the updated version of it keeping the same prerelease. One other option, would be to disable these 8 test projects for non-Windows runs until we update the corefx packages in dev/api, which would even probably happen today as well.

@stephentoub @weshaggard thoughts?

@ericstj
Copy link
Member

ericstj commented Sep 2, 2016

I would have expected your change for TestWithLocalNativeLibraries to actually have solved this. Let's look at a repro to find out why that's not happening.

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

With the help of @ericstj I finally know what the problem is and how to fix it. It will require a buildtools update. I'll update this PR very soon.

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

@dotnet-bot test Innerloop CentOS7.1 Release Build and Test please (segfault during System.Runtime.Tests)

@joperezr joperezr merged commit 8126ed0 into dotnet:dev/api Sep 2, 2016
@davidsh
Copy link
Contributor

davidsh commented Sep 2, 2016

Due to PR #11341 you might want to run some [outerloop] passes on this. Otherwise you are not getting any networking test coverage.

@joperezr
Copy link
Member Author

joperezr commented Sep 2, 2016

@davidsh I didn't get those changes as part of this merge. Last commit I got from master was 022a8c2 which I think happened before your merge.

@joperezr joperezr deleted the MergeMaster branch September 2, 2016 18:12
@davidsh
Copy link
Contributor

davidsh commented Sep 2, 2016

@davidsh I didn't get those changes as part of this merge. Last commit I got from master was 022a8c2 which I think happened before your merge.

Ok. Then it is something to do for future merges.

@karelz karelz modified the milestone: 1.2.0 Dec 3, 2016
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.