repo_name stringclasses 6
values | pr_number int64 512 78.9k | pr_title stringlengths 3 144 | pr_description stringlengths 0 30.3k | author stringlengths 2 21 | date_created timestamp[ns, tz=UTC] | date_merged timestamp[ns, tz=UTC] | previous_commit stringlengths 40 40 | pr_commit stringlengths 40 40 | query stringlengths 17 30.4k | filepath stringlengths 9 210 | before_content stringlengths 0 112M | after_content stringlengths 0 112M | label int64 -1 1 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/VisualBasic/Portable/xlf/VBFeaturesResources.fr.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" or... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" or... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardSeverity.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
{
internal enum Dashboar... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
{
internal enum Dashboar... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/CSharp/Portable/Indentation/CSharpIndentationService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Generic;
using System.Composition;
using System.Diagnostics;
using System.Diagnostics.Code... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Generic;
using System.Composition;
using System.Diagnostics;
using System.Diagnostics.Code... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using ... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using ... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.Visua... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.Visua... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core/Implementation/Interactive/Completion/InteractiveCommandCompletionService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Emitter/Model/GenericMethodInstanceReference.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Linq;
using System.Windows.Controls;
using System.Runtime.InteropServices;
using Microso... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Linq;
using System.Windows.Controls;
using System.Runtime.InteropServices;
using Microso... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedDictionaryTest.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// NOTE: This code is derived from an implementation originally in dotnet/runtime:
// https://github.com/dotnet/run... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// NOTE: This code is derived from an implementation originally in dotnet/runtime:
// https://github.com/dotnet/run... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/xlf/VisualBasicCompilerExtensionsResources.pl.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" or... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" or... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/Structure/Syntax/AbstractSyntaxNodeStructureProvider.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
using Microsoft.CodeAnalysis.Shared.Collections;
namespace Microsoft.CodeAna... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
using Microsoft.CodeAnalysis.Shared.Collections;
namespace Microsoft.CodeAna... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/Operations/OperationVisitor.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.Operations
{
/// <summary>
/// Represents a <see cref="IOperation"/> visit... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.Operations
{
/// <summary>
/// Represents a <see cref="IOperation"/> visit... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/CSharp/Portable/Simplification/Reducers/CSharpVarReducer.Rewriter.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Utilities;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.Utilities;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Diagnostics;
using Microsoft.VisualStudio.InteractiveWindow;
using Mi... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Diagnostics;
using Microsoft.VisualStudio.InteractiveWindow;
using Mi... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Immutable;
using System.Diagnostics;
using System.Globalization;
using ... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Immutable;
using System.Diagnostics;
using System.Globalization;
using ... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core/Host/IPreviewPaneService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.Code... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.Code... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/CSharp/Test/CodeModel/FileCodeClassTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using EnvDTE;
using Microsoft.CodeAnalysis.Test.Utilities;
usin... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using EnvDTE;
using Microsoft.CodeAnalysis.Test.Utilities;
usin... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/RQName/Nodes/RQType.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using Microsoft.CodeAnalysis.Features.RQName.SimpleTree;
namespace Microsoft.CodeAnalysis.Features.R... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using Microsoft.CodeAnalysis.Features.RQName.SimpleTree;
namespace Microsoft.CodeAnalysis.Features.R... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/Options/Option2`1_operators.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics.CodeAnalysis;
namespace Microsoft.CodeAnalysis.Options
{
internal partial class Optio... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics.CodeAnalysis;
namespace Microsoft.CodeAnalysis.Options
{
internal partial class Optio... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Composition;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Composition;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.es.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" or... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" or... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/CSharpTest2/Recommendations/StackAllocKeywordRecommenderTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Uti... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Uti... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/Workspace/Host/Mef/ExportWorkspaceServiceAttribute.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Composition;
namespace Microsoft.CodeAnalysis.Host.Mef
{
/// <su... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Composition;
namespace Microsoft.CodeAnalysis.Host.Mef
{
/// <su... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/Implementation/Preview/ChangeList.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.VisualStudio.Shell.Interop;
namespace Microsoft.VisualStudio.Lang... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.VisualStudio.Shell.Interop;
namespace Microsoft.VisualStudio.Lang... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/CommandLine/CSharpCommandLineArguments.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.CSharp
{
/// <summary>
/// The command line arguments to a C# <see cref="C... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.CSharp
{
/// <summary>
/// The command line arguments to a C# <see cref="C... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Test/CodeRefactorings/ErrorCases/CodeRefactoringExceptionInComputeRefactorings.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Composition;
using System.Threading.Tasks;
using Microsoft.CodeAnalys... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Composition;
using System.Threading.Tasks;
using Microsoft.CodeAnalys... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Method.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Immutable;
using Microsoft.CodeAnalysis.CodeGeneration;
using Microsoft.CodeAnalysis.Editi... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Immutable;
using Microsoft.CodeAnalysis.CodeGeneration;
using Microsoft.CodeAnalysis.Editi... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/CSharp/Portable/Completion/KeywordRecommenders/TypeOfKeywordRecommender.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
using Micro... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
using Micro... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/AddPackage/InstallPackageDirectlyCodeActionOperation.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Microsoft.Cod... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Microsoft.Cod... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ControlFlowRegionExtensions.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.FlowAnalysis
{
internal static partial class ControlFlowRegionExtensions
{... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.FlowAnalysis
{
internal static partial class ControlFlowRegionExtensions
{... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/CSharp/Portable/Organizing/Organizers/RecordDeclarationOrganizer.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Threading;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/Classification/SyntaxClassification/ISyntaxClassificationService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Threading;
using System.Threading.Tasks;
using Micro... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Threading;
using System.Threading.Tasks;
using Micro... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/CodeStyle/Core/Analyzers/xlf/CodeStyleResources.ja.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" or... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" or... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Test/Core/Assert/WorkItemAttribute.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
namespace Roslyn.Test.Utilities
{
/// <summary>
/// Used to tag test meth... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
namespace Roslyn.Test.Utilities
{
/// <summary>
/// Used to tag test meth... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/CSharp/Portable/ConvertForToForEach/CSharpConvertForToForEachCodeRefactoringProvider.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Composition;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Composition;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Emitter/Model/GenericNamespaceTypeInstanceReference.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/TestUtilities/ReassignedVariable/AbstractReassignedVariableTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Editor.UnitTe... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Editor.UnitTe... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Test/Core/Assert/DiffUtil.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
na... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
na... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
u... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
u... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Engine/AbstractFormattingResult.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Microsoft.CodeAnal... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Microsoft.CodeAnal... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_IReturnStatement.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalys... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalys... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/CodeStyle/Core/Analyzers/xlf/CodeStyleResources.pt-BR.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR"... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR"... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRename.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Immutable;
using EnvDTE;
using Microsoft.CodeAnalysis;
using Microsoft.... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Immutable;
using EnvDTE;
using Microsoft.CodeAnalysis;
using Microsoft.... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/QuickInfo/CommonQuickInfoProvider.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Immutable;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Shared.Collections;
... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Immutable;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Shared.Collections;
... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core/Implementation/IntelliSense/AbstractController.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
using Microsoft.CodeAnalysis... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
using Microsoft.CodeAnalysis... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/Core/EditorConfigSettings/Aggregator/ISettingsAggregator.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider;
using Microsoft.CodeAnalysis.Host;
namespac... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider;
using Microsoft.CodeAnalysis.Host;
namespac... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Impl/ProjectSystem/CPS/CPSProject_ExternalErrorReporting.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
using Microsoft.VisualStudio.S... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
using Microsoft.VisualStudio.S... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/Shared/LogicalStringComparer.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropS... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropS... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeRefactorings;
using Microsof... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeRefactorings;
using Microsof... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/CodeRefactorings/SyncNamespace/AbstractSyncNamespaceCodeRefactoringProvider.MoveFileCodeAction.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_UsingStatement.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
using Microsoft.Code... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
using Microsoft.Code... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicGenerateFromUsage.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.VisualStudio.Integration... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.VisualStudio.Integration... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/CSharp/Test/ProjectSystemShim/CPS/CSharpCompilerOptionsTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using Syst... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using Syst... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Test/Syntax/IncrementalParsing/ChangingAsync.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Xunit;
namespace Micros... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Xunit;
namespace Micros... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Remote/ServiceHub/Host/RemoteAnalyzerAssemblyLoaderService.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_UpdateSource.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.Threading;
using System.Threading... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using System.Threading;
using System.Threading... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/LanguageServer/Protocol/Handler/DocumentChanges/DidChangeHandler.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
us... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
us... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/Emit/EmitOptions.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Linq;
using System.Security.Cryptography;
using Syst... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Linq;
using System.Security.Cryptography;
using Syst... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOptimizedNullableOperators.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using M... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/QuickInfo/QuickInfoProviderNames.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.QuickInfo
{
/// <summary>
/// Some of the known <see cref="QuickInfoProvid... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.QuickInfo
{
/// <summary>
/// Some of the known <see cref="QuickInfoProvid... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/MSBuildTest/FileSet.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collectio... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collectio... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/TestUtilities/EditAndContinue/RudeEditDiagnosticDescription.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
nam... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
nam... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/TestUtilities/EditAndContinue/SemanticEditDescription.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Tex... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Tex... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Binder/WithTypeParametersBinder.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModelFactory.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using Microsoft.CodeAnalysis.CSharp.Formatting;
using Microsoft.CodeAnalysi... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
using Microsoft.CodeAnalysis.CSharp.Formatting;
using Microsoft.CodeAnalysi... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/Shared/Naming/FallbackNamingRules.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using Microsoft.CodeAnalysis.Diagnostics.Analy... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Immutable;
using Microsoft.CodeAnalysis.Diagnostics.Analy... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Server/VBCSCompilerTests/BuildServerConnectionTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/LinkedFileDiffMerging/LinkedFileMergeResult.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.Text;
namespa... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.Text;
namespa... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/FindSymbols/SearchQuery.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.FindSymbols
{
intern... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.FindSymbols
{
intern... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/xlf/VSPackage.zh-Hans.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Han... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Han... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Analyzers/CSharp/Tests/RemoveUnnecessaryParentheses/RemoveUnnecessaryPatternParenthesesTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Code... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Code... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/Implementation/TaskList/CommentTaskTokenSerializerProvider.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.ComponentModel.Composition;
using System.Threading;
using System.Threading.Tasks;
using ... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.ComponentModel.Composition;
using System.Threading;
using System.Threading.Tasks;
using ... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CodeStyle/UnusedValuePreference.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.CodeStyle
{
/// <summary>
/// Assignment preference for unused values from... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.CodeStyle
{
/// <summary>
/// Assignment preference for unused values from... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/Operations/Loops/ForToLoopOperationInfo.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
namespace Microsoft.CodeAnalysis.Operations
{
internal class ForToLoopOperationUserDefinedInfo
... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
namespace Microsoft.CodeAnalysis.Operations
{
internal class ForToLoopOperationUserDefinedInfo
... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Test/Syntax/Syntax/TrackNodeTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis.... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/MakeMethodAsynchronous/AbstractMakeMethodAsynchronousCodeFixProvider.KnownTypes.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.Shared.Extensions;
namespace Microsoft.CodeAnalysis.MakeMethodAsyn... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using Microsoft.CodeAnalysis.Shared.Extensions;
namespace Microsoft.CodeAnalysis.MakeMethodAsyn... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Collections.Immutable;
using Roslyn.Utilities;
us... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Collections.Generic;
using System.Collections.Immutable;
using Roslyn.Utilities;
us... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/VisualBasic/Portable/xlf/VBResources.zh-Hant.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Han... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Han... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Impl/CodeModel/ExternalElements/ExternalCodeEvent.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis;
using Microsof... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis;
using Microsof... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Composition;
using System.Diagnostics;
using System.... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Immutable;
using System.Composition;
using System.Diagnostics;
using System.... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/Formatting/ExportNewDocumentFormattingProviderAttribute.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
namespace Microsoft.CodeAnalysis.Formatting
{
[MetadataAttribute]
... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Composition;
namespace Microsoft.CodeAnalysis.Formatting
{
[MetadataAttribute]
... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
using System.L... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
using System.L... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/ReferenceManager/CommonReferenceManager.State.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/ExtractInterface/ExtractInterfaceCodeAction.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysi... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysi... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Impl/CodeModel/InternalElements/CodeAccessorFunction.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis;
us... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis;
us... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/CSharp/Portable/Syntax/LookupPosition.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.CSharp.Syntax
{
/// <summar... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.CSharp.Syntax
{
/// <summar... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Reflection;
using Microsoft.CodeAnalysis.Text;
using System.Collectio... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Reflection;
using Microsoft.CodeAnalysis.Text;
using System.Collectio... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Dependencies/Collections/Internal/xlf/Strings.ko.xlf | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" or... | <?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" or... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/VisualBasic/Portable/PublicAPI.Unshipped.txt | Microsoft.CodeAnalysis.VisualBasic.LanguageVersion.VisualBasic16_9 = 1609 -> Microsoft.CodeAnalysis.VisualBasic.LanguageVersion
Microsoft.CodeAnalysis.VisualBasic.VisualBasicGeneratorDriver
Overrides Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxTree.GetLineMappings(cancellationToken As System.Threading.Cancellat... | Microsoft.CodeAnalysis.VisualBasic.LanguageVersion.VisualBasic16_9 = 1609 -> Microsoft.CodeAnalysis.VisualBasic.LanguageVersion
Microsoft.CodeAnalysis.VisualBasic.VisualBasicGeneratorDriver
Overrides Microsoft.CodeAnalysis.VisualBasic.VisualBasicSyntaxTree.GetLineMappings(cancellationToken As System.Threading.Cancellat... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/Core/Def/Implementation/Venus/VenusCommandFilter`2.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.Editor;
using Microsoft.VisualStudio.Editor;
using Mi... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using Microsoft.CodeAnalysis.Editor;
using Microsoft.VisualStudio.Editor;
using Mi... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/VisualBasic/Portable/CodeRefactorings/AddMissingImports/VisualBasicAddMissingImportsRefactoringProvider.vb | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports System.Composition
Imports System.Diagnostics.CodeAnalysis
Imports Microsoft.CodeAnalysis
Imports Microsoft.Co... | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports System.Composition
Imports System.Diagnostics.CodeAnalysis
Imports Microsoft.CodeAnalysis
Imports Microsoft.Co... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Test/Resources/Core/SymbolsTests/NoPia/Library2.vb | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
' vbc /t:library /vbruntime- /r:Pia1.dll,Pia5.dll Library2.vb
Imports System.Collections.Generic
Imports System.Refle... | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
' vbc /t:library /vbruntime- /r:Pia1.dll,Pia5.dll Library2.vb
Imports System.Collections.Generic
Imports System.Refle... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports System.Composition
Imports Microsoft.CodeAnalysis.Host.Mef
Imports Microsoft.VisualStudio.Utilities
Namespace... | ' Licensed to the .NET Foundation under one or more agreements.
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports System.Composition
Imports Microsoft.CodeAnalysis.Host.Mef
Imports Microsoft.VisualStudio.Utilities
Namespace... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.Immut... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.Immut... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Features/Core/Portable/UnusedReferences/ReferenceUpdate.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.UnusedReferences
{
internal sealed class ReferenceUpdate
{
/// <su... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
namespace Microsoft.CodeAnalysis.UnusedReferences
{
internal sealed class ReferenceUpdate
{
/// <su... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/VisualStudio/CSharp/Impl/LanguageService/CSharpEditorFactory.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Compilers/Core/Portable/RuleSet/RuleSet.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using... | -1 |
dotnet/roslyn | 56,135 | Merge release/dev17.0 to main |
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file c... | dotnet-bot | 2021-09-02T21:01:14Z | 2021-09-02T21:01:27Z | 99014d0615bf706b51c9e0aa325fc431a7d68711 | 7d328caf396488de8fc8a0ea4e39ae2e5824a48a | Merge release/dev17.0 to main.
This is an automatically generated pull request from release/dev17.0 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to t... | ./src/Workspaces/Core/Portable/ExternalAccess/UnitTesting/Api/UnitTestingSymbolExtensions.cs | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api
{
intern... | // Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api
{
intern... | -1 |