Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev16.0 to dev16.1 #6317

Merged
1 commit merged into from
Mar 14, 2019
Merged

Merge dev16.0 to dev16.1 #6317

1 commit merged into from
Mar 14, 2019

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from dev16.0 into dev16.1.

git fetch --all
git checkout merges/dev16.0-to-dev16.1
git reset --hard upstream/dev16.1
git merge upstream/dev16.0
# Fix merge conflicts
git commit
git push upstream merges/dev16.0-to-dev16.1 --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

* Possible fix for script processing

* Update FSharpProjectOptionsManager.fs

* add test files and improve fix
@v-asdhin
Copy link

@brettfo Check visualfsharp-CI failed. Please have a look.

1 similar comment
@v-asdhin
Copy link

@brettfo Check visualfsharp-CI failed. Please have a look.

@v-asdhin
Copy link

@brettfo @KevinRansom Check visualfsharp-CI failed. Please have a look.

@dsyme
Copy link
Contributor

dsyme commented Mar 14, 2019

Failed   TypeProvider.Disposal.SmokeTest1
Error Message:
   Check1, countDisposals() < i, iteration 46
  Expected: True
  But was:  False

Stack Trace:
   at Tests.LanguageService.Script.UsingMSBuild.TypeProviderDisposalSmokeTest(Boolean clearing) in D:\a\1\s\vsintegration\tests\UnitTests\LegacyLanguageService\Tests.LanguageService.Script.fs:line 1615
   at Tests.LanguageService.Script.UsingMSBuild.TypeProvider.Disposal.SmokeTest1() in D:\a\1\s\vsintegration\tests\UnitTests\LegacyLanguageService\Tests.LanguageService.Script.fs:line 1649

@dsyme dsyme closed this Mar 14, 2019
@dsyme dsyme reopened this Mar 14, 2019
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit a23c16a into dev16.1 Mar 14, 2019
@ghost ghost deleted the merges/dev16.0-to-dev16.1 branch March 14, 2019 19:00
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 15, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 15, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 15, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 15, 2019 12:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 15, 2019 19:34
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 15, 2019 19:34
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 16, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 16, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 16, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 16, 2019 12:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 17, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 17, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 17, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 17, 2019 12:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 18, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 18, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 18, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 18, 2019 12:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 19, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 19, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 19, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 19, 2019 12:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 19, 2019 17:37
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 19, 2019 17:37
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 19, 2019 22:06
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 19, 2019 22:06
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 20, 2019 00:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 20, 2019 00:01
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 20, 2019 00:58
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 20, 2019 00:58
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 20, 2019 05:32
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 20, 2019 05:32
@dotnet-bot dotnet-bot restored the merges/dev16.0-to-dev16.1 branch March 20, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/dev16.0-to-dev16.1 branch March 20, 2019 12:01
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
This pull request was closed.
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.

None yet

3 participants