Merge master to release/dev16.3 #7266
Merged
Conversation
This file contains 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
…715.4 (#7240) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19365.4
* Moving UpcastDowncastTests over to NUnit * missing new line
…716.4 (#7245) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19366.4
* Mark name resoltion error message tests for port to NUnit * Add Nunit tests for FieldNotInRecord, RecordFieldProposal, and GlobalQualifierAfterDot * Fix expected error message in FieldNotInRecord Compiler test * Change global Qualifier after dot test back to original fsharpqa version. Needs seperate assert function for parsing errors instead of typechecking * Remove unnecessary double ticks from NameResolution tests
* move some error and warning tests to NUnit * CompilerAssert.ParseWithErrors now uses ParseFile instead of ParseAndCheckFileInProject * merge conflicts
…717.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19367.8
…594-f5347efa8e01 [master] Update dependencies from dotnet/arcade
…718.7 (#7256) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19368.7
* Moving TypeMismatchTests over to NUnit * ci restart
Also publish native symbols so they can be archived later.
* Enable hash algorithm selection * Feedback * More feedback * Revert "Feedback" This reverts commit 6ab1b07. * feedback
…719.2 (#7260) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19369.2
* Improve netcore reference selection * Update baselines
* Moving Libraries Control tests to NUnit * Names tests as Async instead of Control
|
@brettfo Checks fsharp-ci and fsharp-ci (SourceBuild_Linux) failed, and there are file conflicts. Please have a look. |
…722.10 (#7268) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19372.10
|
@KevinRansom can you take a look? PRs #7232 and #7166 are conflicting. You'll have to run the merge locally (instructions in the PR message) and reconcile the tests that were converted to NUnit vs the ones added for the version46/47 switch. |
|
@KevinRansom Checks fsharp-ci, fsharp-ci (Windows coreclr_release), fsharp-ci (Windows desktop_release) and fsharp-ci (Windows fsharpqa_release) failed. Please have a look. |
Merge release/dev16.2 to master
* fixes issue #6832 * Fix comment * Forgot to remove pdbs from fsharp.compiler.nuget * Rename Program.fs and exclude FSharpSdk from checks * Embedded doesn't need to verify tmp or obj directories. * typo * typo * Don't check FSharpSdk for hash * Make comment match code * Empty commit to force rebuild
* Update dependencies from https://github.com/dotnet/arcade build 20190723.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19373.6 * Update dependencies from https://github.com/dotnet/arcade build 20190724.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19374.2 * Update dependencies from https://github.com/dotnet/arcade build 20190725.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.2
KevinRansom
force-pushed
the
merges/master-to-release/dev16.3
branch
from
fa5354f to
0d310ff
Compare
…725.15 (#7282) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.15
KevinRansom
force-pushed
the
merges/master-to-release/dev16.3
branch
from
0d310ff to
c03755f
Compare
ghost
merged commit
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 master into release/dev16.3.
(created from a manual run of the PR generation tool)
git fetch --all git checkout merges/master-to-release/dev16.3 git reset --hard upstream/release/dev16.3 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.3 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.