Skip to content

Updating features/embeddedJson to the latest Master.#29609

Merged
jmarolf merged 366 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson
Aug 31, 2018
Merged

Updating features/embeddedJson to the latest Master.#29609
jmarolf merged 366 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:features/embeddedJson

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

dotnet-automerge-bot and others added 30 commits June 4, 2018 10:30
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
…/embeddedRegex

Merge master to features/embeddedRegex
jaredpar and others added 21 commits August 29, 2018 08:36
This just replicates the pattern used in a few other .With* methods
in this type. A better fix would be to update ForkProject to do this
automatically, but there's some complexity there as some calls require
the fork to happen even if nothing did change. This is just a quick fix
as the deeper fix is going to require some time and care.
* Fix and clean up NuGet package publishing

* Fix path in BuildBoss

* Rename CIBuild to ContinuousIntegrationBuild

* Set OfficialBuildId and ContinuousIntegrationBuild properties

* Set ContinuousIntegrationBuild=true in deterministic build tests

* Remove DeveloperBuild
…29515)

* SourceLink translate mirrored VSTS repo urls to GitHub urls

* Update SourceLink to 1.0.0-beta-63201-01
…rkspace-changed-for-no-op

Don't create new Solution snapshots if nothing changed
…Emit (dotnet#29411)

After I added support for measuring allocations in the compiler
benchmark suite I noticed in a PerfView trace that we were often
resizing the arrays we used for the Emit tables. Looking more closely at
how we allocate the tables, I found that we were using an approximation
that was very close to the actual size of the tables needed, but
systemically undercounted. Ironically, this may be worse than being
farther off since it meant that we were getting right to the edge of
available space, before requiring a resize, meaning a new large
allocation, and copies from all of the entries in the old tables to the
new tables.

By applying a multiplier to the table size and allocating more memory
for the tables, I've actually decreased the total amount of memory
allocated during emit.
Enable VB Semantic tests on CoreClr Linux
* Change meaning of $cibuild in scripts

* Copy Roslyn CoreXT packages to the DevDivPackages\Roslyn instead of Insertion dir
Run the simplifier over the expression generation tests to fix issue 26586
Fix issue where 'remove parens' would break code with ++/-- operators.
@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners August 31, 2018 08:16
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Tagging @jcouv . Once the regex features went in, there were merge conflicts between features/embeddedJson and master. This fixes up those conflicts so that we can continue merging master into this branch on a daily basis.

Thanks!

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv @jmarolf This is just a trivial merge+merge-conflict-fix PR to the feature branch. Could you just merge in so that this branch and master don't continue to deviate further and further? Thanks!

@jmarolf jmarolf merged commit b43290d into dotnet:features/embeddedJson Aug 31, 2018
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Thanks!

@CyrusNajmabadi CyrusNajmabadi deleted the features/embeddedJson branch August 31, 2018 20:01
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.