Skip to content

Merge master into features/embeddedJson#26906

Merged
jcouv merged 42 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson
May 16, 2018
Merged

Merge master into features/embeddedJson#26906
jcouv merged 42 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

shaggygi and others added 30 commits January 1, 2018 14:30
The basic validation of our NuPkg and SWR files is implemented. There
are sill some hacks on how these files are found (hard coded paths, etc
...) that need to be cleaned up. The basic checks though are in place.
Need to restructure our CI so that we can call build.ps1 from our
test-build-correctness leg not the other way around. This is necessary
as we now examine many other artifacts including NuGet packages.
This updates our NuSpec and SWR files to be compliant with the analysis
we are now running over them.
The runtimes directory needs to be checked in addition to the root
directory. This has the same set of problems with deployed dependencies.
Desktop signing uses a COM call into the CLR to sign an assembly,
which is not available on Mono or CoreCLR. This change always
uses portable signing by default on Mono as well as CoreCLR.
….8-preview1

Merge dev15.7.x to dev15.8-preview1
…o-master

Merge dev15.8-preview1 to master
otherwise, it will pick up IList but Array implementation only support Rank==1 on runtime even if there is no compile time error.
Fix our Compiler NuGet dependency list
This is cleaning up some code needed to bootstrap groovy changes in an
earlier PR:

dotnet#26762
Remove value that is not used in fix all.
No longer require conditional compilation in order to run the full
IOperation test suite.
jcouv and others added 12 commits May 15, 2018 07:56
Keeping this offline for now until we get to the root of the Spanish
machine issues.
…sure on the pool in highly multithreaded scenarios. (dotnet#26845)

Related to dotnet#26779.
Updates to our IOperation testing
* Simplify how we do fix all tests.

* Simplify.
…otnet#25032)

* Moved VB tests to test emitted attributes vs source synthesized ones

* PR Comments
dotnet#26857)

* guard us from completely failing when classification type map is messed up.

also add NFW to save dump on such situation

* PR feedbacks and made us to guard from classification issue.

* addressed PR feedback

* PR feedback. add back NFW
@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners May 16, 2018 18:11
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jaredpar @jasonmalinowski Do you know why "windows_build_correctness_prtest " is failing when i merge master into this branch? The specific error i'm getting is:

11:16:39 D:\j\workspace\windows_build---2f6661eb>.\build\scripts\cibuild.cmd -testBuildCorrectness 
11:16:39 Repo Dir D:\j\workspace\windows_build---2f6661eb
11:16:39 Binaries Dir D:\j\workspace\windows_build---2f6661eb\Binaries
11:16:39 Unsupported argument -testBuildCorrectness

it seems strange that this would have a problem with my feature branch, but not have a problem in master.

Thanks!

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Note: from looking at what i'm merging in, that script does not have that flag anymore:

https://github.com/dotnet/roslyn/pull/26906/files#diff-c00c354c65130e8509499c1c33cb4995

But then it's unclear to me why cibuild.cmd would then be trying to call it. Wouldn't any changes to cibuild.cmd also come into my branch?

@jasonmalinowski
Copy link
Copy Markdown
Member

The changes to netci.groovy that change what is being invoked doesn't apply until after you merge the PR. Jenkins consumes what is in your branch, not what is in the PR.

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Ah ok. So it's ok that this leg failed? Thanks!

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv @jmarolf for simple merges into feature branches.

@etbyrd etbyrd added the Community The pull request was submitted by a contributor who is not a Microsoft employee. label May 16, 2018
@jcouv jcouv merged commit 10cf17b into dotnet:features/embeddedJson May 16, 2018
@CyrusNajmabadi CyrusNajmabadi deleted the features/embeddedJson branch May 16, 2018 23:35
@CyrusNajmabadi CyrusNajmabadi restored the features/embeddedJson branch May 16, 2018 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Community The pull request was submitted by a contributor who is not a Microsoft employee.

Projects

None yet

Development

Successfully merging this pull request may close these issues.