From efc6d8d7c01e8bc5990b85625537b3a0cfc82c48 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <RussKie@users.noreply.github.com>
Date: Tue, 16 Feb 2021 10:39:02 +1100
Subject: [PATCH 001/413] Update Analyzer Samples.md

---
 docs/analyzers/Analyzer Samples.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/analyzers/Analyzer Samples.md b/docs/analyzers/Analyzer Samples.md
index 6c6e9dc41689c..a81e15b93f452 100644
--- a/docs/analyzers/Analyzer Samples.md	
+++ b/docs/analyzers/Analyzer Samples.md	
@@ -18,17 +18,17 @@ Analyzers have been broadly categorized into the following three buckets based o
 **Contents:**
 	
 Following sample analyzers, with simple unit tests, are provided:
-  1. Stateless analyzers:
+  1. [Stateless analyzers](https://github.com/dotnet/roslyn-sdk/tree/master/samples/CSharp/Analyzers/Analyzers.Implementation/StatelessAnalyzers):
      1. SymbolAnalyzer: Analyzer for reporting symbol diagnostics.
      2. SyntaxNodeAnalyzer: Analyzer for reporting syntax node diagnostics.
      3. CodeBlockAnalyzer: Analyzer for reporting code block diagnostics.
      4. CompilationAnalyzer: Analyzer for reporting compilation diagnostics.
      5. SyntaxTreeAnalyzer: Analyzer for reporting syntax tree diagnostics.
      6. SemanticModelAnalyzer: Analyzer for reporting syntax tree diagnostics, that require some semantic analysis.
-  2. Stateful analyzers:
+  2. [Stateful analyzers](https://github.com/dotnet/roslyn-sdk/tree/master/samples/CSharp/Analyzers/Analyzers.Implementation/StatefulAnalyzers):
      1. CodeBlockStartedAnalyzer: Analyzer to demonstrate code block wide analysis.
      2. CompilationStartedAnalyzer: Analyzer to demonstrate analysis within a compilation, for example analysis that depends on certain well-known symbol(s).
      3. CompilationStartedAnalyzerWithCompilationWideAnalysis: Analyzer to demonstrate compilation-wide analysis.
-  3. Additional File analyzers:
+  3. [Additional File analyzers](https://github.com/dotnet/roslyn-sdk/tree/master/samples/CSharp/Analyzers/Analyzers.Implementation/AdditionalFileAnalyzers):
      1. SimpleAdditionalFileAnalyzer: Demonstrates reading an additional file line-by-line and using the data in analysis.
      2. XmlAdditionalFileAnalyzer: Demonstrates writing an additional file out to a `Stream` so that it can be read back as a structured document (in this case, XML).

From 9c0e051464d6ec0b92291a867afb1a13d87e1b8d Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:19:51 -0700
Subject: [PATCH 002/413] Add HashSet<T> and supporting files

These files are based on dotnet/runtime@556582d9 (v5.0.7).
---
 .../HashSet/ISet_Generic_Tests`1.cs           |  617 +++++++
 .../HashSet/SegmentedHashSet_Generic_Tests.cs |  199 +++
 .../SegmentedHashSet_Generic_Tests`1.cs       |  711 ++++++++
 ...tedHashSet_IEnumerable_NonGeneric_Tests.cs |   60 +
 .../Collections/HashSet/TestingTypes.cs       |  387 ++++
 .../Collections/Internal/BitHelper.cs         |   40 +
 .../SegmentedHashSetEqualityComparer`1.cs     |   77 +
 ...crosoft.CodeAnalysis.Collections.projitems |    3 +
 .../Collections/SegmentedHashSet`1.cs         | 1582 +++++++++++++++++
 9 files changed, 3676 insertions(+)
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
 create mode 100644 src/Dependencies/Collections/Internal/BitHelper.cs
 create mode 100644 src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
 create mode 100644 src/Dependencies/Collections/SegmentedHashSet`1.cs

diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
new file mode 100644
index 0000000000000..438b72e4ff746
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
@@ -0,0 +1,617 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Xunit;
+
+namespace System.Collections.Tests
+{
+    /// <summary>
+    /// Contains tests that ensure the correctness of any class that implements the generic
+    /// ISet interface.
+    ///
+    /// Tests for an ISet follow a rather different structure because of the consistency in
+    /// function signatures. Instead of having a test for every data scenario within a class for
+    /// every set function, there is instead a test for every configuration of enumerable parameter.
+    /// Each of those tests calls a Validation function that calculates the expected result and then
+    /// compares it to the actual result of the set operation.
+    /// </summary>
+    public abstract class ISet_Generic_Tests<T> : ICollection_Generic_Tests<T>
+    {
+        #region ISet<T> Helper methods
+
+        /// <summary>
+        /// Creates an instance of an ISet{T} that can be used for testing.
+        /// </summary>
+        /// <returns>An instance of an ISet{T} that can be used for testing.</returns>
+        protected abstract ISet<T> GenericISetFactory();
+
+        /// <summary>
+        /// Creates an instance of an ISet{T} that can be used for testing.
+        /// </summary>
+        /// <param name="count">The number of unique items that the returned ISet{T} contains.</param>
+        /// <returns>An instance of an ISet{T} that can be used for testing.</returns>
+        protected virtual ISet<T> GenericISetFactory(int count)
+        {
+            ISet<T> collection = GenericISetFactory();
+            AddToCollection(collection, count);
+            return collection;
+        }
+
+        protected override void AddToCollection(ICollection<T> collection, int numberOfItemsToAdd)
+        {
+            int seed = 9600;
+            ISet<T> set = (ISet<T>)collection;
+            while (set.Count < numberOfItemsToAdd)
+            {
+                T toAdd = CreateT(seed++);
+                while (set.Contains(toAdd) || (InvalidValues != Array.Empty<T>() && InvalidValues.Contains(toAdd, GetIEqualityComparer())))
+                    toAdd = CreateT(seed++);
+                set.Add(toAdd);
+            }
+        }
+
+        protected virtual int ISet_Large_Capacity => 1000;
+
+        #endregion
+
+        #region ICollection<T> Helper Methods
+
+        protected override ICollection<T> GenericICollectionFactory() => GenericISetFactory();
+
+        protected override ICollection<T> GenericICollectionFactory(int count) => GenericISetFactory(count);
+
+        protected override bool DuplicateValuesAllowed => false;
+        protected override bool DefaultValueWhenNotAllowed_Throws => false;
+
+        #endregion
+
+        #region ICollection_Generic
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ICollection_Generic_Add_ReturnValue(int count)
+        {
+            if (!IsReadOnly)
+            {
+                ISet<T> set = GenericISetFactory(count);
+                int seed = 92834;
+                T newValue = CreateT(seed++);
+                while (set.Contains(newValue))
+                    newValue = CreateT(seed++);
+                Assert.True(set.Add(newValue));
+                if (!DuplicateValuesAllowed)
+                    Assert.False(set.Add(newValue));
+                Assert.Equal(count + 1, set.Count);
+                Assert.True(set.Contains(newValue));
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ICollection_Generic_Add_DuplicateValue_DoesNothing(int count)
+        {
+            if (!IsReadOnly)
+            {
+                if (!DuplicateValuesAllowed)
+                {
+                    ICollection<T> collection = GenericICollectionFactory(count);
+                    int seed = 800;
+                    T duplicateValue = CreateT(seed++);
+                    while (collection.Contains(duplicateValue))
+                        duplicateValue = CreateT(seed++);
+                    collection.Add(duplicateValue);
+                    collection.Add(duplicateValue);
+                    Assert.Equal(count + 1, collection.Count);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Set Function Validation
+
+        private void Validate_ExceptWith(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            if (set.Count == 0 || enumerable == set)
+            {
+                set.ExceptWith(enumerable);
+                Assert.Equal(0, set.Count);
+            }
+            else
+            {
+                HashSet<T> expected = new HashSet<T>(set, GetIEqualityComparer());
+                foreach (T element in enumerable)
+                    expected.Remove(element);
+                set.ExceptWith(enumerable);
+                Assert.Equal(expected.Count, set.Count);
+                Assert.True(expected.SetEquals(set));
+            }
+        }
+
+        private void Validate_IntersectWith(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            if (set.Count == 0 || Enumerable.Count(enumerable) == 0)
+            {
+                set.IntersectWith(enumerable);
+                Assert.Equal(0, set.Count);
+            }
+            else if (set == enumerable)
+            {
+                HashSet<T> beforeOperation = new HashSet<T>(set, GetIEqualityComparer());
+                set.IntersectWith(enumerable);
+                Assert.True(beforeOperation.SetEquals(set));
+            }
+            else
+            {
+                IEqualityComparer<T> comparer = GetIEqualityComparer();
+                HashSet<T> expected = new HashSet<T>(comparer);
+                foreach (T value in set)
+                    if (enumerable.Contains(value, comparer))
+                        expected.Add(value);
+                set.IntersectWith(enumerable);
+                Assert.Equal(expected.Count, set.Count);
+                Assert.True(expected.SetEquals(set));
+            }
+        }
+
+        private void Validate_IsProperSubsetOf(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            bool setContainsValueNotInEnumerable = false;
+            bool enumerableContainsValueNotInSet = false;
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in set) // Every value in Set must be in Enumerable
+            {
+                if (!enumerable.Contains(value, comparer))
+                {
+                    setContainsValueNotInEnumerable = true;
+                    break;
+                }
+            }
+            foreach (T value in enumerable) // Enumerable must contain at least one value not in Set
+            {
+                if (!set.Contains(value, comparer))
+                {
+                    enumerableContainsValueNotInSet = true;
+                    break;
+                }
+            }
+            Assert.Equal(!setContainsValueNotInEnumerable && enumerableContainsValueNotInSet, set.IsProperSubsetOf(enumerable));
+        }
+
+        private void Validate_IsProperSupersetOf(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            bool isProperSuperset = true;
+            bool setContainsElementsNotInEnumerable = false;
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in enumerable)
+            {
+                if (!set.Contains(value, comparer))
+                {
+                    isProperSuperset = false;
+                    break;
+                }
+            }
+            foreach (T value in set)
+            {
+                if (!enumerable.Contains(value, comparer))
+                {
+                    setContainsElementsNotInEnumerable = true;
+                    break;
+                }
+            }
+            isProperSuperset = isProperSuperset && setContainsElementsNotInEnumerable;
+            Assert.Equal(isProperSuperset, set.IsProperSupersetOf(enumerable));
+        }
+
+        private void Validate_IsSubsetOf(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in set)
+                if (!enumerable.Contains(value, comparer))
+                {
+                    Assert.False(set.IsSubsetOf(enumerable));
+                    return;
+                }
+            Assert.True(set.IsSubsetOf(enumerable));
+        }
+
+        private void Validate_IsSupersetOf(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in enumerable)
+                if (!set.Contains(value, comparer))
+                {
+                    Assert.False(set.IsSupersetOf(enumerable));
+                    return;
+                }
+            Assert.True(set.IsSupersetOf(enumerable));
+        }
+
+        private void Validate_Overlaps(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in enumerable)
+            {
+                if (set.Contains(value, comparer))
+                {
+                    Assert.True(set.Overlaps(enumerable));
+                    return;
+                }
+            }
+            Assert.False(set.Overlaps(enumerable));
+        }
+
+        private void Validate_SetEquals(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            foreach (T value in set)
+            {
+                if (!enumerable.Contains(value, comparer))
+                {
+                    Assert.False(set.SetEquals(enumerable));
+                    return;
+                }
+            }
+            foreach (T value in enumerable)
+            {
+                if (!set.Contains(value, comparer))
+                {
+                    Assert.False(set.SetEquals(enumerable));
+                    return;
+                }
+            }
+            Assert.True(set.SetEquals(enumerable));
+        }
+
+        private void Validate_SymmetricExceptWith(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> expected = new HashSet<T>(comparer);
+            foreach (T element in enumerable)
+                if (!set.Contains(element, comparer))
+                    expected.Add(element);
+            foreach (T element in set)
+                if (!enumerable.Contains(element, comparer))
+                    expected.Add(element);
+            set.SymmetricExceptWith(enumerable);
+            Assert.Equal(expected.Count, set.Count);
+            Assert.True(expected.SetEquals(set));
+        }
+
+        private void Validate_UnionWith(ISet<T> set, IEnumerable<T> enumerable)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> expected = new HashSet<T>(set, comparer);
+            foreach (T element in enumerable)
+                if (!set.Contains(element, comparer))
+                    expected.Add(element);
+            set.UnionWith(enumerable);
+            Assert.Equal(expected.Count, set.Count);
+            Assert.True(expected.SetEquals(set));
+        }
+
+        #endregion
+
+        #region Set Function tests
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_NullEnumerableArgument(int count)
+        {
+            ISet<T> set = GenericISetFactory(count);
+            Assert.Throws<ArgumentNullException>(() => set.ExceptWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.IntersectWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSubsetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSupersetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsSubsetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsSupersetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.Overlaps(null));
+            Assert.Throws<ArgumentNullException>(() => set.SetEquals(null));
+            Assert.Throws<ArgumentNullException>(() => set.SymmetricExceptWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.UnionWith(null));
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_ExceptWith(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_ExceptWith(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_IntersectWith(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_IntersectWith(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_IsProperSubsetOf(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_IsProperSubsetOf(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_IsProperSupersetOf(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_IsProperSupersetOf(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_IsSubsetOf(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_IsSubsetOf(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_IsSupersetOf(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_IsSupersetOf(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_Overlaps(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_Overlaps(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_SetEquals(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_SetEquals(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_SymmetricExceptWith(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_SymmetricExceptWith(set, enumerable);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_UnionWith(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Validate_UnionWith(set, enumerable);
+        }
+
+        #endregion
+
+        #region Set Function tests on itself
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_ExceptWith_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_ExceptWith(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws InvalidOperationException")]
+        public void ISet_Generic_IntersectWith_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_IntersectWith(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_IsProperSubsetOf_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_IsProperSubsetOf(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_IsProperSupersetOf_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_IsProperSupersetOf(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_IsSubsetOf_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_IsSubsetOf(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_IsSupersetOf_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_IsSupersetOf(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_Overlaps_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_Overlaps(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_SetEquals_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Assert.True(set.SetEquals(set));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_SymmetricExceptWith_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_SymmetricExceptWith(set, set);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void ISet_Generic_UnionWith_Itself(int setLength)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            Validate_UnionWith(set, set);
+        }
+
+        #endregion
+
+        #region Set Function tests on a large Set
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_ExceptWith_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_ExceptWith(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_IntersectWith_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_IntersectWith(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_IsProperSubsetOf_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_IsProperSubsetOf(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_IsProperSupersetOf_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_IsProperSupersetOf(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_IsSubsetOf_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_IsSubsetOf(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_IsSupersetOf_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_IsSupersetOf(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_Overlaps_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_Overlaps(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_SetEquals_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_SetEquals(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_SymmetricExceptWith_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_SymmetricExceptWith(set, enumerable);
+        }
+
+        [Fact]
+        [OuterLoop]
+        public void ISet_Generic_UnionWith_LargeSet()
+        {
+            ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
+            IEnumerable<T> enumerable = CreateEnumerable(EnumerableType.List, set, 150, 0, 0);
+            Validate_UnionWith(set, enumerable);
+        }
+
+        #endregion
+
+        #region Other misc ISet test Scenarios
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void ISet_Generic_SymmetricExceptWith_AfterRemovingElements(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            ISet<T> set = GenericISetFactory(setLength);
+            T value = CreateT(532);
+            if (!set.Contains(value))
+                set.Add(value);
+            set.Remove(value);
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
+            Debug.Assert(enumerable != null);
+
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> expected = new HashSet<T>(comparer);
+            foreach (T element in enumerable)
+                if (!set.Contains(element, comparer))
+                    expected.Add(element);
+            foreach (T element in set)
+                if (!enumerable.Contains(element, comparer))
+                    expected.Add(element);
+            set.SymmetricExceptWith(enumerable);
+            Assert.Equal(expected.Count, set.Count);
+            Assert.True(expected.SetEquals(set));
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
new file mode 100644
index 0000000000000..499732281ea97
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
@@ -0,0 +1,199 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using Xunit;
+
+namespace System.Collections.Tests
+{
+    public class HashSet_Generic_Tests_string : HashSet_Generic_Tests<string>
+    {
+        protected override string CreateT(int seed)
+        {
+            int stringLength = seed % 10 + 5;
+            Random rand = new Random(seed);
+            byte[] bytes = new byte[stringLength];
+            rand.NextBytes(bytes);
+            return Convert.ToBase64String(bytes);
+        }
+    }
+
+    public class HashSet_Generic_Tests_int : HashSet_Generic_Tests<int>
+    {
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override bool DefaultValueAllowed => true;
+    }
+
+    public class HashSet_Generic_Tests_int_With_Comparer_WrapStructural_Int : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new WrapStructural_Int();
+        }
+
+        protected override IComparer<int> GetIComparer()
+        {
+            return new WrapStructural_Int();
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new WrapStructural_Int());
+        }
+    }
+
+    public class HashSet_Generic_Tests_int_With_Comparer_WrapStructural_SimpleInt : HashSet_Generic_Tests<SimpleInt>
+    {
+        protected override IEqualityComparer<SimpleInt> GetIEqualityComparer()
+        {
+            return new WrapStructural_SimpleInt();
+        }
+
+        protected override IComparer<SimpleInt> GetIComparer()
+        {
+            return new WrapStructural_SimpleInt();
+        }
+
+        protected override SimpleInt CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return new SimpleInt(rand.Next());
+        }
+
+        protected override ISet<SimpleInt> GenericISetFactory()
+        {
+            return new HashSet<SimpleInt>(new WrapStructural_SimpleInt());
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_EquatableBackwardsOrder : HashSet_Generic_Tests<EquatableBackwardsOrder>
+    {
+        protected override EquatableBackwardsOrder CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return new EquatableBackwardsOrder(rand.Next());
+        }
+
+        protected override ISet<EquatableBackwardsOrder> GenericISetFactory()
+        {
+            return new HashSet<EquatableBackwardsOrder>();
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_int_With_Comparer_SameAsDefaultComparer : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new Comparer_SameAsDefaultComparer();
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new Comparer_SameAsDefaultComparer());
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_int_With_Comparer_HashCodeAlwaysReturnsZero : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new Comparer_HashCodeAlwaysReturnsZero();
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new Comparer_HashCodeAlwaysReturnsZero());
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_int_With_Comparer_ModOfInt : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new Comparer_ModOfInt(15000);
+        }
+
+        protected override IComparer<int> GetIComparer()
+        {
+            return new Comparer_ModOfInt(15000);
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new Comparer_ModOfInt(15000));
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_int_With_Comparer_AbsOfInt : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new Comparer_AbsOfInt();
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new Comparer_AbsOfInt());
+        }
+    }
+
+    [OuterLoop]
+    public class HashSet_Generic_Tests_int_With_Comparer_BadIntEqualityComparer : HashSet_Generic_Tests<int>
+    {
+        protected override IEqualityComparer<int> GetIEqualityComparer()
+        {
+            return new BadIntEqualityComparer();
+        }
+
+        protected override int CreateT(int seed)
+        {
+            Random rand = new Random(seed);
+            return rand.Next();
+        }
+
+        protected override ISet<int> GenericISetFactory()
+        {
+            return new HashSet<int>(new BadIntEqualityComparer());
+        }
+    }
+}
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
new file mode 100644
index 0000000000000..c82ca3938463a
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
@@ -0,0 +1,711 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization.Formatters.Binary;
+using Xunit;
+
+namespace System.Collections.Tests
+{
+    /// <summary>
+    /// Contains tests that ensure the correctness of the HashSet class.
+    /// </summary>
+    public abstract class HashSet_Generic_Tests<T> : ISet_Generic_Tests<T>
+    {
+        #region ISet<T> Helper Methods
+
+        protected override bool ResetImplemented => true;
+
+        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorThrows : (base.ModifyEnumeratorAllowed & ~(ModifyOperation.Remove | ModifyOperation.Clear));
+
+        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Overwrite | ModifyOperation.Remove | ModifyOperation.Clear;
+
+        protected override ISet<T> GenericISetFactory()
+        {
+            return new HashSet<T>();
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private static IEnumerable<int> NonSquares(int limit)
+        {
+            for (int i = 0; i != limit; ++i)
+            {
+                int root = (int)Math.Sqrt(i);
+                if (i != root * root)
+                    yield return i;
+            }
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor()
+        {
+            HashSet<T> set = new HashSet<T>();
+            Assert.Empty(set);
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_IEqualityComparer()
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> set = new HashSet<T>(comparer);
+            if (comparer == null)
+                Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
+            else
+                Assert.Equal(comparer, set.Comparer);
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_NullIEqualityComparer()
+        {
+            IEqualityComparer<T> comparer = null;
+            HashSet<T> set = new HashSet<T>(comparer);
+            if (comparer == null)
+                Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
+            else
+                Assert.Equal(comparer, set.Comparer);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void HashSet_Generic_Constructor_IEnumerable(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            _ = setLength;
+            _ = numberOfMatchingElements;
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, numberOfDuplicateElements);
+            HashSet<T> set = new HashSet<T>(enumerable);
+            Assert.True(set.SetEquals(enumerable));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_IEnumerable_WithManyDuplicates(int count)
+        {
+            IEnumerable<T> items = CreateEnumerable(EnumerableType.List, null, count, 0, 0);
+            HashSet<T> hashSetFromDuplicates = new HashSet<T>(Enumerable.Range(0, 40).SelectMany(i => items).ToArray());
+            HashSet<T> hashSetFromNoDuplicates = new HashSet<T>(items);
+            Assert.True(hashSetFromNoDuplicates.SetEquals(hashSetFromDuplicates));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_HashSet_SparselyFilled(int count)
+        {
+            HashSet<T> source = (HashSet<T>)CreateEnumerable(EnumerableType.HashSet, null, count, 0, 0);
+            List<T> sourceElements = source.ToList();
+            foreach (int i in NonSquares(count))
+                source.Remove(sourceElements[i]);// Unevenly spaced survivors increases chance of catching any spacing-related bugs.
+
+
+            HashSet<T> set = new HashSet<T>(source, GetIEqualityComparer());
+            Assert.True(set.SetEquals(source));
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_IEnumerable_Null()
+        {
+            Assert.Throws<ArgumentNullException>(() => new HashSet<T>((IEnumerable<T>)null));
+            Assert.Throws<ArgumentNullException>(() => new HashSet<T>((IEnumerable<T>)null, EqualityComparer<T>.Default));
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableTestData))]
+        public void HashSet_Generic_Constructor_IEnumerable_IEqualityComparer(EnumerableType enumerableType, int setLength, int enumerableLength, int numberOfMatchingElements, int numberOfDuplicateElements)
+        {
+            _ = setLength;
+            _ = numberOfMatchingElements;
+            _ = numberOfDuplicateElements;
+            IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, 0);
+            HashSet<T> set = new HashSet<T>(enumerable, GetIEqualityComparer());
+            Assert.True(set.SetEquals(enumerable));
+        }
+
+        #endregion
+
+        #region RemoveWhere
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_RemoveWhere_AllElements(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            int removedCount = set.RemoveWhere((value) => { return true; });
+            Assert.Equal(setLength, removedCount);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_RemoveWhere_NoElements(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            int removedCount = set.RemoveWhere((value) => { return false; });
+            Assert.Equal(0, removedCount);
+            Assert.Equal(setLength, set.Count);
+        }
+
+        [Fact]
+        public void HashSet_Generic_RemoveWhere_NewObject() // Regression Dev10_624201
+        {
+            object[] array = new object[2];
+            object obj = new object();
+            HashSet<object> set = new HashSet<object>();
+
+            set.Add(obj);
+            set.Remove(obj);
+            foreach (object o in set) { }
+            set.CopyTo(array, 0, 2);
+            set.RemoveWhere((element) => { return false; });
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_RemoveWhere_NullMatchPredicate(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            Assert.Throws<ArgumentNullException>(() => set.RemoveWhere(null));
+        }
+
+        #endregion
+
+        #region TrimExcess
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_TrimExcess_OnValidSetThatHasntBeenRemovedFrom(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            set.TrimExcess();
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_TrimExcess_Repeatedly(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            List<T> expected = set.ToList();
+            set.TrimExcess();
+            set.TrimExcess();
+            set.TrimExcess();
+            Assert.True(set.SetEquals(expected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_TrimExcess_AfterRemovingOneElement(int setLength)
+        {
+            if (setLength > 0)
+            {
+                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                List<T> expected = set.ToList();
+                T elementToRemove = set.ElementAt(0);
+
+                set.TrimExcess();
+                Assert.True(set.Remove(elementToRemove));
+                expected.Remove(elementToRemove);
+                set.TrimExcess();
+
+                Assert.True(set.SetEquals(expected));
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_TrimExcess_AfterClearingAndAddingSomeElementsBack(int setLength)
+        {
+            if (setLength > 0)
+            {
+                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                set.TrimExcess();
+                set.Clear();
+                set.TrimExcess();
+                Assert.Equal(0, set.Count);
+
+                AddToCollection(set, setLength / 10);
+                set.TrimExcess();
+                Assert.Equal(setLength / 10, set.Count);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_TrimExcess_AfterClearingAndAddingAllElementsBack(int setLength)
+        {
+            if (setLength > 0)
+            {
+                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                set.TrimExcess();
+                set.Clear();
+                set.TrimExcess();
+                Assert.Equal(0, set.Count);
+
+                AddToCollection(set, setLength);
+                set.TrimExcess();
+                Assert.Equal(setLength, set.Count);
+            }
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_CopyTo_NegativeCount_ThrowsArgumentOutOfRangeException(int count)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(count);
+            T[] arr = new T[count];
+            Assert.Throws<ArgumentOutOfRangeException>(() => set.CopyTo(arr, 0, -1));
+            Assert.Throws<ArgumentOutOfRangeException>(() => set.CopyTo(arr, 0, int.MinValue));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_CopyTo_NoIndexDefaultsToZero(int count)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(count);
+            T[] arr1 = new T[count];
+            T[] arr2 = new T[count];
+            set.CopyTo(arr1);
+            set.CopyTo(arr2, 0);
+            Assert.True(arr1.SequenceEqual(arr2));
+        }
+
+        #endregion
+
+        #region CreateSetComparer
+
+        [Fact]
+        public void SetComparer_SetEqualsTests()
+        {
+            List<T> objects = new List<T>() { CreateT(1), CreateT(2), CreateT(3), CreateT(4), CreateT(5), CreateT(6) };
+
+            var set = new HashSet<HashSet<T>>()
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            var noComparerSet = new HashSet<HashSet<T>>()
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            var comparerSet1 = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            var comparerSet2 = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            {
+                new HashSet<T> { objects[3], objects[4], objects[5] },
+                new HashSet<T> { objects[0], objects[1], objects[2] }
+            };
+
+            Assert.False(noComparerSet.SetEquals(set));
+            Assert.True(comparerSet1.SetEquals(set));
+            Assert.True(comparerSet2.SetEquals(set));
+        }
+
+        [Fact]
+        public void SetComparer_SequenceEqualTests()
+        {
+            List<T> objects = new List<T>() { CreateT(1), CreateT(2), CreateT(3), CreateT(4), CreateT(5), CreateT(6) };
+
+            var set = new HashSet<HashSet<T>>()
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            var noComparerSet = new HashSet<HashSet<T>>()
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            var comparerSet = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            {
+                new HashSet<T> { objects[0], objects[1], objects[2] },
+                new HashSet<T> { objects[3], objects[4], objects[5] }
+            };
+
+            Assert.False(noComparerSet.SequenceEqual(set));
+            Assert.True(noComparerSet.SequenceEqual(set, HashSet<T>.CreateSetComparer()));
+            Assert.False(comparerSet.SequenceEqual(set));
+        }
+
+        #endregion
+
+        [Fact]
+        public void CanBeCastedToISet()
+        {
+            HashSet<T> set = new HashSet<T>();
+            ISet<T> iset = (set as ISet<T>);
+            Assert.NotNull(iset);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_int(int capacity)
+        {
+            HashSet<T> set = new HashSet<T>(capacity);
+            Assert.Equal(0, set.Count);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_int_AddUpToAndBeyondCapacity(int capacity)
+        {
+            HashSet<T> set = new HashSet<T>(capacity);
+
+            AddToCollection(set, capacity);
+            Assert.Equal(capacity, set.Count);
+
+            AddToCollection(set, capacity + 1);
+            Assert.Equal(capacity + 1, set.Count);
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_Capacity_ToNextPrimeNumber()
+        {
+            // Highest pre-computed number + 1.
+            const int Capacity = 7199370;
+            var set = new HashSet<T>(Capacity);
+
+            // Assert that the HashTable's capacity is set to the descendant prime number of the given one.
+            const int NextPrime = 7199371;
+            Assert.Equal(NextPrime, set.EnsureCapacity(0));
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_int_Negative_ThrowsArgumentOutOfRangeException()
+        {
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(-1));
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(int.MinValue));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_int_IEqualityComparer(int capacity)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> set = new HashSet<T>(capacity, comparer);
+            Assert.Equal(0, set.Count);
+            if (comparer == null)
+                Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
+            else
+                Assert.Equal(comparer, set.Comparer);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void HashSet_Generic_Constructor_int_IEqualityComparer_AddUpToAndBeyondCapacity(int capacity)
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            HashSet<T> set = new HashSet<T>(capacity, comparer);
+
+            AddToCollection(set, capacity);
+            Assert.Equal(capacity, set.Count);
+
+            AddToCollection(set, capacity + 1);
+            Assert.Equal(capacity + 1, set.Count);
+        }
+
+        [Fact]
+        public void HashSet_Generic_Constructor_int_IEqualityComparer_Negative_ThrowsArgumentOutOfRangeException()
+        {
+            IEqualityComparer<T> comparer = GetIEqualityComparer();
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(-1, comparer));
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(int.MinValue, comparer));
+        }
+
+        #region TryGetValue
+
+        [Fact]
+        public void HashSet_Generic_TryGetValue_Contains()
+        {
+            T value = CreateT(1);
+            HashSet<T> set = new HashSet<T> { value };
+            T equalValue = CreateT(1);
+            T actualValue;
+            Assert.True(set.TryGetValue(equalValue, out actualValue));
+            Assert.Equal(value, actualValue);
+            if (!typeof(T).IsValueType)
+            {
+                Assert.Same((object)value, (object)actualValue);
+            }
+        }
+
+        [Fact]
+        public void HashSet_Generic_TryGetValue_Contains_OverwriteOutputParam()
+        {
+            T value = CreateT(1);
+            HashSet<T> set = new HashSet<T> { value };
+            T equalValue = CreateT(1);
+            T actualValue = CreateT(2);
+            Assert.True(set.TryGetValue(equalValue, out actualValue));
+            Assert.Equal(value, actualValue);
+            if (!typeof(T).IsValueType)
+            {
+                Assert.Same((object)value, (object)actualValue);
+            }
+        }
+
+        [Fact]
+        public void HashSet_Generic_TryGetValue_NotContains()
+        {
+            T value = CreateT(1);
+            HashSet<T> set = new HashSet<T> { value };
+            T equalValue = CreateT(2);
+            T actualValue;
+            Assert.False(set.TryGetValue(equalValue, out actualValue));
+            Assert.Equal(default(T), actualValue);
+        }
+
+        [Fact]
+        public void HashSet_Generic_TryGetValue_NotContains_OverwriteOutputParam()
+        {
+            T value = CreateT(1);
+            HashSet<T> set = new HashSet<T> { value };
+            T equalValue = CreateT(2);
+            T actualValue = equalValue;
+            Assert.False(set.TryGetValue(equalValue, out actualValue));
+            Assert.Equal(default(T), actualValue);
+        }
+
+        #endregion
+
+        #region EnsureCapacity
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionSizes))]
+        public void EnsureCapacity_Generic_RequestingLargerCapacity_DoesNotInvalidateEnumeration(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)(GenericISetFactory(setLength));
+            var capacity = set.EnsureCapacity(0);
+            IEnumerator valuesEnum = set.GetEnumerator();
+            IEnumerator valuesListEnum = new List<T>(set).GetEnumerator();
+
+            set.EnsureCapacity(capacity + 1); // Verify EnsureCapacity does not invalidate enumeration
+
+            while (valuesEnum.MoveNext())
+            {
+                valuesListEnum.MoveNext();
+                Assert.Equal(valuesListEnum.Current, valuesEnum.Current);
+            }
+        }
+
+        [Fact]
+        public void EnsureCapacity_Generic_NegativeCapacityRequested_Throws()
+        {
+            var set = new HashSet<T>();
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => set.EnsureCapacity(-1));
+        }
+
+        [Fact]
+        public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedZero_ReturnsZero()
+        {
+            var set = new HashSet<T>();
+            Assert.Equal(0, set.EnsureCapacity(0));
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        [InlineData(4)]
+        public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedNonZero_CapacityIsSetToAtLeastTheRequested(int requestedCapacity)
+        {
+            var set = new HashSet<T>();
+            Assert.InRange(set.EnsureCapacity(requestedCapacity), requestedCapacity, int.MaxValue);
+        }
+
+        [Theory]
+        [InlineData(3)]
+        [InlineData(7)]
+        public void EnsureCapacity_Generic_RequestedCapacitySmallerThanCurrent_CapacityUnchanged(int currentCapacity)
+        {
+            HashSet<T> set;
+
+            // assert capacity remains the same when ensuring a capacity smaller or equal than existing
+            for (int i = 0; i <= currentCapacity; i++)
+            {
+                set = new HashSet<T>(currentCapacity);
+                Assert.Equal(currentCapacity, set.EnsureCapacity(i));
+            }
+        }
+
+        [Theory]
+        [InlineData(7)]
+        [InlineData(89)]
+        public void EnsureCapacity_Generic_ExistingCapacityRequested_SameValueReturned(int capacity)
+        {
+            var set = new HashSet<T>(capacity);
+            Assert.Equal(capacity, set.EnsureCapacity(capacity));
+
+            set = (HashSet<T>)GenericISetFactory(capacity);
+            Assert.Equal(capacity, set.EnsureCapacity(capacity));
+        }
+
+        [Theory]
+        [InlineData(0)]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        [InlineData(4)]
+        public void EnsureCapacity_Generic_EnsureCapacityCalledTwice_ReturnsSameValue(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            int capacity = set.EnsureCapacity(0);
+            Assert.Equal(capacity, set.EnsureCapacity(0));
+
+            set = (HashSet<T>)GenericISetFactory(setLength);
+            capacity = set.EnsureCapacity(setLength);
+            Assert.Equal(capacity, set.EnsureCapacity(setLength));
+
+            set = (HashSet<T>)GenericISetFactory(setLength);
+            capacity = set.EnsureCapacity(setLength + 1);
+            Assert.Equal(capacity, set.EnsureCapacity(setLength + 1));
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(5)]
+        [InlineData(7)]
+        [InlineData(8)]
+        public void EnsureCapacity_Generic_HashsetNotEmpty_RequestedSmallerThanCount_ReturnsAtLeastSizeOfCount(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            Assert.InRange(set.EnsureCapacity(setLength - 1), setLength, int.MaxValue);
+        }
+
+        [Theory]
+        [InlineData(7)]
+        [InlineData(20)]
+        public void EnsureCapacity_Generic_HashsetNotEmpty_SetsToAtLeastTheRequested(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+
+            // get current capacity
+            int currentCapacity = set.EnsureCapacity(0);
+
+            // assert we can update to a larger capacity
+            int newCapacity = set.EnsureCapacity(currentCapacity * 2);
+            Assert.InRange(newCapacity, currentCapacity * 2, int.MaxValue);
+        }
+
+        [Fact]
+        public void EnsureCapacity_Generic_CapacityIsSetToPrimeNumberLargerOrEqualToRequested()
+        {
+            var set = new HashSet<T>();
+            Assert.Equal(17, set.EnsureCapacity(17));
+
+            set = new HashSet<T>();
+            Assert.Equal(17, set.EnsureCapacity(15));
+
+            set = new HashSet<T>();
+            Assert.Equal(17, set.EnsureCapacity(13));
+        }
+
+        [Theory]
+        [InlineData(2)]
+        [InlineData(10)]
+        public void EnsureCapacity_Generic_GrowCapacityWithFreeList(int setLength)
+        {
+            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+
+            // Remove the first element to ensure we have a free list.
+            Assert.True(set.Remove(set.ElementAt(0)));
+
+            int currentCapacity = set.EnsureCapacity(0);
+            Assert.True(currentCapacity > 0);
+
+            int newCapacity = set.EnsureCapacity(currentCapacity + 1);
+            Assert.True(newCapacity > currentCapacity);
+        }
+
+        #endregion
+
+        #region Remove
+
+        [Theory]
+        [MemberData(nameof(ValidPositiveCollectionSizes))]
+        public void Remove_NonDefaultComparer_ComparerUsed(int capacity)
+        {
+            var c = new TrackingEqualityComparer<T>();
+            var set = new HashSet<T>(capacity, c);
+
+            AddToCollection(set, capacity);
+            T first = set.First();
+            c.EqualsCalls = 0;
+            c.GetHashCodeCalls = 0;
+
+            Assert.Equal(capacity, set.Count);
+            set.Remove(first);
+            Assert.Equal(capacity - 1, set.Count);
+
+            Assert.InRange(c.EqualsCalls, 1, int.MaxValue);
+            Assert.InRange(c.GetHashCodeCalls, 1, int.MaxValue);
+        }
+
+        #endregion
+
+        #region Serialization
+
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
+        public void ComparerSerialization()
+        {
+            // Strings switch between randomized and non-randomized comparers,
+            // however this should never be observable externally.
+            TestComparerSerialization(EqualityComparer<string>.Default);
+
+            // OrdinalCaseSensitiveComparer is internal and (de)serializes as OrdinalComparer
+            TestComparerSerialization(StringComparer.Ordinal, "System.OrdinalComparer");
+
+            // OrdinalIgnoreCaseComparer is internal and (de)serializes as OrdinalComparer
+            TestComparerSerialization(StringComparer.OrdinalIgnoreCase, "System.OrdinalComparer");
+            TestComparerSerialization(StringComparer.CurrentCulture);
+            TestComparerSerialization(StringComparer.CurrentCultureIgnoreCase);
+            TestComparerSerialization(StringComparer.InvariantCulture);
+            TestComparerSerialization(StringComparer.InvariantCultureIgnoreCase);
+
+            // Check other types while here, IEquatable valuetype, nullable valuetype, and non IEquatable object
+            TestComparerSerialization(EqualityComparer<int>.Default);
+            TestComparerSerialization(EqualityComparer<int?>.Default);
+            TestComparerSerialization(EqualityComparer<object>.Default);
+
+            static void TestComparerSerialization<TCompared>(IEqualityComparer<TCompared> equalityComparer, string internalTypeName = null)
+            {
+                var bf = new BinaryFormatter();
+                var s = new MemoryStream();
+
+                var dict = new HashSet<TCompared>(equalityComparer);
+
+                Assert.Same(equalityComparer, dict.Comparer);
+
+                bf.Serialize(s, dict);
+                s.Position = 0;
+                dict = (HashSet<TCompared>)bf.Deserialize(s);
+
+                if (internalTypeName == null)
+                {
+                    Assert.IsType(equalityComparer.GetType(), dict.Comparer);
+                }
+                else
+                {
+                    Assert.Equal(internalTypeName, dict.Comparer.GetType().ToString());
+                }
+
+                Assert.True(equalityComparer.Equals(dict.Comparer));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
new file mode 100644
index 0000000000000..48ffc2e4ba1d6
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
@@ -0,0 +1,60 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace System.Collections.Tests
+{
+    public class HashSet_IEnumerable_NonGeneric_Tests : IEnumerable_NonGeneric_Tests
+    {
+        protected override IEnumerable NonGenericIEnumerableFactory(int count)
+        {
+            var set = new HashSet<string>();
+            int seed = 12354;
+            while (set.Count < count)
+                set.Add(CreateT(set, seed++));
+            return set;
+        }
+
+        protected override bool Enumerator_Current_UndefinedOperation_Throws => true;
+
+        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorThrows : (base.ModifyEnumeratorAllowed & ~ModifyOperation.Remove);
+
+        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Overwrite | ModifyOperation.Remove;
+
+        /// <summary>
+        /// Returns a set of ModifyEnumerable delegates that modify the enumerable passed to them.
+        /// </summary>
+        protected override IEnumerable<ModifyEnumerable> GetModifyEnumerables(ModifyOperation operations)
+        {
+            if ((operations & ModifyOperation.Clear) == ModifyOperation.Clear)
+            {
+                yield return (IEnumerable enumerable) =>
+                {
+                    HashSet<string> casted = ((HashSet<string>)enumerable);
+                    if (casted.Count > 0)
+                    {
+                        casted.Clear();
+                        return true;
+                    }
+                    return false;
+                };
+            }
+        }
+
+        protected string CreateT(HashSet<string> set, int seed)
+        {
+            int stringLength = seed % 10 + 5;
+            Random rand = new Random(seed);
+            byte[] bytes = new byte[stringLength];
+            rand.NextBytes(bytes);
+            string ret = Convert.ToBase64String(bytes);
+            while (set.Contains(ret))
+            {
+                rand.NextBytes(bytes);
+                ret = Convert.ToBase64String(bytes);
+            }
+            return ret;
+        }
+    }
+}
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
new file mode 100644
index 0000000000000..4df123571586b
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
@@ -0,0 +1,387 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace System.Collections.Tests
+{
+    #region Comparers and Equatables
+
+    // Use parity only as a hashcode so as to have many collisions.
+    [Serializable]
+    public class BadIntEqualityComparer : IEqualityComparer<int>
+    {
+        public bool Equals(int x, int y)
+        {
+            return x == y;
+        }
+
+        public int GetHashCode(int obj)
+        {
+            return obj % 2;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is BadIntEqualityComparer; // Equal to all other instances of this type, not to anything else.
+        }
+
+        public override int GetHashCode()
+        {
+            return unchecked((int)0xC001CAFE); // Doesn't matter as long as its constant.
+        }
+    }
+
+    [Serializable]
+    public class EquatableBackwardsOrder : IEquatable<EquatableBackwardsOrder>, IComparable<EquatableBackwardsOrder>, IComparable
+    {
+        private int _value;
+
+        public EquatableBackwardsOrder(int value)
+        {
+            _value = value;
+        }
+
+        public int CompareTo(EquatableBackwardsOrder other) //backwards from the usual integer ordering
+        {
+            return other._value - _value;
+        }
+
+        public override int GetHashCode() => _value;
+
+        public override bool Equals(object obj)
+        {
+            EquatableBackwardsOrder other = obj as EquatableBackwardsOrder;
+            return other != null && Equals(other);
+        }
+
+        public bool Equals(EquatableBackwardsOrder other)
+        {
+            return _value == other._value;
+        }
+
+        int IComparable.CompareTo(object obj)
+        {
+            if (obj != null && obj.GetType() == typeof(EquatableBackwardsOrder))
+                return ((EquatableBackwardsOrder)obj)._value - _value;
+            else return -1;
+        }
+    }
+
+    [Serializable]
+    public class Comparer_SameAsDefaultComparer : IEqualityComparer<int>, IComparer<int>
+    {
+        public int Compare(int x, int y)
+        {
+            return x - y;
+        }
+
+        public bool Equals(int x, int y)
+        {
+            return x == y;
+        }
+
+        public int GetHashCode(int obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+
+    [Serializable]
+    public class Comparer_HashCodeAlwaysReturnsZero : IEqualityComparer<int>, IComparer<int>
+    {
+        public int Compare(int x, int y)
+        {
+            return x - y;
+        }
+
+        public bool Equals(int x, int y)
+        {
+            return x == y;
+        }
+
+        public int GetHashCode(int obj)
+        {
+            return 0;
+        }
+    }
+
+    [Serializable]
+    public class Comparer_ModOfInt : IEqualityComparer<int>, IComparer<int>
+    {
+        private int _mod;
+
+        public Comparer_ModOfInt(int mod)
+        {
+            _mod = mod;
+        }
+
+        public Comparer_ModOfInt()
+        {
+            _mod = 500;
+        }
+
+        public int Compare(int x, int y)
+        {
+            return ((x % _mod) - (y % _mod));
+        }
+
+        public bool Equals(int x, int y)
+        {
+            return ((x % _mod) == (y % _mod));
+        }
+
+        public int GetHashCode(int x)
+        {
+            return (x % _mod);
+        }
+    }
+
+    [Serializable]
+    public class Comparer_AbsOfInt : IEqualityComparer<int>, IComparer<int>
+    {
+        public int Compare(int x, int y)
+        {
+            return Math.Abs(x) - Math.Abs(y);
+        }
+
+        public bool Equals(int x, int y)
+        {
+            return Math.Abs(x) == Math.Abs(y);
+        }
+
+        public int GetHashCode(int x)
+        {
+            return Math.Abs(x);
+        }
+    }
+
+    #endregion
+
+    #region TestClasses
+
+    [Serializable]
+    public struct SimpleInt : IStructuralComparable, IStructuralEquatable, IComparable, IComparable<SimpleInt>
+    {
+        private int _val;
+        public SimpleInt(int t)
+        {
+            _val = t;
+        }
+        public int Val
+        {
+            get { return _val; }
+            set { _val = value; }
+        }
+
+        public int CompareTo(SimpleInt other)
+        {
+            return other.Val - _val;
+        }
+
+        public int CompareTo(object obj)
+        {
+            if (obj.GetType() == typeof(SimpleInt))
+            {
+                return ((SimpleInt)obj).Val - _val;
+            }
+            return -1;
+        }
+
+        public int CompareTo(object other, IComparer comparer)
+        {
+            if (other.GetType() == typeof(SimpleInt))
+                return ((SimpleInt)other).Val - _val;
+            return -1;
+        }
+
+        public bool Equals(object other, IEqualityComparer comparer)
+        {
+            if (other.GetType() == typeof(SimpleInt))
+                return ((SimpleInt)other).Val == _val;
+            return false;
+        }
+
+        public int GetHashCode(IEqualityComparer comparer)
+        {
+            return comparer.GetHashCode(_val);
+        }
+    }
+
+    [Serializable]
+    public class WrapStructural_Int : IEqualityComparer<int>, IComparer<int>
+    {
+        public int Compare(int x, int y)
+        {
+            return StructuralComparisons.StructuralComparer.Compare(x, y);
+        }
+
+        public bool Equals(int x, int y)
+        {
+            return StructuralComparisons.StructuralEqualityComparer.Equals(x, y);
+        }
+
+        public int GetHashCode(int obj)
+        {
+            return StructuralComparisons.StructuralEqualityComparer.GetHashCode(obj);
+        }
+    }
+
+    [Serializable]
+    public class WrapStructural_SimpleInt : IEqualityComparer<SimpleInt>, IComparer<SimpleInt>
+    {
+        public int Compare(SimpleInt x, SimpleInt y)
+        {
+            return StructuralComparisons.StructuralComparer.Compare(x, y);
+        }
+
+        public bool Equals(SimpleInt x, SimpleInt y)
+        {
+            return StructuralComparisons.StructuralEqualityComparer.Equals(x, y);
+        }
+
+        public int GetHashCode(SimpleInt obj)
+        {
+            return StructuralComparisons.StructuralEqualityComparer.GetHashCode(obj);
+        }
+    }
+
+    public class GenericComparable : IComparable<GenericComparable>
+    {
+        private readonly int _value;
+
+        public GenericComparable(int value)
+        {
+            _value = value;
+        }
+
+        public int CompareTo(GenericComparable other) => _value.CompareTo(other._value);
+    }
+
+    public class NonGenericComparable : IComparable
+    {
+        private readonly GenericComparable _inner;
+
+        public NonGenericComparable(int value)
+        {
+            _inner = new GenericComparable(value);
+        }
+
+        public int CompareTo(object other) =>
+            _inner.CompareTo(((NonGenericComparable)other)._inner);
+    }
+
+    public class BadlyBehavingComparable : IComparable<BadlyBehavingComparable>, IComparable
+    {
+        public int CompareTo(BadlyBehavingComparable other) => 1;
+
+        public int CompareTo(object other) => -1;
+    }
+
+    public class MutatingComparable : IComparable<MutatingComparable>, IComparable
+    {
+        private int _state;
+
+        public MutatingComparable(int initialState)
+        {
+            _state = initialState;
+        }
+
+        public int State => _state;
+
+        public int CompareTo(object other) => _state++;
+
+        public int CompareTo(MutatingComparable other) => _state++;
+    }
+
+    public static class ValueComparable
+    {
+        // Convenience method so the compiler can work its type inference magic.
+        public static ValueComparable<T> Create<T>(T value) where T : IComparable<T>
+        {
+            return new ValueComparable<T>(value);
+        }
+    }
+
+    public struct ValueComparable<T> : IComparable<ValueComparable<T>> where T : IComparable<T>
+    {
+        public ValueComparable(T value)
+        {
+            Value = value;
+        }
+
+        public T Value { get; }
+
+        public int CompareTo(ValueComparable<T> other) =>
+            Value.CompareTo(other.Value);
+    }
+
+    public class Equatable : IEquatable<Equatable>
+    {
+        public Equatable(int value)
+        {
+            Value = value;
+        }
+
+        public int Value { get; }
+
+        // Equals(object) is not implemented on purpose.
+        // EqualityComparer is only supposed to call through to the strongly-typed Equals since we implement IEquatable.
+
+        public bool Equals(Equatable other)
+        {
+            return other != null && Value == other.Value;
+        }
+
+        public override int GetHashCode() => Value;
+    }
+
+    public struct NonEquatableValueType
+    {
+        public NonEquatableValueType(int value)
+        {
+            Value = value;
+        }
+
+        public int Value { get; set; }
+    }
+
+    public class DelegateEquatable : IEquatable<DelegateEquatable>
+    {
+        public DelegateEquatable()
+        {
+            EqualsWorker = _ => false;
+        }
+
+        public Func<DelegateEquatable, bool> EqualsWorker { get; set; }
+
+        public bool Equals(DelegateEquatable other) => EqualsWorker(other);
+    }
+
+    public struct ValueDelegateEquatable : IEquatable<ValueDelegateEquatable>
+    {
+        public Func<ValueDelegateEquatable, bool> EqualsWorker { get; set; }
+
+        public bool Equals(ValueDelegateEquatable other) => EqualsWorker(other);
+    }
+
+    public sealed class TrackingEqualityComparer<T> : IEqualityComparer<T>
+    {
+        public int EqualsCalls;
+        public int GetHashCodeCalls;
+
+        public bool Equals(T x, T y)
+        {
+            EqualsCalls++;
+            return EqualityComparer<T>.Default.Equals(x, y);
+        }
+
+        public int GetHashCode(T obj)
+        {
+            GetHashCodeCalls++;
+            return EqualityComparer<T>.Default.GetHashCode(obj);
+        }
+    }
+
+    #endregion
+}
diff --git a/src/Dependencies/Collections/Internal/BitHelper.cs b/src/Dependencies/Collections/Internal/BitHelper.cs
new file mode 100644
index 0000000000000..b2c87e0d4a458
--- /dev/null
+++ b/src/Dependencies/Collections/Internal/BitHelper.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Collections.Generic
+{
+    internal ref struct BitHelper
+    {
+        private const int IntSize = sizeof(int) * 8;
+        private readonly Span<int> _span;
+
+        internal BitHelper(Span<int> span, bool clear)
+        {
+            if (clear)
+            {
+                span.Clear();
+            }
+            _span = span;
+        }
+
+        internal void MarkBit(int bitPosition)
+        {
+            int bitArrayIndex = bitPosition / IntSize;
+            if ((uint)bitArrayIndex < (uint)_span.Length)
+            {
+                _span[bitArrayIndex] |= (1 << (bitPosition % IntSize));
+            }
+        }
+
+        internal bool IsMarked(int bitPosition)
+        {
+            int bitArrayIndex = bitPosition / IntSize;
+            return
+                (uint)bitArrayIndex < (uint)_span.Length &&
+                (_span[bitArrayIndex] & (1 << (bitPosition % IntSize))) != 0;
+        }
+
+        /// <summary>How many ints must be allocated to represent n bits. Returns (n+31)/32, but avoids overflow.</summary>
+        internal static int ToIntArrayLength(int n) => n > 0 ? ((n - 1) / IntSize + 1) : 0;
+    }
+}
diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
new file mode 100644
index 0000000000000..a5e8594c3c95d
--- /dev/null
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Collections.Generic
+{
+    /// <summary>Equality comparer for hashsets of hashsets</summary>
+    internal sealed class HashSetEqualityComparer<T> : IEqualityComparer<HashSet<T>?>
+    {
+        public bool Equals(HashSet<T>? x, HashSet<T>? y)
+        {
+            // If they're the exact same instance, they're equal.
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            // They're not both null, so if either is null, they're not equal.
+            if (x == null || y == null)
+            {
+                return false;
+            }
+
+            EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
+
+            // If both sets use the same comparer, they're equal if they're the same
+            // size and one is a "subset" of the other.
+            if (HashSet<T>.EqualityComparersAreEqual(x, y))
+            {
+                return x.Count == y.Count && y.IsSubsetOfHashSetWithSameComparer(x);
+            }
+
+            // Otherwise, do an O(N^2) match.
+            foreach (T yi in y)
+            {
+                bool found = false;
+                foreach (T xi in x)
+                {
+                    if (defaultComparer.Equals(yi, xi))
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int GetHashCode(HashSet<T>? obj)
+        {
+            int hashCode = 0; // default to 0 for null/empty set
+
+            if (obj != null)
+            {
+                foreach (T t in obj)
+                {
+                    if (t != null)
+                    {
+                        hashCode ^= t.GetHashCode(); // same hashcode as as default comparer
+                    }
+                }
+            }
+
+            return hashCode;
+        }
+
+        // Equals method for the comparer itself.
+        public override bool Equals(object? obj) => obj is HashSetEqualityComparer<T>;
+
+        public override int GetHashCode() => EqualityComparer<T>.Default.GetHashCode();
+    }
+}
diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.projitems b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.projitems
index ffb157764e4dd..4dc6777339755 100644
--- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.projitems
+++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.projitems
@@ -22,6 +22,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ImmutableSegmentedDictionary`2+ValueCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ImmutableSegmentedDictionary`2.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\ArraySortHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Internal\BitHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\HashHelpers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\ICollectionDebugView`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\IDictionaryDebugView`2.cs" />
@@ -29,12 +30,14 @@
     <Compile Include="$(MSBuildThisFileDirectory)Internal\RoslynUnsafe.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\SegmentedArrayHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\SegmentedArraySegment`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Internal\SegmentedHashSetEqualityComparer`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\ThrowHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RoslynEnumerable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RoslynImmutableInterlocked.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SegmentedArray.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SegmentedArray`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SegmentedDictionary`2.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SegmentedHashSet`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SegmentedList`1.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
new file mode 100644
index 0000000000000..f9bc52a4d4740
--- /dev/null
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -0,0 +1,1582 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
+
+using Internal.Runtime.CompilerServices;
+
+namespace System.Collections.Generic
+{
+    [DebuggerTypeProxy(typeof(ICollectionDebugView<>))]
+    [DebuggerDisplay("Count = {Count}")]
+    [Serializable]
+    [TypeForwardedFrom("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+    public class HashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>, ISerializable, IDeserializationCallback
+    {
+        // This uses the same array-based implementation as Dictionary<TKey, TValue>.
+
+        // Constants for serialization
+        private const string CapacityName = "Capacity"; // Do not rename (binary serialization)
+        private const string ElementsName = "Elements"; // Do not rename (binary serialization)
+        private const string ComparerName = "Comparer"; // Do not rename (binary serialization)
+        private const string VersionName = "Version"; // Do not rename (binary serialization)
+
+        /// <summary>Cutoff point for stackallocs. This corresponds to the number of ints.</summary>
+        private const int StackAllocThreshold = 100;
+
+        /// <summary>
+        /// When constructing a hashset from an existing collection, it may contain duplicates,
+        /// so this is used as the max acceptable excess ratio of capacity to count. Note that
+        /// this is only used on the ctor and not to automatically shrink if the hashset has, e.g,
+        /// a lot of adds followed by removes. Users must explicitly shrink by calling TrimExcess.
+        /// This is set to 3 because capacity is acceptable as 2x rounded up to nearest prime.
+        /// </summary>
+        private const int ShrinkThreshold = 3;
+        private const int StartOfFreeList = -3;
+
+        private int[]? _buckets;
+        private Entry[]? _entries;
+#if TARGET_64BIT
+        private ulong _fastModMultiplier;
+#endif
+        private int _count;
+        private int _freeList;
+        private int _freeCount;
+        private int _version;
+        private IEqualityComparer<T>? _comparer;
+        private SerializationInfo? _siInfo; // temporary variable needed during deserialization
+
+        #region Constructors
+
+        public HashSet() : this((IEqualityComparer<T>?)null) { }
+
+        public HashSet(IEqualityComparer<T>? comparer)
+        {
+            if (comparer != null && comparer != EqualityComparer<T>.Default) // first check for null to avoid forcing default comparer instantiation unnecessarily
+            {
+                _comparer = comparer;
+            }
+
+            // Special-case EqualityComparer<string>.Default, StringComparer.Ordinal, and StringComparer.OrdinalIgnoreCase.
+            // We use a non-randomized comparer for improved perf, falling back to a randomized comparer if the
+            // hash buckets become unbalanced.
+
+            if (typeof(T) == typeof(string))
+            {
+                if (_comparer is null)
+                {
+                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundDefaultComparer;
+                }
+                else if (ReferenceEquals(_comparer, StringComparer.Ordinal))
+                {
+                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundStringComparerOrdinal;
+                }
+                else if (ReferenceEquals(_comparer, StringComparer.OrdinalIgnoreCase))
+                {
+                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundStringComparerOrdinalIgnoreCase;
+                }
+            }
+        }
+
+        public HashSet(int capacity) : this(capacity, null) { }
+
+        public HashSet(IEnumerable<T> collection) : this(collection, null) { }
+
+        public HashSet(IEnumerable<T> collection, IEqualityComparer<T>? comparer) : this(comparer)
+        {
+            if (collection == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
+            }
+
+            if (collection is HashSet<T> otherAsHashSet && EqualityComparersAreEqual(this, otherAsHashSet))
+            {
+                ConstructFrom(otherAsHashSet);
+            }
+            else
+            {
+                // To avoid excess resizes, first set size based on collection's count. The collection may
+                // contain duplicates, so call TrimExcess if resulting HashSet is larger than the threshold.
+                if (collection is ICollection<T> coll)
+                {
+                    int count = coll.Count;
+                    if (count > 0)
+                    {
+                        Initialize(count);
+                    }
+                }
+
+                UnionWith(collection);
+
+                if (_count > 0 && _entries!.Length / _count > ShrinkThreshold)
+                {
+                    TrimExcess();
+                }
+            }
+        }
+
+        public HashSet(int capacity, IEqualityComparer<T>? comparer) : this(comparer)
+        {
+            if (capacity < 0)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity);
+            }
+
+            if (capacity > 0)
+            {
+                Initialize(capacity);
+            }
+        }
+
+        protected HashSet(SerializationInfo info, StreamingContext context)
+        {
+            // We can't do anything with the keys and values until the entire graph has been
+            // deserialized and we have a reasonable estimate that GetHashCode is not going to
+            // fail.  For the time being, we'll just cache this.  The graph is not valid until
+            // OnDeserialization has been called.
+            _siInfo = info;
+        }
+
+        /// <summary>Initializes the HashSet from another HashSet with the same element type and equality comparer.</summary>
+        private void ConstructFrom(HashSet<T> source)
+        {
+            if (source.Count == 0)
+            {
+                // As well as short-circuiting on the rest of the work done,
+                // this avoids errors from trying to access source._buckets
+                // or source._entries when they aren't initialized.
+                return;
+            }
+
+            int capacity = source._buckets!.Length;
+            int threshold = HashHelpers.ExpandPrime(source.Count + 1);
+
+            if (threshold >= capacity)
+            {
+                _buckets = (int[])source._buckets.Clone();
+                _entries = (Entry[])source._entries!.Clone();
+                _freeList = source._freeList;
+                _freeCount = source._freeCount;
+                _count = source._count;
+#if TARGET_64BIT
+                _fastModMultiplier = source._fastModMultiplier;
+#endif
+            }
+            else
+            {
+                Initialize(source.Count);
+
+                Entry[]? entries = source._entries;
+                for (int i = 0; i < source._count; i++)
+                {
+                    ref Entry entry = ref entries![i];
+                    if (entry.Next >= -1)
+                    {
+                        AddIfNotPresent(entry.Value, out _);
+                    }
+                }
+            }
+
+            Debug.Assert(Count == source.Count);
+        }
+
+        #endregion
+
+        #region ICollection<T> methods
+
+        void ICollection<T>.Add(T item) => AddIfNotPresent(item, out _);
+
+        /// <summary>Removes all elements from the <see cref="HashSet{T}"/> object.</summary>
+        public void Clear()
+        {
+            int count = _count;
+            if (count > 0)
+            {
+                Debug.Assert(_buckets != null, "_buckets should be non-null");
+                Debug.Assert(_entries != null, "_entries should be non-null");
+
+                Array.Clear(_buckets, 0, _buckets.Length);
+                _count = 0;
+                _freeList = -1;
+                _freeCount = 0;
+                Array.Clear(_entries, 0, count);
+            }
+        }
+
+        /// <summary>Determines whether the <see cref="HashSet{T}"/> contains the specified element.</summary>
+        /// <param name="item">The element to locate in the <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object contains the specified element; otherwise, false.</returns>
+        public bool Contains(T item) => FindItemIndex(item) >= 0;
+
+        /// <summary>Gets the index of the item in <see cref="_entries"/>, or -1 if it's not in the set.</summary>
+        private int FindItemIndex(T item)
+        {
+            int[]? buckets = _buckets;
+            if (buckets != null)
+            {
+                Entry[]? entries = _entries;
+                Debug.Assert(entries != null, "Expected _entries to be initialized");
+
+                uint collisionCount = 0;
+                IEqualityComparer<T>? comparer = _comparer;
+
+                if (comparer == null)
+                {
+                    int hashCode = item != null ? item.GetHashCode() : 0;
+                    if (typeof(T).IsValueType)
+                    {
+                        // ValueType: Devirtualize with EqualityComparer<TValue>.Default intrinsic
+                        int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                        while (i >= 0)
+                        {
+                            ref Entry entry = ref entries[i];
+                            if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, item))
+                            {
+                                return i;
+                            }
+                            i = entry.Next;
+
+                            collisionCount++;
+                            if (collisionCount > (uint)entries.Length)
+                            {
+                                // The chain of entries forms a loop, which means a concurrent update has happened.
+                                ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Object type: Shared Generic, EqualityComparer<TValue>.Default won't devirtualize (https://github.com/dotnet/runtime/issues/10050),
+                        // so cache in a local rather than get EqualityComparer per loop iteration.
+                        EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
+                        int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                        while (i >= 0)
+                        {
+                            ref Entry entry = ref entries[i];
+                            if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, item))
+                            {
+                                return i;
+                            }
+                            i = entry.Next;
+
+                            collisionCount++;
+                            if (collisionCount > (uint)entries.Length)
+                            {
+                                // The chain of entries forms a loop, which means a concurrent update has happened.
+                                ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    int hashCode = item != null ? comparer.GetHashCode(item) : 0;
+                    int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                    while (i >= 0)
+                    {
+                        ref Entry entry = ref entries[i];
+                        if (entry.HashCode == hashCode && comparer.Equals(entry.Value, item))
+                        {
+                            return i;
+                        }
+                        i = entry.Next;
+
+                        collisionCount++;
+                        if (collisionCount > (uint)entries.Length)
+                        {
+                            // The chain of entries forms a loop, which means a concurrent update has happened.
+                            ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                        }
+                    }
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>Gets a reference to the specified hashcode's bucket, containing an index into <see cref="_entries"/>.</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private ref int GetBucketRef(int hashCode)
+        {
+            int[] buckets = _buckets!;
+#if TARGET_64BIT
+            return ref buckets[HashHelpers.FastMod((uint)hashCode, (uint)buckets.Length, _fastModMultiplier)];
+#else
+            return ref buckets[(uint)hashCode % (uint)buckets.Length];
+#endif
+        }
+
+        public bool Remove(T item)
+        {
+            if (_buckets != null)
+            {
+                Entry[]? entries = _entries;
+                Debug.Assert(entries != null, "entries should be non-null");
+
+                uint collisionCount = 0;
+                int last = -1;
+                int hashCode = item != null ? (_comparer?.GetHashCode(item) ?? item.GetHashCode()) : 0;
+
+                ref int bucket = ref GetBucketRef(hashCode);
+                int i = bucket - 1; // Value in buckets is 1-based
+
+                while (i >= 0)
+                {
+                    ref Entry entry = ref entries[i];
+
+                    if (entry.HashCode == hashCode && (_comparer?.Equals(entry.Value, item) ?? EqualityComparer<T>.Default.Equals(entry.Value, item)))
+                    {
+                        if (last < 0)
+                        {
+                            bucket = entry.Next + 1; // Value in buckets is 1-based
+                        }
+                        else
+                        {
+                            entries[last].Next = entry.Next;
+                        }
+
+                        Debug.Assert((StartOfFreeList - _freeList) < 0, "shouldn't underflow because max hashtable length is MaxPrimeArrayLength = 0x7FEFFFFD(2146435069) _freelist underflow threshold 2147483646");
+                        entry.Next = StartOfFreeList - _freeList;
+
+                        if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+                        {
+                            entry.Value = default!;
+                        }
+
+                        _freeList = i;
+                        _freeCount++;
+                        return true;
+                    }
+
+                    last = i;
+                    i = entry.Next;
+
+                    collisionCount++;
+                    if (collisionCount > (uint)entries.Length)
+                    {
+                        // The chain of entries forms a loop; which means a concurrent update has happened.
+                        // Break out of the loop and throw, rather than looping forever.
+                        ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>Gets the number of elements that are contained in the set.</summary>
+        public int Count => _count - _freeCount;
+
+        bool ICollection<T>.IsReadOnly => false;
+
+        #endregion
+
+        #region IEnumerable methods
+
+        public Enumerator GetEnumerator() => new Enumerator(this);
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        #endregion
+
+        #region ISerializable methods
+
+        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.info);
+            }
+
+            info.AddValue(VersionName, _version); // need to serialize version to avoid problems with serializing while enumerating
+            info.AddValue(ComparerName, Comparer, typeof(IEqualityComparer<T>));
+            info.AddValue(CapacityName, _buckets == null ? 0 : _buckets.Length);
+
+            if (_buckets != null)
+            {
+                var array = new T[Count];
+                CopyTo(array);
+                info.AddValue(ElementsName, array, typeof(T[]));
+            }
+        }
+
+        #endregion
+
+        #region IDeserializationCallback methods
+
+        public virtual void OnDeserialization(object? sender)
+        {
+            if (_siInfo == null)
+            {
+                // It might be necessary to call OnDeserialization from a container if the
+                // container object also implements OnDeserialization. We can return immediately
+                // if this function is called twice. Note we set _siInfo to null at the end of this method.
+                return;
+            }
+
+            int capacity = _siInfo.GetInt32(CapacityName);
+            _comparer = (IEqualityComparer<T>)_siInfo.GetValue(ComparerName, typeof(IEqualityComparer<T>))!;
+            _freeList = -1;
+            _freeCount = 0;
+
+            if (capacity != 0)
+            {
+                _buckets = new int[capacity];
+                _entries = new Entry[capacity];
+#if TARGET_64BIT
+                _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)capacity);
+#endif
+
+                T[]? array = (T[]?)_siInfo.GetValue(ElementsName, typeof(T[]));
+                if (array == null)
+                {
+                    ThrowHelper.ThrowSerializationException(ExceptionResource.Serialization_MissingKeys);
+                }
+
+                // There are no resizes here because we already set capacity above.
+                for (int i = 0; i < array.Length; i++)
+                {
+                    AddIfNotPresent(array[i], out _);
+                }
+            }
+            else
+            {
+                _buckets = null;
+            }
+
+            _version = _siInfo.GetInt32(VersionName);
+            _siInfo = null;
+        }
+
+        #endregion
+
+        #region HashSet methods
+
+        /// <summary>Adds the specified element to the <see cref="HashSet{T}"/>.</summary>
+        /// <param name="item">The element to add to the set.</param>
+        /// <returns>true if the element is added to the <see cref="HashSet{T}"/> object; false if the element is already present.</returns>
+        public bool Add(T item) => AddIfNotPresent(item, out _);
+
+        /// <summary>Searches the set for a given value and returns the equal value it finds, if any.</summary>
+        /// <param name="equalValue">The value to search for.</param>
+        /// <param name="actualValue">The value from the set that the search found, or the default value of <typeparamref name="T"/> when the search yielded no match.</param>
+        /// <returns>A value indicating whether the search was successful.</returns>
+        /// <remarks>
+        /// This can be useful when you want to reuse a previously stored reference instead of
+        /// a newly constructed one (so that more sharing of references can occur) or to look up
+        /// a value that has more complete data than the value you currently have, although their
+        /// comparer functions indicate they are equal.
+        /// </remarks>
+        public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
+        {
+            if (_buckets != null)
+            {
+                int index = FindItemIndex(equalValue);
+                if (index >= 0)
+                {
+                    actualValue = _entries![index].Value;
+                    return true;
+                }
+            }
+
+            actualValue = default;
+            return false;
+        }
+
+        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain all elements that are present in itself, the specified collection, or both.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        public void UnionWith(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            foreach (T item in other)
+            {
+                AddIfNotPresent(item, out _);
+            }
+        }
+
+        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain only elements that are present in that object and in the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        public void IntersectWith(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // Intersection of anything with empty set is empty set, so return if count is 0.
+            // Same if the set intersecting with itself is the same set.
+            if (Count == 0 || other == this)
+            {
+                return;
+            }
+
+            // If other is known to be empty, intersection is empty set; remove all elements, and we're done.
+            if (other is ICollection<T> otherAsCollection)
+            {
+                if (otherAsCollection.Count == 0)
+                {
+                    Clear();
+                    return;
+                }
+
+                // Faster if other is a hashset using same equality comparer; so check
+                // that other is a hashset using the same equality comparer.
+                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                {
+                    IntersectWithHashSetWithSameComparer(otherAsSet);
+                    return;
+                }
+            }
+
+            IntersectWithEnumerable(other);
+        }
+
+        /// <summary>Removes all elements in the specified collection from the current <see cref="HashSet{T}"/> object.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        public void ExceptWith(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // This is already the empty set; return.
+            if (Count == 0)
+            {
+                return;
+            }
+
+            // Special case if other is this; a set minus itself is the empty set.
+            if (other == this)
+            {
+                Clear();
+                return;
+            }
+
+            // Remove every element in other from this.
+            foreach (T element in other)
+            {
+                Remove(element);
+            }
+        }
+
+        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain only elements that are present either in that object or in the specified collection, but not both.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        public void SymmetricExceptWith(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // If set is empty, then symmetric difference is other.
+            if (Count == 0)
+            {
+                UnionWith(other);
+                return;
+            }
+
+            // Special-case this; the symmetric difference of a set with itself is the empty set.
+            if (other == this)
+            {
+                Clear();
+                return;
+            }
+
+            // If other is a HashSet, it has unique elements according to its equality comparer,
+            // but if they're using different equality comparers, then assumption of uniqueness
+            // will fail. So first check if other is a hashset using the same equality comparer;
+            // symmetric except is a lot faster and avoids bit array allocations if we can assume
+            // uniqueness.
+            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            {
+                SymmetricExceptWithUniqueHashSet(otherAsSet);
+            }
+            else
+            {
+                SymmetricExceptWithEnumerable(other);
+            }
+        }
+
+        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a subset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object is a subset of <paramref name="other"/>; otherwise, false.</returns>
+        public bool IsSubsetOf(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // The empty set is a subset of any set, and a set is a subset of itself.
+            // Set is always a subset of itself
+            if (Count == 0 || other == this)
+            {
+                return true;
+            }
+
+            // Faster if other has unique elements according to this equality comparer; so check
+            // that other is a hashset using the same equality comparer.
+            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            {
+                // if this has more elements then it can't be a subset
+                if (Count > otherAsSet.Count)
+                {
+                    return false;
+                }
+
+                // already checked that we're using same equality comparer. simply check that
+                // each element in this is contained in other.
+                return IsSubsetOfHashSetWithSameComparer(otherAsSet);
+            }
+
+            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
+            return uniqueCount == Count && unfoundCount >= 0;
+        }
+
+        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper subset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object is a proper subset of <paramref name="other"/>; otherwise, false.</returns>
+        public bool IsProperSubsetOf(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // No set is a proper subset of itself.
+            if (other == this)
+            {
+                return false;
+            }
+
+            if (other is ICollection<T> otherAsCollection)
+            {
+                // No set is a proper subset of an empty set.
+                if (otherAsCollection.Count == 0)
+                {
+                    return false;
+                }
+
+                // The empty set is a proper subset of anything but the empty set.
+                if (Count == 0)
+                {
+                    return otherAsCollection.Count > 0;
+                }
+
+                // Faster if other is a hashset (and we're using same equality comparer).
+                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                {
+                    if (Count >= otherAsSet.Count)
+                    {
+                        return false;
+                    }
+
+                    // This has strictly less than number of items in other, so the following
+                    // check suffices for proper subset.
+                    return IsSubsetOfHashSetWithSameComparer(otherAsSet);
+                }
+            }
+
+            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
+            return uniqueCount == Count && unfoundCount > 0;
+        }
+
+        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper superset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object is a superset of <paramref name="other"/>; otherwise, false.</returns>
+        public bool IsSupersetOf(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // A set is always a superset of itself.
+            if (other == this)
+            {
+                return true;
+            }
+
+            // Try to fall out early based on counts.
+            if (other is ICollection<T> otherAsCollection)
+            {
+                // If other is the empty set then this is a superset.
+                if (otherAsCollection.Count == 0)
+                {
+                    return true;
+                }
+
+                // Try to compare based on counts alone if other is a hashset with same equality comparer.
+                if (other is HashSet<T> otherAsSet &&
+                    EqualityComparersAreEqual(this, otherAsSet) &&
+                    otherAsSet.Count > Count)
+                {
+                    return false;
+                }
+            }
+
+            return ContainsAllElements(other);
+        }
+
+        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper superset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object is a proper superset of <paramref name="other"/>; otherwise, false.</returns>
+        public bool IsProperSupersetOf(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // The empty set isn't a proper superset of any set, and a set is never a strict superset of itself.
+            if (Count == 0 || other == this)
+            {
+                return false;
+            }
+
+            if (other is ICollection<T> otherAsCollection)
+            {
+                // If other is the empty set then this is a superset.
+                if (otherAsCollection.Count == 0)
+                {
+                    // Note that this has at least one element, based on above check.
+                    return true;
+                }
+
+                // Faster if other is a hashset with the same equality comparer
+                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                {
+                    if (otherAsSet.Count >= Count)
+                    {
+                        return false;
+                    }
+
+                    // Now perform element check.
+                    return ContainsAllElements(otherAsSet);
+                }
+            }
+
+            // Couldn't fall out in the above cases; do it the long way
+            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
+            return uniqueCount < Count && unfoundCount == 0;
+        }
+
+        /// <summary>Determines whether the current <see cref="HashSet{T}"/> object and a specified collection share common elements.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object and <paramref name="other"/> share at least one common element; otherwise, false.</returns>
+        public bool Overlaps(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            if (Count == 0)
+            {
+                return false;
+            }
+
+            // Set overlaps itself
+            if (other == this)
+            {
+                return true;
+            }
+
+            foreach (T element in other)
+            {
+                if (Contains(element))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>Determines whether a <see cref="HashSet{T}"/> object and the specified collection contain the same elements.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="HashSet{T}"/> object is equal to <paramref name="other"/>; otherwise, false.</returns>
+        public bool SetEquals(IEnumerable<T> other)
+        {
+            if (other == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
+            }
+
+            // A set is equal to itself.
+            if (other == this)
+            {
+                return true;
+            }
+
+            // Faster if other is a hashset and we're using same equality comparer.
+            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            {
+                // Attempt to return early: since both contain unique elements, if they have
+                // different counts, then they can't be equal.
+                if (Count != otherAsSet.Count)
+                {
+                    return false;
+                }
+
+                // Already confirmed that the sets have the same number of distinct elements, so if
+                // one is a superset of the other then they must be equal.
+                return ContainsAllElements(otherAsSet);
+            }
+            else
+            {
+                // If this count is 0 but other contains at least one element, they can't be equal.
+                if (Count == 0 &&
+                    other is ICollection<T> otherAsCollection &&
+                    otherAsCollection.Count > 0)
+                {
+                    return false;
+                }
+
+                (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
+                return uniqueCount == Count && unfoundCount == 0;
+            }
+        }
+
+        public void CopyTo(T[] array) => CopyTo(array, 0, Count);
+
+        /// <summary>Copies the elements of a <see cref="HashSet{T}"/> object to an array, starting at the specified array index.</summary>
+        /// <param name="array">The destination array.</param>
+        /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+        public void CopyTo(T[] array, int arrayIndex) => CopyTo(array, arrayIndex, Count);
+
+        public void CopyTo(T[] array, int arrayIndex, int count)
+        {
+            if (array == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array);
+            }
+
+            // Check array index valid index into array.
+            if (arrayIndex < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex), arrayIndex, SR.ArgumentOutOfRange_NeedNonNegNum);
+            }
+
+            // Also throw if count less than 0.
+            if (count < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count), count, SR.ArgumentOutOfRange_NeedNonNegNum);
+            }
+
+            // Will the array, starting at arrayIndex, be able to hold elements? Note: not
+            // checking arrayIndex >= array.Length (consistency with list of allowing
+            // count of 0; subsequent check takes care of the rest)
+            if (arrayIndex > array.Length || count > array.Length - arrayIndex)
+            {
+                ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall);
+            }
+
+            Entry[]? entries = _entries;
+            for (int i = 0; i < _count && count != 0; i++)
+            {
+                ref Entry entry = ref entries![i];
+                if (entry.Next >= -1)
+                {
+                    array[arrayIndex++] = entry.Value;
+                    count--;
+                }
+            }
+        }
+
+        /// <summary>Removes all elements that match the conditions defined by the specified predicate from a <see cref="HashSet{T}"/> collection.</summary>
+        public int RemoveWhere(Predicate<T> match)
+        {
+            if (match == null)
+            {
+                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
+            }
+
+            Entry[]? entries = _entries;
+            int numRemoved = 0;
+            for (int i = 0; i < _count; i++)
+            {
+                ref Entry entry = ref entries![i];
+                if (entry.Next >= -1)
+                {
+                    // Cache value in case delegate removes it
+                    T value = entry.Value;
+                    if (match(value))
+                    {
+                        // Check again that remove actually removed it.
+                        if (Remove(value))
+                        {
+                            numRemoved++;
+                        }
+                    }
+                }
+            }
+
+            return numRemoved;
+        }
+
+        /// <summary>Gets the <see cref="IEqualityComparer"/> object that is used to determine equality for the values in the set.</summary>
+        public IEqualityComparer<T> Comparer
+        {
+            get
+            {
+                if (typeof(T) == typeof(string))
+                {
+                    return (IEqualityComparer<T>)IInternalStringEqualityComparer.GetUnderlyingEqualityComparer((IEqualityComparer<string?>?)_comparer);
+                }
+                else
+                {
+                    return _comparer ?? EqualityComparer<T>.Default;
+                }
+            }
+        }
+
+        /// <summary>Ensures that this hash set can hold the specified number of elements without growing.</summary>
+        public int EnsureCapacity(int capacity)
+        {
+            if (capacity < 0)
+            {
+                ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity);
+            }
+
+            int currentCapacity = _entries == null ? 0 : _entries.Length;
+            if (currentCapacity >= capacity)
+            {
+                return currentCapacity;
+            }
+
+            if (_buckets == null)
+            {
+                return Initialize(capacity);
+            }
+
+            int newSize = HashHelpers.GetPrime(capacity);
+            Resize(newSize, forceNewHashCodes: false);
+            return newSize;
+        }
+
+        private void Resize() => Resize(HashHelpers.ExpandPrime(_count), forceNewHashCodes: false);
+
+        private void Resize(int newSize, bool forceNewHashCodes)
+        {
+            // Value types never rehash
+            Debug.Assert(!forceNewHashCodes || !typeof(T).IsValueType);
+            Debug.Assert(_entries != null, "_entries should be non-null");
+            Debug.Assert(newSize >= _entries.Length);
+
+            var entries = new Entry[newSize];
+
+            int count = _count;
+            Array.Copy(_entries, entries, count);
+
+            if (!typeof(T).IsValueType && forceNewHashCodes)
+            {
+                Debug.Assert(_comparer is NonRandomizedStringEqualityComparer);
+                _comparer = (IEqualityComparer<T>)((NonRandomizedStringEqualityComparer)_comparer).GetRandomizedEqualityComparer();
+
+                for (int i = 0; i < count; i++)
+                {
+                    ref Entry entry = ref entries[i];
+                    if (entry.Next >= -1)
+                    {
+                        entry.HashCode = entry.Value != null ? _comparer!.GetHashCode(entry.Value) : 0;
+                    }
+                }
+
+                if (ReferenceEquals(_comparer, EqualityComparer<T>.Default))
+                {
+                    _comparer = null;
+                }
+            }
+
+            // Assign member variables after both arrays allocated to guard against corruption from OOM if second fails
+            _buckets = new int[newSize];
+#if TARGET_64BIT
+            _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)newSize);
+#endif
+            for (int i = 0; i < count; i++)
+            {
+                ref Entry entry = ref entries[i];
+                if (entry.Next >= -1)
+                {
+                    ref int bucket = ref GetBucketRef(entry.HashCode);
+                    entry.Next = bucket - 1; // Value in _buckets is 1-based
+                    bucket = i + 1;
+                }
+            }
+
+            _entries = entries;
+        }
+
+        /// <summary>
+        /// Sets the capacity of a <see cref="HashSet{T}"/> object to the actual number of elements it contains,
+        /// rounded up to a nearby, implementation-specific value.
+        /// </summary>
+        public void TrimExcess()
+        {
+            int capacity = Count;
+
+            int newSize = HashHelpers.GetPrime(capacity);
+            Entry[]? oldEntries = _entries;
+            int currentCapacity = oldEntries == null ? 0 : oldEntries.Length;
+            if (newSize >= currentCapacity)
+            {
+                return;
+            }
+
+            int oldCount = _count;
+            _version++;
+            Initialize(newSize);
+            Entry[]? entries = _entries;
+            int count = 0;
+            for (int i = 0; i < oldCount; i++)
+            {
+                int hashCode = oldEntries![i].HashCode; // At this point, we know we have entries.
+                if (oldEntries[i].Next >= -1)
+                {
+                    ref Entry entry = ref entries![count];
+                    entry = oldEntries[i];
+                    ref int bucket = ref GetBucketRef(hashCode);
+                    entry.Next = bucket - 1; // Value in _buckets is 1-based
+                    bucket = count + 1;
+                    count++;
+                }
+            }
+
+            _count = capacity;
+            _freeCount = 0;
+        }
+
+        #endregion
+
+        #region Helper methods
+
+        /// <summary>Returns an <see cref="IEqualityComparer"/> object that can be used for equality testing of a <see cref="HashSet{T}"/> object.</summary>
+        public static IEqualityComparer<HashSet<T>> CreateSetComparer() => new HashSetEqualityComparer<T>();
+
+        /// <summary>
+        /// Initializes buckets and slots arrays. Uses suggested capacity by finding next prime
+        /// greater than or equal to capacity.
+        /// </summary>
+        private int Initialize(int capacity)
+        {
+            int size = HashHelpers.GetPrime(capacity);
+            var buckets = new int[size];
+            var entries = new Entry[size];
+
+            // Assign member variables after both arrays are allocated to guard against corruption from OOM if second fails.
+            _freeList = -1;
+            _buckets = buckets;
+            _entries = entries;
+#if TARGET_64BIT
+            _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)size);
+#endif
+
+            return size;
+        }
+
+        /// <summary>Adds the specified element to the set if it's not already contained.</summary>
+        /// <param name="value">The element to add to the set.</param>
+        /// <param name="location">The index into <see cref="_entries"/> of the element.</param>
+        /// <returns>true if the element is added to the <see cref="HashSet{T}"/> object; false if the element is already present.</returns>
+        private bool AddIfNotPresent(T value, out int location)
+        {
+            if (_buckets == null)
+            {
+                Initialize(0);
+            }
+            Debug.Assert(_buckets != null);
+
+            Entry[]? entries = _entries;
+            Debug.Assert(entries != null, "expected entries to be non-null");
+
+            IEqualityComparer<T>? comparer = _comparer;
+            int hashCode;
+
+            uint collisionCount = 0;
+            ref int bucket = ref Unsafe.NullRef<int>();
+
+            if (comparer == null)
+            {
+                hashCode = value != null ? value.GetHashCode() : 0;
+                bucket = ref GetBucketRef(hashCode);
+                int i = bucket - 1; // Value in _buckets is 1-based
+                if (typeof(T).IsValueType)
+                {
+                    // ValueType: Devirtualize with EqualityComparer<TValue>.Default intrinsic
+                    while (i >= 0)
+                    {
+                        ref Entry entry = ref entries[i];
+                        if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, value))
+                        {
+                            location = i;
+                            return false;
+                        }
+                        i = entry.Next;
+
+                        collisionCount++;
+                        if (collisionCount > (uint)entries.Length)
+                        {
+                            // The chain of entries forms a loop, which means a concurrent update has happened.
+                            ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                        }
+                    }
+                }
+                else
+                {
+                    // Object type: Shared Generic, EqualityComparer<TValue>.Default won't devirtualize (https://github.com/dotnet/runtime/issues/10050),
+                    // so cache in a local rather than get EqualityComparer per loop iteration.
+                    EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
+                    while (i >= 0)
+                    {
+                        ref Entry entry = ref entries[i];
+                        if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, value))
+                        {
+                            location = i;
+                            return false;
+                        }
+                        i = entry.Next;
+
+                        collisionCount++;
+                        if (collisionCount > (uint)entries.Length)
+                        {
+                            // The chain of entries forms a loop, which means a concurrent update has happened.
+                            ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                        }
+                    }
+                }
+            }
+            else
+            {
+                hashCode = value != null ? comparer.GetHashCode(value) : 0;
+                bucket = ref GetBucketRef(hashCode);
+                int i = bucket - 1; // Value in _buckets is 1-based
+                while (i >= 0)
+                {
+                    ref Entry entry = ref entries[i];
+                    if (entry.HashCode == hashCode && comparer.Equals(entry.Value, value))
+                    {
+                        location = i;
+                        return false;
+                    }
+                    i = entry.Next;
+
+                    collisionCount++;
+                    if (collisionCount > (uint)entries.Length)
+                    {
+                        // The chain of entries forms a loop, which means a concurrent update has happened.
+                        ThrowHelper.ThrowInvalidOperationException_ConcurrentOperationsNotSupported();
+                    }
+                }
+            }
+
+            int index;
+            if (_freeCount > 0)
+            {
+                index = _freeList;
+                _freeCount--;
+                Debug.Assert((StartOfFreeList - entries![_freeList].Next) >= -1, "shouldn't overflow because `next` cannot underflow");
+                _freeList = StartOfFreeList - entries[_freeList].Next;
+            }
+            else
+            {
+                int count = _count;
+                if (count == entries.Length)
+                {
+                    Resize();
+                    bucket = ref GetBucketRef(hashCode);
+                }
+                index = count;
+                _count = count + 1;
+                entries = _entries;
+            }
+
+            {
+                ref Entry entry = ref entries![index];
+                entry.HashCode = hashCode;
+                entry.Next = bucket - 1; // Value in _buckets is 1-based
+                entry.Value = value;
+                bucket = index + 1;
+                _version++;
+                location = index;
+            }
+
+            // Value types never rehash
+            if (!typeof(T).IsValueType && collisionCount > HashHelpers.HashCollisionThreshold && comparer is NonRandomizedStringEqualityComparer)
+            {
+                // If we hit the collision threshold we'll need to switch to the comparer which is using randomized string hashing
+                // i.e. EqualityComparer<string>.Default.
+                Resize(entries.Length, forceNewHashCodes: true);
+                location = FindItemIndex(value);
+                Debug.Assert(location >= 0);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if this contains of other's elements. Iterates over other's elements and
+        /// returns false as soon as it finds an element in other that's not in this.
+        /// Used by SupersetOf, ProperSupersetOf, and SetEquals.
+        /// </summary>
+        private bool ContainsAllElements(IEnumerable<T> other)
+        {
+            foreach (T element in other)
+            {
+                if (!Contains(element))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Implementation Notes:
+        /// If other is a hashset and is using same equality comparer, then checking subset is
+        /// faster. Simply check that each element in this is in other.
+        ///
+        /// Note: if other doesn't use same equality comparer, then Contains check is invalid,
+        /// which is why callers must take are of this.
+        ///
+        /// If callers are concerned about whether this is a proper subset, they take care of that.
+        /// </summary>
+        internal bool IsSubsetOfHashSetWithSameComparer(HashSet<T> other)
+        {
+            foreach (T item in this)
+            {
+                if (!other.Contains(item))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// If other is a hashset that uses same equality comparer, intersect is much faster
+        /// because we can use other's Contains
+        /// </summary>
+        private void IntersectWithHashSetWithSameComparer(HashSet<T> other)
+        {
+            Entry[]? entries = _entries;
+            for (int i = 0; i < _count; i++)
+            {
+                ref Entry entry = ref entries![i];
+                if (entry.Next >= -1)
+                {
+                    T item = entry.Value;
+                    if (!other.Contains(item))
+                    {
+                        Remove(item);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Iterate over other. If contained in this, mark an element in bit array corresponding to
+        /// its position in _slots. If anything is unmarked (in bit array), remove it.
+        ///
+        /// This attempts to allocate on the stack, if below StackAllocThreshold.
+        /// </summary>
+        private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
+        {
+            Debug.Assert(_buckets != null, "_buckets shouldn't be null; callers should check first");
+
+            // Keep track of current last index; don't want to move past the end of our bit array
+            // (could happen if another thread is modifying the collection).
+            int originalCount = _count;
+            int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
+
+            Span<int> span = stackalloc int[StackAllocThreshold];
+            BitHelper bitHelper = intArrayLength <= StackAllocThreshold ?
+                new BitHelper(span.Slice(0, intArrayLength), clear: true) :
+                new BitHelper(new int[intArrayLength], clear: false);
+
+            // Mark if contains: find index of in slots array and mark corresponding element in bit array.
+            foreach (T item in other)
+            {
+                int index = FindItemIndex(item);
+                if (index >= 0)
+                {
+                    bitHelper.MarkBit(index);
+                }
+            }
+
+            // If anything unmarked, remove it. Perf can be optimized here if BitHelper had a
+            // FindFirstUnmarked method.
+            for (int i = 0; i < originalCount; i++)
+            {
+                ref Entry entry = ref _entries![i];
+                if (entry.Next >= -1 && !bitHelper.IsMarked(i))
+                {
+                    Remove(entry.Value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// if other is a set, we can assume it doesn't have duplicate elements, so use this
+        /// technique: if can't remove, then it wasn't present in this set, so add.
+        ///
+        /// As with other methods, callers take care of ensuring that other is a hashset using the
+        /// same equality comparer.
+        /// </summary>
+        /// <param name="other"></param>
+        private void SymmetricExceptWithUniqueHashSet(HashSet<T> other)
+        {
+            foreach (T item in other)
+            {
+                if (!Remove(item))
+                {
+                    AddIfNotPresent(item, out _);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Implementation notes:
+        ///
+        /// Used for symmetric except when other isn't a HashSet. This is more tedious because
+        /// other may contain duplicates. HashSet technique could fail in these situations:
+        /// 1. Other has a duplicate that's not in this: HashSet technique would add then
+        /// remove it.
+        /// 2. Other has a duplicate that's in this: HashSet technique would remove then add it
+        /// back.
+        /// In general, its presence would be toggled each time it appears in other.
+        ///
+        /// This technique uses bit marking to indicate whether to add/remove the item. If already
+        /// present in collection, it will get marked for deletion. If added from other, it will
+        /// get marked as something not to remove.
+        ///
+        /// </summary>
+        /// <param name="other"></param>
+        private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
+        {
+            int originalCount = _count;
+            int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
+
+            Span<int> itemsToRemoveSpan = stackalloc int[StackAllocThreshold / 2];
+            BitHelper itemsToRemove = intArrayLength <= StackAllocThreshold / 2 ?
+                new BitHelper(itemsToRemoveSpan.Slice(0, intArrayLength), clear: true) :
+                new BitHelper(new int[intArrayLength], clear: false);
+
+            Span<int> itemsAddedFromOtherSpan = stackalloc int[StackAllocThreshold / 2];
+            BitHelper itemsAddedFromOther = intArrayLength <= StackAllocThreshold / 2 ?
+                new BitHelper(itemsAddedFromOtherSpan.Slice(0, intArrayLength), clear: true) :
+                new BitHelper(new int[intArrayLength], clear: false);
+
+            foreach (T item in other)
+            {
+                int location;
+                if (AddIfNotPresent(item, out location))
+                {
+                    // wasn't already present in collection; flag it as something not to remove
+                    // *NOTE* if location is out of range, we should ignore. BitHelper will
+                    // detect that it's out of bounds and not try to mark it. But it's
+                    // expected that location could be out of bounds because adding the item
+                    // will increase _lastIndex as soon as all the free spots are filled.
+                    itemsAddedFromOther.MarkBit(location);
+                }
+                else
+                {
+                    // already there...if not added from other, mark for remove.
+                    // *NOTE* Even though BitHelper will check that location is in range, we want
+                    // to check here. There's no point in checking items beyond originalCount
+                    // because they could not have been in the original collection
+                    if (location < originalCount && !itemsAddedFromOther.IsMarked(location))
+                    {
+                        itemsToRemove.MarkBit(location);
+                    }
+                }
+            }
+
+            // if anything marked, remove it
+            for (int i = 0; i < originalCount; i++)
+            {
+                if (itemsToRemove.IsMarked(i))
+                {
+                    Remove(_entries![i].Value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines counts that can be used to determine equality, subset, and superset. This
+        /// is only used when other is an IEnumerable and not a HashSet. If other is a HashSet
+        /// these properties can be checked faster without use of marking because we can assume
+        /// other has no duplicates.
+        ///
+        /// The following count checks are performed by callers:
+        /// 1. Equals: checks if unfoundCount = 0 and uniqueFoundCount = _count; i.e. everything
+        /// in other is in this and everything in this is in other
+        /// 2. Subset: checks if unfoundCount >= 0 and uniqueFoundCount = _count; i.e. other may
+        /// have elements not in this and everything in this is in other
+        /// 3. Proper subset: checks if unfoundCount > 0 and uniqueFoundCount = _count; i.e
+        /// other must have at least one element not in this and everything in this is in other
+        /// 4. Proper superset: checks if unfound count = 0 and uniqueFoundCount strictly less
+        /// than _count; i.e. everything in other was in this and this had at least one element
+        /// not contained in other.
+        ///
+        /// An earlier implementation used delegates to perform these checks rather than returning
+        /// an ElementCount struct; however this was changed due to the perf overhead of delegates.
+        /// </summary>
+        /// <param name="other"></param>
+        /// <param name="returnIfUnfound">Allows us to finish faster for equals and proper superset
+        /// because unfoundCount must be 0.</param>
+        private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements(IEnumerable<T> other, bool returnIfUnfound)
+        {
+            // Need special case in case this has no elements.
+            if (_count == 0)
+            {
+                int numElementsInOther = 0;
+                foreach (T item in other)
+                {
+                    numElementsInOther++;
+                    break; // break right away, all we want to know is whether other has 0 or 1 elements
+                }
+
+                return (UniqueCount: 0, UnfoundCount: numElementsInOther);
+            }
+
+            Debug.Assert((_buckets != null) && (_count > 0), "_buckets was null but count greater than 0");
+
+            int originalCount = _count;
+            int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
+
+            Span<int> span = stackalloc int[StackAllocThreshold];
+            BitHelper bitHelper = intArrayLength <= StackAllocThreshold ?
+                new BitHelper(span.Slice(0, intArrayLength), clear: true) :
+                new BitHelper(new int[intArrayLength], clear: false);
+
+            int unfoundCount = 0; // count of items in other not found in this
+            int uniqueFoundCount = 0; // count of unique items in other found in this
+
+            foreach (T item in other)
+            {
+                int index = FindItemIndex(item);
+                if (index >= 0)
+                {
+                    if (!bitHelper.IsMarked(index))
+                    {
+                        // Item hasn't been seen yet.
+                        bitHelper.MarkBit(index);
+                        uniqueFoundCount++;
+                    }
+                }
+                else
+                {
+                    unfoundCount++;
+                    if (returnIfUnfound)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return (uniqueFoundCount, unfoundCount);
+        }
+
+        /// <summary>
+        /// Checks if equality comparers are equal. This is used for algorithms that can
+        /// speed up if it knows the other item has unique elements. I.e. if they're using
+        /// different equality comparers, then uniqueness assumption between sets break.
+        /// </summary>
+        internal static bool EqualityComparersAreEqual(HashSet<T> set1, HashSet<T> set2) => set1.Comparer.Equals(set2.Comparer);
+
+#endregion
+
+        private struct Entry
+        {
+            public int HashCode;
+            /// <summary>
+            /// 0-based index of next entry in chain: -1 means end of chain
+            /// also encodes whether this entry _itself_ is part of the free list by changing sign and subtracting 3,
+            /// so -2 means end of free list, -3 means index 0 but on free list, -4 means index 1 but on free list, etc.
+            /// </summary>
+            public int Next;
+            public T Value;
+        }
+
+        public struct Enumerator : IEnumerator<T>
+        {
+            private readonly HashSet<T> _hashSet;
+            private readonly int _version;
+            private int _index;
+            private T _current;
+
+            internal Enumerator(HashSet<T> hashSet)
+            {
+                _hashSet = hashSet;
+                _version = hashSet._version;
+                _index = 0;
+                _current = default!;
+            }
+
+            public bool MoveNext()
+            {
+                if (_version != _hashSet._version)
+                {
+                    ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
+                }
+
+                // Use unsigned comparison since we set index to dictionary.count+1 when the enumeration ends.
+                // dictionary.count+1 could be negative if dictionary.count is int.MaxValue
+                while ((uint)_index < (uint)_hashSet._count)
+                {
+                    ref Entry entry = ref _hashSet._entries![_index++];
+                    if (entry.Next >= -1)
+                    {
+                        _current = entry.Value;
+                        return true;
+                    }
+                }
+
+                _index = _hashSet._count + 1;
+                _current = default!;
+                return false;
+            }
+
+            public T Current => _current;
+
+            public void Dispose() { }
+
+            object? IEnumerator.Current
+            {
+                get
+                {
+                    if (_index == 0 || (_index == _hashSet._count + 1))
+                    {
+                        ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumOpCantHappen();
+                    }
+
+                    return _current;
+                }
+            }
+
+            void IEnumerator.Reset()
+            {
+                if (_version != _hashSet._version)
+                {
+                    ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumFailedVersion();
+                }
+
+                _index = 0;
+                _current = default!;
+            }
+        }
+    }
+}

From fa322ffb80a13841cfb49d53daf5e74927edc242 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:20:29 -0700
Subject: [PATCH 003/413] Add origin notes

---
 .../Collections/HashSet/ISet_Generic_Tests`1.cs             | 6 ++++++
 .../Collections/HashSet/SegmentedHashSet_Generic_Tests.cs   | 6 ++++++
 .../Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs | 6 ++++++
 .../SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs        | 6 ++++++
 .../CodeAnalysisTest/Collections/HashSet/TestingTypes.cs    | 6 ++++++
 src/Dependencies/Collections/Internal/BitHelper.cs          | 6 ++++++
 .../Internal/SegmentedHashSetEqualityComparer`1.cs          | 6 ++++++
 src/Dependencies/Collections/SegmentedHashSet`1.cs          | 6 ++++++
 8 files changed, 48 insertions(+)

diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
index 438b72e4ff746..f1e9dbcae03a7 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/Common/tests/System/Collections/ISet.Generic.Tests.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
index 499732281ea97..253941240153e 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Collections.Generic;
 using Xunit;
 
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
index c82ca3938463a..0c98e521ed4f3 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
index 48ffc2e4ba1d6..54dbae1fbd74d 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.AsNonGenericIEnumerable.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Collections.Generic;
 
 namespace System.Collections.Tests
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
index 4df123571586b..8ce466ee32b35 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/Common/tests/System/Collections/TestingTypes.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Collections.Generic;
 
 namespace System.Collections.Tests
diff --git a/src/Dependencies/Collections/Internal/BitHelper.cs b/src/Dependencies/Collections/Internal/BitHelper.cs
index b2c87e0d4a458..18bb071e4c25b 100644
--- a/src/Dependencies/Collections/Internal/BitHelper.cs
+++ b/src/Dependencies/Collections/Internal/BitHelper.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/Common/src/System/Collections/Generic/BitHelper.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 namespace System.Collections.Generic
 {
     internal ref struct BitHelper
diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
index a5e8594c3c95d..c0a47b7f89c8e 100644
--- a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 namespace System.Collections.Generic
 {
     /// <summary>Equality comparer for hashsets of hashsets</summary>
diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index f9bc52a4d4740..3ae667e5c9e26 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -1,6 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// NOTE: This code is derived from an implementation originally in dotnet/runtime:
+// https://github.com/dotnet/runtime/blob/v5.0.7/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs
+//
+// See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
+// reference implementation.
+
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;

From 17617c75f710fa7cf72d5d483e7513d01add7d1e Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:34:02 -0700
Subject: [PATCH 004/413] Rename type to SegmentedHashSet<T>

---
 .../Collections/Internal/BitHelper.cs         |   2 +-
 .../SegmentedHashSetEqualityComparer`1.cs     |  12 +-
 .../Collections/SegmentedHashSet`1.cs         | 142 +++++++++---------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/Dependencies/Collections/Internal/BitHelper.cs b/src/Dependencies/Collections/Internal/BitHelper.cs
index 18bb071e4c25b..b13dce1646576 100644
--- a/src/Dependencies/Collections/Internal/BitHelper.cs
+++ b/src/Dependencies/Collections/Internal/BitHelper.cs
@@ -7,7 +7,7 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
-namespace System.Collections.Generic
+namespace Microsoft.CodeAnalysis.Collections.Internal
 {
     internal ref struct BitHelper
     {
diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
index c0a47b7f89c8e..449981afc611b 100644
--- a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -7,12 +7,12 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
-namespace System.Collections.Generic
+namespace Microsoft.CodeAnalysis.Collections.Internal
 {
     /// <summary>Equality comparer for hashsets of hashsets</summary>
-    internal sealed class HashSetEqualityComparer<T> : IEqualityComparer<HashSet<T>?>
+    internal sealed class SegmentedHashSetEqualityComparer<T> : IEqualityComparer<SegmentedHashSet<T>?>
     {
-        public bool Equals(HashSet<T>? x, HashSet<T>? y)
+        public bool Equals(SegmentedHashSet<T>? x, SegmentedHashSet<T>? y)
         {
             // If they're the exact same instance, they're equal.
             if (ReferenceEquals(x, y))
@@ -30,7 +30,7 @@ public bool Equals(HashSet<T>? x, HashSet<T>? y)
 
             // If both sets use the same comparer, they're equal if they're the same
             // size and one is a "subset" of the other.
-            if (HashSet<T>.EqualityComparersAreEqual(x, y))
+            if (SegmentedHashSet<T>.EqualityComparersAreEqual(x, y))
             {
                 return x.Count == y.Count && y.IsSubsetOfHashSetWithSameComparer(x);
             }
@@ -57,7 +57,7 @@ public bool Equals(HashSet<T>? x, HashSet<T>? y)
             return true;
         }
 
-        public int GetHashCode(HashSet<T>? obj)
+        public int GetHashCode(SegmentedHashSet<T>? obj)
         {
             int hashCode = 0; // default to 0 for null/empty set
 
@@ -76,7 +76,7 @@ public int GetHashCode(HashSet<T>? obj)
         }
 
         // Equals method for the comparer itself.
-        public override bool Equals(object? obj) => obj is HashSetEqualityComparer<T>;
+        public override bool Equals(object? obj) => obj is SegmentedHashSetEqualityComparer<T>;
 
         public override int GetHashCode() => EqualityComparer<T>.Default.GetHashCode();
     }
diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 3ae667e5c9e26..77f2db778ac74 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -14,13 +14,13 @@
 
 using Internal.Runtime.CompilerServices;
 
-namespace System.Collections.Generic
+namespace Microsoft.CodeAnalysis.Collections
 {
     [DebuggerTypeProxy(typeof(ICollectionDebugView<>))]
     [DebuggerDisplay("Count = {Count}")]
     [Serializable]
     [TypeForwardedFrom("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
-    public class HashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>, ISerializable, IDeserializationCallback
+    internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>, ISerializable, IDeserializationCallback
     {
         // This uses the same array-based implementation as Dictionary<TKey, TValue>.
 
@@ -57,9 +57,9 @@ public class HashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IRead
 
         #region Constructors
 
-        public HashSet() : this((IEqualityComparer<T>?)null) { }
+        public SegmentedHashSet() : this((IEqualityComparer<T>?)null) { }
 
-        public HashSet(IEqualityComparer<T>? comparer)
+        public SegmentedHashSet(IEqualityComparer<T>? comparer)
         {
             if (comparer != null && comparer != EqualityComparer<T>.Default) // first check for null to avoid forcing default comparer instantiation unnecessarily
             {
@@ -87,25 +87,25 @@ public HashSet(IEqualityComparer<T>? comparer)
             }
         }
 
-        public HashSet(int capacity) : this(capacity, null) { }
+        public SegmentedHashSet(int capacity) : this(capacity, null) { }
 
-        public HashSet(IEnumerable<T> collection) : this(collection, null) { }
+        public SegmentedHashSet(IEnumerable<T> collection) : this(collection, null) { }
 
-        public HashSet(IEnumerable<T> collection, IEqualityComparer<T>? comparer) : this(comparer)
+        public SegmentedHashSet(IEnumerable<T> collection, IEqualityComparer<T>? comparer) : this(comparer)
         {
             if (collection == null)
             {
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
             }
 
-            if (collection is HashSet<T> otherAsHashSet && EqualityComparersAreEqual(this, otherAsHashSet))
+            if (collection is SegmentedHashSet<T> otherAsHashSet && EqualityComparersAreEqual(this, otherAsHashSet))
             {
                 ConstructFrom(otherAsHashSet);
             }
             else
             {
                 // To avoid excess resizes, first set size based on collection's count. The collection may
-                // contain duplicates, so call TrimExcess if resulting HashSet is larger than the threshold.
+                // contain duplicates, so call TrimExcess if resulting SegmentedHashSet is larger than the threshold.
                 if (collection is ICollection<T> coll)
                 {
                     int count = coll.Count;
@@ -124,7 +124,7 @@ public HashSet(IEnumerable<T> collection, IEqualityComparer<T>? comparer) : this
             }
         }
 
-        public HashSet(int capacity, IEqualityComparer<T>? comparer) : this(comparer)
+        public SegmentedHashSet(int capacity, IEqualityComparer<T>? comparer) : this(comparer)
         {
             if (capacity < 0)
             {
@@ -137,7 +137,7 @@ public HashSet(int capacity, IEqualityComparer<T>? comparer) : this(comparer)
             }
         }
 
-        protected HashSet(SerializationInfo info, StreamingContext context)
+        protected SegmentedHashSet(SerializationInfo info, StreamingContext context)
         {
             // We can't do anything with the keys and values until the entire graph has been
             // deserialized and we have a reasonable estimate that GetHashCode is not going to
@@ -146,8 +146,8 @@ protected HashSet(SerializationInfo info, StreamingContext context)
             _siInfo = info;
         }
 
-        /// <summary>Initializes the HashSet from another HashSet with the same element type and equality comparer.</summary>
-        private void ConstructFrom(HashSet<T> source)
+        /// <summary>Initializes the SegmentedHashSet from another SegmentedHashSet with the same element type and equality comparer.</summary>
+        private void ConstructFrom(SegmentedHashSet<T> source)
         {
             if (source.Count == 0)
             {
@@ -195,7 +195,7 @@ private void ConstructFrom(HashSet<T> source)
 
         void ICollection<T>.Add(T item) => AddIfNotPresent(item, out _);
 
-        /// <summary>Removes all elements from the <see cref="HashSet{T}"/> object.</summary>
+        /// <summary>Removes all elements from the <see cref="SegmentedHashSet{T}"/> object.</summary>
         public void Clear()
         {
             int count = _count;
@@ -212,9 +212,9 @@ public void Clear()
             }
         }
 
-        /// <summary>Determines whether the <see cref="HashSet{T}"/> contains the specified element.</summary>
-        /// <param name="item">The element to locate in the <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object contains the specified element; otherwise, false.</returns>
+        /// <summary>Determines whether the <see cref="SegmentedHashSet{T}"/> contains the specified element.</summary>
+        /// <param name="item">The element to locate in the <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object contains the specified element; otherwise, false.</returns>
         public bool Contains(T item) => FindItemIndex(item) >= 0;
 
         /// <summary>Gets the index of the item in <see cref="_entries"/>, or -1 if it's not in the set.</summary>
@@ -461,11 +461,11 @@ public virtual void OnDeserialization(object? sender)
 
         #endregion
 
-        #region HashSet methods
+        #region SegmentedHashSet methods
 
-        /// <summary>Adds the specified element to the <see cref="HashSet{T}"/>.</summary>
+        /// <summary>Adds the specified element to the <see cref="SegmentedHashSet{T}"/>.</summary>
         /// <param name="item">The element to add to the set.</param>
-        /// <returns>true if the element is added to the <see cref="HashSet{T}"/> object; false if the element is already present.</returns>
+        /// <returns>true if the element is added to the <see cref="SegmentedHashSet{T}"/> object; false if the element is already present.</returns>
         public bool Add(T item) => AddIfNotPresent(item, out _);
 
         /// <summary>Searches the set for a given value and returns the equal value it finds, if any.</summary>
@@ -494,8 +494,8 @@ public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
             return false;
         }
 
-        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain all elements that are present in itself, the specified collection, or both.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <summary>Modifies the current <see cref="SegmentedHashSet{T}"/> object to contain all elements that are present in itself, the specified collection, or both.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
         public void UnionWith(IEnumerable<T> other)
         {
             if (other == null)
@@ -509,8 +509,8 @@ public void UnionWith(IEnumerable<T> other)
             }
         }
 
-        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain only elements that are present in that object and in the specified collection.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <summary>Modifies the current <see cref="SegmentedHashSet{T}"/> object to contain only elements that are present in that object and in the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
         public void IntersectWith(IEnumerable<T> other)
         {
             if (other == null)
@@ -536,7 +536,7 @@ public void IntersectWith(IEnumerable<T> other)
 
                 // Faster if other is a hashset using same equality comparer; so check
                 // that other is a hashset using the same equality comparer.
-                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
                 {
                     IntersectWithHashSetWithSameComparer(otherAsSet);
                     return;
@@ -546,8 +546,8 @@ public void IntersectWith(IEnumerable<T> other)
             IntersectWithEnumerable(other);
         }
 
-        /// <summary>Removes all elements in the specified collection from the current <see cref="HashSet{T}"/> object.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <summary>Removes all elements in the specified collection from the current <see cref="SegmentedHashSet{T}"/> object.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
         public void ExceptWith(IEnumerable<T> other)
         {
             if (other == null)
@@ -575,8 +575,8 @@ public void ExceptWith(IEnumerable<T> other)
             }
         }
 
-        /// <summary>Modifies the current <see cref="HashSet{T}"/> object to contain only elements that are present either in that object or in the specified collection, but not both.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
+        /// <summary>Modifies the current <see cref="SegmentedHashSet{T}"/> object to contain only elements that are present either in that object or in the specified collection, but not both.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
         public void SymmetricExceptWith(IEnumerable<T> other)
         {
             if (other == null)
@@ -598,12 +598,12 @@ public void SymmetricExceptWith(IEnumerable<T> other)
                 return;
             }
 
-            // If other is a HashSet, it has unique elements according to its equality comparer,
+            // If other is a SegmentedHashSet, it has unique elements according to its equality comparer,
             // but if they're using different equality comparers, then assumption of uniqueness
             // will fail. So first check if other is a hashset using the same equality comparer;
             // symmetric except is a lot faster and avoids bit array allocations if we can assume
             // uniqueness.
-            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
             {
                 SymmetricExceptWithUniqueHashSet(otherAsSet);
             }
@@ -613,9 +613,9 @@ public void SymmetricExceptWith(IEnumerable<T> other)
             }
         }
 
-        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a subset of the specified collection.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object is a subset of <paramref name="other"/>; otherwise, false.</returns>
+        /// <summary>Determines whether a <see cref="SegmentedHashSet{T}"/> object is a subset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object is a subset of <paramref name="other"/>; otherwise, false.</returns>
         public bool IsSubsetOf(IEnumerable<T> other)
         {
             if (other == null)
@@ -632,7 +632,7 @@ public bool IsSubsetOf(IEnumerable<T> other)
 
             // Faster if other has unique elements according to this equality comparer; so check
             // that other is a hashset using the same equality comparer.
-            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
             {
                 // if this has more elements then it can't be a subset
                 if (Count > otherAsSet.Count)
@@ -649,9 +649,9 @@ public bool IsSubsetOf(IEnumerable<T> other)
             return uniqueCount == Count && unfoundCount >= 0;
         }
 
-        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper subset of the specified collection.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object is a proper subset of <paramref name="other"/>; otherwise, false.</returns>
+        /// <summary>Determines whether a <see cref="SegmentedHashSet{T}"/> object is a proper subset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object is a proper subset of <paramref name="other"/>; otherwise, false.</returns>
         public bool IsProperSubsetOf(IEnumerable<T> other)
         {
             if (other == null)
@@ -680,7 +680,7 @@ public bool IsProperSubsetOf(IEnumerable<T> other)
                 }
 
                 // Faster if other is a hashset (and we're using same equality comparer).
-                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
                 {
                     if (Count >= otherAsSet.Count)
                     {
@@ -697,9 +697,9 @@ public bool IsProperSubsetOf(IEnumerable<T> other)
             return uniqueCount == Count && unfoundCount > 0;
         }
 
-        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper superset of the specified collection.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object is a superset of <paramref name="other"/>; otherwise, false.</returns>
+        /// <summary>Determines whether a <see cref="SegmentedHashSet{T}"/> object is a proper superset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object is a superset of <paramref name="other"/>; otherwise, false.</returns>
         public bool IsSupersetOf(IEnumerable<T> other)
         {
             if (other == null)
@@ -723,7 +723,7 @@ public bool IsSupersetOf(IEnumerable<T> other)
                 }
 
                 // Try to compare based on counts alone if other is a hashset with same equality comparer.
-                if (other is HashSet<T> otherAsSet &&
+                if (other is SegmentedHashSet<T> otherAsSet &&
                     EqualityComparersAreEqual(this, otherAsSet) &&
                     otherAsSet.Count > Count)
                 {
@@ -734,9 +734,9 @@ public bool IsSupersetOf(IEnumerable<T> other)
             return ContainsAllElements(other);
         }
 
-        /// <summary>Determines whether a <see cref="HashSet{T}"/> object is a proper superset of the specified collection.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object is a proper superset of <paramref name="other"/>; otherwise, false.</returns>
+        /// <summary>Determines whether a <see cref="SegmentedHashSet{T}"/> object is a proper superset of the specified collection.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object is a proper superset of <paramref name="other"/>; otherwise, false.</returns>
         public bool IsProperSupersetOf(IEnumerable<T> other)
         {
             if (other == null)
@@ -760,7 +760,7 @@ public bool IsProperSupersetOf(IEnumerable<T> other)
                 }
 
                 // Faster if other is a hashset with the same equality comparer
-                if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+                if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
                 {
                     if (otherAsSet.Count >= Count)
                     {
@@ -777,9 +777,9 @@ public bool IsProperSupersetOf(IEnumerable<T> other)
             return uniqueCount < Count && unfoundCount == 0;
         }
 
-        /// <summary>Determines whether the current <see cref="HashSet{T}"/> object and a specified collection share common elements.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object and <paramref name="other"/> share at least one common element; otherwise, false.</returns>
+        /// <summary>Determines whether the current <see cref="SegmentedHashSet{T}"/> object and a specified collection share common elements.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object and <paramref name="other"/> share at least one common element; otherwise, false.</returns>
         public bool Overlaps(IEnumerable<T> other)
         {
             if (other == null)
@@ -809,9 +809,9 @@ public bool Overlaps(IEnumerable<T> other)
             return false;
         }
 
-        /// <summary>Determines whether a <see cref="HashSet{T}"/> object and the specified collection contain the same elements.</summary>
-        /// <param name="other">The collection to compare to the current <see cref="HashSet{T}"/> object.</param>
-        /// <returns>true if the <see cref="HashSet{T}"/> object is equal to <paramref name="other"/>; otherwise, false.</returns>
+        /// <summary>Determines whether a <see cref="SegmentedHashSet{T}"/> object and the specified collection contain the same elements.</summary>
+        /// <param name="other">The collection to compare to the current <see cref="SegmentedHashSet{T}"/> object.</param>
+        /// <returns>true if the <see cref="SegmentedHashSet{T}"/> object is equal to <paramref name="other"/>; otherwise, false.</returns>
         public bool SetEquals(IEnumerable<T> other)
         {
             if (other == null)
@@ -826,7 +826,7 @@ public bool SetEquals(IEnumerable<T> other)
             }
 
             // Faster if other is a hashset and we're using same equality comparer.
-            if (other is HashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
+            if (other is SegmentedHashSet<T> otherAsSet && EqualityComparersAreEqual(this, otherAsSet))
             {
                 // Attempt to return early: since both contain unique elements, if they have
                 // different counts, then they can't be equal.
@@ -856,7 +856,7 @@ other is ICollection<T> otherAsCollection &&
 
         public void CopyTo(T[] array) => CopyTo(array, 0, Count);
 
-        /// <summary>Copies the elements of a <see cref="HashSet{T}"/> object to an array, starting at the specified array index.</summary>
+        /// <summary>Copies the elements of a <see cref="SegmentedHashSet{T}"/> object to an array, starting at the specified array index.</summary>
         /// <param name="array">The destination array.</param>
         /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
         public void CopyTo(T[] array, int arrayIndex) => CopyTo(array, arrayIndex, Count);
@@ -900,7 +900,7 @@ public void CopyTo(T[] array, int arrayIndex, int count)
             }
         }
 
-        /// <summary>Removes all elements that match the conditions defined by the specified predicate from a <see cref="HashSet{T}"/> collection.</summary>
+        /// <summary>Removes all elements that match the conditions defined by the specified predicate from a <see cref="SegmentedHashSet{T}"/> collection.</summary>
         public int RemoveWhere(Predicate<T> match)
         {
             if (match == null)
@@ -1025,7 +1025,7 @@ private void Resize(int newSize, bool forceNewHashCodes)
         }
 
         /// <summary>
-        /// Sets the capacity of a <see cref="HashSet{T}"/> object to the actual number of elements it contains,
+        /// Sets the capacity of a <see cref="SegmentedHashSet{T}"/> object to the actual number of elements it contains,
         /// rounded up to a nearby, implementation-specific value.
         /// </summary>
         public void TrimExcess()
@@ -1067,8 +1067,8 @@ public void TrimExcess()
 
         #region Helper methods
 
-        /// <summary>Returns an <see cref="IEqualityComparer"/> object that can be used for equality testing of a <see cref="HashSet{T}"/> object.</summary>
-        public static IEqualityComparer<HashSet<T>> CreateSetComparer() => new HashSetEqualityComparer<T>();
+        /// <summary>Returns an <see cref="IEqualityComparer"/> object that can be used for equality testing of a <see cref="SegmentedHashSet{T}"/> object.</summary>
+        public static IEqualityComparer<SegmentedHashSet<T>> CreateSetComparer() => new SegmentedHashSetEqualityComparer<T>();
 
         /// <summary>
         /// Initializes buckets and slots arrays. Uses suggested capacity by finding next prime
@@ -1094,7 +1094,7 @@ private int Initialize(int capacity)
         /// <summary>Adds the specified element to the set if it's not already contained.</summary>
         /// <param name="value">The element to add to the set.</param>
         /// <param name="location">The index into <see cref="_entries"/> of the element.</param>
-        /// <returns>true if the element is added to the <see cref="HashSet{T}"/> object; false if the element is already present.</returns>
+        /// <returns>true if the element is added to the <see cref="SegmentedHashSet{T}"/> object; false if the element is already present.</returns>
         private bool AddIfNotPresent(T value, out int location)
         {
             if (_buckets == null)
@@ -1258,7 +1258,7 @@ private bool ContainsAllElements(IEnumerable<T> other)
         ///
         /// If callers are concerned about whether this is a proper subset, they take care of that.
         /// </summary>
-        internal bool IsSubsetOfHashSetWithSameComparer(HashSet<T> other)
+        internal bool IsSubsetOfHashSetWithSameComparer(SegmentedHashSet<T> other)
         {
             foreach (T item in this)
             {
@@ -1275,7 +1275,7 @@ internal bool IsSubsetOfHashSetWithSameComparer(HashSet<T> other)
         /// If other is a hashset that uses same equality comparer, intersect is much faster
         /// because we can use other's Contains
         /// </summary>
-        private void IntersectWithHashSetWithSameComparer(HashSet<T> other)
+        private void IntersectWithHashSetWithSameComparer(SegmentedHashSet<T> other)
         {
             Entry[]? entries = _entries;
             for (int i = 0; i < _count; i++)
@@ -1342,7 +1342,7 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
         /// same equality comparer.
         /// </summary>
         /// <param name="other"></param>
-        private void SymmetricExceptWithUniqueHashSet(HashSet<T> other)
+        private void SymmetricExceptWithUniqueHashSet(SegmentedHashSet<T> other)
         {
             foreach (T item in other)
             {
@@ -1356,11 +1356,11 @@ private void SymmetricExceptWithUniqueHashSet(HashSet<T> other)
         /// <summary>
         /// Implementation notes:
         ///
-        /// Used for symmetric except when other isn't a HashSet. This is more tedious because
-        /// other may contain duplicates. HashSet technique could fail in these situations:
-        /// 1. Other has a duplicate that's not in this: HashSet technique would add then
+        /// Used for symmetric except when other isn't a SegmentedHashSet. This is more tedious because
+        /// other may contain duplicates. SegmentedHashSet technique could fail in these situations:
+        /// 1. Other has a duplicate that's not in this: SegmentedHashSet technique would add then
         /// remove it.
-        /// 2. Other has a duplicate that's in this: HashSet technique would remove then add it
+        /// 2. Other has a duplicate that's in this: SegmentedHashSet technique would remove then add it
         /// back.
         /// In general, its presence would be toggled each time it appears in other.
         ///
@@ -1422,7 +1422,7 @@ private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
 
         /// <summary>
         /// Determines counts that can be used to determine equality, subset, and superset. This
-        /// is only used when other is an IEnumerable and not a HashSet. If other is a HashSet
+        /// is only used when other is an IEnumerable and not a SegmentedHashSet. If other is a SegmentedHashSet
         /// these properties can be checked faster without use of marking because we can assume
         /// other has no duplicates.
         ///
@@ -1501,7 +1501,7 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
         /// speed up if it knows the other item has unique elements. I.e. if they're using
         /// different equality comparers, then uniqueness assumption between sets break.
         /// </summary>
-        internal static bool EqualityComparersAreEqual(HashSet<T> set1, HashSet<T> set2) => set1.Comparer.Equals(set2.Comparer);
+        internal static bool EqualityComparersAreEqual(SegmentedHashSet<T> set1, SegmentedHashSet<T> set2) => set1.Comparer.Equals(set2.Comparer);
 
 #endregion
 
@@ -1519,12 +1519,12 @@ private struct Entry
 
         public struct Enumerator : IEnumerator<T>
         {
-            private readonly HashSet<T> _hashSet;
+            private readonly SegmentedHashSet<T> _hashSet;
             private readonly int _version;
             private int _index;
             private T _current;
 
-            internal Enumerator(HashSet<T> hashSet)
+            internal Enumerator(SegmentedHashSet<T> hashSet)
             {
                 _hashSet = hashSet;
                 _version = hashSet._version;

From 3fd3edf2ab78fbb943644956b5fb91c6979bb8eb Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:46:50 -0700
Subject: [PATCH 005/413] Remove serialization support

---
 .../Collections/SegmentedHashSet`1.cs         | 91 +------------------
 1 file changed, 1 insertion(+), 90 deletions(-)

diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 77f2db778ac74..59ba5890c15fe 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -10,7 +10,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
 
 using Internal.Runtime.CompilerServices;
 
@@ -18,18 +17,11 @@ namespace Microsoft.CodeAnalysis.Collections
 {
     [DebuggerTypeProxy(typeof(ICollectionDebugView<>))]
     [DebuggerDisplay("Count = {Count}")]
-    [Serializable]
     [TypeForwardedFrom("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
-    internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>, ISerializable, IDeserializationCallback
+    internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>
     {
         // This uses the same array-based implementation as Dictionary<TKey, TValue>.
 
-        // Constants for serialization
-        private const string CapacityName = "Capacity"; // Do not rename (binary serialization)
-        private const string ElementsName = "Elements"; // Do not rename (binary serialization)
-        private const string ComparerName = "Comparer"; // Do not rename (binary serialization)
-        private const string VersionName = "Version"; // Do not rename (binary serialization)
-
         /// <summary>Cutoff point for stackallocs. This corresponds to the number of ints.</summary>
         private const int StackAllocThreshold = 100;
 
@@ -53,7 +45,6 @@ internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollectio
         private int _freeCount;
         private int _version;
         private IEqualityComparer<T>? _comparer;
-        private SerializationInfo? _siInfo; // temporary variable needed during deserialization
 
         #region Constructors
 
@@ -137,15 +128,6 @@ public SegmentedHashSet(int capacity, IEqualityComparer<T>? comparer) : this(com
             }
         }
 
-        protected SegmentedHashSet(SerializationInfo info, StreamingContext context)
-        {
-            // We can't do anything with the keys and values until the entire graph has been
-            // deserialized and we have a reasonable estimate that GetHashCode is not going to
-            // fail.  For the time being, we'll just cache this.  The graph is not valid until
-            // OnDeserialization has been called.
-            _siInfo = info;
-        }
-
         /// <summary>Initializes the SegmentedHashSet from another SegmentedHashSet with the same element type and equality comparer.</summary>
         private void ConstructFrom(SegmentedHashSet<T> source)
         {
@@ -390,77 +372,6 @@ public bool Remove(T item)
 
         #endregion
 
-        #region ISerializable methods
-
-        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.info);
-            }
-
-            info.AddValue(VersionName, _version); // need to serialize version to avoid problems with serializing while enumerating
-            info.AddValue(ComparerName, Comparer, typeof(IEqualityComparer<T>));
-            info.AddValue(CapacityName, _buckets == null ? 0 : _buckets.Length);
-
-            if (_buckets != null)
-            {
-                var array = new T[Count];
-                CopyTo(array);
-                info.AddValue(ElementsName, array, typeof(T[]));
-            }
-        }
-
-        #endregion
-
-        #region IDeserializationCallback methods
-
-        public virtual void OnDeserialization(object? sender)
-        {
-            if (_siInfo == null)
-            {
-                // It might be necessary to call OnDeserialization from a container if the
-                // container object also implements OnDeserialization. We can return immediately
-                // if this function is called twice. Note we set _siInfo to null at the end of this method.
-                return;
-            }
-
-            int capacity = _siInfo.GetInt32(CapacityName);
-            _comparer = (IEqualityComparer<T>)_siInfo.GetValue(ComparerName, typeof(IEqualityComparer<T>))!;
-            _freeList = -1;
-            _freeCount = 0;
-
-            if (capacity != 0)
-            {
-                _buckets = new int[capacity];
-                _entries = new Entry[capacity];
-#if TARGET_64BIT
-                _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)capacity);
-#endif
-
-                T[]? array = (T[]?)_siInfo.GetValue(ElementsName, typeof(T[]));
-                if (array == null)
-                {
-                    ThrowHelper.ThrowSerializationException(ExceptionResource.Serialization_MissingKeys);
-                }
-
-                // There are no resizes here because we already set capacity above.
-                for (int i = 0; i < array.Length; i++)
-                {
-                    AddIfNotPresent(array[i], out _);
-                }
-            }
-            else
-            {
-                _buckets = null;
-            }
-
-            _version = _siInfo.GetInt32(VersionName);
-            _siInfo = null;
-        }
-
-        #endregion
-
         #region SegmentedHashSet methods
 
         /// <summary>Adds the specified element to the <see cref="SegmentedHashSet{T}"/>.</summary>

From 16870015979d69f84fb8c0c9fe3eaa1803b82736 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:48:27 -0700
Subject: [PATCH 006/413] Remove requirement that the runtime support comparer
 devirtualization and non-randomized string comparers

---
 .../Collections/SegmentedHashSet`1.cs         | 91 ++++++-------------
 1 file changed, 26 insertions(+), 65 deletions(-)

diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 59ba5890c15fe..100c640d2c440 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -20,6 +20,13 @@ namespace Microsoft.CodeAnalysis.Collections
     [TypeForwardedFrom("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
     internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>
     {
+        private const bool SupportsComparerDevirtualization
+#if NETCOREAPP
+            = true;
+#else
+            = false;
+#endif
+
         // This uses the same array-based implementation as Dictionary<TKey, TValue>.
 
         /// <summary>Cutoff point for stackallocs. This corresponds to the number of ints.</summary>
@@ -44,7 +51,15 @@ internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollectio
         private int _freeList;
         private int _freeCount;
         private int _version;
-        private IEqualityComparer<T>? _comparer;
+#if NETCOREAPP
+        private readonly IEqualityComparer<T>? _comparer;
+#else
+        /// <summary>
+        /// <see cref="EqualityComparer{T}.Default"/> doesn't devirtualize on .NET Framework, so we always ensure
+        /// <see cref="_comparer"/> is initialized to a non-<see langword="null"/> value.
+        /// </summary>
+        private readonly IEqualityComparer<T> _comparer;
+#endif
 
         #region Constructors
 
@@ -57,25 +72,10 @@ public SegmentedHashSet(IEqualityComparer<T>? comparer)
                 _comparer = comparer;
             }
 
-            // Special-case EqualityComparer<string>.Default, StringComparer.Ordinal, and StringComparer.OrdinalIgnoreCase.
-            // We use a non-randomized comparer for improved perf, falling back to a randomized comparer if the
-            // hash buckets become unbalanced.
-
-            if (typeof(T) == typeof(string))
-            {
-                if (_comparer is null)
-                {
-                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundDefaultComparer;
-                }
-                else if (ReferenceEquals(_comparer, StringComparer.Ordinal))
-                {
-                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundStringComparerOrdinal;
-                }
-                else if (ReferenceEquals(_comparer, StringComparer.OrdinalIgnoreCase))
-                {
-                    _comparer = (IEqualityComparer<T>)NonRandomizedStringEqualityComparer.WrappedAroundStringComparerOrdinalIgnoreCase;
-                }
-            }
+#if !NETCOREAPP
+            // .NET Framework doesn't support devirtualization, so we always initialize comparer to a non-null value
+            _comparer ??= EqualityComparer<T>.Default;
+#endif
         }
 
         public SegmentedHashSet(int capacity) : this(capacity, null) { }
@@ -211,7 +211,7 @@ private int FindItemIndex(T item)
                 uint collisionCount = 0;
                 IEqualityComparer<T>? comparer = _comparer;
 
-                if (comparer == null)
+                if (SupportsComparerDevirtualization && comparer == null)
                 {
                     int hashCode = item != null ? item.GetHashCode() : 0;
                     if (typeof(T).IsValueType)
@@ -847,14 +847,7 @@ public IEqualityComparer<T> Comparer
         {
             get
             {
-                if (typeof(T) == typeof(string))
-                {
-                    return (IEqualityComparer<T>)IInternalStringEqualityComparer.GetUnderlyingEqualityComparer((IEqualityComparer<string?>?)_comparer);
-                }
-                else
-                {
-                    return _comparer ?? EqualityComparer<T>.Default;
-                }
+                return _comparer ?? EqualityComparer<T>.Default;
             }
         }
 
@@ -878,16 +871,14 @@ public int EnsureCapacity(int capacity)
             }
 
             int newSize = HashHelpers.GetPrime(capacity);
-            Resize(newSize, forceNewHashCodes: false);
+            Resize(newSize);
             return newSize;
         }
 
-        private void Resize() => Resize(HashHelpers.ExpandPrime(_count), forceNewHashCodes: false);
+        private void Resize() => Resize(HashHelpers.ExpandPrime(_count));
 
-        private void Resize(int newSize, bool forceNewHashCodes)
+        private void Resize(int newSize)
         {
-            // Value types never rehash
-            Debug.Assert(!forceNewHashCodes || !typeof(T).IsValueType);
             Debug.Assert(_entries != null, "_entries should be non-null");
             Debug.Assert(newSize >= _entries.Length);
 
@@ -896,26 +887,6 @@ private void Resize(int newSize, bool forceNewHashCodes)
             int count = _count;
             Array.Copy(_entries, entries, count);
 
-            if (!typeof(T).IsValueType && forceNewHashCodes)
-            {
-                Debug.Assert(_comparer is NonRandomizedStringEqualityComparer);
-                _comparer = (IEqualityComparer<T>)((NonRandomizedStringEqualityComparer)_comparer).GetRandomizedEqualityComparer();
-
-                for (int i = 0; i < count; i++)
-                {
-                    ref Entry entry = ref entries[i];
-                    if (entry.Next >= -1)
-                    {
-                        entry.HashCode = entry.Value != null ? _comparer!.GetHashCode(entry.Value) : 0;
-                    }
-                }
-
-                if (ReferenceEquals(_comparer, EqualityComparer<T>.Default))
-                {
-                    _comparer = null;
-                }
-            }
-
             // Assign member variables after both arrays allocated to guard against corruption from OOM if second fails
             _buckets = new int[newSize];
 #if TARGET_64BIT
@@ -1023,7 +994,7 @@ private bool AddIfNotPresent(T value, out int location)
             uint collisionCount = 0;
             ref int bucket = ref Unsafe.NullRef<int>();
 
-            if (comparer == null)
+            if (SupportsComparerDevirtualization && comparer == null)
             {
                 hashCode = value != null ? value.GetHashCode() : 0;
                 bucket = ref GetBucketRef(hashCode);
@@ -1128,16 +1099,6 @@ private bool AddIfNotPresent(T value, out int location)
                 location = index;
             }
 
-            // Value types never rehash
-            if (!typeof(T).IsValueType && collisionCount > HashHelpers.HashCollisionThreshold && comparer is NonRandomizedStringEqualityComparer)
-            {
-                // If we hit the collision threshold we'll need to switch to the comparer which is using randomized string hashing
-                // i.e. EqualityComparer<string>.Default.
-                Resize(entries.Length, forceNewHashCodes: true);
-                location = FindItemIndex(value);
-                Debug.Assert(location >= 0);
-            }
-
             return true;
         }
 

From e1ed6d78e7bfbc3cba7190dea05d111d64e88946 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:52:07 -0700
Subject: [PATCH 007/413] Fix code style diagnostics (except naming)

---
 .../Collections/Internal/BitHelper.cs         |   5 +-
 .../SegmentedHashSetEqualityComparer`1.cs     |  13 +-
 .../Collections/SegmentedHashSet`1.cs         | 204 +++++++++---------
 3 files changed, 112 insertions(+), 110 deletions(-)

diff --git a/src/Dependencies/Collections/Internal/BitHelper.cs b/src/Dependencies/Collections/Internal/BitHelper.cs
index b13dce1646576..079f8b6738cff 100644
--- a/src/Dependencies/Collections/Internal/BitHelper.cs
+++ b/src/Dependencies/Collections/Internal/BitHelper.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/Common/src/System/Collections/Generic/BitHelper.cs
@@ -25,7 +26,7 @@ internal BitHelper(Span<int> span, bool clear)
 
         internal void MarkBit(int bitPosition)
         {
-            int bitArrayIndex = bitPosition / IntSize;
+            var bitArrayIndex = bitPosition / IntSize;
             if ((uint)bitArrayIndex < (uint)_span.Length)
             {
                 _span[bitArrayIndex] |= (1 << (bitPosition % IntSize));
@@ -34,7 +35,7 @@ internal void MarkBit(int bitPosition)
 
         internal bool IsMarked(int bitPosition)
         {
-            int bitArrayIndex = bitPosition / IntSize;
+            var bitArrayIndex = bitPosition / IntSize;
             return
                 (uint)bitArrayIndex < (uint)_span.Length &&
                 (_span[bitArrayIndex] & (1 << (bitPosition % IntSize))) != 0;
diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
index 449981afc611b..af2d74b8e1498 100644
--- a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs
@@ -26,7 +27,7 @@ public bool Equals(SegmentedHashSet<T>? x, SegmentedHashSet<T>? y)
                 return false;
             }
 
-            EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
+            var defaultComparer = EqualityComparer<T>.Default;
 
             // If both sets use the same comparer, they're equal if they're the same
             // size and one is a "subset" of the other.
@@ -36,10 +37,10 @@ public bool Equals(SegmentedHashSet<T>? x, SegmentedHashSet<T>? y)
             }
 
             // Otherwise, do an O(N^2) match.
-            foreach (T yi in y)
+            foreach (var yi in y)
             {
-                bool found = false;
-                foreach (T xi in x)
+                var found = false;
+                foreach (var xi in x)
                 {
                     if (defaultComparer.Equals(yi, xi))
                     {
@@ -59,11 +60,11 @@ public bool Equals(SegmentedHashSet<T>? x, SegmentedHashSet<T>? y)
 
         public int GetHashCode(SegmentedHashSet<T>? obj)
         {
-            int hashCode = 0; // default to 0 for null/empty set
+            var hashCode = 0; // default to 0 for null/empty set
 
             if (obj != null)
             {
-                foreach (T t in obj)
+                foreach (var t in obj)
                 {
                     if (t != null)
                     {
diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 100c640d2c440..9e525fded282d 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs
@@ -99,7 +100,7 @@ public SegmentedHashSet(IEnumerable<T> collection, IEqualityComparer<T>? compare
                 // contain duplicates, so call TrimExcess if resulting SegmentedHashSet is larger than the threshold.
                 if (collection is ICollection<T> coll)
                 {
-                    int count = coll.Count;
+                    var count = coll.Count;
                     if (count > 0)
                     {
                         Initialize(count);
@@ -139,8 +140,8 @@ private void ConstructFrom(SegmentedHashSet<T> source)
                 return;
             }
 
-            int capacity = source._buckets!.Length;
-            int threshold = HashHelpers.ExpandPrime(source.Count + 1);
+            var capacity = source._buckets!.Length;
+            var threshold = HashHelpers.ExpandPrime(source.Count + 1);
 
             if (threshold >= capacity)
             {
@@ -157,10 +158,10 @@ private void ConstructFrom(SegmentedHashSet<T> source)
             {
                 Initialize(source.Count);
 
-                Entry[]? entries = source._entries;
-                for (int i = 0; i < source._count; i++)
+                var entries = source._entries;
+                for (var i = 0; i < source._count; i++)
                 {
-                    ref Entry entry = ref entries![i];
+                    ref var entry = ref entries![i];
                     if (entry.Next >= -1)
                     {
                         AddIfNotPresent(entry.Value, out _);
@@ -180,7 +181,7 @@ private void ConstructFrom(SegmentedHashSet<T> source)
         /// <summary>Removes all elements from the <see cref="SegmentedHashSet{T}"/> object.</summary>
         public void Clear()
         {
-            int count = _count;
+            var count = _count;
             if (count > 0)
             {
                 Debug.Assert(_buckets != null, "_buckets should be non-null");
@@ -202,25 +203,25 @@ public void Clear()
         /// <summary>Gets the index of the item in <see cref="_entries"/>, or -1 if it's not in the set.</summary>
         private int FindItemIndex(T item)
         {
-            int[]? buckets = _buckets;
+            var buckets = _buckets;
             if (buckets != null)
             {
-                Entry[]? entries = _entries;
+                var entries = _entries;
                 Debug.Assert(entries != null, "Expected _entries to be initialized");
 
                 uint collisionCount = 0;
-                IEqualityComparer<T>? comparer = _comparer;
+                var comparer = _comparer;
 
                 if (SupportsComparerDevirtualization && comparer == null)
                 {
-                    int hashCode = item != null ? item.GetHashCode() : 0;
+                    var hashCode = item != null ? item.GetHashCode() : 0;
                     if (typeof(T).IsValueType)
                     {
                         // ValueType: Devirtualize with EqualityComparer<TValue>.Default intrinsic
-                        int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                        var i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
                         while (i >= 0)
                         {
-                            ref Entry entry = ref entries[i];
+                            ref var entry = ref entries[i];
                             if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, item))
                             {
                                 return i;
@@ -239,11 +240,11 @@ private int FindItemIndex(T item)
                     {
                         // Object type: Shared Generic, EqualityComparer<TValue>.Default won't devirtualize (https://github.com/dotnet/runtime/issues/10050),
                         // so cache in a local rather than get EqualityComparer per loop iteration.
-                        EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
-                        int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                        var defaultComparer = EqualityComparer<T>.Default;
+                        var i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
                         while (i >= 0)
                         {
-                            ref Entry entry = ref entries[i];
+                            ref var entry = ref entries[i];
                             if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, item))
                             {
                                 return i;
@@ -261,11 +262,11 @@ private int FindItemIndex(T item)
                 }
                 else
                 {
-                    int hashCode = item != null ? comparer.GetHashCode(item) : 0;
-                    int i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
+                    var hashCode = item != null ? comparer.GetHashCode(item) : 0;
+                    var i = GetBucketRef(hashCode) - 1; // Value in _buckets is 1-based
                     while (i >= 0)
                     {
-                        ref Entry entry = ref entries[i];
+                        ref var entry = ref entries[i];
                         if (entry.HashCode == hashCode && comparer.Equals(entry.Value, item))
                         {
                             return i;
@@ -289,7 +290,7 @@ private int FindItemIndex(T item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private ref int GetBucketRef(int hashCode)
         {
-            int[] buckets = _buckets!;
+            var buckets = _buckets!;
 #if TARGET_64BIT
             return ref buckets[HashHelpers.FastMod((uint)hashCode, (uint)buckets.Length, _fastModMultiplier)];
 #else
@@ -301,19 +302,19 @@ public bool Remove(T item)
         {
             if (_buckets != null)
             {
-                Entry[]? entries = _entries;
+                var entries = _entries;
                 Debug.Assert(entries != null, "entries should be non-null");
 
                 uint collisionCount = 0;
-                int last = -1;
-                int hashCode = item != null ? (_comparer?.GetHashCode(item) ?? item.GetHashCode()) : 0;
+                var last = -1;
+                var hashCode = item != null ? (_comparer?.GetHashCode(item) ?? item.GetHashCode()) : 0;
 
-                ref int bucket = ref GetBucketRef(hashCode);
-                int i = bucket - 1; // Value in buckets is 1-based
+                ref var bucket = ref GetBucketRef(hashCode);
+                var i = bucket - 1; // Value in buckets is 1-based
 
                 while (i >= 0)
                 {
-                    ref Entry entry = ref entries[i];
+                    ref var entry = ref entries[i];
 
                     if (entry.HashCode == hashCode && (_comparer?.Equals(entry.Value, item) ?? EqualityComparer<T>.Default.Equals(entry.Value, item)))
                     {
@@ -364,7 +365,7 @@ public bool Remove(T item)
 
         #region IEnumerable methods
 
-        public Enumerator GetEnumerator() => new Enumerator(this);
+        public Enumerator GetEnumerator() => new(this);
 
         IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
 
@@ -393,7 +394,7 @@ public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
         {
             if (_buckets != null)
             {
-                int index = FindItemIndex(equalValue);
+                var index = FindItemIndex(equalValue);
                 if (index >= 0)
                 {
                     actualValue = _entries![index].Value;
@@ -414,7 +415,7 @@ public void UnionWith(IEnumerable<T> other)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.other);
             }
 
-            foreach (T item in other)
+            foreach (var item in other)
             {
                 AddIfNotPresent(item, out _);
             }
@@ -480,7 +481,7 @@ public void ExceptWith(IEnumerable<T> other)
             }
 
             // Remove every element in other from this.
-            foreach (T element in other)
+            foreach (var element in other)
             {
                 Remove(element);
             }
@@ -556,7 +557,7 @@ public bool IsSubsetOf(IEnumerable<T> other)
                 return IsSubsetOfHashSetWithSameComparer(otherAsSet);
             }
 
-            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
+            (var uniqueCount, var unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
             return uniqueCount == Count && unfoundCount >= 0;
         }
 
@@ -604,7 +605,7 @@ public bool IsProperSubsetOf(IEnumerable<T> other)
                 }
             }
 
-            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
+            (var uniqueCount, var unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: false);
             return uniqueCount == Count && unfoundCount > 0;
         }
 
@@ -684,7 +685,7 @@ public bool IsProperSupersetOf(IEnumerable<T> other)
             }
 
             // Couldn't fall out in the above cases; do it the long way
-            (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
+            (var uniqueCount, var unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
             return uniqueCount < Count && unfoundCount == 0;
         }
 
@@ -709,7 +710,7 @@ public bool Overlaps(IEnumerable<T> other)
                 return true;
             }
 
-            foreach (T element in other)
+            foreach (var element in other)
             {
                 if (Contains(element))
                 {
@@ -760,7 +761,7 @@ other is ICollection<T> otherAsCollection &&
                     return false;
                 }
 
-                (int uniqueCount, int unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
+                (var uniqueCount, var unfoundCount) = CheckUniqueAndUnfoundElements(other, returnIfUnfound: true);
                 return uniqueCount == Count && unfoundCount == 0;
             }
         }
@@ -799,10 +800,10 @@ public void CopyTo(T[] array, int arrayIndex, int count)
                 ThrowHelper.ThrowArgumentException(ExceptionResource.Arg_ArrayPlusOffTooSmall);
             }
 
-            Entry[]? entries = _entries;
-            for (int i = 0; i < _count && count != 0; i++)
+            var entries = _entries;
+            for (var i = 0; i < _count && count != 0; i++)
             {
-                ref Entry entry = ref entries![i];
+                ref var entry = ref entries![i];
                 if (entry.Next >= -1)
                 {
                     array[arrayIndex++] = entry.Value;
@@ -819,15 +820,15 @@ public int RemoveWhere(Predicate<T> match)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
             }
 
-            Entry[]? entries = _entries;
-            int numRemoved = 0;
-            for (int i = 0; i < _count; i++)
+            var entries = _entries;
+            var numRemoved = 0;
+            for (var i = 0; i < _count; i++)
             {
-                ref Entry entry = ref entries![i];
+                ref var entry = ref entries![i];
                 if (entry.Next >= -1)
                 {
                     // Cache value in case delegate removes it
-                    T value = entry.Value;
+                    var value = entry.Value;
                     if (match(value))
                     {
                         // Check again that remove actually removed it.
@@ -859,7 +860,7 @@ public int EnsureCapacity(int capacity)
                 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity);
             }
 
-            int currentCapacity = _entries == null ? 0 : _entries.Length;
+            var currentCapacity = _entries == null ? 0 : _entries.Length;
             if (currentCapacity >= capacity)
             {
                 return currentCapacity;
@@ -870,7 +871,7 @@ public int EnsureCapacity(int capacity)
                 return Initialize(capacity);
             }
 
-            int newSize = HashHelpers.GetPrime(capacity);
+            var newSize = HashHelpers.GetPrime(capacity);
             Resize(newSize);
             return newSize;
         }
@@ -884,7 +885,7 @@ private void Resize(int newSize)
 
             var entries = new Entry[newSize];
 
-            int count = _count;
+            var count = _count;
             Array.Copy(_entries, entries, count);
 
             // Assign member variables after both arrays allocated to guard against corruption from OOM if second fails
@@ -892,12 +893,12 @@ private void Resize(int newSize)
 #if TARGET_64BIT
             _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)newSize);
 #endif
-            for (int i = 0; i < count; i++)
+            for (var i = 0; i < count; i++)
             {
-                ref Entry entry = ref entries[i];
+                ref var entry = ref entries[i];
                 if (entry.Next >= -1)
                 {
-                    ref int bucket = ref GetBucketRef(entry.HashCode);
+                    ref var bucket = ref GetBucketRef(entry.HashCode);
                     entry.Next = bucket - 1; // Value in _buckets is 1-based
                     bucket = i + 1;
                 }
@@ -912,29 +913,29 @@ private void Resize(int newSize)
         /// </summary>
         public void TrimExcess()
         {
-            int capacity = Count;
+            var capacity = Count;
 
-            int newSize = HashHelpers.GetPrime(capacity);
-            Entry[]? oldEntries = _entries;
-            int currentCapacity = oldEntries == null ? 0 : oldEntries.Length;
+            var newSize = HashHelpers.GetPrime(capacity);
+            var oldEntries = _entries;
+            var currentCapacity = oldEntries == null ? 0 : oldEntries.Length;
             if (newSize >= currentCapacity)
             {
                 return;
             }
 
-            int oldCount = _count;
+            var oldCount = _count;
             _version++;
             Initialize(newSize);
-            Entry[]? entries = _entries;
-            int count = 0;
-            for (int i = 0; i < oldCount; i++)
+            var entries = _entries;
+            var count = 0;
+            for (var i = 0; i < oldCount; i++)
             {
-                int hashCode = oldEntries![i].HashCode; // At this point, we know we have entries.
+                var hashCode = oldEntries![i].HashCode; // At this point, we know we have entries.
                 if (oldEntries[i].Next >= -1)
                 {
-                    ref Entry entry = ref entries![count];
+                    ref var entry = ref entries![count];
                     entry = oldEntries[i];
-                    ref int bucket = ref GetBucketRef(hashCode);
+                    ref var bucket = ref GetBucketRef(hashCode);
                     entry.Next = bucket - 1; // Value in _buckets is 1-based
                     bucket = count + 1;
                     count++;
@@ -958,7 +959,7 @@ public void TrimExcess()
         /// </summary>
         private int Initialize(int capacity)
         {
-            int size = HashHelpers.GetPrime(capacity);
+            var size = HashHelpers.GetPrime(capacity);
             var buckets = new int[size];
             var entries = new Entry[size];
 
@@ -985,26 +986,26 @@ private bool AddIfNotPresent(T value, out int location)
             }
             Debug.Assert(_buckets != null);
 
-            Entry[]? entries = _entries;
+            var entries = _entries;
             Debug.Assert(entries != null, "expected entries to be non-null");
 
-            IEqualityComparer<T>? comparer = _comparer;
+            var comparer = _comparer;
             int hashCode;
 
             uint collisionCount = 0;
-            ref int bucket = ref Unsafe.NullRef<int>();
+            ref var bucket = ref Unsafe.NullRef<int>();
 
             if (SupportsComparerDevirtualization && comparer == null)
             {
                 hashCode = value != null ? value.GetHashCode() : 0;
                 bucket = ref GetBucketRef(hashCode);
-                int i = bucket - 1; // Value in _buckets is 1-based
+                var i = bucket - 1; // Value in _buckets is 1-based
                 if (typeof(T).IsValueType)
                 {
                     // ValueType: Devirtualize with EqualityComparer<TValue>.Default intrinsic
                     while (i >= 0)
                     {
-                        ref Entry entry = ref entries[i];
+                        ref var entry = ref entries[i];
                         if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, value))
                         {
                             location = i;
@@ -1024,10 +1025,10 @@ private bool AddIfNotPresent(T value, out int location)
                 {
                     // Object type: Shared Generic, EqualityComparer<TValue>.Default won't devirtualize (https://github.com/dotnet/runtime/issues/10050),
                     // so cache in a local rather than get EqualityComparer per loop iteration.
-                    EqualityComparer<T> defaultComparer = EqualityComparer<T>.Default;
+                    var defaultComparer = EqualityComparer<T>.Default;
                     while (i >= 0)
                     {
-                        ref Entry entry = ref entries[i];
+                        ref var entry = ref entries[i];
                         if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, value))
                         {
                             location = i;
@@ -1048,10 +1049,10 @@ private bool AddIfNotPresent(T value, out int location)
             {
                 hashCode = value != null ? comparer.GetHashCode(value) : 0;
                 bucket = ref GetBucketRef(hashCode);
-                int i = bucket - 1; // Value in _buckets is 1-based
+                var i = bucket - 1; // Value in _buckets is 1-based
                 while (i >= 0)
                 {
-                    ref Entry entry = ref entries[i];
+                    ref var entry = ref entries[i];
                     if (entry.HashCode == hashCode && comparer.Equals(entry.Value, value))
                     {
                         location = i;
@@ -1078,7 +1079,7 @@ private bool AddIfNotPresent(T value, out int location)
             }
             else
             {
-                int count = _count;
+                var count = _count;
                 if (count == entries.Length)
                 {
                     Resize();
@@ -1090,7 +1091,7 @@ private bool AddIfNotPresent(T value, out int location)
             }
 
             {
-                ref Entry entry = ref entries![index];
+                ref var entry = ref entries![index];
                 entry.HashCode = hashCode;
                 entry.Next = bucket - 1; // Value in _buckets is 1-based
                 entry.Value = value;
@@ -1109,7 +1110,7 @@ private bool AddIfNotPresent(T value, out int location)
         /// </summary>
         private bool ContainsAllElements(IEnumerable<T> other)
         {
-            foreach (T element in other)
+            foreach (var element in other)
             {
                 if (!Contains(element))
                 {
@@ -1132,7 +1133,7 @@ private bool ContainsAllElements(IEnumerable<T> other)
         /// </summary>
         internal bool IsSubsetOfHashSetWithSameComparer(SegmentedHashSet<T> other)
         {
-            foreach (T item in this)
+            foreach (var item in this)
             {
                 if (!other.Contains(item))
                 {
@@ -1149,13 +1150,13 @@ internal bool IsSubsetOfHashSetWithSameComparer(SegmentedHashSet<T> other)
         /// </summary>
         private void IntersectWithHashSetWithSameComparer(SegmentedHashSet<T> other)
         {
-            Entry[]? entries = _entries;
-            for (int i = 0; i < _count; i++)
+            var entries = _entries;
+            for (var i = 0; i < _count; i++)
             {
-                ref Entry entry = ref entries![i];
+                ref var entry = ref entries![i];
                 if (entry.Next >= -1)
                 {
-                    T item = entry.Value;
+                    var item = entry.Value;
                     if (!other.Contains(item))
                     {
                         Remove(item);
@@ -1176,18 +1177,18 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
 
             // Keep track of current last index; don't want to move past the end of our bit array
             // (could happen if another thread is modifying the collection).
-            int originalCount = _count;
+            var originalCount = _count;
             int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
 
             Span<int> span = stackalloc int[StackAllocThreshold];
-            BitHelper bitHelper = intArrayLength <= StackAllocThreshold ?
+            var bitHelper = intArrayLength <= StackAllocThreshold ?
                 new BitHelper(span.Slice(0, intArrayLength), clear: true) :
                 new BitHelper(new int[intArrayLength], clear: false);
 
             // Mark if contains: find index of in slots array and mark corresponding element in bit array.
-            foreach (T item in other)
+            foreach (var item in other)
             {
-                int index = FindItemIndex(item);
+                var index = FindItemIndex(item);
                 if (index >= 0)
                 {
                     bitHelper.MarkBit(index);
@@ -1196,9 +1197,9 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
 
             // If anything unmarked, remove it. Perf can be optimized here if BitHelper had a
             // FindFirstUnmarked method.
-            for (int i = 0; i < originalCount; i++)
+            for (var i = 0; i < originalCount; i++)
             {
-                ref Entry entry = ref _entries![i];
+                ref var entry = ref _entries![i];
                 if (entry.Next >= -1 && !bitHelper.IsMarked(i))
                 {
                     Remove(entry.Value);
@@ -1216,7 +1217,7 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
         /// <param name="other"></param>
         private void SymmetricExceptWithUniqueHashSet(SegmentedHashSet<T> other)
         {
-            foreach (T item in other)
+            foreach (var item in other)
             {
                 if (!Remove(item))
                 {
@@ -1244,23 +1245,22 @@ private void SymmetricExceptWithUniqueHashSet(SegmentedHashSet<T> other)
         /// <param name="other"></param>
         private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
         {
-            int originalCount = _count;
+            var originalCount = _count;
             int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
 
             Span<int> itemsToRemoveSpan = stackalloc int[StackAllocThreshold / 2];
-            BitHelper itemsToRemove = intArrayLength <= StackAllocThreshold / 2 ?
+            var itemsToRemove = intArrayLength <= StackAllocThreshold / 2 ?
                 new BitHelper(itemsToRemoveSpan.Slice(0, intArrayLength), clear: true) :
                 new BitHelper(new int[intArrayLength], clear: false);
 
             Span<int> itemsAddedFromOtherSpan = stackalloc int[StackAllocThreshold / 2];
-            BitHelper itemsAddedFromOther = intArrayLength <= StackAllocThreshold / 2 ?
+            var itemsAddedFromOther = intArrayLength <= StackAllocThreshold / 2 ?
                 new BitHelper(itemsAddedFromOtherSpan.Slice(0, intArrayLength), clear: true) :
                 new BitHelper(new int[intArrayLength], clear: false);
 
-            foreach (T item in other)
+            foreach (var item in other)
             {
-                int location;
-                if (AddIfNotPresent(item, out location))
+                if (AddIfNotPresent(item, out var location))
                 {
                     // wasn't already present in collection; flag it as something not to remove
                     // *NOTE* if location is out of range, we should ignore. BitHelper will
@@ -1283,7 +1283,7 @@ private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
             }
 
             // if anything marked, remove it
-            for (int i = 0; i < originalCount; i++)
+            for (var i = 0; i < originalCount; i++)
             {
                 if (itemsToRemove.IsMarked(i))
                 {
@@ -1320,8 +1320,8 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
             // Need special case in case this has no elements.
             if (_count == 0)
             {
-                int numElementsInOther = 0;
-                foreach (T item in other)
+                var numElementsInOther = 0;
+                foreach (var item in other)
                 {
                     numElementsInOther++;
                     break; // break right away, all we want to know is whether other has 0 or 1 elements
@@ -1332,20 +1332,20 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
 
             Debug.Assert((_buckets != null) && (_count > 0), "_buckets was null but count greater than 0");
 
-            int originalCount = _count;
+            var originalCount = _count;
             int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
 
             Span<int> span = stackalloc int[StackAllocThreshold];
-            BitHelper bitHelper = intArrayLength <= StackAllocThreshold ?
+            var bitHelper = intArrayLength <= StackAllocThreshold ?
                 new BitHelper(span.Slice(0, intArrayLength), clear: true) :
                 new BitHelper(new int[intArrayLength], clear: false);
 
-            int unfoundCount = 0; // count of items in other not found in this
-            int uniqueFoundCount = 0; // count of unique items in other found in this
+            var unfoundCount = 0; // count of items in other not found in this
+            var uniqueFoundCount = 0; // count of unique items in other found in this
 
-            foreach (T item in other)
+            foreach (var item in other)
             {
-                int index = FindItemIndex(item);
+                var index = FindItemIndex(item);
                 if (index >= 0)
                 {
                     if (!bitHelper.IsMarked(index))
@@ -1375,7 +1375,7 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
         /// </summary>
         internal static bool EqualityComparersAreEqual(SegmentedHashSet<T> set1, SegmentedHashSet<T> set2) => set1.Comparer.Equals(set2.Comparer);
 
-#endregion
+        #endregion
 
         private struct Entry
         {
@@ -1415,7 +1415,7 @@ public bool MoveNext()
                 // dictionary.count+1 could be negative if dictionary.count is int.MaxValue
                 while ((uint)_index < (uint)_hashSet._count)
                 {
-                    ref Entry entry = ref _hashSet._entries![_index++];
+                    ref var entry = ref _hashSet._entries![_index++];
                     if (entry.Next >= -1)
                     {
                         _current = entry.Value;

From 57f35617e71ae643f6608431d8ad3b7e8af2567d Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:53:43 -0700
Subject: [PATCH 008/413] Fix naming code style diagnostics

---
 .../Collections/SegmentedHashSet`1.cs         | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 9e525fded282d..bc4518e8d4362 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -162,9 +162,9 @@ private void ConstructFrom(SegmentedHashSet<T> source)
                 for (var i = 0; i < source._count; i++)
                 {
                     ref var entry = ref entries![i];
-                    if (entry.Next >= -1)
+                    if (entry._next >= -1)
                     {
-                        AddIfNotPresent(entry.Value, out _);
+                        AddIfNotPresent(entry._value, out _);
                     }
                 }
             }
@@ -222,11 +222,11 @@ private int FindItemIndex(T item)
                         while (i >= 0)
                         {
                             ref var entry = ref entries[i];
-                            if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, item))
+                            if (entry._hashCode == hashCode && EqualityComparer<T>.Default.Equals(entry._value, item))
                             {
                                 return i;
                             }
-                            i = entry.Next;
+                            i = entry._next;
 
                             collisionCount++;
                             if (collisionCount > (uint)entries.Length)
@@ -245,11 +245,11 @@ private int FindItemIndex(T item)
                         while (i >= 0)
                         {
                             ref var entry = ref entries[i];
-                            if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, item))
+                            if (entry._hashCode == hashCode && defaultComparer.Equals(entry._value, item))
                             {
                                 return i;
                             }
-                            i = entry.Next;
+                            i = entry._next;
 
                             collisionCount++;
                             if (collisionCount > (uint)entries.Length)
@@ -267,11 +267,11 @@ private int FindItemIndex(T item)
                     while (i >= 0)
                     {
                         ref var entry = ref entries[i];
-                        if (entry.HashCode == hashCode && comparer.Equals(entry.Value, item))
+                        if (entry._hashCode == hashCode && comparer.Equals(entry._value, item))
                         {
                             return i;
                         }
-                        i = entry.Next;
+                        i = entry._next;
 
                         collisionCount++;
                         if (collisionCount > (uint)entries.Length)
@@ -316,23 +316,23 @@ public bool Remove(T item)
                 {
                     ref var entry = ref entries[i];
 
-                    if (entry.HashCode == hashCode && (_comparer?.Equals(entry.Value, item) ?? EqualityComparer<T>.Default.Equals(entry.Value, item)))
+                    if (entry._hashCode == hashCode && (_comparer?.Equals(entry._value, item) ?? EqualityComparer<T>.Default.Equals(entry._value, item)))
                     {
                         if (last < 0)
                         {
-                            bucket = entry.Next + 1; // Value in buckets is 1-based
+                            bucket = entry._next + 1; // Value in buckets is 1-based
                         }
                         else
                         {
-                            entries[last].Next = entry.Next;
+                            entries[last]._next = entry._next;
                         }
 
                         Debug.Assert((StartOfFreeList - _freeList) < 0, "shouldn't underflow because max hashtable length is MaxPrimeArrayLength = 0x7FEFFFFD(2146435069) _freelist underflow threshold 2147483646");
-                        entry.Next = StartOfFreeList - _freeList;
+                        entry._next = StartOfFreeList - _freeList;
 
                         if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
                         {
-                            entry.Value = default!;
+                            entry._value = default!;
                         }
 
                         _freeList = i;
@@ -341,7 +341,7 @@ public bool Remove(T item)
                     }
 
                     last = i;
-                    i = entry.Next;
+                    i = entry._next;
 
                     collisionCount++;
                     if (collisionCount > (uint)entries.Length)
@@ -397,7 +397,7 @@ public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
                 var index = FindItemIndex(equalValue);
                 if (index >= 0)
                 {
-                    actualValue = _entries![index].Value;
+                    actualValue = _entries![index]._value;
                     return true;
                 }
             }
@@ -804,9 +804,9 @@ public void CopyTo(T[] array, int arrayIndex, int count)
             for (var i = 0; i < _count && count != 0; i++)
             {
                 ref var entry = ref entries![i];
-                if (entry.Next >= -1)
+                if (entry._next >= -1)
                 {
-                    array[arrayIndex++] = entry.Value;
+                    array[arrayIndex++] = entry._value;
                     count--;
                 }
             }
@@ -825,10 +825,10 @@ public int RemoveWhere(Predicate<T> match)
             for (var i = 0; i < _count; i++)
             {
                 ref var entry = ref entries![i];
-                if (entry.Next >= -1)
+                if (entry._next >= -1)
                 {
                     // Cache value in case delegate removes it
-                    var value = entry.Value;
+                    var value = entry._value;
                     if (match(value))
                     {
                         // Check again that remove actually removed it.
@@ -896,10 +896,10 @@ private void Resize(int newSize)
             for (var i = 0; i < count; i++)
             {
                 ref var entry = ref entries[i];
-                if (entry.Next >= -1)
+                if (entry._next >= -1)
                 {
-                    ref var bucket = ref GetBucketRef(entry.HashCode);
-                    entry.Next = bucket - 1; // Value in _buckets is 1-based
+                    ref var bucket = ref GetBucketRef(entry._hashCode);
+                    entry._next = bucket - 1; // Value in _buckets is 1-based
                     bucket = i + 1;
                 }
             }
@@ -930,13 +930,13 @@ public void TrimExcess()
             var count = 0;
             for (var i = 0; i < oldCount; i++)
             {
-                var hashCode = oldEntries![i].HashCode; // At this point, we know we have entries.
-                if (oldEntries[i].Next >= -1)
+                var hashCode = oldEntries![i]._hashCode; // At this point, we know we have entries.
+                if (oldEntries[i]._next >= -1)
                 {
                     ref var entry = ref entries![count];
                     entry = oldEntries[i];
                     ref var bucket = ref GetBucketRef(hashCode);
-                    entry.Next = bucket - 1; // Value in _buckets is 1-based
+                    entry._next = bucket - 1; // Value in _buckets is 1-based
                     bucket = count + 1;
                     count++;
                 }
@@ -1006,12 +1006,12 @@ private bool AddIfNotPresent(T value, out int location)
                     while (i >= 0)
                     {
                         ref var entry = ref entries[i];
-                        if (entry.HashCode == hashCode && EqualityComparer<T>.Default.Equals(entry.Value, value))
+                        if (entry._hashCode == hashCode && EqualityComparer<T>.Default.Equals(entry._value, value))
                         {
                             location = i;
                             return false;
                         }
-                        i = entry.Next;
+                        i = entry._next;
 
                         collisionCount++;
                         if (collisionCount > (uint)entries.Length)
@@ -1029,12 +1029,12 @@ private bool AddIfNotPresent(T value, out int location)
                     while (i >= 0)
                     {
                         ref var entry = ref entries[i];
-                        if (entry.HashCode == hashCode && defaultComparer.Equals(entry.Value, value))
+                        if (entry._hashCode == hashCode && defaultComparer.Equals(entry._value, value))
                         {
                             location = i;
                             return false;
                         }
-                        i = entry.Next;
+                        i = entry._next;
 
                         collisionCount++;
                         if (collisionCount > (uint)entries.Length)
@@ -1053,12 +1053,12 @@ private bool AddIfNotPresent(T value, out int location)
                 while (i >= 0)
                 {
                     ref var entry = ref entries[i];
-                    if (entry.HashCode == hashCode && comparer.Equals(entry.Value, value))
+                    if (entry._hashCode == hashCode && comparer.Equals(entry._value, value))
                     {
                         location = i;
                         return false;
                     }
-                    i = entry.Next;
+                    i = entry._next;
 
                     collisionCount++;
                     if (collisionCount > (uint)entries.Length)
@@ -1074,8 +1074,8 @@ private bool AddIfNotPresent(T value, out int location)
             {
                 index = _freeList;
                 _freeCount--;
-                Debug.Assert((StartOfFreeList - entries![_freeList].Next) >= -1, "shouldn't overflow because `next` cannot underflow");
-                _freeList = StartOfFreeList - entries[_freeList].Next;
+                Debug.Assert((StartOfFreeList - entries![_freeList]._next) >= -1, "shouldn't overflow because `next` cannot underflow");
+                _freeList = StartOfFreeList - entries[_freeList]._next;
             }
             else
             {
@@ -1092,9 +1092,9 @@ private bool AddIfNotPresent(T value, out int location)
 
             {
                 ref var entry = ref entries![index];
-                entry.HashCode = hashCode;
-                entry.Next = bucket - 1; // Value in _buckets is 1-based
-                entry.Value = value;
+                entry._hashCode = hashCode;
+                entry._next = bucket - 1; // Value in _buckets is 1-based
+                entry._value = value;
                 bucket = index + 1;
                 _version++;
                 location = index;
@@ -1154,9 +1154,9 @@ private void IntersectWithHashSetWithSameComparer(SegmentedHashSet<T> other)
             for (var i = 0; i < _count; i++)
             {
                 ref var entry = ref entries![i];
-                if (entry.Next >= -1)
+                if (entry._next >= -1)
                 {
-                    var item = entry.Value;
+                    var item = entry._value;
                     if (!other.Contains(item))
                     {
                         Remove(item);
@@ -1200,9 +1200,9 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
             for (var i = 0; i < originalCount; i++)
             {
                 ref var entry = ref _entries![i];
-                if (entry.Next >= -1 && !bitHelper.IsMarked(i))
+                if (entry._next >= -1 && !bitHelper.IsMarked(i))
                 {
-                    Remove(entry.Value);
+                    Remove(entry._value);
                 }
             }
         }
@@ -1287,7 +1287,7 @@ private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
             {
                 if (itemsToRemove.IsMarked(i))
                 {
-                    Remove(_entries![i].Value);
+                    Remove(_entries![i]._value);
                 }
             }
         }
@@ -1379,14 +1379,14 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
 
         private struct Entry
         {
-            public int HashCode;
+            public int _hashCode;
             /// <summary>
             /// 0-based index of next entry in chain: -1 means end of chain
             /// also encodes whether this entry _itself_ is part of the free list by changing sign and subtracting 3,
             /// so -2 means end of free list, -3 means index 0 but on free list, -4 means index 1 but on free list, etc.
             /// </summary>
-            public int Next;
-            public T Value;
+            public int _next;
+            public T _value;
         }
 
         public struct Enumerator : IEnumerator<T>
@@ -1416,9 +1416,9 @@ public bool MoveNext()
                 while ((uint)_index < (uint)_hashSet._count)
                 {
                     ref var entry = ref _hashSet._entries![_index++];
-                    if (entry.Next >= -1)
+                    if (entry._next >= -1)
                     {
-                        _current = entry.Value;
+                        _current = entry._value;
                         return true;
                     }
                 }

From 88fb7f4301fe3bbdc0c8e689291d9f9dfcf3488e Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 09:58:12 -0700
Subject: [PATCH 009/413] Clean up remaining build errors

---
 .../Collections/Internal/BitHelper.cs            |  2 ++
 .../SegmentedHashSetEqualityComparer`1.cs        |  2 ++
 .../Collections/Internal/ThrowHelper.cs          |  6 ++++++
 .../Collections/SegmentedHashSet`1.cs            | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/Dependencies/Collections/Internal/BitHelper.cs b/src/Dependencies/Collections/Internal/BitHelper.cs
index 079f8b6738cff..bbe971cf0f5d2 100644
--- a/src/Dependencies/Collections/Internal/BitHelper.cs
+++ b/src/Dependencies/Collections/Internal/BitHelper.cs
@@ -8,6 +8,8 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
+
 namespace Microsoft.CodeAnalysis.Collections.Internal
 {
     internal ref struct BitHelper
diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
index af2d74b8e1498..1dfbce88e090a 100644
--- a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -8,6 +8,8 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System.Collections.Generic;
+
 namespace Microsoft.CodeAnalysis.Collections.Internal
 {
     /// <summary>Equality comparer for hashsets of hashsets</summary>
diff --git a/src/Dependencies/Collections/Internal/ThrowHelper.cs b/src/Dependencies/Collections/Internal/ThrowHelper.cs
index ffd0217983087..9c5a3cceae509 100644
--- a/src/Dependencies/Collections/Internal/ThrowHelper.cs
+++ b/src/Dependencies/Collections/Internal/ThrowHelper.cs
@@ -239,6 +239,8 @@ private static string GetArgumentName(ExceptionArgument argument)
                     return "dictionary";
                 case ExceptionArgument.array:
                     return "array";
+                case ExceptionArgument.info:
+                    return "info";
                 case ExceptionArgument.key:
                     return "key";
                 case ExceptionArgument.value:
@@ -269,6 +271,8 @@ private static string GetArgumentName(ExceptionArgument argument)
                     return "length";
                 case ExceptionArgument.destinationArray:
                     return "destinationArray";
+                case ExceptionArgument.other:
+                    return "other";
                 default:
                     Debug.Fail("The enum value is not defined, please check the ExceptionArgument Enum.");
                     return "";
@@ -319,6 +323,7 @@ internal enum ExceptionArgument
     {
         dictionary,
         array,
+        info,
         key,
         value,
         startIndex,
@@ -334,6 +339,7 @@ internal enum ExceptionArgument
         source,
         length,
         destinationArray,
+        other,
     }
 
     //
diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index bc4518e8d4362..3c9f5c113fdb0 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -8,18 +8,22 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
-
-using Internal.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.Collections.Internal;
 
 namespace Microsoft.CodeAnalysis.Collections
 {
     [DebuggerTypeProxy(typeof(ICollectionDebugView<>))]
     [DebuggerDisplay("Count = {Count}")]
-    [TypeForwardedFrom("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
-    internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>, IReadOnlySet<T>
+    internal class SegmentedHashSet<T> : ICollection<T>, ISet<T>, IReadOnlyCollection<T>
+#if NET5_0_OR_GREATER
+        , IReadOnlySet<T>
+#endif
     {
         private const bool SupportsComparerDevirtualization
 #if NETCOREAPP
@@ -330,7 +334,9 @@ public bool Remove(T item)
                         Debug.Assert((StartOfFreeList - _freeList) < 0, "shouldn't underflow because max hashtable length is MaxPrimeArrayLength = 0x7FEFFFFD(2146435069) _freelist underflow threshold 2147483646");
                         entry._next = StartOfFreeList - _freeList;
 
+#if NETCOREAPP
                         if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
+#endif
                         {
                             entry._value = default!;
                         }
@@ -993,7 +999,7 @@ private bool AddIfNotPresent(T value, out int location)
             int hashCode;
 
             uint collisionCount = 0;
-            ref var bucket = ref Unsafe.NullRef<int>();
+            ref var bucket = ref RoslynUnsafe.NullRef<int>();
 
             if (SupportsComparerDevirtualization && comparer == null)
             {

From 677b2bec99a3d92691955ca77406603e2e18cca9 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 10:17:36 -0700
Subject: [PATCH 010/413] Assume TARGET_64BIT for performance

---
 src/Dependencies/Collections/SegmentedHashSet`1.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 3c9f5c113fdb0..6f395076584c0 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -49,9 +49,7 @@ private const bool SupportsComparerDevirtualization
 
         private int[]? _buckets;
         private Entry[]? _entries;
-#if TARGET_64BIT
         private ulong _fastModMultiplier;
-#endif
         private int _count;
         private int _freeList;
         private int _freeCount;
@@ -154,9 +152,7 @@ private void ConstructFrom(SegmentedHashSet<T> source)
                 _freeList = source._freeList;
                 _freeCount = source._freeCount;
                 _count = source._count;
-#if TARGET_64BIT
                 _fastModMultiplier = source._fastModMultiplier;
-#endif
             }
             else
             {
@@ -295,11 +291,7 @@ private int FindItemIndex(T item)
         private ref int GetBucketRef(int hashCode)
         {
             var buckets = _buckets!;
-#if TARGET_64BIT
             return ref buckets[HashHelpers.FastMod((uint)hashCode, (uint)buckets.Length, _fastModMultiplier)];
-#else
-            return ref buckets[(uint)hashCode % (uint)buckets.Length];
-#endif
         }
 
         public bool Remove(T item)
@@ -896,9 +888,7 @@ private void Resize(int newSize)
 
             // Assign member variables after both arrays allocated to guard against corruption from OOM if second fails
             _buckets = new int[newSize];
-#if TARGET_64BIT
             _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)newSize);
-#endif
             for (var i = 0; i < count; i++)
             {
                 ref var entry = ref entries[i];
@@ -973,9 +963,7 @@ private int Initialize(int capacity)
             _freeList = -1;
             _buckets = buckets;
             _entries = entries;
-#if TARGET_64BIT
             _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)size);
-#endif
 
             return size;
         }

From c0c39b1656746f4f35699b5fbc1c32afa03bedc8 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 10:18:01 -0700
Subject: [PATCH 011/413] Use segmented arrays internally

---
 .../Collections/SegmentedHashSet`1.cs         | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/Dependencies/Collections/SegmentedHashSet`1.cs b/src/Dependencies/Collections/SegmentedHashSet`1.cs
index 6f395076584c0..6eb2a0c96e485 100644
--- a/src/Dependencies/Collections/SegmentedHashSet`1.cs
+++ b/src/Dependencies/Collections/SegmentedHashSet`1.cs
@@ -47,8 +47,8 @@ private const bool SupportsComparerDevirtualization
         private const int ShrinkThreshold = 3;
         private const int StartOfFreeList = -3;
 
-        private int[]? _buckets;
-        private Entry[]? _entries;
+        private SegmentedArray<int> _buckets;
+        private SegmentedArray<Entry> _entries;
         private ulong _fastModMultiplier;
         private int _count;
         private int _freeList;
@@ -111,7 +111,7 @@ public SegmentedHashSet(IEnumerable<T> collection, IEqualityComparer<T>? compare
 
                 UnionWith(collection);
 
-                if (_count > 0 && _entries!.Length / _count > ShrinkThreshold)
+                if (_count > 0 && _entries.Length / _count > ShrinkThreshold)
                 {
                     TrimExcess();
                 }
@@ -142,13 +142,13 @@ private void ConstructFrom(SegmentedHashSet<T> source)
                 return;
             }
 
-            var capacity = source._buckets!.Length;
+            var capacity = source._buckets.Length;
             var threshold = HashHelpers.ExpandPrime(source.Count + 1);
 
             if (threshold >= capacity)
             {
-                _buckets = (int[])source._buckets.Clone();
-                _entries = (Entry[])source._entries!.Clone();
+                _buckets = (SegmentedArray<int>)source._buckets.Clone();
+                _entries = (SegmentedArray<Entry>)source._entries.Clone();
                 _freeList = source._freeList;
                 _freeCount = source._freeCount;
                 _count = source._count;
@@ -161,7 +161,7 @@ private void ConstructFrom(SegmentedHashSet<T> source)
                 var entries = source._entries;
                 for (var i = 0; i < source._count; i++)
                 {
-                    ref var entry = ref entries![i];
+                    ref var entry = ref entries[i];
                     if (entry._next >= -1)
                     {
                         AddIfNotPresent(entry._value, out _);
@@ -184,14 +184,14 @@ public void Clear()
             var count = _count;
             if (count > 0)
             {
-                Debug.Assert(_buckets != null, "_buckets should be non-null");
-                Debug.Assert(_entries != null, "_entries should be non-null");
+                Debug.Assert(_buckets.Length > 0, "_buckets should be non-empty");
+                Debug.Assert(_entries.Length > 0, "_entries should be non-empty");
 
-                Array.Clear(_buckets, 0, _buckets.Length);
+                SegmentedArray.Clear(_buckets, 0, _buckets.Length);
                 _count = 0;
                 _freeList = -1;
                 _freeCount = 0;
-                Array.Clear(_entries, 0, count);
+                SegmentedArray.Clear(_entries, 0, count);
             }
         }
 
@@ -204,10 +204,10 @@ public void Clear()
         private int FindItemIndex(T item)
         {
             var buckets = _buckets;
-            if (buckets != null)
+            if (buckets.Length > 0)
             {
                 var entries = _entries;
-                Debug.Assert(entries != null, "Expected _entries to be initialized");
+                Debug.Assert(entries.Length > 0, "Expected _entries to be initialized");
 
                 uint collisionCount = 0;
                 var comparer = _comparer;
@@ -290,16 +290,16 @@ private int FindItemIndex(T item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private ref int GetBucketRef(int hashCode)
         {
-            var buckets = _buckets!;
-            return ref buckets[HashHelpers.FastMod((uint)hashCode, (uint)buckets.Length, _fastModMultiplier)];
+            var buckets = _buckets;
+            return ref buckets[(int)HashHelpers.FastMod((uint)hashCode, (uint)buckets.Length, _fastModMultiplier)];
         }
 
         public bool Remove(T item)
         {
-            if (_buckets != null)
+            if (_buckets.Length > 0)
             {
                 var entries = _entries;
-                Debug.Assert(entries != null, "entries should be non-null");
+                Debug.Assert(entries.Length > 0, "entries should be non-empty");
 
                 uint collisionCount = 0;
                 var last = -1;
@@ -390,12 +390,12 @@ public bool Remove(T item)
         /// </remarks>
         public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
         {
-            if (_buckets != null)
+            if (_buckets.Length > 0)
             {
                 var index = FindItemIndex(equalValue);
                 if (index >= 0)
                 {
-                    actualValue = _entries![index]._value;
+                    actualValue = _entries[index]._value;
                     return true;
                 }
             }
@@ -801,7 +801,7 @@ public void CopyTo(T[] array, int arrayIndex, int count)
             var entries = _entries;
             for (var i = 0; i < _count && count != 0; i++)
             {
-                ref var entry = ref entries![i];
+                ref var entry = ref entries[i];
                 if (entry._next >= -1)
                 {
                     array[arrayIndex++] = entry._value;
@@ -822,7 +822,7 @@ public int RemoveWhere(Predicate<T> match)
             var numRemoved = 0;
             for (var i = 0; i < _count; i++)
             {
-                ref var entry = ref entries![i];
+                ref var entry = ref entries[i];
                 if (entry._next >= -1)
                 {
                     // Cache value in case delegate removes it
@@ -858,13 +858,13 @@ public int EnsureCapacity(int capacity)
                 ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.capacity);
             }
 
-            var currentCapacity = _entries == null ? 0 : _entries.Length;
+            var currentCapacity = _entries.Length;
             if (currentCapacity >= capacity)
             {
                 return currentCapacity;
             }
 
-            if (_buckets == null)
+            if (_buckets.Length == 0)
             {
                 return Initialize(capacity);
             }
@@ -878,16 +878,16 @@ public int EnsureCapacity(int capacity)
 
         private void Resize(int newSize)
         {
-            Debug.Assert(_entries != null, "_entries should be non-null");
+            Debug.Assert(_entries.Length > 0, "_entries should be non-empty");
             Debug.Assert(newSize >= _entries.Length);
 
-            var entries = new Entry[newSize];
+            var entries = new SegmentedArray<Entry>(newSize);
 
             var count = _count;
-            Array.Copy(_entries, entries, count);
+            SegmentedArray.Copy(_entries, entries, count);
 
             // Assign member variables after both arrays allocated to guard against corruption from OOM if second fails
-            _buckets = new int[newSize];
+            _buckets = new SegmentedArray<int>(newSize);
             _fastModMultiplier = HashHelpers.GetFastModMultiplier((uint)newSize);
             for (var i = 0; i < count; i++)
             {
@@ -913,7 +913,7 @@ public void TrimExcess()
 
             var newSize = HashHelpers.GetPrime(capacity);
             var oldEntries = _entries;
-            var currentCapacity = oldEntries == null ? 0 : oldEntries.Length;
+            var currentCapacity = oldEntries.Length;
             if (newSize >= currentCapacity)
             {
                 return;
@@ -926,10 +926,10 @@ public void TrimExcess()
             var count = 0;
             for (var i = 0; i < oldCount; i++)
             {
-                var hashCode = oldEntries![i]._hashCode; // At this point, we know we have entries.
+                var hashCode = oldEntries[i]._hashCode; // At this point, we know we have entries.
                 if (oldEntries[i]._next >= -1)
                 {
-                    ref var entry = ref entries![count];
+                    ref var entry = ref entries[count];
                     entry = oldEntries[i];
                     ref var bucket = ref GetBucketRef(hashCode);
                     entry._next = bucket - 1; // Value in _buckets is 1-based
@@ -956,8 +956,8 @@ public void TrimExcess()
         private int Initialize(int capacity)
         {
             var size = HashHelpers.GetPrime(capacity);
-            var buckets = new int[size];
-            var entries = new Entry[size];
+            var buckets = new SegmentedArray<int>(size);
+            var entries = new SegmentedArray<Entry>(size);
 
             // Assign member variables after both arrays are allocated to guard against corruption from OOM if second fails.
             _freeList = -1;
@@ -974,14 +974,14 @@ private int Initialize(int capacity)
         /// <returns>true if the element is added to the <see cref="SegmentedHashSet{T}"/> object; false if the element is already present.</returns>
         private bool AddIfNotPresent(T value, out int location)
         {
-            if (_buckets == null)
+            if (_buckets.Length == 0)
             {
                 Initialize(0);
             }
-            Debug.Assert(_buckets != null);
+            Debug.Assert(_buckets.Length > 0);
 
             var entries = _entries;
-            Debug.Assert(entries != null, "expected entries to be non-null");
+            Debug.Assert(entries.Length > 0, "expected entries to be non-empty");
 
             var comparer = _comparer;
             int hashCode;
@@ -1068,7 +1068,7 @@ private bool AddIfNotPresent(T value, out int location)
             {
                 index = _freeList;
                 _freeCount--;
-                Debug.Assert((StartOfFreeList - entries![_freeList]._next) >= -1, "shouldn't overflow because `next` cannot underflow");
+                Debug.Assert((StartOfFreeList - entries[_freeList]._next) >= -1, "shouldn't overflow because `next` cannot underflow");
                 _freeList = StartOfFreeList - entries[_freeList]._next;
             }
             else
@@ -1085,7 +1085,7 @@ private bool AddIfNotPresent(T value, out int location)
             }
 
             {
-                ref var entry = ref entries![index];
+                ref var entry = ref entries[index];
                 entry._hashCode = hashCode;
                 entry._next = bucket - 1; // Value in _buckets is 1-based
                 entry._value = value;
@@ -1147,7 +1147,7 @@ private void IntersectWithHashSetWithSameComparer(SegmentedHashSet<T> other)
             var entries = _entries;
             for (var i = 0; i < _count; i++)
             {
-                ref var entry = ref entries![i];
+                ref var entry = ref entries[i];
                 if (entry._next >= -1)
                 {
                     var item = entry._value;
@@ -1167,7 +1167,7 @@ private void IntersectWithHashSetWithSameComparer(SegmentedHashSet<T> other)
         /// </summary>
         private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
         {
-            Debug.Assert(_buckets != null, "_buckets shouldn't be null; callers should check first");
+            Debug.Assert(_buckets.Length > 0, "_buckets shouldn't be empty; callers should check first");
 
             // Keep track of current last index; don't want to move past the end of our bit array
             // (could happen if another thread is modifying the collection).
@@ -1193,7 +1193,7 @@ private unsafe void IntersectWithEnumerable(IEnumerable<T> other)
             // FindFirstUnmarked method.
             for (var i = 0; i < originalCount; i++)
             {
-                ref var entry = ref _entries![i];
+                ref var entry = ref _entries[i];
                 if (entry._next >= -1 && !bitHelper.IsMarked(i))
                 {
                     Remove(entry._value);
@@ -1281,7 +1281,7 @@ private unsafe void SymmetricExceptWithEnumerable(IEnumerable<T> other)
             {
                 if (itemsToRemove.IsMarked(i))
                 {
-                    Remove(_entries![i]._value);
+                    Remove(_entries[i]._value);
                 }
             }
         }
@@ -1324,7 +1324,7 @@ private unsafe (int UniqueCount, int UnfoundCount) CheckUniqueAndUnfoundElements
                 return (UniqueCount: 0, UnfoundCount: numElementsInOther);
             }
 
-            Debug.Assert((_buckets != null) && (_count > 0), "_buckets was null but count greater than 0");
+            Debug.Assert((_buckets.Length > 0) && (_count > 0), "_buckets was empty but count greater than 0");
 
             var originalCount = _count;
             int intArrayLength = BitHelper.ToIntArrayLength(originalCount);
@@ -1409,7 +1409,7 @@ public bool MoveNext()
                 // dictionary.count+1 could be negative if dictionary.count is int.MaxValue
                 while ((uint)_index < (uint)_hashSet._count)
                 {
-                    ref var entry = ref _hashSet._entries![_index++];
+                    ref var entry = ref _hashSet._entries[_index++];
                     if (entry._next >= -1)
                     {
                         _current = entry._value;

From 0bbcabb12b1a1c5f82278bd6148dca25ecfbd68a Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 2 Jul 2021 14:29:57 -0700
Subject: [PATCH 012/413] Update tests for SegmentedHashSet<T>

---
 .../HashSet/ISet_Generic_Tests`1.cs           |  41 ++-
 .../HashSet/SegmentedHashSet_Generic_Tests.cs |  48 ++--
 .../SegmentedHashSet_Generic_Tests`1.cs       | 249 +++++++-----------
 ...tedHashSet_IEnumerable_NonGeneric_Tests.cs |  18 +-
 .../Collections/HashSet/TestingTypes.cs       |  71 ++---
 .../Collections/List/TestBase.Generic.cs      |  13 +-
 .../Collections/List/TestBase.NonGeneric.cs   |   2 +-
 7 files changed, 198 insertions(+), 244 deletions(-)

diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
index f1e9dbcae03a7..5e770c6ce0170 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/Common/tests/System/Collections/ISet.Generic.Tests.cs
@@ -7,12 +8,14 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace System.Collections.Tests
+namespace Microsoft.CodeAnalysis.UnitTests.Collections
 {
     /// <summary>
     /// Contains tests that ensure the correctness of any class that implements the generic
@@ -25,6 +28,7 @@ namespace System.Collections.Tests
     /// compares it to the actual result of the set operation.
     /// </summary>
     public abstract class ISet_Generic_Tests<T> : ICollection_Generic_Tests<T>
+        where T : notnull
     {
         #region ISet<T> Helper methods
 
@@ -139,7 +143,7 @@ private void Validate_ExceptWith(ISet<T> set, IEnumerable<T> enumerable)
 
         private void Validate_IntersectWith(ISet<T> set, IEnumerable<T> enumerable)
         {
-            if (set.Count == 0 || Enumerable.Count(enumerable) == 0)
+            if (set.Count == 0 || !Enumerable.Any(enumerable))
             {
                 set.IntersectWith(enumerable);
                 Assert.Equal(0, set.Count);
@@ -308,16 +312,16 @@ private void Validate_UnionWith(ISet<T> set, IEnumerable<T> enumerable)
         public void ISet_Generic_NullEnumerableArgument(int count)
         {
             ISet<T> set = GenericISetFactory(count);
-            Assert.Throws<ArgumentNullException>(() => set.ExceptWith(null));
-            Assert.Throws<ArgumentNullException>(() => set.IntersectWith(null));
-            Assert.Throws<ArgumentNullException>(() => set.IsProperSubsetOf(null));
-            Assert.Throws<ArgumentNullException>(() => set.IsProperSupersetOf(null));
-            Assert.Throws<ArgumentNullException>(() => set.IsSubsetOf(null));
-            Assert.Throws<ArgumentNullException>(() => set.IsSupersetOf(null));
-            Assert.Throws<ArgumentNullException>(() => set.Overlaps(null));
-            Assert.Throws<ArgumentNullException>(() => set.SetEquals(null));
-            Assert.Throws<ArgumentNullException>(() => set.SymmetricExceptWith(null));
-            Assert.Throws<ArgumentNullException>(() => set.UnionWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.ExceptWith(null!));
+            Assert.Throws<ArgumentNullException>(() => set.IntersectWith(null!));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSubsetOf(null!));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSupersetOf(null!));
+            Assert.Throws<ArgumentNullException>(() => set.IsSubsetOf(null!));
+            Assert.Throws<ArgumentNullException>(() => set.IsSupersetOf(null!));
+            Assert.Throws<ArgumentNullException>(() => set.Overlaps(null!));
+            Assert.Throws<ArgumentNullException>(() => set.SetEquals(null!));
+            Assert.Throws<ArgumentNullException>(() => set.SymmetricExceptWith(null!));
+            Assert.Throws<ArgumentNullException>(() => set.UnionWith(null!));
         }
 
         [Theory]
@@ -422,9 +426,8 @@ public void ISet_Generic_ExceptWith_Itself(int setLength)
             Validate_ExceptWith(set, set);
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(CoreClrOnly))]
         [MemberData(nameof(ValidCollectionSizes))]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws InvalidOperationException")]
         public void ISet_Generic_IntersectWith_Itself(int setLength)
         {
             ISet<T> set = GenericISetFactory(setLength);
@@ -500,7 +503,6 @@ public void ISet_Generic_UnionWith_Itself(int setLength)
         #region Set Function tests on a large Set
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_ExceptWith_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -509,7 +511,6 @@ public void ISet_Generic_ExceptWith_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_IntersectWith_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -518,7 +519,6 @@ public void ISet_Generic_IntersectWith_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_IsProperSubsetOf_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -527,7 +527,6 @@ public void ISet_Generic_IsProperSubsetOf_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_IsProperSupersetOf_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -536,7 +535,6 @@ public void ISet_Generic_IsProperSupersetOf_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_IsSubsetOf_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -545,7 +543,6 @@ public void ISet_Generic_IsSubsetOf_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_IsSupersetOf_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -554,7 +551,6 @@ public void ISet_Generic_IsSupersetOf_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_Overlaps_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -563,7 +559,6 @@ public void ISet_Generic_Overlaps_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_SetEquals_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -572,7 +567,6 @@ public void ISet_Generic_SetEquals_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_SymmetricExceptWith_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
@@ -581,7 +575,6 @@ public void ISet_Generic_SymmetricExceptWith_LargeSet()
         }
 
         [Fact]
-        [OuterLoop]
         public void ISet_Generic_UnionWith_LargeSet()
         {
             ISet<T> set = GenericISetFactory(ISet_Large_Capacity);
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
index 253941240153e..3068f0fff5e8a 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.cs
@@ -7,12 +8,13 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
 using System.Collections.Generic;
-using Xunit;
+using Microsoft.CodeAnalysis.Collections;
 
-namespace System.Collections.Tests
+namespace Microsoft.CodeAnalysis.UnitTests.Collections
 {
-    public class HashSet_Generic_Tests_string : HashSet_Generic_Tests<string>
+    public class SegmentedHashSet_Generic_Tests_string : SegmentedHashSet_Generic_Tests<string>
     {
         protected override string CreateT(int seed)
         {
@@ -24,7 +26,7 @@ protected override string CreateT(int seed)
         }
     }
 
-    public class HashSet_Generic_Tests_int : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int : SegmentedHashSet_Generic_Tests<int>
     {
         protected override int CreateT(int seed)
         {
@@ -35,7 +37,7 @@ protected override int CreateT(int seed)
         protected override bool DefaultValueAllowed => true;
     }
 
-    public class HashSet_Generic_Tests_int_With_Comparer_WrapStructural_Int : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_WrapStructural_Int : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -55,11 +57,11 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new WrapStructural_Int());
+            return new SegmentedHashSet<int>(new WrapStructural_Int());
         }
     }
 
-    public class HashSet_Generic_Tests_int_With_Comparer_WrapStructural_SimpleInt : HashSet_Generic_Tests<SimpleInt>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_WrapStructural_SimpleInt : SegmentedHashSet_Generic_Tests<SimpleInt>
     {
         protected override IEqualityComparer<SimpleInt> GetIEqualityComparer()
         {
@@ -79,12 +81,11 @@ protected override SimpleInt CreateT(int seed)
 
         protected override ISet<SimpleInt> GenericISetFactory()
         {
-            return new HashSet<SimpleInt>(new WrapStructural_SimpleInt());
+            return new SegmentedHashSet<SimpleInt>(new WrapStructural_SimpleInt());
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_EquatableBackwardsOrder : HashSet_Generic_Tests<EquatableBackwardsOrder>
+    public class SegmentedHashSet_Generic_Tests_EquatableBackwardsOrder : SegmentedHashSet_Generic_Tests<EquatableBackwardsOrder>
     {
         protected override EquatableBackwardsOrder CreateT(int seed)
         {
@@ -94,12 +95,11 @@ protected override EquatableBackwardsOrder CreateT(int seed)
 
         protected override ISet<EquatableBackwardsOrder> GenericISetFactory()
         {
-            return new HashSet<EquatableBackwardsOrder>();
+            return new SegmentedHashSet<EquatableBackwardsOrder>();
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_int_With_Comparer_SameAsDefaultComparer : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_SameAsDefaultComparer : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -114,12 +114,11 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new Comparer_SameAsDefaultComparer());
+            return new SegmentedHashSet<int>(new Comparer_SameAsDefaultComparer());
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_int_With_Comparer_HashCodeAlwaysReturnsZero : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_HashCodeAlwaysReturnsZero : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -134,12 +133,11 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new Comparer_HashCodeAlwaysReturnsZero());
+            return new SegmentedHashSet<int>(new Comparer_HashCodeAlwaysReturnsZero());
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_int_With_Comparer_ModOfInt : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_ModOfInt : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -159,12 +157,11 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new Comparer_ModOfInt(15000));
+            return new SegmentedHashSet<int>(new Comparer_ModOfInt(15000));
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_int_With_Comparer_AbsOfInt : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_AbsOfInt : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -179,12 +176,11 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new Comparer_AbsOfInt());
+            return new SegmentedHashSet<int>(new Comparer_AbsOfInt());
         }
     }
 
-    [OuterLoop]
-    public class HashSet_Generic_Tests_int_With_Comparer_BadIntEqualityComparer : HashSet_Generic_Tests<int>
+    public class SegmentedHashSet_Generic_Tests_int_With_Comparer_BadIntEqualityComparer : SegmentedHashSet_Generic_Tests<int>
     {
         protected override IEqualityComparer<int> GetIEqualityComparer()
         {
@@ -199,7 +195,7 @@ protected override int CreateT(int seed)
 
         protected override ISet<int> GenericISetFactory()
         {
-            return new HashSet<int>(new BadIntEqualityComparer());
+            return new SegmentedHashSet<int>(new BadIntEqualityComparer());
         }
     }
 }
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
index 0c98e521ed4f3..7ad7b9238e273 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_Generic_Tests`1.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.cs
@@ -7,30 +8,32 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Runtime.Serialization.Formatters.Binary;
+using Microsoft.CodeAnalysis.Collections;
 using Xunit;
 
-namespace System.Collections.Tests
+namespace Microsoft.CodeAnalysis.UnitTests.Collections
 {
     /// <summary>
-    /// Contains tests that ensure the correctness of the HashSet class.
+    /// Contains tests that ensure the correctness of the SegmentedHashSet class.
     /// </summary>
-    public abstract class HashSet_Generic_Tests<T> : ISet_Generic_Tests<T>
+    public abstract class SegmentedHashSet_Generic_Tests<T> : ISet_Generic_Tests<T>
+        where T : notnull
     {
         #region ISet<T> Helper Methods
 
         protected override bool ResetImplemented => true;
 
-        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorThrows : (base.ModifyEnumeratorAllowed & ~(ModifyOperation.Remove | ModifyOperation.Clear));
+        protected override ModifyOperation ModifyEnumeratorThrows => base.ModifyEnumeratorAllowed & ~(ModifyOperation.Remove | ModifyOperation.Clear);
 
-        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Overwrite | ModifyOperation.Remove | ModifyOperation.Clear;
+        protected override ModifyOperation ModifyEnumeratorAllowed => ModifyOperation.Overwrite | ModifyOperation.Remove | ModifyOperation.Clear;
 
         protected override ISet<T> GenericISetFactory()
         {
-            return new HashSet<T>();
+            return new SegmentedHashSet<T>();
         }
 
         #endregion
@@ -50,7 +53,7 @@ private static IEnumerable<int> NonSquares(int limit)
         [Fact]
         public void HashSet_Generic_Constructor()
         {
-            HashSet<T> set = new HashSet<T>();
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>();
             Assert.Empty(set);
         }
 
@@ -58,7 +61,7 @@ public void HashSet_Generic_Constructor()
         public void HashSet_Generic_Constructor_IEqualityComparer()
         {
             IEqualityComparer<T> comparer = GetIEqualityComparer();
-            HashSet<T> set = new HashSet<T>(comparer);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(comparer);
             if (comparer == null)
                 Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
             else
@@ -68,8 +71,8 @@ public void HashSet_Generic_Constructor_IEqualityComparer()
         [Fact]
         public void HashSet_Generic_Constructor_NullIEqualityComparer()
         {
-            IEqualityComparer<T> comparer = null;
-            HashSet<T> set = new HashSet<T>(comparer);
+            IEqualityComparer<T>? comparer = null;
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(comparer);
             if (comparer == null)
                 Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
             else
@@ -83,7 +86,7 @@ public void HashSet_Generic_Constructor_IEnumerable(EnumerableType enumerableTyp
             _ = setLength;
             _ = numberOfMatchingElements;
             IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, numberOfDuplicateElements);
-            HashSet<T> set = new HashSet<T>(enumerable);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(enumerable);
             Assert.True(set.SetEquals(enumerable));
         }
 
@@ -92,8 +95,8 @@ public void HashSet_Generic_Constructor_IEnumerable(EnumerableType enumerableTyp
         public void HashSet_Generic_Constructor_IEnumerable_WithManyDuplicates(int count)
         {
             IEnumerable<T> items = CreateEnumerable(EnumerableType.List, null, count, 0, 0);
-            HashSet<T> hashSetFromDuplicates = new HashSet<T>(Enumerable.Range(0, 40).SelectMany(i => items).ToArray());
-            HashSet<T> hashSetFromNoDuplicates = new HashSet<T>(items);
+            SegmentedHashSet<T> hashSetFromDuplicates = new SegmentedHashSet<T>(Enumerable.Range(0, 40).SelectMany(i => items).ToArray());
+            SegmentedHashSet<T> hashSetFromNoDuplicates = new SegmentedHashSet<T>(items);
             Assert.True(hashSetFromNoDuplicates.SetEquals(hashSetFromDuplicates));
         }
 
@@ -101,21 +104,21 @@ public void HashSet_Generic_Constructor_IEnumerable_WithManyDuplicates(int count
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_Constructor_HashSet_SparselyFilled(int count)
         {
-            HashSet<T> source = (HashSet<T>)CreateEnumerable(EnumerableType.HashSet, null, count, 0, 0);
+            SegmentedHashSet<T> source = (SegmentedHashSet<T>)CreateEnumerable(EnumerableType.SegmentedHashSet, null, count, 0, 0);
             List<T> sourceElements = source.ToList();
             foreach (int i in NonSquares(count))
                 source.Remove(sourceElements[i]);// Unevenly spaced survivors increases chance of catching any spacing-related bugs.
 
 
-            HashSet<T> set = new HashSet<T>(source, GetIEqualityComparer());
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(source, GetIEqualityComparer());
             Assert.True(set.SetEquals(source));
         }
 
         [Fact]
         public void HashSet_Generic_Constructor_IEnumerable_Null()
         {
-            Assert.Throws<ArgumentNullException>(() => new HashSet<T>((IEnumerable<T>)null));
-            Assert.Throws<ArgumentNullException>(() => new HashSet<T>((IEnumerable<T>)null, EqualityComparer<T>.Default));
+            Assert.Throws<ArgumentNullException>(() => new SegmentedHashSet<T>((IEnumerable<T>)null!));
+            Assert.Throws<ArgumentNullException>(() => new SegmentedHashSet<T>((IEnumerable<T>)null!, EqualityComparer<T>.Default));
         }
 
         [Theory]
@@ -126,7 +129,7 @@ public void HashSet_Generic_Constructor_IEnumerable_IEqualityComparer(Enumerable
             _ = numberOfMatchingElements;
             _ = numberOfDuplicateElements;
             IEnumerable<T> enumerable = CreateEnumerable(enumerableType, null, enumerableLength, 0, 0);
-            HashSet<T> set = new HashSet<T>(enumerable, GetIEqualityComparer());
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(enumerable, GetIEqualityComparer());
             Assert.True(set.SetEquals(enumerable));
         }
 
@@ -138,7 +141,7 @@ public void HashSet_Generic_Constructor_IEnumerable_IEqualityComparer(Enumerable
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_RemoveWhere_AllElements(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             int removedCount = set.RemoveWhere((value) => { return true; });
             Assert.Equal(setLength, removedCount);
         }
@@ -147,7 +150,7 @@ public void HashSet_Generic_RemoveWhere_AllElements(int setLength)
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_RemoveWhere_NoElements(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             int removedCount = set.RemoveWhere((value) => { return false; });
             Assert.Equal(0, removedCount);
             Assert.Equal(setLength, set.Count);
@@ -157,8 +160,8 @@ public void HashSet_Generic_RemoveWhere_NoElements(int setLength)
         public void HashSet_Generic_RemoveWhere_NewObject() // Regression Dev10_624201
         {
             object[] array = new object[2];
-            object obj = new object();
-            HashSet<object> set = new HashSet<object>();
+            object obj = new();
+            SegmentedHashSet<object> set = new SegmentedHashSet<object>();
 
             set.Add(obj);
             set.Remove(obj);
@@ -171,8 +174,8 @@ public void HashSet_Generic_RemoveWhere_NewObject() // Regression Dev10_624201
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_RemoveWhere_NullMatchPredicate(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
-            Assert.Throws<ArgumentNullException>(() => set.RemoveWhere(null));
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
+            Assert.Throws<ArgumentNullException>(() => set.RemoveWhere(null!));
         }
 
         #endregion
@@ -183,7 +186,7 @@ public void HashSet_Generic_RemoveWhere_NullMatchPredicate(int setLength)
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_TrimExcess_OnValidSetThatHasntBeenRemovedFrom(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             set.TrimExcess();
         }
 
@@ -191,7 +194,7 @@ public void HashSet_Generic_TrimExcess_OnValidSetThatHasntBeenRemovedFrom(int se
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_TrimExcess_Repeatedly(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             List<T> expected = set.ToList();
             set.TrimExcess();
             set.TrimExcess();
@@ -205,7 +208,7 @@ public void HashSet_Generic_TrimExcess_AfterRemovingOneElement(int setLength)
         {
             if (setLength > 0)
             {
-                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
                 List<T> expected = set.ToList();
                 T elementToRemove = set.ElementAt(0);
 
@@ -224,7 +227,7 @@ public void HashSet_Generic_TrimExcess_AfterClearingAndAddingSomeElementsBack(in
         {
             if (setLength > 0)
             {
-                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
                 set.TrimExcess();
                 set.Clear();
                 set.TrimExcess();
@@ -242,7 +245,7 @@ public void HashSet_Generic_TrimExcess_AfterClearingAndAddingAllElementsBack(int
         {
             if (setLength > 0)
             {
-                HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+                SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
                 set.TrimExcess();
                 set.Clear();
                 set.TrimExcess();
@@ -262,7 +265,7 @@ public void HashSet_Generic_TrimExcess_AfterClearingAndAddingAllElementsBack(int
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_CopyTo_NegativeCount_ThrowsArgumentOutOfRangeException(int count)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(count);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(count);
             T[] arr = new T[count];
             Assert.Throws<ArgumentOutOfRangeException>(() => set.CopyTo(arr, 0, -1));
             Assert.Throws<ArgumentOutOfRangeException>(() => set.CopyTo(arr, 0, int.MinValue));
@@ -272,7 +275,7 @@ public void HashSet_Generic_CopyTo_NegativeCount_ThrowsArgumentOutOfRangeExcepti
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_CopyTo_NoIndexDefaultsToZero(int count)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(count);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(count);
             T[] arr1 = new T[count];
             T[] arr2 = new T[count];
             set.CopyTo(arr1);
@@ -289,28 +292,28 @@ public void SetComparer_SetEqualsTests()
         {
             List<T> objects = new List<T>() { CreateT(1), CreateT(2), CreateT(3), CreateT(4), CreateT(5), CreateT(6) };
 
-            var set = new HashSet<HashSet<T>>()
+            var set = new SegmentedHashSet<SegmentedHashSet<T>>()
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
-            var noComparerSet = new HashSet<HashSet<T>>()
+            var noComparerSet = new SegmentedHashSet<SegmentedHashSet<T>>()
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
-            var comparerSet1 = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            var comparerSet1 = new SegmentedHashSet<SegmentedHashSet<T>>(SegmentedHashSet<T>.CreateSetComparer())
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
-            var comparerSet2 = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            var comparerSet2 = new SegmentedHashSet<SegmentedHashSet<T>>(SegmentedHashSet<T>.CreateSetComparer())
             {
-                new HashSet<T> { objects[3], objects[4], objects[5] },
-                new HashSet<T> { objects[0], objects[1], objects[2] }
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] },
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] }
             };
 
             Assert.False(noComparerSet.SetEquals(set));
@@ -323,26 +326,26 @@ public void SetComparer_SequenceEqualTests()
         {
             List<T> objects = new List<T>() { CreateT(1), CreateT(2), CreateT(3), CreateT(4), CreateT(5), CreateT(6) };
 
-            var set = new HashSet<HashSet<T>>()
+            var set = new SegmentedHashSet<SegmentedHashSet<T>>()
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
-            var noComparerSet = new HashSet<HashSet<T>>()
+            var noComparerSet = new SegmentedHashSet<SegmentedHashSet<T>>()
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
-            var comparerSet = new HashSet<HashSet<T>>(HashSet<T>.CreateSetComparer())
+            var comparerSet = new SegmentedHashSet<SegmentedHashSet<T>>(SegmentedHashSet<T>.CreateSetComparer())
             {
-                new HashSet<T> { objects[0], objects[1], objects[2] },
-                new HashSet<T> { objects[3], objects[4], objects[5] }
+                new SegmentedHashSet<T> { objects[0], objects[1], objects[2] },
+                new SegmentedHashSet<T> { objects[3], objects[4], objects[5] }
             };
 
             Assert.False(noComparerSet.SequenceEqual(set));
-            Assert.True(noComparerSet.SequenceEqual(set, HashSet<T>.CreateSetComparer()));
+            Assert.True(noComparerSet.SequenceEqual(set, SegmentedHashSet<T>.CreateSetComparer()));
             Assert.False(comparerSet.SequenceEqual(set));
         }
 
@@ -351,7 +354,7 @@ public void SetComparer_SequenceEqualTests()
         [Fact]
         public void CanBeCastedToISet()
         {
-            HashSet<T> set = new HashSet<T>();
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>();
             ISet<T> iset = (set as ISet<T>);
             Assert.NotNull(iset);
         }
@@ -360,7 +363,7 @@ public void CanBeCastedToISet()
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_Constructor_int(int capacity)
         {
-            HashSet<T> set = new HashSet<T>(capacity);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(capacity);
             Assert.Equal(0, set.Count);
         }
 
@@ -368,7 +371,7 @@ public void HashSet_Generic_Constructor_int(int capacity)
         [MemberData(nameof(ValidCollectionSizes))]
         public void HashSet_Generic_Constructor_int_AddUpToAndBeyondCapacity(int capacity)
         {
-            HashSet<T> set = new HashSet<T>(capacity);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(capacity);
 
             AddToCollection(set, capacity);
             Assert.Equal(capacity, set.Count);
@@ -382,7 +385,7 @@ public void HashSet_Generic_Constructor_Capacity_ToNextPrimeNumber()
         {
             // Highest pre-computed number + 1.
             const int Capacity = 7199370;
-            var set = new HashSet<T>(Capacity);
+            var set = new SegmentedHashSet<T>(Capacity);
 
             // Assert that the HashTable's capacity is set to the descendant prime number of the given one.
             const int NextPrime = 7199371;
@@ -392,8 +395,8 @@ public void HashSet_Generic_Constructor_Capacity_ToNextPrimeNumber()
         [Fact]
         public void HashSet_Generic_Constructor_int_Negative_ThrowsArgumentOutOfRangeException()
         {
-            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(-1));
-            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(int.MinValue));
+            Assert.Throws<ArgumentOutOfRangeException>("capacity", () => new SegmentedHashSet<T>(-1));
+            Assert.Throws<ArgumentOutOfRangeException>("capacity", () => new SegmentedHashSet<T>(int.MinValue));
         }
 
         [Theory]
@@ -401,7 +404,7 @@ public void HashSet_Generic_Constructor_int_Negative_ThrowsArgumentOutOfRangeExc
         public void HashSet_Generic_Constructor_int_IEqualityComparer(int capacity)
         {
             IEqualityComparer<T> comparer = GetIEqualityComparer();
-            HashSet<T> set = new HashSet<T>(capacity, comparer);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(capacity, comparer);
             Assert.Equal(0, set.Count);
             if (comparer == null)
                 Assert.Equal(EqualityComparer<T>.Default, set.Comparer);
@@ -414,7 +417,7 @@ public void HashSet_Generic_Constructor_int_IEqualityComparer(int capacity)
         public void HashSet_Generic_Constructor_int_IEqualityComparer_AddUpToAndBeyondCapacity(int capacity)
         {
             IEqualityComparer<T> comparer = GetIEqualityComparer();
-            HashSet<T> set = new HashSet<T>(capacity, comparer);
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(capacity, comparer);
 
             AddToCollection(set, capacity);
             Assert.Equal(capacity, set.Count);
@@ -427,8 +430,8 @@ public void HashSet_Generic_Constructor_int_IEqualityComparer_AddUpToAndBeyondCa
         public void HashSet_Generic_Constructor_int_IEqualityComparer_Negative_ThrowsArgumentOutOfRangeException()
         {
             IEqualityComparer<T> comparer = GetIEqualityComparer();
-            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(-1, comparer));
-            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => new HashSet<T>(int.MinValue, comparer));
+            Assert.Throws<ArgumentOutOfRangeException>("capacity", () => new SegmentedHashSet<T>(-1, comparer));
+            Assert.Throws<ArgumentOutOfRangeException>("capacity", () => new SegmentedHashSet<T>(int.MinValue, comparer));
         }
 
         #region TryGetValue
@@ -437,14 +440,13 @@ public void HashSet_Generic_Constructor_int_IEqualityComparer_Negative_ThrowsArg
         public void HashSet_Generic_TryGetValue_Contains()
         {
             T value = CreateT(1);
-            HashSet<T> set = new HashSet<T> { value };
+            SegmentedHashSet<T> set = new SegmentedHashSet<T> { value };
             T equalValue = CreateT(1);
-            T actualValue;
-            Assert.True(set.TryGetValue(equalValue, out actualValue));
+            Assert.True(set.TryGetValue(equalValue, out T? actualValue));
             Assert.Equal(value, actualValue);
             if (!typeof(T).IsValueType)
             {
-                Assert.Same((object)value, (object)actualValue);
+                Assert.Same((object)value, (object?)actualValue);
             }
         }
 
@@ -452,14 +454,16 @@ public void HashSet_Generic_TryGetValue_Contains()
         public void HashSet_Generic_TryGetValue_Contains_OverwriteOutputParam()
         {
             T value = CreateT(1);
-            HashSet<T> set = new HashSet<T> { value };
+            SegmentedHashSet<T> set = new SegmentedHashSet<T> { value };
             T equalValue = CreateT(1);
-            T actualValue = CreateT(2);
+#pragma warning disable IDE0059 // Unnecessary assignment of a value (intentional for the test)
+            T? actualValue = CreateT(2);
+#pragma warning restore IDE0059 // Unnecessary assignment of a value
             Assert.True(set.TryGetValue(equalValue, out actualValue));
             Assert.Equal(value, actualValue);
             if (!typeof(T).IsValueType)
             {
-                Assert.Same((object)value, (object)actualValue);
+                Assert.Same((object)value, (object?)actualValue);
             }
         }
 
@@ -467,10 +471,9 @@ public void HashSet_Generic_TryGetValue_Contains_OverwriteOutputParam()
         public void HashSet_Generic_TryGetValue_NotContains()
         {
             T value = CreateT(1);
-            HashSet<T> set = new HashSet<T> { value };
+            SegmentedHashSet<T> set = new SegmentedHashSet<T> { value };
             T equalValue = CreateT(2);
-            T actualValue;
-            Assert.False(set.TryGetValue(equalValue, out actualValue));
+            Assert.False(set.TryGetValue(equalValue, out T? actualValue));
             Assert.Equal(default(T), actualValue);
         }
 
@@ -478,9 +481,11 @@ public void HashSet_Generic_TryGetValue_NotContains()
         public void HashSet_Generic_TryGetValue_NotContains_OverwriteOutputParam()
         {
             T value = CreateT(1);
-            HashSet<T> set = new HashSet<T> { value };
+            SegmentedHashSet<T> set = new SegmentedHashSet<T> { value };
             T equalValue = CreateT(2);
-            T actualValue = equalValue;
+#pragma warning disable IDE0059 // Unnecessary assignment of a value (intentional for the test)
+            T? actualValue = equalValue;
+#pragma warning restore IDE0059 // Unnecessary assignment of a value
             Assert.False(set.TryGetValue(equalValue, out actualValue));
             Assert.Equal(default(T), actualValue);
         }
@@ -493,7 +498,7 @@ public void HashSet_Generic_TryGetValue_NotContains_OverwriteOutputParam()
         [MemberData(nameof(ValidCollectionSizes))]
         public void EnsureCapacity_Generic_RequestingLargerCapacity_DoesNotInvalidateEnumeration(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)(GenericISetFactory(setLength));
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)(GenericISetFactory(setLength));
             var capacity = set.EnsureCapacity(0);
             IEnumerator valuesEnum = set.GetEnumerator();
             IEnumerator valuesListEnum = new List<T>(set).GetEnumerator();
@@ -510,14 +515,14 @@ public void EnsureCapacity_Generic_RequestingLargerCapacity_DoesNotInvalidateEnu
         [Fact]
         public void EnsureCapacity_Generic_NegativeCapacityRequested_Throws()
         {
-            var set = new HashSet<T>();
-            AssertExtensions.Throws<ArgumentOutOfRangeException>("capacity", () => set.EnsureCapacity(-1));
+            var set = new SegmentedHashSet<T>();
+            Assert.Throws<ArgumentOutOfRangeException>("capacity", () => set.EnsureCapacity(-1));
         }
 
         [Fact]
         public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedZero_ReturnsZero()
         {
-            var set = new HashSet<T>();
+            var set = new SegmentedHashSet<T>();
             Assert.Equal(0, set.EnsureCapacity(0));
         }
 
@@ -528,7 +533,7 @@ public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedZero_ReturnsZe
         [InlineData(4)]
         public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedNonZero_CapacityIsSetToAtLeastTheRequested(int requestedCapacity)
         {
-            var set = new HashSet<T>();
+            var set = new SegmentedHashSet<T>();
             Assert.InRange(set.EnsureCapacity(requestedCapacity), requestedCapacity, int.MaxValue);
         }
 
@@ -537,12 +542,12 @@ public void EnsureCapacity_Generic_HashsetNotInitialized_RequestedNonZero_Capaci
         [InlineData(7)]
         public void EnsureCapacity_Generic_RequestedCapacitySmallerThanCurrent_CapacityUnchanged(int currentCapacity)
         {
-            HashSet<T> set;
+            SegmentedHashSet<T> set;
 
             // assert capacity remains the same when ensuring a capacity smaller or equal than existing
             for (int i = 0; i <= currentCapacity; i++)
             {
-                set = new HashSet<T>(currentCapacity);
+                set = new SegmentedHashSet<T>(currentCapacity);
                 Assert.Equal(currentCapacity, set.EnsureCapacity(i));
             }
         }
@@ -552,10 +557,10 @@ public void EnsureCapacity_Generic_RequestedCapacitySmallerThanCurrent_CapacityU
         [InlineData(89)]
         public void EnsureCapacity_Generic_ExistingCapacityRequested_SameValueReturned(int capacity)
         {
-            var set = new HashSet<T>(capacity);
+            var set = new SegmentedHashSet<T>(capacity);
             Assert.Equal(capacity, set.EnsureCapacity(capacity));
 
-            set = (HashSet<T>)GenericISetFactory(capacity);
+            set = (SegmentedHashSet<T>)GenericISetFactory(capacity);
             Assert.Equal(capacity, set.EnsureCapacity(capacity));
         }
 
@@ -567,15 +572,15 @@ public void EnsureCapacity_Generic_ExistingCapacityRequested_SameValueReturned(i
         [InlineData(4)]
         public void EnsureCapacity_Generic_EnsureCapacityCalledTwice_ReturnsSameValue(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             int capacity = set.EnsureCapacity(0);
             Assert.Equal(capacity, set.EnsureCapacity(0));
 
-            set = (HashSet<T>)GenericISetFactory(setLength);
+            set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             capacity = set.EnsureCapacity(setLength);
             Assert.Equal(capacity, set.EnsureCapacity(setLength));
 
-            set = (HashSet<T>)GenericISetFactory(setLength);
+            set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             capacity = set.EnsureCapacity(setLength + 1);
             Assert.Equal(capacity, set.EnsureCapacity(setLength + 1));
         }
@@ -587,7 +592,7 @@ public void EnsureCapacity_Generic_EnsureCapacityCalledTwice_ReturnsSameValue(in
         [InlineData(8)]
         public void EnsureCapacity_Generic_HashsetNotEmpty_RequestedSmallerThanCount_ReturnsAtLeastSizeOfCount(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
             Assert.InRange(set.EnsureCapacity(setLength - 1), setLength, int.MaxValue);
         }
 
@@ -596,7 +601,7 @@ public void EnsureCapacity_Generic_HashsetNotEmpty_RequestedSmallerThanCount_Ret
         [InlineData(20)]
         public void EnsureCapacity_Generic_HashsetNotEmpty_SetsToAtLeastTheRequested(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
 
             // get current capacity
             int currentCapacity = set.EnsureCapacity(0);
@@ -609,13 +614,13 @@ public void EnsureCapacity_Generic_HashsetNotEmpty_SetsToAtLeastTheRequested(int
         [Fact]
         public void EnsureCapacity_Generic_CapacityIsSetToPrimeNumberLargerOrEqualToRequested()
         {
-            var set = new HashSet<T>();
+            var set = new SegmentedHashSet<T>();
             Assert.Equal(17, set.EnsureCapacity(17));
 
-            set = new HashSet<T>();
+            set = new SegmentedHashSet<T>();
             Assert.Equal(17, set.EnsureCapacity(15));
 
-            set = new HashSet<T>();
+            set = new SegmentedHashSet<T>();
             Assert.Equal(17, set.EnsureCapacity(13));
         }
 
@@ -624,7 +629,7 @@ public void EnsureCapacity_Generic_CapacityIsSetToPrimeNumberLargerOrEqualToRequ
         [InlineData(10)]
         public void EnsureCapacity_Generic_GrowCapacityWithFreeList(int setLength)
         {
-            HashSet<T> set = (HashSet<T>)GenericISetFactory(setLength);
+            SegmentedHashSet<T> set = (SegmentedHashSet<T>)GenericISetFactory(setLength);
 
             // Remove the first element to ensure we have a free list.
             Assert.True(set.Remove(set.ElementAt(0)));
@@ -645,7 +650,7 @@ public void EnsureCapacity_Generic_GrowCapacityWithFreeList(int setLength)
         public void Remove_NonDefaultComparer_ComparerUsed(int capacity)
         {
             var c = new TrackingEqualityComparer<T>();
-            var set = new HashSet<T>(capacity, c);
+            var set = new SegmentedHashSet<T>(capacity, c);
 
             AddToCollection(set, capacity);
             T first = set.First();
@@ -661,57 +666,5 @@ public void Remove_NonDefaultComparer_ComparerUsed(int capacity)
         }
 
         #endregion
-
-        #region Serialization
-
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
-        public void ComparerSerialization()
-        {
-            // Strings switch between randomized and non-randomized comparers,
-            // however this should never be observable externally.
-            TestComparerSerialization(EqualityComparer<string>.Default);
-
-            // OrdinalCaseSensitiveComparer is internal and (de)serializes as OrdinalComparer
-            TestComparerSerialization(StringComparer.Ordinal, "System.OrdinalComparer");
-
-            // OrdinalIgnoreCaseComparer is internal and (de)serializes as OrdinalComparer
-            TestComparerSerialization(StringComparer.OrdinalIgnoreCase, "System.OrdinalComparer");
-            TestComparerSerialization(StringComparer.CurrentCulture);
-            TestComparerSerialization(StringComparer.CurrentCultureIgnoreCase);
-            TestComparerSerialization(StringComparer.InvariantCulture);
-            TestComparerSerialization(StringComparer.InvariantCultureIgnoreCase);
-
-            // Check other types while here, IEquatable valuetype, nullable valuetype, and non IEquatable object
-            TestComparerSerialization(EqualityComparer<int>.Default);
-            TestComparerSerialization(EqualityComparer<int?>.Default);
-            TestComparerSerialization(EqualityComparer<object>.Default);
-
-            static void TestComparerSerialization<TCompared>(IEqualityComparer<TCompared> equalityComparer, string internalTypeName = null)
-            {
-                var bf = new BinaryFormatter();
-                var s = new MemoryStream();
-
-                var dict = new HashSet<TCompared>(equalityComparer);
-
-                Assert.Same(equalityComparer, dict.Comparer);
-
-                bf.Serialize(s, dict);
-                s.Position = 0;
-                dict = (HashSet<TCompared>)bf.Deserialize(s);
-
-                if (internalTypeName == null)
-                {
-                    Assert.IsType(equalityComparer.GetType(), dict.Comparer);
-                }
-                else
-                {
-                    Assert.Equal(internalTypeName, dict.Comparer.GetType().ToString());
-                }
-
-                Assert.True(equalityComparer.Equals(dict.Comparer));
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
index 54dbae1fbd74d..0eb9c23b473a9 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/SegmentedHashSet_IEnumerable_NonGeneric_Tests.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/System.Collections/tests/Generic/HashSet/HashSet.Generic.Tests.AsNonGenericIEnumerable.cs
@@ -7,15 +8,18 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Collections;
 
-namespace System.Collections.Tests
+namespace Microsoft.CodeAnalysis.UnitTests.Collections
 {
-    public class HashSet_IEnumerable_NonGeneric_Tests : IEnumerable_NonGeneric_Tests
+    public class SegmentedHashSet_IEnumerable_NonGeneric_Tests : IEnumerable_NonGeneric_Tests
     {
         protected override IEnumerable NonGenericIEnumerableFactory(int count)
         {
-            var set = new HashSet<string>();
+            var set = new SegmentedHashSet<string>();
             int seed = 12354;
             while (set.Count < count)
                 set.Add(CreateT(set, seed++));
@@ -24,9 +28,9 @@ protected override IEnumerable NonGenericIEnumerableFactory(int count)
 
         protected override bool Enumerator_Current_UndefinedOperation_Throws => true;
 
-        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorThrows : (base.ModifyEnumeratorAllowed & ~ModifyOperation.Remove);
+        protected override ModifyOperation ModifyEnumeratorThrows => base.ModifyEnumeratorAllowed & ~ModifyOperation.Remove;
 
-        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Overwrite | ModifyOperation.Remove;
+        protected override ModifyOperation ModifyEnumeratorAllowed => ModifyOperation.Overwrite | ModifyOperation.Remove;
 
         /// <summary>
         /// Returns a set of ModifyEnumerable delegates that modify the enumerable passed to them.
@@ -37,7 +41,7 @@ protected override IEnumerable<ModifyEnumerable> GetModifyEnumerables(ModifyOper
             {
                 yield return (IEnumerable enumerable) =>
                 {
-                    HashSet<string> casted = ((HashSet<string>)enumerable);
+                    SegmentedHashSet<string> casted = ((SegmentedHashSet<string>)enumerable);
                     if (casted.Count > 0)
                     {
                         casted.Clear();
@@ -48,7 +52,7 @@ protected override IEnumerable<ModifyEnumerable> GetModifyEnumerables(ModifyOper
             }
         }
 
-        protected string CreateT(HashSet<string> set, int seed)
+        private protected static string CreateT(SegmentedHashSet<string> set, int seed)
         {
             int stringLength = seed % 10 + 5;
             Random rand = new Random(seed);
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
index 8ce466ee32b35..0df05d92e5ab0 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/TestingTypes.cs
@@ -1,5 +1,6 @@
 // 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/runtime/blob/v5.0.7/src/libraries/Common/tests/System/Collections/TestingTypes.cs
@@ -7,9 +8,13 @@
 // See the commentary in https://github.com/dotnet/roslyn/pull/50156 for notes on incorporating changes made to the
 // reference implementation.
 
+#pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T>
+
+using System;
+using System.Collections;
 using System.Collections.Generic;
 
-namespace System.Collections.Tests
+namespace Microsoft.CodeAnalysis.UnitTests.Collections
 {
     #region Comparers and Equatables
 
@@ -27,7 +32,7 @@ public int GetHashCode(int obj)
             return obj % 2;
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj is BadIntEqualityComparer; // Equal to all other instances of this type, not to anything else.
         }
@@ -39,34 +44,36 @@ public override int GetHashCode()
     }
 
     [Serializable]
-    public class EquatableBackwardsOrder : IEquatable<EquatableBackwardsOrder>, IComparable<EquatableBackwardsOrder>, IComparable
+    public class EquatableBackwardsOrder : IEquatable<EquatableBackwardsOrder?>, IComparable<EquatableBackwardsOrder>, IComparable
     {
-        private int _value;
+        private readonly int _value;
 
         public EquatableBackwardsOrder(int value)
         {
             _value = value;
         }
 
-        public int CompareTo(EquatableBackwardsOrder other) //backwards from the usual integer ordering
+        public int CompareTo(EquatableBackwardsOrder? other) //backwards from the usual integer ordering
         {
+            if (other is null)
+                return -1;
+
             return other._value - _value;
         }
 
         public override int GetHashCode() => _value;
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
-            EquatableBackwardsOrder other = obj as EquatableBackwardsOrder;
-            return other != null && Equals(other);
+            return obj is EquatableBackwardsOrder other && Equals(other);
         }
 
-        public bool Equals(EquatableBackwardsOrder other)
+        public bool Equals(EquatableBackwardsOrder? other)
         {
-            return _value == other._value;
+            return _value == other?._value;
         }
 
-        int IComparable.CompareTo(object obj)
+        int IComparable.CompareTo(object? obj)
         {
             if (obj != null && obj.GetType() == typeof(EquatableBackwardsOrder))
                 return ((EquatableBackwardsOrder)obj)._value - _value;
@@ -115,7 +122,7 @@ public int GetHashCode(int obj)
     [Serializable]
     public class Comparer_ModOfInt : IEqualityComparer<int>, IComparer<int>
     {
-        private int _mod;
+        private readonly int _mod;
 
         public Comparer_ModOfInt(int mod)
         {
@@ -185,25 +192,25 @@ public int CompareTo(SimpleInt other)
             return other.Val - _val;
         }
 
-        public int CompareTo(object obj)
+        public int CompareTo(object? obj)
         {
-            if (obj.GetType() == typeof(SimpleInt))
+            if (obj?.GetType() == typeof(SimpleInt))
             {
                 return ((SimpleInt)obj).Val - _val;
             }
             return -1;
         }
 
-        public int CompareTo(object other, IComparer comparer)
+        public int CompareTo(object? other, IComparer comparer)
         {
-            if (other.GetType() == typeof(SimpleInt))
+            if (other?.GetType() == typeof(SimpleInt))
                 return ((SimpleInt)other).Val - _val;
             return -1;
         }
 
-        public bool Equals(object other, IEqualityComparer comparer)
+        public bool Equals(object? other, IEqualityComparer comparer)
         {
-            if (other.GetType() == typeof(SimpleInt))
+            if (other?.GetType() == typeof(SimpleInt))
                 return ((SimpleInt)other).Val == _val;
             return false;
         }
@@ -261,7 +268,7 @@ public GenericComparable(int value)
             _value = value;
         }
 
-        public int CompareTo(GenericComparable other) => _value.CompareTo(other._value);
+        public int CompareTo(GenericComparable? other) => _value.CompareTo(other?._value);
     }
 
     public class NonGenericComparable : IComparable
@@ -273,15 +280,15 @@ public NonGenericComparable(int value)
             _inner = new GenericComparable(value);
         }
 
-        public int CompareTo(object other) =>
-            _inner.CompareTo(((NonGenericComparable)other)._inner);
+        public int CompareTo(object? other) =>
+            _inner.CompareTo(((NonGenericComparable?)other)?._inner);
     }
 
     public class BadlyBehavingComparable : IComparable<BadlyBehavingComparable>, IComparable
     {
-        public int CompareTo(BadlyBehavingComparable other) => 1;
+        public int CompareTo(BadlyBehavingComparable? other) => 1;
 
-        public int CompareTo(object other) => -1;
+        public int CompareTo(object? other) => -1;
     }
 
     public class MutatingComparable : IComparable<MutatingComparable>, IComparable
@@ -295,9 +302,9 @@ public MutatingComparable(int initialState)
 
         public int State => _state;
 
-        public int CompareTo(object other) => _state++;
+        public int CompareTo(object? other) => _state++;
 
-        public int CompareTo(MutatingComparable other) => _state++;
+        public int CompareTo(MutatingComparable? other) => _state++;
     }
 
     public static class ValueComparable
@@ -334,7 +341,7 @@ public Equatable(int value)
         // Equals(object) is not implemented on purpose.
         // EqualityComparer is only supposed to call through to the strongly-typed Equals since we implement IEquatable.
 
-        public bool Equals(Equatable other)
+        public bool Equals(Equatable? other)
         {
             return other != null && Value == other.Value;
         }
@@ -359,9 +366,9 @@ public DelegateEquatable()
             EqualsWorker = _ => false;
         }
 
-        public Func<DelegateEquatable, bool> EqualsWorker { get; set; }
+        public Func<DelegateEquatable?, bool> EqualsWorker { get; set; }
 
-        public bool Equals(DelegateEquatable other) => EqualsWorker(other);
+        public bool Equals(DelegateEquatable? other) => EqualsWorker(other);
     }
 
     public struct ValueDelegateEquatable : IEquatable<ValueDelegateEquatable>
@@ -373,10 +380,10 @@ public struct ValueDelegateEquatable : IEquatable<ValueDelegateEquatable>
 
     public sealed class TrackingEqualityComparer<T> : IEqualityComparer<T>
     {
-        public int EqualsCalls;
-        public int GetHashCodeCalls;
+        public int EqualsCalls { get; set; }
+        public int GetHashCodeCalls { get; set; }
 
-        public bool Equals(T x, T y)
+        public bool Equals(T? x, T? y)
         {
             EqualsCalls++;
             return EqualityComparer<T>.Default.Equals(x, y);
@@ -385,7 +392,7 @@ public bool Equals(T x, T y)
         public int GetHashCode(T obj)
         {
             GetHashCodeCalls++;
-            return EqualityComparer<T>.Default.GetHashCode(obj);
+            return EqualityComparer<T>.Default.GetHashCode(obj!);
         }
     }
 
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.Generic.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.Generic.cs
index 191ebdf4b9121..9dd55bb59224e 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.Generic.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.Generic.cs
@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.CodeAnalysis.Collections;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.Collections
@@ -99,9 +100,9 @@ protected IEnumerable<T> CreateEnumerable(EnumerableType type, IEnumerable<T>? e
 
             switch (type)
             {
-                case EnumerableType.HashSet:
+                case EnumerableType.SegmentedHashSet:
                     Debug.Assert(numberOfDuplicateElements == 0, "Can not create a HashSet with duplicate elements - numberOfDuplicateElements must be zero");
-                    return CreateHashSet(enumerableToMatchTo, count, numberOfMatchingElements);
+                    return CreateSegmentedHashSet(enumerableToMatchTo, count, numberOfMatchingElements);
                 case EnumerableType.List:
                     return CreateList(enumerableToMatchTo, count, numberOfMatchingElements, numberOfDuplicateElements);
                 case EnumerableType.SortedSet:
@@ -221,16 +222,16 @@ protected IEnumerable<T> CreateList(IEnumerable<T>? enumerableToMatchTo, int cou
         /// to it until it is full. It will begin by adding the desired number of matching,
         /// followed by random (deterministic) elements until the desired count is reached.
         /// </summary>
-        protected IEnumerable<T> CreateHashSet(IEnumerable<T>? enumerableToMatchTo, int count, int numberOfMatchingElements)
+        protected IEnumerable<T> CreateSegmentedHashSet(IEnumerable<T>? enumerableToMatchTo, int count, int numberOfMatchingElements)
         {
-            HashSet<T> set = new HashSet<T>(GetIEqualityComparer());
+            SegmentedHashSet<T> set = new SegmentedHashSet<T>(GetIEqualityComparer());
             int seed = 528;
-            List<T>? match = null;
+            SegmentedList<T>? match = null;
 
             // Add Matching elements
             if (enumerableToMatchTo != null)
             {
-                match = enumerableToMatchTo.ToList();
+                match = enumerableToMatchTo.ToSegmentedList();
                 for (int i = 0; i < numberOfMatchingElements; i++)
                     set.Add(match[i]);
             }
diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.NonGeneric.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.NonGeneric.cs
index c7d92adbb7006..eb71b35efed54 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.NonGeneric.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Collections/List/TestBase.NonGeneric.cs
@@ -35,7 +35,7 @@ public static IEnumerable<object[]> ValidPositiveCollectionSizes()
 
         public enum EnumerableType
         {
-            HashSet,
+            SegmentedHashSet,
             SortedSet,
             List,
             Queue,

From b5d0f66bfb64079e1990d6e255bc2e99eeb61c51 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 24 Nov 2021 13:44:19 +0000
Subject: [PATCH 013/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211123.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21573.3
---
 eng/Version.Details.xml            |  8 ++++----
 eng/common/build.sh                |  4 ----
 eng/common/native/init-compiler.sh |  2 +-
 eng/common/sdk-task.ps1            |  3 ---
 eng/common/templates/job/job.yml   |  1 +
 eng/common/tools.ps1               | 21 ---------------------
 eng/common/tools.sh                |  7 -------
 global.json                        |  4 ++--
 8 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f6ddaaf08536..33edf83e68f7c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21569.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
+      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/build.sh b/eng/common/build.sh
index bc07a1c684824..55b298f16ccd1 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,10 +187,6 @@ function InitializeCustomToolset {
 }
 
 function Build {
-
-  if [[ "$ci" == true ]]; then
-    TryLogClientIpAddress
-  fi
   InitializeToolset
   InitializeCustomToolset
 
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 8c944f30b2864..03a996062a796 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then
 fi
 
 if [[ "$compiler" == "clang" ]]; then
-    if command -v "lld$desired_version" > /dev/null; then
+    if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
         # Only lld version >= 9 can be considered stable
         if [[ "$majorVersion" -ge 9 ]]; then
             LDFLAGS="-fuse-ld=lld"
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 7ab9baac5c8d9..b1bca63ab1d82 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -83,9 +83,6 @@ try {
   }
 
   if ($restore) {
-    if ($ci) {
-      Try-LogClientIpAddress
-    }
     Build 'Restore'
   }
 
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 37dceb1bab0a9..7678b94ce740c 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -114,6 +114,7 @@ jobs:
         continueOnError: ${{ parameters.continueOnError }}
         condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
     - task: NuGetAuthenticate@0
 
   - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 90b1f9fdcdb19..f1e1cb53953bc 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   # Disable telemetry on CI.
   if ($ci) {
     $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
- 
-    # In case of network error, try to log the current IP for reference
-    Try-LogClientIpAddress
   }
 
   # Source Build uses DotNetCoreSdkDir variable
@@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
   }
 }
 
-function Try-LogClientIpAddress()
-{
-    Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
-    try
-    {
-        $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
-        $lines = $result.Content.Split([Environment]::NewLine) 
-        $socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
-        Write-Host $socketIp
-        $clientIp = $lines | Select-String -Pattern "^Client IP:.*"
-        Write-Host $clientIp
-    }
-    catch
-    {
-        Write-Host "Unable to get this machine's effective IP address for logging: $_"
-    }
-}
-
 #
 # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
 #
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index dd7030ff5385e..e555c34269f6e 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -405,13 +405,6 @@ function StopProcesses {
   return 0
 }
 
-function TryLogClientIpAddress () {
-  echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
-  if command -v curl > /dev/null; then
-    curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
-  fi
-}
-
 function MSBuild {
   local args=$@
   if [[ "$pipelines_log" == true ]]; then
diff --git a/global.json b/global.json
index 7534a89b9c1dd..135e0e2d654df 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
   }
 }

From 2bcbcc89fd8e0846367d866fa29eb941552ac847 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 25 Nov 2021 13:38:42 +0000
Subject: [PATCH 014/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211124.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21574.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 33edf83e68f7c..79ef472afcdfd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21574.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
+      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21574.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
+      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 135e0e2d654df..b44bb1037b63a 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3"
   }
 }

From 9693ec52d055eaeab54d5b4ce3f576407fe1a25d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 26 Nov 2021 13:39:31 +0000
Subject: [PATCH 015/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211126.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21576.2
---
 eng/Version.Details.xml            |  8 ++++----
 eng/common/native/init-compiler.sh | 10 ++++------
 global.json                        |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 79ef472afcdfd..43ebf703ba45b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21574.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21574.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 03a996062a796..fd1d080e20435 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then
     exit 1
 fi
 
-if [[ "$compiler" == "clang" ]]; then
-    if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
-        # Only lld version >= 9 can be considered stable
-        if [[ "$majorVersion" -ge 9 ]]; then
-            LDFLAGS="-fuse-ld=lld"
-        fi
+# Only lld version >= 9 can be considered stable
+if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
+    if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then
+        LDFLAGS="-fuse-ld=lld"
     fi
 fi
 
diff --git a/global.json b/global.json
index b44bb1037b63a..813759b425f87 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2"
   }
 }

From 215717961285fba8c3a7019811dc2c8dec9f5436 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 27 Nov 2021 13:35:18 +0000
Subject: [PATCH 016/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211126.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21576.4
---
 eng/Version.Details.xml            | 8 ++++----
 eng/common/native/init-compiler.sh | 3 ++-
 global.json                        | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 43ebf703ba45b..3240b55a86132 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
+      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
+      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index fd1d080e20435..e361e03fabdd2 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -2,6 +2,7 @@
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
+# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! 
 
 if [[ "$#" -lt 3 ]]; then
   echo "Usage..."
@@ -113,7 +114,7 @@ fi
 
 # Only lld version >= 9 can be considered stable
 if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
-    if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then
+    if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
         LDFLAGS="-fuse-ld=lld"
     fi
 fi
diff --git a/global.json b/global.json
index 813759b425f87..3960ed57eddd5 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
   }
 }

From 524a44d57ab8c118abdae528c20df0c8010ceb82 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 3 Dec 2021 13:40:16 +0000
Subject: [PATCH 017/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211202.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21602.3
---
 eng/Version.Details.xml                  | 8 ++++----
 eng/common/sdl/packages.config           | 2 +-
 eng/common/templates/job/execute-sdl.yml | 2 +-
 eng/common/tools.sh                      | 2 +-
 global.json                              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3240b55a86132..9cfdd7f035ebe 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21602.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>59775387deb609d7c62f9e713d133c34ba28ffcd</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21602.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+      <Sha>59775387deb609d7c62f9e713d133c34ba28ffcd</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd721..4585cfd6bba1e 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 3aafc82e4171a..8128f2c357052 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -54,7 +54,7 @@ jobs:
     # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
     # sync with the packages.config file.
     - name: DefaultGuardianVersion
-      value: 0.53.3
+      value: 0.109.0
     - name: GuardianVersion
       value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
     - name: GuardianPackagesConfigFile
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index e555c34269f6e..17f0a365805d5 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -178,7 +178,7 @@ function InstallDotNetSdk {
   if [[ $# -ge 3 ]]; then
     architecture=$3
   fi
-  InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
+  InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
 }
 
 function InstallDotNet {
diff --git a/global.json b/global.json
index 3960ed57eddd5..f74139efc66b9 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3"
   }
 }

From d4f6be4772a2e260daf82de8ce476ddb0c1f5002 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 4 Dec 2021 13:44:56 +0000
Subject: [PATCH 018/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211203.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21603.6
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9cfdd7f035ebe..2920898296228 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21602.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21603.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>59775387deb609d7c62f9e713d133c34ba28ffcd</Sha>
+      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21602.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21603.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>59775387deb609d7c62f9e713d133c34ba28ffcd</Sha>
+      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index f74139efc66b9..14aa2fe8b0e09 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6"
   }
 }

From c46aa8a690f5b12f10fe72ad81ae6aefb7f128fc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 7 Dec 2021 13:53:39 +0000
Subject: [PATCH 019/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211206.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21606.6
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2920898296228..86bf63e1e2f5e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21603.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21603.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21606.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha>
+      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 14aa2fe8b0e09..a78ea4ad4aad6 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21606.6"
   }
 }

From 98d070a790ce80cdc49dbcc0cc2932992b247d5d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 Dec 2021 13:53:13 +0000
Subject: [PATCH 020/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211208.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21608.1
---
 eng/Version.Details.xml                       |  8 +--
 eng/common/cross/armv6/sources.list.buster    |  2 +
 eng/common/cross/build-rootfs.sh              | 17 ++++-
 eng/common/templates/job/execute-sdl.yml      | 69 +++----------------
 eng/common/templates/steps/execute-sdl.yml    | 68 ++++++++++++++++++
 .../templates/variables/sdl-variables.yml     |  7 ++
 global.json                                   |  4 +-
 7 files changed, 108 insertions(+), 67 deletions(-)
 create mode 100644 eng/common/cross/armv6/sources.list.buster
 create mode 100644 eng/common/templates/steps/execute-sdl.yml
 create mode 100644 eng/common/templates/variables/sdl-variables.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 86bf63e1e2f5e..e40a6fcabb38d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21606.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21608.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
+      <Sha>200adbc809c4451973d1929a53a75502b7cada01</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21606.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21608.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5d969787afb2fd87f642458687e3ad41094ac3ab</Sha>
+      <Sha>200adbc809c4451973d1929a53a75502b7cada01</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/armv6/sources.list.buster b/eng/common/cross/armv6/sources.list.buster
new file mode 100644
index 0000000000000..f27fc4fb346b6
--- /dev/null
+++ b/eng/common/cross/armv6/sources.list.buster
@@ -0,0 +1,2 @@
+deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 6fa2c8aa5511d..5102245b7b5e3 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -99,6 +99,15 @@ while :; do
             __AlpineArch=armv7
             __QEMUArch=arm
             ;;
+        armv6)
+            __BuildArch=armv6
+            __UbuntuArch=armhf
+            __QEMUArch=arm
+            __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
+            __CodeName=buster
+            __LLDB_Package="liblldb-6.0-dev"
+            __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
+            ;;
         arm64)
             __BuildArch=arm64
             __UbuntuArch=arm64
@@ -236,6 +245,12 @@ while :; do
     shift
 done
 
+if [ -e "$__Keyring" ]; then
+    __Keyring="--keyring=$__Keyring"
+else
+    __Keyring=""
+fi
+
 if [ "$__BuildArch" == "armel" ]; then
     __LLDB_Package="lldb-3.5-dev"
 fi
@@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
     wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
     wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
 elif [[ -n $__CodeName ]]; then
-    qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
+    qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
     cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
     chroot $__RootfsDir apt-get update
     chroot $__RootfsDir apt-get -f -y install
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 8128f2c357052..8cf772b3cbf81 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -51,14 +51,9 @@ jobs:
       value: ${{ parameters.AzDOPipelineId }}
     - name: AzDOBuildId
       value: ${{ parameters.AzDOBuildId }}
-    # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
-    # sync with the packages.config file.
-    - name: DefaultGuardianVersion
-      value: 0.109.0
+    - template: /eng/common/templates/variables/sdl-variables.yml
     - name: GuardianVersion
       value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
-    - name: GuardianPackagesConfigFile
-      value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
   pool:
     vmImage: windows-2019
   steps:
@@ -125,57 +120,11 @@ jobs:
       displayName: Extract Archive Artifacts
       continueOnError: ${{ parameters.sdlContinueOnError }}
   
-  - ${{ if ne(parameters.overrideGuardianVersion, '') }}:
-    - powershell: |
-        $content = Get-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content was:`n$content"
-
-        $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
-        $content | Set-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content updated to:`n$content"
-      displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
-
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-  - task: NuGetCommand@2
-    displayName: 'Install Guardian'
-    inputs:
-      restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-      feedsToUse: config
-      nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
-      externalFeedCredentials: GuardianConnect
-      restoreDirectory: $(Build.SourcesDirectory)\.packages
-
-  - ${{ if ne(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  - ${{ if eq(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }}
-        -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
-        -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-        -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
-        ${{ parameters.additionalParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-
-  - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
-    # We want to publish the Guardian results and configuration for easy diagnosis. However, the
-    # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
-    # tooling files. Some of these files are large and aren't useful during an investigation, so
-    # exclude them by simply deleting them before publishing. (As of writing, there is no documented
-    # way to selectively exclude a dir from the pipeline artifact publish task.)
-    - task: DeleteFiles@1
-      displayName: Delete Guardian dependencies to avoid uploading
-      inputs:
-        SourceFolder: $(Agent.BuildDirectory)/.gdn
-        Contents: |
-          c
-          i
-      condition: succeededOrFailed()
-    - publish: $(Agent.BuildDirectory)/.gdn
-      artifact: GuardianConfiguration
-      displayName: Publish GuardianConfiguration
-      condition: succeededOrFailed()
+  - template: /eng/common/templates/steps/execute-sdl.yml
+    parameters:
+      overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+      executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+      overrideParameters: ${{ parameters.overrideParameters }}
+      additionalParameters: ${{ parameters.additionalParameters }}
+      publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+      sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml
new file mode 100644
index 0000000000000..7b8ee18a28d7e
--- /dev/null
+++ b/eng/common/templates/steps/execute-sdl.yml
@@ -0,0 +1,68 @@
+parameters:
+  overrideGuardianVersion: ''
+  executeAllSdlToolsScript: ''
+  overrideParameters: ''
+  additionalParameters: ''
+  publishGuardianDirectoryToPipeline: false
+  sdlContinueOnError: false
+  condition: ''
+
+steps:
+- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
+  - powershell: |
+      $content = Get-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content was:`n$content"
+
+      $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
+      $content | Set-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content updated to:`n$content"
+    displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
+
+- task: NuGetToolInstaller@1
+  displayName: 'Install NuGet.exe'
+  
+- task: NuGetCommand@2
+  displayName: 'Install Guardian'
+  inputs:
+    restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+    feedsToUse: config
+    nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
+    externalFeedCredentials: GuardianConnect
+    restoreDirectory: $(Build.SourcesDirectory)\.packages
+
+- ${{ if ne(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if eq(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }}
+      -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
+      -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
+      -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
+      ${{ parameters.additionalParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
+  # We want to publish the Guardian results and configuration for easy diagnosis. However, the
+  # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
+  # tooling files. Some of these files are large and aren't useful during an investigation, so
+  # exclude them by simply deleting them before publishing. (As of writing, there is no documented
+  # way to selectively exclude a dir from the pipeline artifact publish task.)
+  - task: DeleteFiles@1
+    displayName: Delete Guardian dependencies to avoid uploading
+    inputs:
+      SourceFolder: $(Agent.BuildDirectory)/.gdn
+      Contents: |
+        c
+        i
+    condition: succeededOrFailed()
+  - publish: $(Agent.BuildDirectory)/.gdn
+    artifact: GuardianConfiguration
+    displayName: Publish GuardianConfiguration
+    condition: succeededOrFailed()
\ No newline at end of file
diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml
new file mode 100644
index 0000000000000..dbdd66d4a4b3a
--- /dev/null
+++ b/eng/common/templates/variables/sdl-variables.yml
@@ -0,0 +1,7 @@
+variables:
+# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+# sync with the packages.config file.
+- name: DefaultGuardianVersion
+  value: 0.109.0
+- name: GuardianPackagesConfigFile
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/global.json b/global.json
index a78ea4ad4aad6..071ecc6c608bb 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21606.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21606.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21608.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21608.1"
   }
 }

From 0322eabf76f6404df01f10ee10041eec3fc613d8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Dec 2021 13:49:18 +0000
Subject: [PATCH 021/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211209.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21609.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e40a6fcabb38d..f23a3b1429404 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21608.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21609.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>200adbc809c4451973d1929a53a75502b7cada01</Sha>
+      <Sha>05a63c6bae31f97583d35f5a16e1bd8f41a1d094</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21608.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21609.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>200adbc809c4451973d1929a53a75502b7cada01</Sha>
+      <Sha>05a63c6bae31f97583d35f5a16e1bd8f41a1d094</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 071ecc6c608bb..34a8a46ea03d3 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21608.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21608.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21609.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21609.2"
   }
 }

From 0e19bb375f27b7396ddd6ad327dee4f78113f795 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 11 Dec 2021 13:44:53 +0000
Subject: [PATCH 022/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211210.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21610.4
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f23a3b1429404..5a33a1bcf5adc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21609.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21610.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>05a63c6bae31f97583d35f5a16e1bd8f41a1d094</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21609.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21610.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>05a63c6bae31f97583d35f5a16e1bd8f41a1d094</Sha>
+      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 34a8a46ea03d3..1c7d412b7817d 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21609.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21609.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21610.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21610.4"
   }
 }

From 8b74def7cb54ec648bdc955b243646a30500d7b3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 13:44:43 +0000
Subject: [PATCH 023/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211213.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21613.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5a33a1bcf5adc..02eb8c1e90083 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21610.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21613.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
+      <Sha>bcd6e007b9f53be0a7aff804d5c17ea7e179317b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21610.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21613.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>18adc5b47acce8bb03948baf578fca442d1029d4</Sha>
+      <Sha>bcd6e007b9f53be0a7aff804d5c17ea7e179317b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 1c7d412b7817d..1fbcd02737cf9 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21610.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21610.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21613.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21613.2"
   }
 }

From 79dec64b6c528f9d8ac53547a26eab7e8fa4aa87 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:42:48 +0000
Subject: [PATCH 024/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211214.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21614.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 02eb8c1e90083..00e897e15a33d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21613.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21614.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bcd6e007b9f53be0a7aff804d5c17ea7e179317b</Sha>
+      <Sha>cc0fa942bf43c2814af778868d4e7ddf21146b96</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21613.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21614.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bcd6e007b9f53be0a7aff804d5c17ea7e179317b</Sha>
+      <Sha>cc0fa942bf43c2814af778868d4e7ddf21146b96</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 1fbcd02737cf9..4a9419d56feba 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21613.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21613.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21614.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21614.1"
   }
 }

From 83203be612ac601dcc7a276a31415244a5fff9dd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Dec 2021 13:41:55 +0000
Subject: [PATCH 025/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211215.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21615.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 00e897e15a33d..043d063747f6a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21614.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21615.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cc0fa942bf43c2814af778868d4e7ddf21146b96</Sha>
+      <Sha>943d03f62955c771825dfa1f1bdeb8f853a2d7dd</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21614.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21615.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cc0fa942bf43c2814af778868d4e7ddf21146b96</Sha>
+      <Sha>943d03f62955c771825dfa1f1bdeb8f853a2d7dd</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 4a9419d56feba..fd86f0793bb3e 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21614.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21614.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21615.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21615.1"
   }
 }

From 525fcd5ace5a6687f78e464931f4baf5e37e15cc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Dec 2021 13:40:40 +0000
Subject: [PATCH 026/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211217.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21617.4
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 043d063747f6a..120cd44cb52c5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21615.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21617.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>943d03f62955c771825dfa1f1bdeb8f853a2d7dd</Sha>
+      <Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21615.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21617.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>943d03f62955c771825dfa1f1bdeb8f853a2d7dd</Sha>
+      <Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index fd86f0793bb3e..ff549c0402cf6 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21615.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21615.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21617.4"
   }
 }

From 134357994257d5df6273457d600608d7b5e4f7a4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:44:41 +0000
Subject: [PATCH 027/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211220.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21620.2
---
 eng/Version.Details.xml              | 8 ++++----
 eng/common/dotnet-install.sh         | 3 +++
 eng/common/native/CommonLibrary.psm1 | 3 ++-
 global.json                          | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 120cd44cb52c5..105bc8d60c04d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21617.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21620.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
+      <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21617.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21620.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
+      <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index fdfeea66e7d43..5c94e98632a0a 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -55,6 +55,9 @@ case $cpuname in
   aarch64)
     buildarch=arm64
     ;;
+  loongarch64)
+    buildarch=loongarch64
+    ;;
   amd64|x86_64)
     buildarch=x64
     ;;
diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1
index adf707c8fe700..ca38268c44d83 100644
--- a/eng/common/native/CommonLibrary.psm1
+++ b/eng/common/native/CommonLibrary.psm1
@@ -276,7 +276,8 @@ function Get-MachineArchitecture {
   }
   if (($ProcessorArchitecture -Eq "AMD64") -Or
       ($ProcessorArchitecture -Eq "IA64") -Or
-      ($ProcessorArchitecture -Eq "ARM64")) {
+      ($ProcessorArchitecture -Eq "ARM64") -Or
+      ($ProcessorArchitecture -Eq "LOONGARCH64")) {
     return "x64"
   }
   return "x86"
diff --git a/global.json b/global.json
index ff549c0402cf6..d66acb0b9072e 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21617.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21620.2"
   }
 }

From 18b0daf47473b5481b1b72f76a755efb1a99d55e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:42:09 +0000
Subject: [PATCH 028/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211221.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21621.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 105bc8d60c04d..4955b81ab4c56 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21620.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21621.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
+      <Sha>0cd94b1d02c03377d99f3739beb191591f6abee5</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21620.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21621.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
+      <Sha>0cd94b1d02c03377d99f3739beb191591f6abee5</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index d66acb0b9072e..02b28209e68ee 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21620.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21621.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21621.3"
   }
 }

From accc20ae4e4678c6ac23f14958815ef2a0802c9d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 23 Dec 2021 13:43:28 +0000
Subject: [PATCH 029/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211223.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21623.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4955b81ab4c56..17cc44be3501b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21621.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cd94b1d02c03377d99f3739beb191591f6abee5</Sha>
+      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21621.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cd94b1d02c03377d99f3739beb191591f6abee5</Sha>
+      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 02b28209e68ee..59c01b0b4680d 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21621.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21621.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21623.1"
   }
 }

From f0f0bfe8d8b36bc1591309be3825b5a8c68e5cc3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Dec 2021 13:42:09 +0000
Subject: [PATCH 030/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211223.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21623.2
---
 eng/Version.Details.xml                    |   8 +-
 eng/common/cross/arm/tizen-build-rootfs.sh |  35 +++++
 eng/common/cross/arm/tizen-fetch.sh        | 170 +++++++++++++++++++++
 eng/common/cross/arm/tizen/tizen.patch     |   9 ++
 eng/common/cross/build-rootfs.sh           |   4 +-
 eng/common/cross/toolchain.cmake           |  11 +-
 global.json                                |   4 +-
 7 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 eng/common/cross/arm/tizen-build-rootfs.sh
 create mode 100644 eng/common/cross/arm/tizen-fetch.sh
 create mode 100644 eng/common/cross/arm/tizen/tizen.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 17cc44be3501b..2551c405e8fa0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/arm/tizen-build-rootfs.sh b/eng/common/cross/arm/tizen-build-rootfs.sh
new file mode 100644
index 0000000000000..9fdb32e920e22
--- /dev/null
+++ b/eng/common/cross/arm/tizen-build-rootfs.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen"
+
+if [[ -z "$ROOTFS_DIR" ]]; then
+    echo "ROOTFS_DIR is not defined."
+    exit 1;
+fi
+
+TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
+mkdir -p $TIZEN_TMP_DIR
+
+# Download files
+echo ">>Start downloading files"
+VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
+echo "<<Finish downloading files"
+
+echo ">>Start constructing Tizen rootfs"
+TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
+cd $ROOTFS_DIR
+for f in $TIZEN_RPM_FILES; do
+    rpm2cpio $f  | cpio -idm --quiet
+done
+echo "<<Finish constructing Tizen rootfs"
+
+# Cleanup tmp
+rm -rf $TIZEN_TMP_DIR
+
+# Configure Tizen rootfs
+echo ">>Start configuring Tizen rootfs"
+ln -sfn asm-arm ./usr/include/asm
+patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/arm/tizen-fetch.sh b/eng/common/cross/arm/tizen-fetch.sh
new file mode 100644
index 0000000000000..eabd06c4afede
--- /dev/null
+++ b/eng/common/cross/arm/tizen-fetch.sh
@@ -0,0 +1,170 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
+	VERBOSE=0
+fi
+
+Log()
+{
+	if [ $VERBOSE -ge $1 ]; then
+		echo ${@:2}
+	fi
+}
+
+Inform()
+{
+	Log 1 -e "\x1B[0;34m$@\x1B[m"
+}
+
+Debug()
+{
+	Log 2 -e "\x1B[0;32m$@\x1B[m"
+}
+
+Error()
+{
+	>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
+}
+
+Fetch()
+{
+	URL=$1
+	FILE=$2
+	PROGRESS=$3
+	if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
+		CURL_OPT="--progress-bar"
+	else
+		CURL_OPT="--silent"
+	fi
+	curl $CURL_OPT $URL > $FILE
+}
+
+hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
+hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
+hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
+
+TMPDIR=$1
+if [ ! -d $TMPDIR ]; then
+	TMPDIR=./tizen_tmp
+	Debug "Create temporary directory : $TMPDIR"
+	mkdir -p $TMPDIR 
+fi
+
+TIZEN_URL=http://download.tizen.org/snapshots/tizen
+BUILD_XML=build.xml
+REPOMD_XML=repomd.xml
+PRIMARY_XML=primary.xml
+TARGET_URL="http://__not_initialized"
+
+Xpath_get()
+{
+	XPATH_RESULT=''
+	XPATH=$1
+	XML_FILE=$2
+	RESULT=$(xmllint --xpath $XPATH $XML_FILE)
+	if [[ -z ${RESULT// } ]]; then
+		Error "Can not find target from $XML_FILE"
+		Debug "Xpath = $XPATH"
+		exit 1
+	fi
+	XPATH_RESULT=$RESULT
+}
+
+fetch_tizen_pkgs_init()
+{
+	TARGET=$1
+	PROFILE=$2
+	Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
+
+	TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
+	if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
+	mkdir -p $TMP_PKG_DIR
+
+	PKG_URL=$TIZEN_URL/$PROFILE/latest
+
+	BUILD_XML_URL=$PKG_URL/$BUILD_XML
+	TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
+	TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
+	TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
+	TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
+
+	Fetch $BUILD_XML_URL $TMP_BUILD
+
+	Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
+
+	TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
+	Xpath_get $TARGET_XPATH $TMP_BUILD
+	TARGET_PATH=$XPATH_RESULT
+	TARGET_URL=$PKG_URL/$TARGET_PATH
+
+	REPOMD_URL=$TARGET_URL/repodata/repomd.xml
+	PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
+
+	Fetch $REPOMD_URL $TMP_REPOMD
+
+	Debug "fetch $REPOMD_URL to $TMP_REPOMD"
+
+	Xpath_get $PRIMARY_XPATH $TMP_REPOMD
+	PRIMARY_XML_PATH=$XPATH_RESULT
+	PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
+
+	Fetch $PRIMARY_URL $TMP_PRIMARYGZ
+
+	Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
+
+	gunzip $TMP_PRIMARYGZ 
+
+	Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" 
+}
+
+fetch_tizen_pkgs()
+{
+	ARCH=$1
+	PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
+
+	PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
+
+	for pkg in ${@:2}
+	do
+		Inform "Fetching... $pkg"
+		XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		PKG_PATH=$XPATH_RESULT
+
+		XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		CHECKSUM=$XPATH_RESULT
+
+		PKG_URL=$TARGET_URL/$PKG_PATH
+		PKG_FILE=$(basename $PKG_PATH)
+		PKG_PATH=$TMPDIR/$PKG_FILE
+
+		Debug "Download $PKG_URL to $PKG_PATH"
+		Fetch $PKG_URL $PKG_PATH true
+
+		echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
+		if [ $? -ne 0 ]; then
+			Error "Fail to fetch $PKG_URL to $PKG_PATH"
+			Debug "Checksum = $CHECKSUM"
+			exit 1
+		fi
+	done
+}
+
+Inform "Initialize arm base"
+fetch_tizen_pkgs_init standard base
+Inform "fetch common packages"
+fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
+Inform "fetch coreclr packages"
+fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+Inform "fetch corefx packages"
+fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
+
+Inform "Initialize standard unified"
+fetch_tizen_pkgs_init standard unified
+Inform "fetch corefx packages"
+fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
+
diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch
new file mode 100644
index 0000000000000..fb12ade7250ae
--- /dev/null
+++ b/eng/common/cross/arm/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf32-littlearm)
+-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-armhf.so.3 ) )
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 5102245b7b5e3..e94d13d62ef64 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -185,8 +185,8 @@ while :; do
             __LLDB_Package="liblldb-6.0-dev"
             ;;
         tizen)
-            if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
-                echo "Tizen is available only for armel and arm64."
+            if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
+                echo "Tizen is available only for arm, armel and arm64."
                 usage;
                 exit 1;
             fi
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 6501c3a955f78..8369ae0b431d7 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -26,6 +26,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
+  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
@@ -58,6 +61,10 @@ endif()
 
 # Specify include paths
 if(DEFINED TIZEN_TOOLCHAIN)
+  if(TARGET_ARCH_NAME STREQUAL "arm")
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
+  endif()
   if(TARGET_ARCH_NAME STREQUAL "armel")
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
@@ -150,7 +157,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "armel")
+if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel")
   if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
@@ -205,7 +212,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
 endif()
 
 if(DEFINED TIZEN_TOOLCHAIN)
-  if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
   endif()
diff --git a/global.json b/global.json
index 59c01b0b4680d..d2b1106cc4d2b 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21623.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21623.2"
   }
 }

From 8211a1d3107263976414448983f6efb2372e164c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 28 Dec 2021 13:41:59 +0000
Subject: [PATCH 031/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211227.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21627.1
---
 eng/Version.Details.xml            |  8 +++----
 eng/common/cross/toolchain.cmake   | 38 +++++++++++++++++++-----------
 eng/common/native/init-compiler.sh | 32 ++++++++++++++++++++-----
 global.json                        |  4 ++--
 4 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2551c405e8fa0..a3c9299433e91 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21627.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
+      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21627.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
+      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 8369ae0b431d7..f7878dddd3921 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
 set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
 if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
   set(CMAKE_SYSTEM_NAME FreeBSD)
+  set(FREEBSD 1)
 elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
   set(CMAKE_SYSTEM_NAME SunOS)
   set(ILLUMOS 1)
 else()
   set(CMAKE_SYSTEM_NAME Linux)
+  set(LINUX 1)
 endif()
 set(CMAKE_SYSTEM_VERSION 1)
 
+if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
+  set(TIZEN 1)
+elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
+  set(ANDROID 1)
+endif()
+
 if(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   set(TOOLCHAIN "arm-linux-gnueabi")
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
     set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm")
@@ -26,7 +34,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
     set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@@ -36,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   else()
     set(TOOLCHAIN "aarch64-linux-gnu")
   endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
     set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
@@ -45,7 +53,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   set(CMAKE_SYSTEM_PROCESSOR i686)
   set(TOOLCHAIN "i686-linux-gnu")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif (FREEBSD)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(triple "x86_64-unknown-freebsd12")
 elseif (ILLUMOS)
@@ -60,7 +68,7 @@ if(DEFINED ENV{TOOLCHAIN})
 endif()
 
 # Specify include paths
-if(DEFINED TIZEN_TOOLCHAIN)
+if(TIZEN)
   if(TARGET_ARCH_NAME STREQUAL "arm")
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
@@ -75,7 +83,7 @@ if(DEFINED TIZEN_TOOLCHAIN)
   endif()
 endif()
 
-if("$ENV{__DistroRid}" MATCHES "android.*")
+if(ANDROID)
     if(TARGET_ARCH_NAME STREQUAL "arm")
         set(ANDROID_ABI armeabi-v7a)
     elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@@ -83,7 +91,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
     endif()
 
     # extract platform number required by the NDK's toolchain
-    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
+    file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS)
+    string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}")
+    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}")
 
     set(ANDROID_TOOLCHAIN clang)
     set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
@@ -92,7 +102,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
 
     # include official NDK toolchain script
     include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif(FREEBSD)
     # we cross-compile by instructing clang
     set(CMAKE_C_COMPILER_TARGET ${triple})
     set(CMAKE_CXX_COMPILER_TARGET ${triple})
@@ -152,20 +162,20 @@ function(add_toolchain_linker_flag Flag)
   set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(LINUX)
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
+  if(TIZEN)
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+  if(TIZEN)
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
@@ -184,7 +194,7 @@ endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -211,7 +221,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
   add_compile_options(-Wno-error=unused-command-line-argument)
 endif()
 
-if(DEFINED TIZEN_TOOLCHAIN)
+if(TIZEN)
   if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index e361e03fabdd2..6d7ba15e5f2b5 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -2,25 +2,45 @@
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
-# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! 
+# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
 
 if [[ "$#" -lt 3 ]]; then
   echo "Usage..."
-  echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
+  echo "init-compiler.sh <script directory> <Architecture> <compiler>"
   echo "Specify the script directory."
   echo "Specify the target architecture."
   echo "Specify the name of compiler (clang or gcc)."
-  echo "Specify the major version of compiler."
-  echo "Specify the minor version of compiler."
   exit 1
 fi
 
 nativescriptroot="$1"
 build_arch="$2"
 compiler="$3"
+
+case "$compiler" in
+    clang*|-clang*|--clang*)
+        # clangx.y or clang-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
+            minorVersion=0;
+        fi
+        compiler=clang
+        ;;
+
+    gcc*|-gcc*|--gcc*)
+        # gccx.y or gcc-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        compiler=gcc
+        ;;
+esac
+
 cxxCompiler="$compiler++"
-majorVersion="$4"
-minorVersion="$5"
 
 . "$nativescriptroot"/../pipeline-logging-functions.sh
 
diff --git a/global.json b/global.json
index d2b1106cc4d2b..83e76770ccbeb 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21623.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21627.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21627.1"
   }
 }

From eb0ff331712989256a2d1eb540d6b639ea213965 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Dec 2021 13:42:55 +0000
Subject: [PATCH 032/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211228.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21628.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a3c9299433e91..d92109d207d90 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21627.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21628.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
+      <Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21627.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21628.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
+      <Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 83e76770ccbeb..3825534c4bf08 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21627.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21627.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21628.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21628.1"
   }
 }

From 6ccc1b31e4fbd0666d270b94e9ad01e5b4ee3cdd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:40:45 +0000
Subject: [PATCH 033/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211229.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21629.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d92109d207d90..e17c53a2abbdc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21628.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21629.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
+      <Sha>88f5cddd49bfceca1761a93d16a0a3b5c012f521</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21628.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21629.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
+      <Sha>88f5cddd49bfceca1761a93d16a0a3b5c012f521</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 3825534c4bf08..21e688ac8ef13 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21628.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21628.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21629.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21629.1"
   }
 }

From a686bec8e0607e4ee3eff1b9b359cf2173a5176f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 31 Dec 2021 13:41:12 +0000
Subject: [PATCH 034/413] Update dependencies from
 https://github.com/dotnet/arcade build 20211230.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21630.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e17c53a2abbdc..c3795f577861e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21629.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88f5cddd49bfceca1761a93d16a0a3b5c012f521</Sha>
+      <Sha>12ba11c57391a796290dd8775c74f3df26cdbc6b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21629.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88f5cddd49bfceca1761a93d16a0a3b5c012f521</Sha>
+      <Sha>12ba11c57391a796290dd8775c74f3df26cdbc6b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 21e688ac8ef13..dcf87f0f7671f 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21629.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21629.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21630.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21630.1"
   }
 }

From 7004298b2d52d51ae18c9ac3e2e822b0e7dc38f4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 13:45:17 +0000
Subject: [PATCH 035/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220103.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22053.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c3795f577861e..8903ae06c5f80 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21630.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22053.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>12ba11c57391a796290dd8775c74f3df26cdbc6b</Sha>
+      <Sha>a0f6d2432ce3d1bb30ee747bb534f477c75fd667</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21630.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22053.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>12ba11c57391a796290dd8775c74f3df26cdbc6b</Sha>
+      <Sha>a0f6d2432ce3d1bb30ee747bb534f477c75fd667</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index dcf87f0f7671f..3321e0dc9261a 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21630.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21630.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22053.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22053.2"
   }
 }

From 165ac2ea1521265d1cf1df8406d15425b31e9db2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Jan 2022 13:42:41 +0000
Subject: [PATCH 036/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220104.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22054.5
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8903ae06c5f80..64f779b238754 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22053.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22054.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a0f6d2432ce3d1bb30ee747bb534f477c75fd667</Sha>
+      <Sha>85188b0c348f3f7f8206f441ec2ee2da6dbb06fe</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22053.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22054.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a0f6d2432ce3d1bb30ee747bb534f477c75fd667</Sha>
+      <Sha>85188b0c348f3f7f8206f441ec2ee2da6dbb06fe</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 3321e0dc9261a..f967fe25f6271 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22053.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22053.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22054.5",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22054.5"
   }
 }

From 9676f12873873537d4a24841636d29643a1a4ed6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:44:26 +0000
Subject: [PATCH 037/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220106.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22056.6
---
 eng/Version.Details.xml                       |  8 +-
 eng/common/generate-graph-files.ps1           | 86 -------------------
 eng/common/sdl/configure-sdl-tool.ps1         |  9 +-
 eng/common/sdl/execute-all-sdl-tools.ps1      |  4 +-
 .../templates/job/generate-graph-files.yml    | 48 -----------
 eng/common/templates/jobs/codeql-build.yml    | 31 +++++++
 eng/common/templates/jobs/jobs.yml            | 10 ---
 eng/common/templates/steps/execute-codeql.yml | 32 +++++++
 global.json                                   |  4 +-
 9 files changed, 80 insertions(+), 152 deletions(-)
 delete mode 100644 eng/common/generate-graph-files.ps1
 delete mode 100644 eng/common/templates/job/generate-graph-files.yml
 create mode 100644 eng/common/templates/jobs/codeql-build.yml
 create mode 100644 eng/common/templates/steps/execute-codeql.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 64f779b238754..2bcf927d6ce2e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22054.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22056.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>85188b0c348f3f7f8206f441ec2ee2da6dbb06fe</Sha>
+      <Sha>34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22054.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22056.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>85188b0c348f3f7f8206f441ec2ee2da6dbb06fe</Sha>
+      <Sha>34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1
deleted file mode 100644
index 0728b1a8b570d..0000000000000
--- a/eng/common/generate-graph-files.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(
-  [Parameter(Mandatory=$true)][string] $barToken,       # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens
-  [Parameter(Mandatory=$true)][string] $gitHubPat,      # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
-  [Parameter(Mandatory=$true)][string] $azdoPat,        # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
-  [Parameter(Mandatory=$true)][string] $outputFolder,   # Where the graphviz.txt file will be created
-  [string] $darcVersion,                                # darc's version
-  [string] $graphvizVersion = '2.38',                   # GraphViz version
-  [switch] $includeToolset                              # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
-                                                        # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
-)
-
-function CheckExitCode ([string]$stage)
-{
-  $exitCode = $LASTEXITCODE
-  if ($exitCode  -ne 0) {
-    Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..."
-    ExitWithExitCode $exitCode
-  }
-}
-
-try {
-  $ErrorActionPreference = 'Stop'
-  . $PSScriptRoot\tools.ps1
-  
-  Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
-
-  Push-Location $PSScriptRoot
-
-  Write-Host 'Installing darc...'
-  . .\darc-init.ps1 -darcVersion $darcVersion
-  CheckExitCode 'Running darc-init'
-
-  $engCommonBaseDir = Join-Path $PSScriptRoot 'native\'
-  $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory
-  $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external'
-  $installBin = Join-Path $graphvizInstallDir 'bin'
-
-  Write-Host 'Installing dot...'
-  .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose
-
-  $darcExe = "$env:USERPROFILE\.dotnet\tools"
-  $darcExe = Resolve-Path "$darcExe\darc.exe"
-
-  Create-Directory $outputFolder
-
-  # Generate 3 graph descriptions:
-  # 1. Flat with coherency information
-  # 2. Graphviz (dot) file
-  # 3. Standard dependency graph
-  $graphVizFilePath = "$outputFolder\graphviz.txt"
-  $graphVizImageFilePath = "$outputFolder\graph.png"
-  $normalGraphFilePath = "$outputFolder\graph-full.txt"
-  $flatGraphFilePath = "$outputFolder\graph-flat.txt"
-  $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" )
-
-  if ($includeToolset) {
-    Write-Host 'Toolsets will be included in the graph...'
-    $baseOptions += @( '--include-toolset' )
-  }
-
-  Write-Host 'Generating standard dependency graph...'
-  & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath
-  CheckExitCode 'Generating normal dependency graph'
-
-  Write-Host 'Generating flat dependency graph and graphviz file...'
-  & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath
-  CheckExitCode 'Generating flat and graphviz dependency graph'
-
-  Write-Host "Generating graph image $graphVizFilePath"
-  $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe"
-  & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath"
-  CheckExitCode 'Generating graphviz image'
-
-  Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!"
-}
-catch {
-  if (!$includeToolset) {
-    Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow
-    Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow
-  }
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category 'Arcade' -Message $_
-  ExitWithExitCode 1
-} finally {
-  Pop-Location
-}
\ No newline at end of file
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index 8a68fc24b11b0..bdbf49e6c71de 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -15,7 +15,9 @@ Param(
   # Optional: Additional params to add to any tool using CredScan.
   [string[]] $CrScanAdditionalRunConfigParams,
   # Optional: Additional params to add to any tool using PoliCheck.
-  [string[]] $PoliCheckAdditionalRunConfigParams
+  [string[]] $PoliCheckAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using CodeQL/Semmle.
+  [string[]] $CodeQLAdditionalRunConfigParams
 )
 
 $ErrorActionPreference = 'Stop'
@@ -78,6 +80,11 @@ try {
         $tool.Args += "`"Target < $TargetDirectory`""
       }
       $tool.Args += $PoliCheckAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
+      if ($targetDirectory) {
+        $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
+      }
+      $tool.Args += $CodeQLAdditionalRunConfigParams
     }
 
     # Create variable pointing to the args array directly so we can use splat syntax later.
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index e5bef8ebd3a3b..4797e012c7d2f 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -34,6 +34,7 @@ Param(
   [string] $GuardianLoggerLevel='Standard',                                                      # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
   [string[]] $CrScanAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
   [string[]] $PoliCheckAdditionalRunConfigParams,                                                # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [string[]] $CodeQLAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
   [bool] $BreakOnFailure=$False                                                                  # Optional: Fail the build if there were errors during the run
 )
 
@@ -105,7 +106,8 @@ try {
           -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
           -GuardianLoggerLevel $GuardianLoggerLevel `
           -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
-          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
+          -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
         if ($BreakOnFailure) {
           Exit-IfNZEC "Sdl"
         }
diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml
deleted file mode 100644
index e54ce956f9088..0000000000000
--- a/eng/common/templates/job/generate-graph-files.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool: {}
-
-  # Optional: Include toolset dependencies in the generated graph files
-  includeToolset: false
-  
-jobs:
-- job: Generate_Graph_Files
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: Generate Graph Files
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-    # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-    # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat
-    - group: Publish-Build-Assets
-    - group: DotNet-AllOrgs-Darc-Pats
-    - name: _GraphArguments
-      value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) 
-        -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) 
-        -barToken $(MaestroAccessToken) 
-        -outputFolder '$(Build.StagingDirectory)/GraphFiles/'
-    - ${{ if ne(parameters.includeToolset, 'false') }}:
-      - name: _GraphArguments
-        value: ${{ variables._GraphArguments }} -includeToolset
-
-  steps:
-    - task: PowerShell@2
-      displayName: Generate Graph Files
-      inputs:
-        filePath: eng\common\generate-graph-files.ps1 
-        arguments: $(_GraphArguments)
-      continueOnError: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Graph to Artifacts
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
-        PublishLocation: Container
-        ArtifactName: GraphFiles
-      continueOnError: true
-      condition: always()      
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
new file mode 100644
index 0000000000000..f7dc5ea4aaa63
--- /dev/null
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -0,0 +1,31 @@
+parameters:
+  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+  continueOnError: false
+  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  jobs: []
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    enableMicrobuild: false
+    enablePublishBuildArtifacts: false
+    enablePublishTestResults: false
+    enablePublishBuildAssets: false
+    enablePublishUsingPipelines: false
+    enableTelemetry: true
+
+    variables:
+      - group: Publish-Build-Assets
+      # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+      # sync with the packages.config file.
+      - name: DefaultGuardianVersion
+        value: 0.109.0
+      - name: GuardianPackagesConfigFile
+        value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+      - name: GuardianVersion
+        value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+  
+    jobs: ${{ parameters.jobs }}
+        
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 8dd1fdbd144a0..ff4ab75c886dc 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -87,13 +87,3 @@ jobs:
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
-
-  - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}:
-    - template: ../job/generate-graph-files.yml
-      parameters:
-        continueOnError: ${{ parameters.continueOnError }}
-        includeToolset: ${{ parameters.graphFileGeneration.includeToolset }}
-        dependsOn:
-          - Asset_Registry_Publish
-        pool:
-          vmImage: 'windows-2019'
diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml
new file mode 100644
index 0000000000000..3930b1630214b
--- /dev/null
+++ b/eng/common/templates/steps/execute-codeql.yml
@@ -0,0 +1,32 @@
+parameters:
+  # Language that should be analyzed. Defaults to csharp
+  language: csharp
+  # Build Commands
+  buildCommands: ''
+  overrideParameters: ''                                       # Optional: to override values for parameters.
+  additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+  # diagnosis of problems with specific tool configurations.
+  publishGuardianDirectoryToPipeline: false
+  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+  # parameters rather than relying on YAML. It may be better to use a local script, because you can
+  # reproduce results locally without piecing together a command based on the YAML.
+  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+  # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
+  # 'continueOnError', the parameter value is not correctly picked up.
+  # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
+  # optional: determines whether to continue the build if the step errors;
+  sdlContinueOnError: false
+
+steps:
+- template: /eng/common/templates/steps/execute-sdl.yml
+  parameters:
+    overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+    executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+    overrideParameters: ${{ parameters.overrideParameters }}
+    additionalParameters: '${{ parameters.additionalParameters }}
+      -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")'
+    publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+    sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
\ No newline at end of file
diff --git a/global.json b/global.json
index f967fe25f6271..6f74401be4912 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22054.5",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22054.5"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22056.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22056.6"
   }
 }

From 575c12c5443d26f25f0c5ea0f907f60a00107896 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 13:39:20 +0000
Subject: [PATCH 038/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220113.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22063.1
---
 eng/Version.Details.xml                       |   8 +-
 .../channels/generic-internal-channel.yml     | 190 ------
 .../channels/generic-public-channel.yml       | 192 -------
 .../templates/post-build/post-build.yml       | 539 ++++--------------
 global.json                                   |   4 +-
 5 files changed, 115 insertions(+), 818 deletions(-)
 delete mode 100644 eng/common/templates/post-build/channels/generic-internal-channel.yml
 delete mode 100644 eng/common/templates/post-build/channels/generic-public-channel.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2bcf927d6ce2e..64ba0d8bdde70 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22056.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22063.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5</Sha>
+      <Sha>7a7ba506eed201288d4182fce8b380b22bdd73cb</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22056.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22063.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5</Sha>
+      <Sha>7a7ba506eed201288d4182fce8b380b22bdd73cb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
deleted file mode 100644
index 8990dfc8c87cc..0000000000000
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            /p:PublishToMSDL=false
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
-            /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:PublishToMSDL=false
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
deleted file mode 100644
index 3220c6a4f92ff..0000000000000
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-  # If the channel name is empty, no links will be generated
-  akaMSChannelName: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      - name: ArtifactsCategory
-        value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:ArtifactsCategory=$(ArtifactsCategory)
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
-            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
-            /p:AkaMSClientId=$(akams-client-id)
-            /p:AkaMSClientSecret=$(akams-client-secret)
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 4f79cf0f33703..d1759337abe6a 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,71 +1,89 @@
 parameters:
- # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
-  # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
-  # Publishing V3 DOES NOT accept inlining the publishing stages.
-  publishingInfraVersion: 2
-  # When set to true the publishing templates from the repo will be used
-  # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
-  inline: true
-
-  # Only used if inline==false. When set to true will stall the current build until
-  # the Promotion Pipeline build finishes. Otherwise, the current build will continue 
-  # execution concurrently with the promotion build.
-  waitPublishingFinish: true
-
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-  enableSourceLinkValidation: false
-  enableSigningValidation: true
-  enableSymbolValidation: false
-  enableNugetValidation: true
-  publishInstallersAndChecksums: true
-  SDLValidationParameters:
-    enable: false
-    continueOnError: false
-    params: ''
-    artifactNames: ''
-    downloadArtifacts: true
+  # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+  # Publishing V1 is no longer supported
+  # Publishing V2 is no longer supported
+  # Publishing V3 is the default
+  - name: publishingInfraVersion
+    displayName: Which version of publishing should be used to promote the build definition?
+    type: number
+    default: 3
+    values:
+    - 3
+
+  - name: BARBuildId
+    displayName: BAR Build Id
+    type: number
+    default: 0
+
+  - name: PromoteToChannelIds
+    displayName: Channel to promote BARBuildId to
+    type: string
+    default: ''
+
+  - name: enableSourceLinkValidation
+    displayName: Enable SourceLink validation
+    type: boolean
+    default: false
+
+  - name: enableSigningValidation
+    displayName: Enable signing validation
+    type: boolean
+    default: true
+
+  - name: enableSymbolValidation
+    displayName: Enable symbol validation
+    type: boolean
+    default: false
+
+  - name: enableNugetValidation
+    displayName: Enable NuGet validation
+    type: boolean
+    default: true
+    
+  - name: publishInstallersAndChecksums
+    displayName: Publish installers and checksums
+    type: boolean
+    default: true
+
+  - name: SDLValidationParameters
+    type: object
+    default:
+      enable: false
+      continueOnError: false
+      params: ''
+      artifactNames: ''
+      downloadArtifacts: true
 
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
-  symbolPublishingAdditionalParameters: ''
-  artifactsPublishingAdditionalParameters: ''
-  signingValidationAdditionalParameters: ''
+  - name: symbolPublishingAdditionalParameters
+    displayName: Symbol publishing additional parameters
+    type: string
+    default: ''
+
+  - name: artifactsPublishingAdditionalParameters
+    displayName: Artifact publishing additional parameters
+    type: string
+    default: ''
+
+  - name: signingValidationAdditionalParameters
+    displayName: Signing validation additional parameters
+    type: string
+    default: ''
 
   # Which stages should finish execution before post-build stages start
-  validateDependsOn:
-  - build
-  publishDependsOn: 
-  - Validate
+  - name: validateDependsOn
+    type: object
+    default:
+    - build
 
-  # Channel ID's instantiated in this file.
-  # When adding a new channel implementation the call to `check-channel-consistency.ps1` 
-  # needs to be updated with the new channel ID
-  NetEngLatestChannelId: 2
-  NetEngValidationChannelId: 9
-  NetDev5ChannelId: 131
-  NetDev6ChannelId: 1296
-  GeneralTestingChannelId: 529
-  NETCoreToolingDevChannelId: 548
-  NETCoreToolingReleaseChannelId: 549
-  NETInternalToolingChannelId: 551
-  NETCoreExperimentalChannelId: 562
-  NetEngServicesIntChannelId: 678
-  NetEngServicesProdChannelId: 679
-  NetCoreSDK313xxChannelId: 759
-  NetCoreSDK313xxInternalChannelId: 760
-  NetCoreSDK314xxChannelId: 921
-  NetCoreSDK314xxInternalChannelId: 922
-  VS166ChannelId: 1010
-  VS167ChannelId: 1011
-  VS168ChannelId: 1154
-  VSMasterChannelId: 1012
-  VS169ChannelId: 1473
-  VS1610ChannelId: 1692
+  - name: publishDependsOn
+    type: object
+    default:
+    - Validate
 
 stages:
-- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
   - stage: Validate
     dependsOn: ${{ parameters.validateDependsOn }}
     displayName: Validate Build Assets
@@ -77,23 +95,6 @@ stages:
         BARBuildId: ${{ parameters.BARBuildId }}
         PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
 
-    - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-      - job:
-        displayName: Post-build Checks
-        dependsOn: setupMaestroVars
-        variables:
-          - name: TargetChannels
-            value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
-        pool:
-          vmImage: 'windows-2019'
-        steps:
-          - task: PowerShell@2
-            displayName: Maestro Channels Consistency
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
-              arguments: -PromoteToChannels "$(TargetChannels)"
-                -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
-
     - job:
       displayName: NuGet Validation
       dependsOn: setupMaestroVars
@@ -229,361 +230,39 @@ stages:
         artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
         downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
 
-- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
-  - stage: publish_using_darc
-    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.publishDependsOn }}
-    ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Publish using Darc
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - job:
-      displayName: Publish Using Darc
-      dependsOn: setupMaestroVars
-      timeoutInMinutes: 120
-      variables:
-        - name: BARBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: PowerShell@2
-          displayName: Publish Using Darc
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId) 
-              -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
-              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-              -MaestroToken '$(MaestroApiAccessToken)'
-              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
-              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-
-- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev5_Publish'
-      channelName: '.NET 5 Dev'
-      akaMSChannelName: 'net5/dev'
-      channelId: ${{ parameters.NetDev5ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev6_Publish'
-      channelName: '.NET 6 Dev'
-      akaMSChannelName: 'net6/dev'
-      channelId: ${{ parameters.NetDev6ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+- stage: publish_using_darc
+  ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.publishDependsOn }}
+  ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.validateDependsOn }}
+  displayName: Publish using Darc
+  variables:
+    - template: common-variables.yml
+  jobs:
+  - template: setup-maestro-vars.yml
     parameters:
       BARBuildId: ${{ parameters.BARBuildId }}
       PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Latest_Publish'
-      channelName: '.NET Eng - Latest'
-      akaMSChannelName: 'eng/daily'
-      channelId: ${{ parameters.NetEngLatestChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
 
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Validation_Publish'
-      channelName: '.NET Eng - Validation'
-      akaMSChannelName: 'eng/validation'
-      channelId: ${{ parameters.NetEngValidationChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'General_Testing_Publish'
-      channelName: 'General Testing'
-      akaMSChannelName: 'generaltesting'
-      channelId: ${{ parameters.GeneralTestingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Dev_Publishing'
-      channelName: '.NET Core Tooling Dev'
-      channelId: ${{ parameters.NETCoreToolingDevChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Release_Publishing'
-      channelName: '.NET Core Tooling Release'
-      channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NET_Internal_Tooling_Publishing'
-      channelName: '.NET Internal Tooling'
-      channelId: ${{ parameters.NETInternalToolingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Experimental_Publishing'
-      channelName: '.NET Core Experimental'
-      channelId: ${{ parameters.NETCoreExperimentalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Int_Publish'
-      channelName: '.NET Eng Services - Int'
-      channelId: ${{ parameters.NetEngServicesIntChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Prod_Publish'
-      channelName: '.NET Eng Services - Prod'
-      channelId: ${{ parameters.NetEngServicesProdChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx'
-      channelId: ${{ parameters.NetCoreSDK314xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx Internal'
-      channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx'
-      channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx Internal'
-      channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_6_Publishing'
-      channelName: 'VS 16.6'
-      channelId: ${{ parameters.VS166ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_7_Publishing'
-      channelName: 'VS 16.7'
-      channelId: ${{ parameters.VS167ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-      
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_8_Publishing'
-      channelName: 'VS 16.8'
-      channelId: ${{ parameters.VS168ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_Master_Publishing'
-      channelName: 'VS Master'
-      channelId: ${{ parameters.VSMasterChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_9_Publishing'
-      channelName: 'VS 16.9'
-      channelId: ${{ parameters.VS169ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_10_Publishing'
-      channelName: 'VS 16.10'
-      channelId: ${{ parameters.VS1610ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+  - job:
+    displayName: Publish Using Darc
+    dependsOn: setupMaestroVars
+    timeoutInMinutes: 120
+    variables:
+      - name: BARBuildId
+        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+      - task: PowerShell@2
+        displayName: Publish Using Darc
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          arguments: -BuildId $(BARBuildId) 
+            -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+            -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+            -MaestroToken '$(MaestroApiAccessToken)'
+            -WaitPublishingFinish true
+            -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
+            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/global.json b/global.json
index 6f74401be4912..133b313ed80bc 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22056.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22056.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.1"
   }
 }

From fa6d4d98d0f4b5d719ac1ea1962720b91a6afbb6 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Thu, 13 Jan 2022 13:41:33 -0800
Subject: [PATCH 039/413] Enable null on UseExplicitTypeCodeFixProvider

---
 .../UseExplicitTypeCodeFixProvider.cs         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index abdfb11cf27e6..d749b003a0675 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -2,8 +2,6 @@
 // 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.Composition;
@@ -19,6 +17,7 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CSharp.TypeStyle
@@ -63,11 +62,11 @@ internal static async Task HandleDeclarationAsync(
             Document document, SyntaxEditor editor,
             SyntaxNode node, CancellationToken cancellationToken)
         {
-            var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var declarationContext = node.Parent;
 
-            TypeSyntax typeSyntax = null;
-            ParenthesizedVariableDesignationSyntax parensDesignation = null;
+            TypeSyntax? typeSyntax = null;
+            ParenthesizedVariableDesignationSyntax? parensDesignation = null;
             if (declarationContext is RefTypeSyntax refType)
             {
                 declarationContext = declarationContext.Parent;
@@ -84,14 +83,14 @@ internal static async Task HandleDeclarationAsync(
             else if (declarationContext is DeclarationExpressionSyntax declarationExpression)
             {
                 typeSyntax = declarationExpression.Type;
-                if (declarationExpression.Designation.IsKind(SyntaxKind.ParenthesizedVariableDesignation, out ParenthesizedVariableDesignationSyntax variableDesignation))
+                if (declarationExpression.Designation.IsKind(SyntaxKind.ParenthesizedVariableDesignation, out ParenthesizedVariableDesignationSyntax? variableDesignation))
                 {
                     parensDesignation = variableDesignation;
                 }
             }
             else
             {
-                throw ExceptionUtilities.UnexpectedValue(declarationContext.Kind());
+                throw ExceptionUtilities.UnexpectedValue(declarationContext?.Kind());
             }
 
             if (parensDesignation is null)
@@ -102,7 +101,7 @@ internal static async Task HandleDeclarationAsync(
                 // that would defeat the purpose of this refactoring entirely).
                 var newTypeSyntax =
                     semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType
-                                 .GenerateTypeSyntax(allowVar: false)
+                                 !.GenerateTypeSyntax(allowVar: false)
                                  .WithTriviaFrom(typeSyntax);
 
                 Debug.Assert(!newTypeSyntax.ContainsDiagnostics, "Explicit type replacement likely introduced an error in code");
@@ -111,7 +110,10 @@ internal static async Task HandleDeclarationAsync(
             }
             else
             {
-                var tupleTypeSymbol = semanticModel.GetTypeInfo(typeSyntax.Parent, cancellationToken).ConvertedType;
+                RoslynDebug.AssertNotNull(typeSyntax);
+                var tupleTypeSymbol = semanticModel.GetTypeInfo(typeSyntax.Parent!, cancellationToken).ConvertedType;
+
+                RoslynDebug.AssertNotNull(tupleTypeSymbol);
 
                 var leadingTrivia = node.GetLeadingTrivia()
                     .Concat(parensDesignation.GetAllPrecedingTriviaToPreviousToken().Where(t => !t.IsWhitespace()).Select(t => t.WithoutAnnotations(SyntaxAnnotation.ElasticAnnotation)));

From 23f30e8b9c4a014158e0063244a2a902a280d07c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:42:15 +0000
Subject: [PATCH 040/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220113.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22063.6
---
 eng/Version.Details.xml                       |  8 +++---
 eng/common/cross/toolchain.cmake              | 11 ++++++--
 eng/common/post-build/publish-using-darc.ps1  | 28 +------------------
 .../templates/post-build/post-build.yml       |  1 -
 global.json                                   |  4 +--
 5 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 64ba0d8bdde70..6ccd6e9ef0a64 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22063.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22063.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7a7ba506eed201288d4182fce8b380b22bdd73cb</Sha>
+      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22063.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22063.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7a7ba506eed201288d4182fce8b380b22bdd73cb</Sha>
+      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index f7878dddd3921..fba2afda438b6 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -37,6 +37,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   if(TIZEN)
     set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "armv6")
+  set(CMAKE_SYSTEM_PROCESSOR armv6l)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
+    set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
+  else()
+    set(TOOLCHAIN "arm-linux-gnueabihf")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
@@ -60,7 +67,7 @@ elseif (ILLUMOS)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(TOOLCHAIN "x86_64-illumos")
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -194,7 +201,7 @@ endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 2427ca6b6aec7..8508397d77640 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,13 +5,8 @@ param(
   [Parameter(Mandatory=$true)][string] $MaestroToken,
   [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
-  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
-  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
-  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
-  [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
+  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
 )
 
 try {
@@ -35,27 +30,6 @@ try {
     $optionalParams.Add("--no-wait") | Out-Null
   }
 
-  if ("false" -ne $PublishInstallersAndChecksums) {
-    $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableNugetValidation) {
-    $optionalParams.Add("--validate-nuget") | Out-Null
-  }
-
-  if ("true" -eq $EnableSourceLinkValidation) {
-    $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableSigningValidation) {
-    $optionalParams.Add("--validate-signingchecksums") | Out-Null
-
-    if ("" -ne $SigningValidationAdditionalParameters) {
-      $optionalParams.Add("--signing-validation-parameters") | Out-Null
-      $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
-    }
-  }
-
   & $darc add-build-to-channel `
   --id $buildId `
   --publishing-infra-version $PublishingInfraVersion `
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index d1759337abe6a..8985b429c8543 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -263,6 +263,5 @@ stages:
             -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
             -MaestroToken '$(MaestroApiAccessToken)'
             -WaitPublishingFinish true
-            -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
             -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/global.json b/global.json
index 133b313ed80bc..d13f8db2dc177 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.6"
   }
 }

From 0b6353ba462199f602d10519816a3167a67c7b53 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Fri, 14 Jan 2022 10:34:42 -0800
Subject: [PATCH 041/413] Extract code from MethodExtractor to common
 NullableHelpers, use in UseExplicitTypeRefactoring to determine if a type
 should be nullable or not when converting from var.

---
 .../UseExplicitTypeCodeFixProvider.cs         |  77 +++
 .../Compilation/MemberSemanticModel.cs        |   2 +-
 .../Symbols/Source/NullablePublicAPITests.cs  |  32 ++
 .../UseExplicitTypeRefactoringTests.cs        | 458 +++++++++++++++++-
 .../CSharpMethodExtractor.Analyzer.cs         |  36 +-
 .../CSharpWorkspaceExtensions.projitems       |   1 +
 .../NullableHelpers/NullableHelpers.cs        | 109 +++++
 7 files changed, 682 insertions(+), 33 deletions(-)
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index d749b003a0675..ad3872478a56a 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -166,6 +166,83 @@ private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol,
                 .WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
         }
 
+        private static async Task HandleForEachStatementAsync(Document document, SyntaxEditor editor, ForEachStatementSyntax forEach, CancellationToken cancellationToken)
+        {
+            var typeSyntax = forEach.Type.StripRefIfNeeded();
+            var declarationSyntax = forEach.Identifier.Parent;
+
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
+
+            RoslynDebug.AssertNotNull(typeSymbol);
+            RoslynDebug.AssertNotNull(declarationSyntax);
+
+            typeSymbol = AdjustNullabilityOfTypeSymbol(
+                typeSymbol,
+                semanticModel,
+                declarationSyntax,
+                cancellationToken);
+
+            editor.ReplaceNode(typeSyntax, GenerateTypeDeclaration(typeSyntax, typeSymbol));
+        }
+
+        private static async Task HandleVariableDeclarationAsync(Document document, SyntaxEditor editor, VariableDeclarationSyntax varDecl, CancellationToken cancellationToken)
+        {
+            var typeSyntax = varDecl.Type.StripRefIfNeeded();
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+            var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
+            RoslynDebug.AssertNotNull(typeSymbol);
+
+            // Since we're only dealing with variable declaration using var, we know
+            // that implicitly typed variables cannot have multiple declarators in
+            // a single declaration (CS0819). Only one variable should be present
+            var declarationSyntax = varDecl.Variables.Single().Identifier.Parent;
+            RoslynDebug.AssertNotNull(declarationSyntax);
+
+            typeSymbol = AdjustNullabilityOfTypeSymbol(
+                typeSymbol,
+                semanticModel,
+                declarationSyntax,
+                cancellationToken);
+
+            editor.ReplaceNode(typeSyntax, GenerateTypeDeclaration(typeSyntax, typeSymbol));
+        }
+
+        private static ITypeSymbol AdjustNullabilityOfTypeSymbol(
+            ITypeSymbol typeSymbol,
+            SemanticModel semanticModel,
+            SyntaxNode declarationSyntax,
+            CancellationToken cancellationToken)
+        {
+            if (typeSymbol.NullableAnnotation == NullableAnnotation.Annotated)
+            {
+                // It's possible that the var shouldn't be annotated nullable, check assignments to the variable and 
+                // determine if it needs to be null
+                var isPossiblyAssignedNull = NullableHelpers.IsDeclaredSymbolAssignedPossiblyNullValue(semanticModel, declarationSyntax, cancellationToken);
+                if (!isPossiblyAssignedNull)
+                {
+                    // If the symbol is never assigned null we can update the type symbol to also be non-null
+                    return typeSymbol.WithNullableAnnotation(NullableAnnotation.NotAnnotated);
+                }
+            }
+
+            return typeSymbol;
+        }
+
+        private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
+        {
+            // We're going to be passed through the simplifier.  Tell it to not just convert this back to var (as
+            // that would defeat the purpose of this refactoring entirely).
+            var newTypeSyntax = newTypeSymbol
+                         .GenerateTypeSyntax(allowVar: false)
+                         .WithTriviaFrom(typeSyntax);
+
+            Debug.Assert(!newTypeSyntax.ContainsDiagnostics, "Explicit type replacement likely introduced an error in code");
+
+            return newTypeSyntax;
+        }
+
         private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
diff --git a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
index b2ec4487ff52c..c75e5100f6119 100644
--- a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
+++ b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
@@ -976,7 +976,7 @@ public override ForEachStatementInfo GetForEachStatementInfo(CommonForEachStatem
                 enumeratorInfoOpt.MoveNextInfo.Method.GetPublicSymbol(),
                 currentProperty: ((PropertySymbol)enumeratorInfoOpt.CurrentPropertyGetter?.AssociatedSymbol).GetPublicSymbol(),
                 disposeMethod.GetPublicSymbol(),
-                enumeratorInfoOpt.ElementType.GetPublicSymbol(),
+                enumeratorInfoOpt.ElementTypeWithAnnotations.GetPublicSymbol(),
                 BoundNode.GetConversion(boundForEach.ElementConversion, boundForEach.ElementPlaceholder),
                 BoundNode.GetConversion(enumeratorInfoOpt.CurrentConversion, enumeratorInfoOpt.CurrentPlaceholder));
         }
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/NullablePublicAPITests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/NullablePublicAPITests.cs
index 2afbe863c3509..3be390af19eb8 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/NullablePublicAPITests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/NullablePublicAPITests.cs
@@ -2573,6 +2573,38 @@ void assertAnnotation(SingleVariableDesignationSyntax variable, PublicNullableAn
             }
         }
 
+        [Fact]
+        public void GetForeachInfo()
+        {
+            var source = @"
+class C
+{
+    void M(string?[] nullableStrings, string[] strings)
+    {
+        foreach (var o in nullableStrings) {}
+        foreach (var o in strings) {}
+    }
+}";
+
+            var comp = CreateCompilation(source, options: WithNullableEnable());
+            comp.VerifyDiagnostics();
+
+            var syntaxTree = comp.SyntaxTrees[0];
+            var root = syntaxTree.GetRoot();
+            var model = comp.GetSemanticModel(syntaxTree);
+
+            var declarations = root.DescendantNodes().OfType<ForEachStatementSyntax>().ToList();
+
+            assertAnnotation(declarations[0], PublicNullableAnnotation.Annotated);
+            assertAnnotation(declarations[1], PublicNullableAnnotation.NotAnnotated);
+
+            void assertAnnotation(ForEachStatementSyntax foreachStatement, PublicNullableAnnotation expectedElementTypeAnnotation)
+            {
+                var foreachInfo = model.GetForEachStatementInfo(foreachStatement);
+                Assert.Equal(expectedElementTypeAnnotation, foreachInfo.ElementType.NullableAnnotation);
+            }
+        }
+
         [InlineData("always")]
         [InlineData("never")]
         [Theory, WorkItem(37659, "https://github.com/dotnet/roslyn/issues/37659")]
diff --git a/src/EditorFeatures/CSharpTest/CodeRefactorings/UseExplicitOrImplicitType/UseExplicitTypeRefactoringTests.cs b/src/EditorFeatures/CSharpTest/CodeRefactorings/UseExplicitOrImplicitType/UseExplicitTypeRefactoringTests.cs
index 5426302dfdb27..bb2a37e75e25a 100644
--- a/src/EditorFeatures/CSharpTest/CodeRefactorings/UseExplicitOrImplicitType/UseExplicitTypeRefactoringTests.cs
+++ b/src/EditorFeatures/CSharpTest/CodeRefactorings/UseExplicitOrImplicitType/UseExplicitTypeRefactoringTests.cs
@@ -2,8 +2,6 @@
 // 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.CodeRefactorings;
 using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.UseExplicitType;
@@ -425,6 +423,462 @@ static void Main()
             await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
         }
 
+        [Fact]
+        public async Task TestNullabilityAssignment1()
+        {
+            var code = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        var[||] v = s_data;
+    }
+}";
+
+            var expected = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        string v = s_data;
+    }
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment2()
+        {
+            var code = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        var[||] v = s_data;
+        v = null;
+    }
+}";
+
+            var expected = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        string? v = s_data;
+        v = null;
+    }
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment3()
+        {
+            var code = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        var[||] v = s_data;
+        v = GetNullableString();
+    }
+
+    static string? GetNullableString() => null;
+}";
+
+            var expected = @"
+#nullable enable
+
+class C
+{
+    private static string s_data;
+
+    static void Main()
+    {
+        string? v = s_data;
+        v = GetNullableString();
+    }
+
+    static string? GetNullableString() => null;
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Foreach1()
+        {
+            var code = @"
+#nullable enable
+
+using System.Collections;
+
+class C
+{
+    static void Main()
+    {
+        foreach (var[||] item in new string?[] { """", null })
+        {
+        }
+    }
+}";
+
+            var expected = @"
+#nullable enable
+
+using System.Collections;
+
+class C
+{
+    static void Main()
+    {
+        foreach (string? item in new string?[] { """", null })
+        {
+        }
+    }
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Foreach2()
+        {
+            var code = @"
+#nullable enable
+
+using System.Collections;
+
+class C
+{
+    static void Main()
+    {
+        foreach (var[||] item in new string[] { """" })
+        {
+        }
+    }
+}";
+
+            var expected = @"
+#nullable enable
+
+using System.Collections;
+
+class C
+{
+    static void Main()
+    {
+        foreach (string item in new string[] { """" })
+        {
+        }
+    }
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Lambda1()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    private static string s_data = """";
+
+    static void Main()
+    {
+        Action a = () => {
+            var[||] v = s_data;
+            v = GetNullableString();
+        };
+    }
+
+    static string? GetNullableString() => null;
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    private static string s_data = """";
+
+    static void Main()
+    {
+        Action a = () => {
+            string? v = s_data;
+            v = GetNullableString();
+        };
+    }
+
+    static string? GetNullableString() => null;
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Lambda2()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        Action a = () => {
+            var[||] v = """";
+            v = GetString();
+        };
+    }
+
+    static string GetString() => """";
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        Action a = () => {
+            string v = """";
+            v = GetString();
+        };
+    }
+
+    static string GetString() => """";
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Lambda3()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        [||]var v = """";
+        Action a = () => {
+            v = GetString();
+        };
+    }
+
+    static string GetString() => """";
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        string v = """";
+        Action a = () => {
+            v = GetString();
+        };
+    }
+
+    static string GetString() => """";
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Lambda4()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        var[||] v = """";
+        Action a = () => {
+            v = GetString();
+        };
+    }
+
+    static string? GetString() => null;
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    static void Main()
+    {
+        string? v = """";
+        Action a = () => {
+            v = GetString();
+        };
+    }
+
+    static string? GetString() => null;
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Property1()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    string S
+    {
+        get 
+        {
+            var[||] v = """";
+            v = GetString();
+            return v;
+        }
+    }
+
+    static void Main()
+    {
+    }
+
+    static string GetString() => """";
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    string S
+    {
+        get 
+        {
+            string v = """";
+            v = GetString();
+            return v;
+        }
+    }
+
+    static void Main()
+    {
+    }
+
+    static string GetString() => """";
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
+        [Fact]
+        public async Task TestNullabilityAssignment_Property2()
+        {
+            var code = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    string? S
+    {
+        get 
+        {
+            var[||] v = """";
+            v = GetString();
+            return v;
+        }
+    }
+
+    static void Main()
+    {
+    }
+
+    static string? GetString() => null;
+}";
+
+            var expected = @"
+#nullable enable
+
+using System;
+
+class C
+{
+    string? S
+    {
+        get 
+        {
+            string? v = """";
+            v = GetString();
+            return v;
+        }
+    }
+
+    static void Main()
+    {
+    }
+
+    static string? GetString() => null;
+}";
+
+            await TestInRegularAndScriptWhenDiagnosticNotAppliedAsync(code, expected);
+        }
+
         [Fact, WorkItem(42880, "https://github.com/dotnet/roslyn/issues/42880")]
         public async Task TestRefLocal1()
         {
diff --git a/src/Features/CSharp/Portable/ExtractMethod/CSharpMethodExtractor.Analyzer.cs b/src/Features/CSharp/Portable/ExtractMethod/CSharpMethodExtractor.Analyzer.cs
index a9ad53ccb737f..e25e1fd93c07f 100644
--- a/src/Features/CSharp/Portable/ExtractMethod/CSharpMethodExtractor.Analyzer.cs
+++ b/src/Features/CSharp/Portable/ExtractMethod/CSharpMethodExtractor.Analyzer.cs
@@ -136,39 +136,15 @@ protected override ITypeSymbol GetSymbolType(SemanticModel semanticModel, ISymbo
             {
                 var selectionOperation = semanticModel.GetOperation(SelectionResult.GetContainingScope());
 
-                switch (symbol)
+                // Check if null is possibly assigned to the symbol. If it is, leave nullable annotation as is, otherwise
+                // we can modify the annotation to be NotAnnotated to code that more likely matches the user's intent.
+                if (selectionOperation is not null &&
+                    NullableHelpers.IsSymbolAssignedPossiblyNullValue(semanticModel, selectionOperation, symbol) == false)
                 {
-                    case ILocalSymbol localSymbol when localSymbol.NullableAnnotation == NullableAnnotation.Annotated:
-                    case IParameterSymbol parameterSymbol when parameterSymbol.NullableAnnotation == NullableAnnotation.Annotated:
-
-                        // For local symbols and parameters, we can check what the flow state 
-                        // for refences to the symbols are and determine if we can change 
-                        // the nullability to a less permissive state.
-                        var references = selectionOperation.DescendantsAndSelf()
-                            .Where(IsSymbolReferencedByOperation);
-
-                        if (AreAllReferencesNotNull(references))
-                        {
-                            return base.GetSymbolType(semanticModel, symbol).WithNullableAnnotation(NullableAnnotation.NotAnnotated);
-                        }
-
-                        return base.GetSymbolType(semanticModel, symbol);
-
-                    default:
-                        return base.GetSymbolType(semanticModel, symbol);
+                    return base.GetSymbolType(semanticModel, symbol).WithNullableAnnotation(NullableAnnotation.NotAnnotated);
                 }
 
-                bool AreAllReferencesNotNull(IEnumerable<IOperation> references)
-                => references.All(r => semanticModel.GetTypeInfo(r.Syntax).Nullability.FlowState == NullableFlowState.NotNull);
-
-                bool IsSymbolReferencedByOperation(IOperation operation)
-                    => operation switch
-                    {
-                        ILocalReferenceOperation localReference => localReference.Local.Equals(symbol),
-                        IParameterReferenceOperation parameterReference => parameterReference.Parameter.Equals(symbol),
-                        IAssignmentOperation assignment => IsSymbolReferencedByOperation(assignment.Target),
-                        _ => false
-                    };
+                return base.GetSymbolType(semanticModel, symbol);
             }
         }
     }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/CSharpWorkspaceExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/CSharpWorkspaceExtensions.projitems
index 731120e62cb66..b788d45f330a1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/CSharpWorkspaceExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/CSharpWorkspaceExtensions.projitems
@@ -60,6 +60,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Utilities\CSharpSimplificationHelpers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utilities\NullableHelpers\NullableExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utilities\SyntaxKindSet.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utilities\NullableHelpers\NullableHelpers.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)CSharpWorkspaceExtensionsResources.resx" GenerateSource="true" Link="CSharpWorkspaceExtensionsResources.resx" />
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
new file mode 100644
index 0000000000000..0671c5fbbd822
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
@@ -0,0 +1,109 @@
+// 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 enable
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Operations;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis
+{
+    internal static class NullableHelpers
+    {
+        /// <summary>
+        /// Gets the declared symbol and root operation from the passed in declarationSyntax and calls
+        /// <see cref="IsSymbolAssignedPossiblyNullValue(SemanticModel, IOperation, ISymbol)"/>. Note
+        /// that this is bool and not bool? because we know that the symbol is at the very least declared, 
+        /// so there's no need to return a null value. 
+        /// </summary>
+        public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel semanticModel, SyntaxNode declarationSyntax, CancellationToken cancellationToken)
+        {
+            var declaredType = semanticModel.GetRequiredDeclaredSymbol(declarationSyntax, cancellationToken);
+            var declaredOperation = semanticModel.GetRequiredOperation(declarationSyntax, cancellationToken);
+
+            var rootOperation = declaredOperation;
+
+            // Walk up the tree to find a root for the operation
+            // that contains the declaration
+            while (rootOperation.Parent is not null)
+            {
+                rootOperation = rootOperation.Parent;
+            }
+
+            return IsSymbolAssignedPossiblyNullValue(semanticModel, rootOperation, declaredType) == true;
+        }
+
+        /// <summary>
+        /// Given an operation, goes through all decendent operations and returns true if the symbol passed in
+        /// is ever assigned a possibly null value as determined by nullable flow state. Returns
+        /// null if no references are found, letting the caller determine what to do with that information
+        /// </summary>
+        public static bool? IsSymbolAssignedPossiblyNullValue(SemanticModel semanticModel, IOperation operation, ISymbol symbol)
+        {
+            var references = operation.DescendantsAndSelf()
+                .Where(o => IsSymbolReferencedByOperation(o, symbol, allowNullInitializer: false));
+
+            var hasReference = false;
+
+            foreach (var reference in references)
+            {
+                hasReference = true;
+
+                // foreach statements are handled special because the iterator is not assignable, so the elementtype 
+                // annotation is accurate for determining if the loop declaration has a reference that allows the symbol
+                // to be null
+                if (reference is IForEachLoopOperation forEachLoop)
+                {
+                    var foreachInfo = semanticModel.GetForEachStatementInfo((CommonForEachStatementSyntax)forEachLoop.Syntax);
+
+                    if (foreachInfo.ElementType is null)
+                    {
+                        continue;
+                    }
+
+                    // Use NotAnnotated here to keep both Annotated and None (oblivious) treated the same, since
+                    // this is directly looking at the annotation and not the flow state
+                    if (foreachInfo.ElementType.NullableAnnotation != NullableAnnotation.NotAnnotated)
+                    {
+                        return true;
+                    }
+
+                    continue;
+                }
+
+                var syntax = reference is IVariableDeclaratorOperation variableDeclarator
+                    ? variableDeclarator.GetVariableInitializer().Value.Syntax
+                    : reference.Syntax;
+
+                var typeInfo = semanticModel.GetTypeInfo(syntax);
+
+                if (typeInfo.Nullability.FlowState == NullableFlowState.MaybeNull)
+                {
+                    return true;
+                }
+            }
+
+            return hasReference ? (bool?)false : null;
+        }
+
+        private static bool IsSymbolReferencedByOperation(IOperation operation, ISymbol symbol, bool allowNullInitializer)
+            => operation switch
+            {
+                ILocalReferenceOperation localReference => localReference.Local.Equals(symbol),
+                IParameterReferenceOperation parameterReference => parameterReference.Parameter.Equals(symbol),
+                IAssignmentOperation assignment => assignment is not IDeconstructionAssignmentOperation && IsSymbolReferencedByOperation(assignment.Target, symbol, allowNullInitializer: false),
+                IForEachLoopOperation loopOperation => IsSymbolReferencedByOperation(loopOperation.LoopControlVariable, symbol, allowNullInitializer: true),
+                ITupleOperation tupleOperation => tupleOperation.Elements.Any(element => IsSymbolReferencedByOperation(element, symbol, allowNullInitializer: false)),
+
+                // We want to be explicit about if we allow the variable to have a null variable initializer. The use case for now is around foreach loops 
+                // where the LoopControlVariable of the operation will have a null initializer.
+                IVariableDeclaratorOperation variableDeclarator => (allowNullInitializer || variableDeclarator.GetVariableInitializer() != null) && variableDeclarator.Symbol.Equals(symbol),
+                _ => false
+            };
+    }
+}

From 3c8b19e6e8090583c7366460b0f6f053d431c063 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Fri, 14 Jan 2022 11:51:51 -0800
Subject: [PATCH 042/413] Add missing calls to new Handle*

---
 .../UseExplicitTypeCodeFixProvider.cs         | 131 +++++++++---------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index ad3872478a56a..3ca1a2270327d 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -65,8 +65,6 @@ internal static async Task HandleDeclarationAsync(
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var declarationContext = node.Parent;
 
-            TypeSyntax? typeSyntax = null;
-            ParenthesizedVariableDesignationSyntax? parensDesignation = null;
             if (declarationContext is RefTypeSyntax refType)
             {
                 declarationContext = declarationContext.Parent;
@@ -74,96 +72,49 @@ internal static async Task HandleDeclarationAsync(
 
             if (declarationContext is VariableDeclarationSyntax varDecl)
             {
-                typeSyntax = varDecl.Type;
+                await HandleVariableDeclarationAsync(document, editor, varDecl, cancellationToken).ConfigureAwait(false);
             }
             else if (declarationContext is ForEachStatementSyntax forEach)
             {
-                typeSyntax = forEach.Type;
+                await HandleForEachStatementAsync(document, editor, forEach, cancellationToken).ConfigureAwait(false);
             }
             else if (declarationContext is DeclarationExpressionSyntax declarationExpression)
             {
-                typeSyntax = declarationExpression.Type;
-                if (declarationExpression.Designation.IsKind(SyntaxKind.ParenthesizedVariableDesignation, out ParenthesizedVariableDesignationSyntax? variableDesignation))
-                {
-                    parensDesignation = variableDesignation;
-                }
+                await HandleDeclarationExpressionAsync(document, editor, declarationExpression, cancellationToken).ConfigureAwait(false);
             }
             else
             {
                 throw ExceptionUtilities.UnexpectedValue(declarationContext?.Kind());
             }
+        }
+        private static async Task HandleDeclarationExpressionAsync(Document document, SyntaxEditor editor, DeclarationExpressionSyntax declarationExpression, CancellationToken cancellationToken)
+        {
+            var typeSyntax = declarationExpression.Type;
+            typeSyntax = typeSyntax.StripRefIfNeeded();
 
-            if (parensDesignation is null)
-            {
-                typeSyntax = typeSyntax.StripRefIfNeeded();
-
-                // We're going to be passed through the simplifier.  Tell it to not just convert this back to var (as
-                // that would defeat the purpose of this refactoring entirely).
-                var newTypeSyntax =
-                    semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType
-                                 !.GenerateTypeSyntax(allowVar: false)
-                                 .WithTriviaFrom(typeSyntax);
-
-                Debug.Assert(!newTypeSyntax.ContainsDiagnostics, "Explicit type replacement likely introduced an error in code");
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
 
-                editor.ReplaceNode(typeSyntax, newTypeSyntax);
-            }
-            else
+            if (declarationExpression.Designation.IsKind(SyntaxKind.ParenthesizedVariableDesignation, out ParenthesizedVariableDesignationSyntax? variableDesignation))
             {
-                RoslynDebug.AssertNotNull(typeSyntax);
-                var tupleTypeSymbol = semanticModel.GetTypeInfo(typeSyntax.Parent!, cancellationToken).ConvertedType;
+                RoslynDebug.AssertNotNull(typeSyntax.Parent);
 
+                var tupleTypeSymbol = semanticModel.GetTypeInfo(typeSyntax.Parent, cancellationToken).ConvertedType;
                 RoslynDebug.AssertNotNull(tupleTypeSymbol);
 
-                var leadingTrivia = node.GetLeadingTrivia()
-                    .Concat(parensDesignation.GetAllPrecedingTriviaToPreviousToken().Where(t => !t.IsWhitespace()).Select(t => t.WithoutAnnotations(SyntaxAnnotation.ElasticAnnotation)));
+                var leadingTrivia = declarationExpression.GetLeadingTrivia()
+                    .Concat(variableDesignation.GetAllPrecedingTriviaToPreviousToken().Where(t => !t.IsWhitespace()).Select(t => t.WithoutAnnotations(SyntaxAnnotation.ElasticAnnotation)));
 
-                var tupleDeclaration = GenerateTupleDeclaration(tupleTypeSymbol, parensDesignation).WithLeadingTrivia(leadingTrivia);
+                var tupleDeclaration = GenerateTupleDeclaration(tupleTypeSymbol, variableDesignation).WithLeadingTrivia(leadingTrivia);
 
-                editor.ReplaceNode(declarationContext, tupleDeclaration);
+                editor.ReplaceNode(declarationExpression, tupleDeclaration);
             }
-        }
-
-        private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol, ParenthesizedVariableDesignationSyntax parensDesignation)
-        {
-            Debug.Assert(typeSymbol.IsTupleType);
-            var elements = ((INamedTypeSymbol)typeSymbol).TupleElements;
-            Debug.Assert(elements.Length == parensDesignation.Variables.Count);
-
-            using var builderDisposer = ArrayBuilder<SyntaxNode>.GetInstance(elements.Length, out var builder);
-            for (var i = 0; i < elements.Length; i++)
+            else
             {
-                var designation = parensDesignation.Variables[i];
-                var type = elements[i].Type;
-                ExpressionSyntax newDeclaration;
-                switch (designation.Kind())
-                {
-                    case SyntaxKind.SingleVariableDesignation:
-                    case SyntaxKind.DiscardDesignation:
-                        var typeName = type.GenerateTypeSyntax(allowVar: false);
-                        newDeclaration = SyntaxFactory.DeclarationExpression(typeName, designation);
-                        break;
-                    case SyntaxKind.ParenthesizedVariableDesignation:
-                        newDeclaration = GenerateTupleDeclaration(type, (ParenthesizedVariableDesignationSyntax)designation);
-                        break;
-                    default:
-                        throw ExceptionUtilities.UnexpectedValue(designation.Kind());
-                }
-
-                newDeclaration = newDeclaration
-                    .WithLeadingTrivia(designation.GetAllPrecedingTriviaToPreviousToken())
-                    .WithTrailingTrivia(designation.GetTrailingTrivia());
+                var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
+                RoslynDebug.AssertNotNull(typeSymbol);
 
-                builder.Add(SyntaxFactory.Argument(newDeclaration));
+                editor.ReplaceNode(typeSyntax, GenerateTypeDeclaration(typeSyntax, typeSymbol));
             }
-
-            var separatorBuilder = ArrayBuilder<SyntaxToken>.GetInstance(builder.Count - 1, SyntaxFactory.Token(leading: default, SyntaxKind.CommaToken, trailing: default));
-
-            return SyntaxFactory.TupleExpression(
-                SyntaxFactory.Token(SyntaxKind.OpenParenToken).WithTrailingTrivia(),
-                SyntaxFactory.SeparatedList(builder.ToImmutable(), separatorBuilder.ToImmutableAndFree()),
-                SyntaxFactory.Token(SyntaxKind.CloseParenToken))
-                .WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
         }
 
         private static async Task HandleForEachStatementAsync(Document document, SyntaxEditor editor, ForEachStatementSyntax forEach, CancellationToken cancellationToken)
@@ -230,6 +181,48 @@ private static ITypeSymbol AdjustNullabilityOfTypeSymbol(
             return typeSymbol;
         }
 
+        private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol, ParenthesizedVariableDesignationSyntax parensDesignation)
+        {
+            Debug.Assert(typeSymbol.IsTupleType);
+            var elements = ((INamedTypeSymbol)typeSymbol).TupleElements;
+            Debug.Assert(elements.Length == parensDesignation.Variables.Count);
+
+            using var builderDisposer = ArrayBuilder<SyntaxNode>.GetInstance(elements.Length, out var builder);
+            for (var i = 0; i < elements.Length; i++)
+            {
+                var designation = parensDesignation.Variables[i];
+                var type = elements[i].Type;
+                ExpressionSyntax newDeclaration;
+                switch (designation.Kind())
+                {
+                    case SyntaxKind.SingleVariableDesignation:
+                    case SyntaxKind.DiscardDesignation:
+                        var typeName = type.GenerateTypeSyntax(allowVar: false);
+                        newDeclaration = SyntaxFactory.DeclarationExpression(typeName, designation);
+                        break;
+                    case SyntaxKind.ParenthesizedVariableDesignation:
+                        newDeclaration = GenerateTupleDeclaration(type, (ParenthesizedVariableDesignationSyntax)designation);
+                        break;
+                    default:
+                        throw ExceptionUtilities.UnexpectedValue(designation.Kind());
+                }
+
+                newDeclaration = newDeclaration
+                    .WithLeadingTrivia(designation.GetAllPrecedingTriviaToPreviousToken())
+                    .WithTrailingTrivia(designation.GetTrailingTrivia());
+
+                builder.Add(SyntaxFactory.Argument(newDeclaration));
+            }
+
+            var separatorBuilder = ArrayBuilder<SyntaxToken>.GetInstance(builder.Count - 1, SyntaxFactory.Token(leading: default, SyntaxKind.CommaToken, trailing: default));
+
+            return SyntaxFactory.TupleExpression(
+                SyntaxFactory.Token(SyntaxKind.OpenParenToken).WithTrailingTrivia(),
+                SyntaxFactory.SeparatedList(builder.ToImmutable(), separatorBuilder.ToImmutableAndFree()),
+                SyntaxFactory.Token(SyntaxKind.CloseParenToken))
+                .WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
+        }
+
         private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
         {
             // We're going to be passed through the simplifier.  Tell it to not just convert this back to var (as

From 283b209c86486c491603de459dcafb41c782f93c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 15 Jan 2022 13:38:02 +0000
Subject: [PATCH 043/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220114.25

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22064.25
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6ccd6e9ef0a64..76576e468654e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22063.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22064.25">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
+      <Sha>511824f9ad21a8bc070b4bad2a95acd119c4afa0</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22063.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22064.25">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
+      <Sha>511824f9ad21a8bc070b4bad2a95acd119c4afa0</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index d13f8db2dc177..8ef5017942cab 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22064.25",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22064.25"
   }
 }

From d9a598f6ba5133978300a4d1c36bff10c9745d06 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Sun, 16 Jan 2022 16:38:36 -0800
Subject: [PATCH 044/413] Apply suggestions from code review

Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
---
 .../UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 3ca1a2270327d..71898b2add570 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -87,6 +87,7 @@ internal static async Task HandleDeclarationAsync(
                 throw ExceptionUtilities.UnexpectedValue(declarationContext?.Kind());
             }
         }
+
         private static async Task HandleDeclarationExpressionAsync(Document document, SyntaxEditor editor, DeclarationExpressionSyntax declarationExpression, CancellationToken cancellationToken)
         {
             var typeSyntax = declarationExpression.Type;

From cd015aa5c47c69257372807d201555f4332e6f9c Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Sun, 16 Jan 2022 17:02:12 -0800
Subject: [PATCH 045/413] Combine methods

---
 .../UseExplicitTypeCodeFixProvider.cs         | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 71898b2add570..979adc36db389 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -118,40 +118,33 @@ private static async Task HandleDeclarationExpressionAsync(Document document, Sy
             }
         }
 
-        private static async Task HandleForEachStatementAsync(Document document, SyntaxEditor editor, ForEachStatementSyntax forEach, CancellationToken cancellationToken)
-        {
-            var typeSyntax = forEach.Type.StripRefIfNeeded();
-            var declarationSyntax = forEach.Identifier.Parent;
-
-            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
-
-            RoslynDebug.AssertNotNull(typeSymbol);
-            RoslynDebug.AssertNotNull(declarationSyntax);
-
-            typeSymbol = AdjustNullabilityOfTypeSymbol(
-                typeSymbol,
-                semanticModel,
-                declarationSyntax,
+        private static Task HandleForEachStatementAsync(Document document, SyntaxEditor editor, ForEachStatementSyntax forEach, CancellationToken cancellationToken)
+            => UpdateTypeSyntaxAsync(
+                document,
+                editor,
+                forEach.Type,
+                forEach.Identifier.Parent!,
                 cancellationToken);
 
-            editor.ReplaceNode(typeSyntax, GenerateTypeDeclaration(typeSyntax, typeSymbol));
-        }
+        private static Task HandleVariableDeclarationAsync(Document document, SyntaxEditor editor, VariableDeclarationSyntax varDecl, CancellationToken cancellationToken)
+            => UpdateTypeSyntaxAsync(
+                document,
+                editor,
+                varDecl.Type,
+                // Since we're only dealing with variable declaration using var, we know
+                // that implicitly typed variables cannot have multiple declarators in
+                // a single declaration (CS0819). Only one variable should be present
+                varDecl.Variables.Single().Identifier.Parent!,
+                cancellationToken);
 
-        private static async Task HandleVariableDeclarationAsync(Document document, SyntaxEditor editor, VariableDeclarationSyntax varDecl, CancellationToken cancellationToken)
+        private static async Task UpdateTypeSyntaxAsync(Document document, SyntaxEditor editor, TypeSyntax typeSyntax, SyntaxNode declarationSyntax, CancellationToken cancellationToken)
         {
-            var typeSyntax = varDecl.Type.StripRefIfNeeded();
-            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            typeSyntax = typeSyntax.StripRefIfNeeded();
 
+            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
             RoslynDebug.AssertNotNull(typeSymbol);
 
-            // Since we're only dealing with variable declaration using var, we know
-            // that implicitly typed variables cannot have multiple declarators in
-            // a single declaration (CS0819). Only one variable should be present
-            var declarationSyntax = varDecl.Variables.Single().Identifier.Parent;
-            RoslynDebug.AssertNotNull(declarationSyntax);
-
             typeSymbol = AdjustNullabilityOfTypeSymbol(
                 typeSymbol,
                 semanticModel,

From 00239b76655697267174c38efbeaae793539d982 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Sun, 16 Jan 2022 17:21:15 -0800
Subject: [PATCH 046/413] Cleanup and PR feedback

---
 .../CSharp/Utilities/NullableHelpers/NullableHelpers.cs  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
index 0671c5fbbd822..9287bc5845bf9 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
@@ -32,6 +32,11 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
             // that contains the declaration
             while (rootOperation.Parent is not null)
             {
+                if (rootOperation is IBlockOperation)
+                {
+                    break;
+                }
+
                 rootOperation = rootOperation.Parent;
             }
 
@@ -77,7 +82,7 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
                 }
 
                 var syntax = reference is IVariableDeclaratorOperation variableDeclarator
-                    ? variableDeclarator.GetVariableInitializer().Value.Syntax
+                    ? variableDeclarator.GetVariableInitializer()!.Value.Syntax
                     : reference.Syntax;
 
                 var typeInfo = semanticModel.GetTypeInfo(syntax);
@@ -96,7 +101,7 @@ private static bool IsSymbolReferencedByOperation(IOperation operation, ISymbol
             {
                 ILocalReferenceOperation localReference => localReference.Local.Equals(symbol),
                 IParameterReferenceOperation parameterReference => parameterReference.Parameter.Equals(symbol),
-                IAssignmentOperation assignment => assignment is not IDeconstructionAssignmentOperation && IsSymbolReferencedByOperation(assignment.Target, symbol, allowNullInitializer: false),
+                IAssignmentOperation assignment => IsSymbolReferencedByOperation(assignment.Target, symbol, allowNullInitializer: false),
                 IForEachLoopOperation loopOperation => IsSymbolReferencedByOperation(loopOperation.LoopControlVariable, symbol, allowNullInitializer: true),
                 ITupleOperation tupleOperation => tupleOperation.Elements.Any(element => IsSymbolReferencedByOperation(element, symbol, allowNullInitializer: false)),
 

From 18052ff4225b4ec22d9db434d267de1225c22602 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:40:49 +0000
Subject: [PATCH 047/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220117.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22067.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 76576e468654e..05937fd278ac1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22064.25">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22067.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>511824f9ad21a8bc070b4bad2a95acd119c4afa0</Sha>
+      <Sha>3fb1f4bbc1f2cdd26071764132a3592eceab63fe</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22064.25">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22067.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>511824f9ad21a8bc070b4bad2a95acd119c4afa0</Sha>
+      <Sha>3fb1f4bbc1f2cdd26071764132a3592eceab63fe</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 8ef5017942cab..d0b9b1e864aac 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22064.25",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22064.25"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22067.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22067.1"
   }
 }

From 16857e652d6aa40f3f3feb7f4d9b2207d66ac051 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Tue, 18 Jan 2022 16:53:29 -0800
Subject: [PATCH 048/413] Fix correctness build

---
 .../UseExplicitTypeCodeFixProvider.cs                          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 979adc36db389..10869d0f4a568 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -62,10 +62,9 @@ internal static async Task HandleDeclarationAsync(
             Document document, SyntaxEditor editor,
             SyntaxNode node, CancellationToken cancellationToken)
         {
-            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var declarationContext = node.Parent;
 
-            if (declarationContext is RefTypeSyntax refType)
+            if (declarationContext is RefTypeSyntax)
             {
                 declarationContext = declarationContext.Parent;
             }

From 2f140ddf1d4460460f7ed895484b6229dec46660 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 13:37:24 +0000
Subject: [PATCH 049/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220118.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22068.3
---
 eng/Version.Details.xml                     | 8 ++++----
 eng/common/templates/steps/source-build.yml | 2 +-
 global.json                                 | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 05937fd278ac1..bafd400a84e02 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22067.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22068.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3fb1f4bbc1f2cdd26071764132a3592eceab63fe</Sha>
+      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22067.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22068.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3fb1f4bbc1f2cdd26071764132a3592eceab63fe</Sha>
+      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index ba40dc82f1411..d85d6d07d5c7b 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -23,7 +23,7 @@ steps:
     # In addition, add an msbuild argument to copy the WIP from the repo to the target build location.
     # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those
     # changes.
-    $internalRestoreArgs=
+    internalRestoreArgs=
     if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then
       # Temporarily work around https://github.com/dotnet/arcade/issues/7709
       chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
diff --git a/global.json b/global.json
index d0b9b1e864aac..2887c69572345 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22067.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22067.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22068.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22068.3"
   }
 }

From 4c2862705a2598226d6a38f8fe5a43f3ab36bcb2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 22 Jan 2022 13:41:20 +0000
Subject: [PATCH 050/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220121.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22071.6
---
 eng/Version.Details.xml                       |   8 +-
 eng/common/internal/NuGet.config              |   7 +
 eng/common/templates/job/execute-sdl.yml      |  13 +-
 eng/common/templates/job/onelocbuild.yml      |   3 +-
 eng/common/templates/jobs/jobs.yml            |   4 +-
 .../templates/post-build/common-variables.yml |  69 ----------
 .../templates/post-build/post-build.yml       |  74 +++++------
 .../post-build/setup-maestro-vars.yml         | 123 ++++++++----------
 global.json                                   |   4 +-
 9 files changed, 108 insertions(+), 197 deletions(-)
 create mode 100644 eng/common/internal/NuGet.config

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bafd400a84e02..a670910c0df02 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22068.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
+      <Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22068.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22071.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
+      <Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
new file mode 100644
index 0000000000000..769650362f4aa
--- /dev/null
+++ b/eng/common/internal/NuGet.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 8cf772b3cbf81..a4837c32c3869 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -29,14 +29,6 @@ parameters:
   # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
   # not pipeline artifacts, so doesn't affect the use of this parameter.
   pipelineArtifactNames: []
-  # Optional: location and ID of the AzDO build that the build/pipeline artifacts should be
-  # downloaded from. By default, uses runtime expressions to decide based on the variables set by
-  # the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are
-  # running without Maestro++/BAR involved, or to download artifacts from a specific existing build
-  # to iterate quickly on SDL changes.
-  AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-  AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-  AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
 
 jobs:
 - job: Run_SDL
@@ -55,11 +47,14 @@ jobs:
     - name: GuardianVersion
       value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
   pool:
-    vmImage: windows-2019
+    name: NetCore1ESPool-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - checkout: self
     clean: true
 
+  - template: /eng/common/templates/post-build/setup-maestro-vars.yml
+
   - ${{ if ne(parameters.downloadArtifacts, 'false')}}:
     - ${{ if ne(parameters.artifactNames, '') }}:
       - ${{ each artifactName in parameters.artifactNames }}:
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index c4fc18b3ee77a..0b93fd5b490eb 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,8 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool:
-    vmImage: 'windows-2019'
+    name: NetCore1ESPool-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index ff4ab75c886dc..dafa603dc5d90 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,7 +83,9 @@ jobs:
         - ${{ if eq(parameters.enableSourceBuild, true) }}:
           - Source_Build_Complete
         pool:
-          vmImage: 'windows-2019'
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c99fd7503767c..c830e6f277606 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -4,54 +4,6 @@ variables:
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-MSRC-Storage
   - group: Publish-Build-Assets
-    
-  # .NET Core 3.1 Dev
-  - name: PublicDevRelease_31_Channel_Id
-    value: 128
-
-  # .NET 5 Dev
-  - name: Net_5_Dev_Channel_Id
-    value: 131
-
-  # .NET Eng - Validation
-  - name: Net_Eng_Validation_Channel_Id
-    value: 9
-
-  # .NET Eng - Latest
-  - name: Net_Eng_Latest_Channel_Id
-    value: 2
-
-  # .NET 3 Eng - Validation
-  - name: NET_3_Eng_Validation_Channel_Id
-    value: 390
-
-  # .NET 3 Eng
-  - name: NetCore_3_Tools_Channel_Id
-    value: 344
-
-  # .NET Core 3.0 Internal Servicing
-  - name: InternalServicing_30_Channel_Id
-    value: 184
-
-  # .NET Core 3.0 Release
-  - name: PublicRelease_30_Channel_Id
-    value: 19
-
-  # .NET Core 3.1 Release
-  - name: PublicRelease_31_Channel_Id
-    value: 129
-
-  # General Testing
-  - name: GeneralTesting_Channel_Id
-    value: 529
-
-  # .NET Core 3.1 Blazor Features
-  - name: NetCore_31_Blazor_Features_Channel_Id
-    value: 531
-
-  # .NET Core Experimental
-  - name: NetCore_Experimental_Channel_Id
-    value: 562
 
   # Whether the build is internal or not
   - name: IsInternalBuild
@@ -70,27 +22,6 @@ variables:
   - name: SymbolToolVersion
     value: 1.0.1
 
-  # Feed Configurations
-  # These should include the suffix "/index.json"
-
-  # Default locations for Installers and checksums
-  # Public Locations
-  - name: ChecksumsBlobFeedUrl
-    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
-  - name: InstallersBlobFeedUrl
-    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
-
-  # Private Locations
-  - name: InternalChecksumsBlobFeedUrl
-    value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalChecksumsBlobFeedKey
-    value: $(dotnetclichecksumsmsrc-storage-key)
-
-  - name: InternalInstallersBlobFeedUrl
-    value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalInstallersBlobFeedKey
-    value: $(dotnetclimsrc-access-key)
-
   # Skip component governance and codesign validation for SDL. These jobs
   # create no content.
   - name: skipComponentGovernanceDetection
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 8985b429c8543..9583d27dbbf89 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -90,25 +90,19 @@ stages:
     variables:
       - template: common-variables.yml
     jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
     - job:
       displayName: NuGet Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
       pool:
-        vmImage: 'windows-2019'
-      variables:
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -129,19 +123,16 @@ stages:
 
     - job:
       displayName: Signing Validation
-      dependsOn: setupMaestroVars
       condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -186,19 +177,16 @@ stages:
 
     - job:
       displayName: SourceLink Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Blob Artifacts
           inputs:
@@ -224,7 +212,6 @@ stages:
     - template: /eng/common/templates/job/execute-sdl.yml
       parameters:
         enable: ${{ parameters.SDLValidationParameters.enable }}
-        dependsOn: setupMaestroVars
         additionalParameters: ${{ parameters.SDLValidationParameters.params }}
         continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
         artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
@@ -239,21 +226,18 @@ stages:
   variables:
     - template: common-variables.yml
   jobs:
-  - template: setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
   - job:
     displayName: Publish Using Darc
-    dependsOn: setupMaestroVars
     timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
     pool:
-      vmImage: 'windows-2019'
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
+      - template: setup-maestro-vars.yml
+        parameters:
+          BARBuildId: ${{ parameters.BARBuildId }}
+          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
       - task: PowerShell@2
         displayName: Publish Using Darc
         inputs:
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 4a22b2e6f6de7..826d3ed5f74c2 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -2,77 +2,68 @@ parameters:
   BARBuildId: ''
   PromoteToChannelIds: ''
 
-jobs:
-- job: setupMaestroVars
-  displayName: Setup Maestro Vars
-  variables:
-    - template: common-variables.yml
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - checkout: none
-
-    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Release Configs
-        inputs:
-          buildType: current
-          artifactName: ReleaseConfigs
-          checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      name: setReleaseVars
-      displayName: Set Release Configs Vars
+steps:
+  - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Release Configs
       inputs:
-        targetType: inline
-        script: |
-          try {
-            if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
-              $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
+        buildType: current
+        artifactName: ReleaseConfigs
+        checkDownloadedFiles: true
 
-              $BarId = $Content | Select -Index 0
-              $Channels = $Content | Select -Index 1             
-              $IsStableBuild = $Content | Select -Index 2
+  - task: PowerShell@2
+    name: setReleaseVars
+    displayName: Set Release Configs Vars
+    inputs:
+      targetType: inline
+      script: |
+        try {
+          if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
+            $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
 
-              $AzureDevOpsProject = $Env:System_TeamProject
-              $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
-              $AzureDevOpsBuildId = $Env:Build_BuildId
-            }
-            else {
-              $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
+            $BarId = $Content | Select -Index 0
+            $Channels = $Content | Select -Index 1             
+            $IsStableBuild = $Content | Select -Index 2
 
-              $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-              $apiHeaders.Add('Accept', 'application/json')
-              $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-              $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-             
-              $BarId = $Env:BARBuildId
-              $Channels = $Env:PromoteToMaestroChannels -split ","
-              $Channels = $Channels -join "]["
-              $Channels = "[$Channels]"
+            $AzureDevOpsProject = $Env:System_TeamProject
+            $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
+            $AzureDevOpsBuildId = $Env:Build_BuildId
+          }
+          else {
+            $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
 
-              $IsStableBuild = $buildInfo.stable
-              $AzureDevOpsProject = $buildInfo.azureDevOpsProject
-              $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
-              $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
-            }
+            $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
+            $apiHeaders.Add('Accept', 'application/json')
+            $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
 
-            Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
-            Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
-            Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
+            $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
+            
+            $BarId = $Env:BARBuildId
+            $Channels = $Env:PromoteToMaestroChannels -split ","
+            $Channels = $Channels -join "]["
+            $Channels = "[$Channels]"
 
-            Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
-            Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
-            Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
+            $IsStableBuild = $buildInfo.stable
+            $AzureDevOpsProject = $buildInfo.azureDevOpsProject
+            $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
+            $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
           }
-          catch {
-            Write-Host $_
-            Write-Host $_.Exception
-            Write-Host $_.ScriptStackTrace
-            exit 1
-          }
-      env:
-        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
+
+          Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId"
+          Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels"
+          Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild"
+
+          Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject"
+          Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId"
+          Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId"
+        }
+        catch {
+          Write-Host $_
+          Write-Host $_.Exception
+          Write-Host $_.ScriptStackTrace
+          exit 1
+        }
+    env:
+      MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/global.json b/global.json
index 2887c69572345..23f5127d06937 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22068.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22068.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22071.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22071.6"
   }
 }

From 4afdfc3c17bb1a071bae97f81ad1f3a176c30599 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 13:38:24 +0000
Subject: [PATCH 051/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220124.13

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22074.13
---
 eng/Version.Details.xml                       |  8 ++--
 eng/common/templates/job/execute-sdl.yml      | 10 ++++-
 eng/common/templates/job/onelocbuild.yml      | 19 ++++++---
 eng/common/templates/jobs/jobs.yml            | 10 ++++-
 .../templates/post-build/post-build.yml       | 42 +++++++++++++++----
 .../post-build/setup-maestro-vars.yml         |  1 +
 global.json                                   |  4 +-
 7 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a670910c0df02..c5e5db6370fa2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22074.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
+      <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22071.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22074.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
+      <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index a4837c32c3869..24cec0424e5d6 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -47,8 +47,14 @@ jobs:
     - name: GuardianVersion
       value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
   pool:
-    name: NetCore1ESPool-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+    ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+      name: VSEngSS-MicroBuild2022-1ES
+      demands: Cmd
+    # If it's not devdiv, it's dnceng
+    ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - checkout: self
     clean: true
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 0b93fd5b490eb..9d1e3042d8a6c 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -3,10 +3,8 @@ parameters:
   dependsOn: ''
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool:
-    name: NetCore1ESPool-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
-
+  pool: ''
+    
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
@@ -32,7 +30,18 @@ jobs:
 
   displayName: OneLocBuild
 
-  pool: ${{ parameters.pool }}
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+        name: VSEngSS-MicroBuild2022-1ES
+        demands: Cmd
+      # If it's not devdiv, it's dnceng
+      ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   variables:
     - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index dafa603dc5d90..554e71cfc436d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,8 +83,14 @@ jobs:
         - ${{ if eq(parameters.enableSourceBuild, true) }}:
           - Source_Build_Complete
         pool:
-          name: NetCore1ESPool-Internal
-          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+          # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+          ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+            name: VSEngSS-MicroBuild2022-1ES
+            demands: Cmd
+          # If it's not devdiv, it's dnceng
+          ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 9583d27dbbf89..2f176571f020c 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -94,8 +94,14 @@ stages:
       displayName: NuGet Validation
       condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
       pool:
-        name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
       steps:
         - template: setup-maestro-vars.yml
@@ -125,8 +131,14 @@ stages:
       displayName: Signing Validation
       condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
       pool:
-        name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
         - template: setup-maestro-vars.yml
           parameters:
@@ -179,8 +191,14 @@ stages:
       displayName: SourceLink Validation
       condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
       pool:
-        name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
         - template: setup-maestro-vars.yml
           parameters:
@@ -230,14 +248,22 @@ stages:
     displayName: Publish Using Darc
     timeoutInMinutes: 120
     pool:
-      name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
       - template: setup-maestro-vars.yml
         parameters:
           BARBuildId: ${{ parameters.BARBuildId }}
           PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
 
+      - task: NuGetAuthenticate@0
+
       - task: PowerShell@2
         displayName: Publish Using Darc
         inputs:
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 826d3ed5f74c2..0c87f149a4ad7 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -16,6 +16,7 @@ steps:
     displayName: Set Release Configs Vars
     inputs:
       targetType: inline
+      pwsh: true
       script: |
         try {
           if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
diff --git a/global.json b/global.json
index 23f5127d06937..91c6250b1c266 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22071.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22071.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22074.13"
   }
 }

From 8d306da9ac78accebbaa62c9bb41cd89c38aba8e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 26 Jan 2022 13:39:44 +0000
Subject: [PATCH 052/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220125.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22075.6
---
 eng/Version.Details.xml          |  8 ++++----
 eng/common/cross/build-rootfs.sh | 12 ++++--------
 global.json                      |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c5e5db6370fa2..f8e693f38eb96 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22074.13">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22075.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
+      <Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22074.13">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22075.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
+      <Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index e94d13d62ef64..f97dca7705408 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -7,7 +7,7 @@ usage()
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
     echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
-    echo "                              for FreeBSD can be: freebsd11, freebsd12, freebsd13"
+    echo "                              for FreeBSD can be: freebsd12, freebsd13"
     echo "                              for illumos can be: illumos."
     echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
@@ -60,13 +60,13 @@ __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
 
-__FreeBSDBase="12.2-RELEASE"
-__FreeBSDPkg="1.12.0"
+__FreeBSDBase="12.3-RELEASE"
+__FreeBSDPkg="1.17.0"
 __FreeBSDABI="12"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
 __FreeBSDPackages+=" libinotify"
-__FreeBSDPackages+=" lttng-ust"
+__FreeBSDPackages+=" openssl"
 __FreeBSDPackages+=" krb5"
 __FreeBSDPackages+=" terminfo-db"
 
@@ -206,10 +206,6 @@ while :; do
             __AlpineVersion=3.14
             __AlpinePackages+=" llvm11-libs"
             ;;
-        freebsd11)
-            __FreeBSDBase="11.3-RELEASE"
-            __FreeBSDABI="11"
-            ;&
         freebsd12)
             __CodeName=freebsd
             __BuildArch=x64
diff --git a/global.json b/global.json
index 91c6250b1c266..2593cfe719e6d 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22074.13"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6"
   }
 }

From b04836a2068ebc60c70d527aa2d2088656f99f38 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 27 Jan 2022 13:52:24 +0000
Subject: [PATCH 053/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220126.9

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22076.9
---
 eng/Version.Details.xml                              | 8 ++++----
 eng/common/templates/job/job.yml                     | 4 ++++
 eng/common/templates/job/publish-build-assets.yml    | 4 ----
 eng/common/templates/jobs/jobs.yml                   | 4 ++++
 eng/common/templates/post-build/common-variables.yml | 4 ----
 global.json                                          | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f8e693f38eb96..f1679bac360f0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22075.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22076.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
+      <Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22075.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22076.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
+      <Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 7678b94ce740c..c5c2a9915121b 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,6 +24,7 @@ parameters:
   enablePublishBuildAssets: false
   enablePublishTestResults: false
   enablePublishUsingPipelines: false
+  disableComponentGovernance: false
   mergeTestResults: false
   testRunTitle: ''
   testResultsFormat: ''
@@ -137,6 +138,9 @@ jobs:
         richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
       continueOnError: true
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+      - task: ComponentGovernanceComponentDetection@0
+
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index fe9dfdf720cf8..d91bf9147116f 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -38,10 +38,6 @@ jobs:
       value: ${{ parameters.configuration }}
     - group: Publish-Build-Assets
     - group: AzureDevOps-Artifact-Feeds-Pats
-    # Skip component governance and codesign validation for SDL. These jobs
-    # create no content.
-    - name: skipComponentGovernanceDetection
-      value: true
     - name: runCodesignValidationInjection
       value: false
 
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 554e71cfc436d..70d44735ace4a 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,6 +8,10 @@ parameters:
   # Optional: Enable publishing using release pipelines
   enablePublishUsingPipelines: false
 
+  # Optional: Disable component governance detection. In general, component governance
+  # should be on for all jobs. Use only in the event of issues.
+  disableComponentGovernance: false
+
   # Optional: Enable running the source-build jobs to build repo from source
   enableSourceBuild: false
 
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c830e6f277606..1ac7f49a43ca8 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -22,9 +22,5 @@ variables:
   - name: SymbolToolVersion
     value: 1.0.1
 
-  # Skip component governance and codesign validation for SDL. These jobs
-  # create no content.
-  - name: skipComponentGovernanceDetection
-    value: true
   - name: runCodesignValidationInjection
     value: false
diff --git a/global.json b/global.json
index 2593cfe719e6d..cd037faf95aa6 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22076.9"
   }
 }

From 1d008e6ec6e6acbaa7befb708218b8d4f0e9f7ab Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 28 Jan 2022 13:41:00 +0000
Subject: [PATCH 054/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220127.8

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22077.8
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f1679bac360f0..1fe9c6ff0f5d4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22076.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22077.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
+      <Sha>510b555b426c5383890bbc3c94aca38b8c290758</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22076.9">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22077.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
+      <Sha>510b555b426c5383890bbc3c94aca38b8c290758</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index cd037faf95aa6..c402caf16e486 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22076.9"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22077.8",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22077.8"
   }
 }

From 8d01f1ee1a9a1a409ee4fcb7824cc7d0ce2868e2 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Fri, 28 Jan 2022 16:11:39 -0800
Subject: [PATCH 055/413] Simplify

---
 .../NullableHelpers/NullableHelpers.cs        | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
index 9287bc5845bf9..a5bc1ca56bec1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
@@ -30,13 +30,9 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
 
             // Walk up the tree to find a root for the operation
             // that contains the declaration
-            while (rootOperation.Parent is not null)
+            while (rootOperation is not IBlockOperation &&
+                rootOperation.Parent is not null)
             {
-                if (rootOperation is IBlockOperation)
-                {
-                    break;
-                }
-
                 rootOperation = rootOperation.Parent;
             }
 
@@ -51,7 +47,7 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
         public static bool? IsSymbolAssignedPossiblyNullValue(SemanticModel semanticModel, IOperation operation, ISymbol symbol)
         {
             var references = operation.DescendantsAndSelf()
-                .Where(o => IsSymbolReferencedByOperation(o, symbol, allowNullInitializer: false));
+                .Where(o => IsSymbolReferencedByOperation(o, symbol));
 
             var hasReference = false;
 
@@ -96,18 +92,17 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
             return hasReference ? (bool?)false : null;
         }
 
-        private static bool IsSymbolReferencedByOperation(IOperation operation, ISymbol symbol, bool allowNullInitializer)
+        private static bool IsSymbolReferencedByOperation(IOperation operation, ISymbol symbol)
             => operation switch
             {
                 ILocalReferenceOperation localReference => localReference.Local.Equals(symbol),
                 IParameterReferenceOperation parameterReference => parameterReference.Parameter.Equals(symbol),
-                IAssignmentOperation assignment => IsSymbolReferencedByOperation(assignment.Target, symbol, allowNullInitializer: false),
-                IForEachLoopOperation loopOperation => IsSymbolReferencedByOperation(loopOperation.LoopControlVariable, symbol, allowNullInitializer: true),
-                ITupleOperation tupleOperation => tupleOperation.Elements.Any(element => IsSymbolReferencedByOperation(element, symbol, allowNullInitializer: false)),
+                IAssignmentOperation assignment => IsSymbolReferencedByOperation(assignment.Target, symbol),
+                ITupleOperation tupleOperation => tupleOperation.Elements.Any(element => IsSymbolReferencedByOperation(element, symbol)),
+                IForEachLoopOperation { LoopControlVariable: IVariableDeclaratorOperation variableDeclarator } => variableDeclarator.Symbol.Equals(symbol),
 
-                // We want to be explicit about if we allow the variable to have a null variable initializer. The use case for now is around foreach loops 
-                // where the LoopControlVariable of the operation will have a null initializer.
-                IVariableDeclaratorOperation variableDeclarator => (allowNullInitializer || variableDeclarator.GetVariableInitializer() != null) && variableDeclarator.Symbol.Equals(symbol),
+                // A variable initializer is required for this to be a meaningful operation for determining possible null assignment
+                IVariableDeclaratorOperation variableDeclarator => variableDeclarator.GetVariableInitializer() != null && variableDeclarator.Symbol.Equals(symbol),
                 _ => false
             };
     }

From 50bed7a054b73ea1ae675d136e225414cbf247d2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 29 Jan 2022 13:37:56 +0000
Subject: [PATCH 056/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220128.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22078.2
---
 eng/Version.Details.xml          | 8 ++++----
 eng/common/internal/NuGet.config | 2 +-
 global.json                      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1fe9c6ff0f5d4..b740102f32e02 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22077.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22078.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>510b555b426c5383890bbc3c94aca38b8c290758</Sha>
+      <Sha>9b22f498e6c8c225251f5a39c35cd9af54dff69e</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22077.8">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22078.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>510b555b426c5383890bbc3c94aca38b8c290758</Sha>
+      <Sha>9b22f498e6c8c225251f5a39c35cd9af54dff69e</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
index 769650362f4aa..19d3d311b166f 100644
--- a/eng/common/internal/NuGet.config
+++ b/eng/common/internal/NuGet.config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
+    <add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/global.json b/global.json
index c402caf16e486..b129a63f81a51 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22077.8",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22077.8"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22078.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22078.2"
   }
 }

From 9c7644ccf4dc489d3e98182dec783b24a23c4e0b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 31 Jan 2022 13:37:59 +0000
Subject: [PATCH 057/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220130.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22080.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b740102f32e02..7e52b090820cd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22078.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b22f498e6c8c225251f5a39c35cd9af54dff69e</Sha>
+      <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22078.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22080.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9b22f498e6c8c225251f5a39c35cd9af54dff69e</Sha>
+      <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index b129a63f81a51..32a06f022dd57 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22078.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22078.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1"
   }
 }

From e133ffb72ddcef094265eed8937e85c59c6cbd13 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Fri, 4 Feb 2022 12:32:54 -0800
Subject: [PATCH 058/413] Apply suggestions from code review

Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
---
 .../UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 10869d0f4a568..4b4662054fb37 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -122,7 +122,7 @@ private static Task HandleForEachStatementAsync(Document document, SyntaxEditor
                 document,
                 editor,
                 forEach.Type,
-                forEach.Identifier.Parent!,
+                forEach.Identifier.GetRequiredParent(),
                 cancellationToken);
 
         private static Task HandleVariableDeclarationAsync(Document document, SyntaxEditor editor, VariableDeclarationSyntax varDecl, CancellationToken cancellationToken)

From 2318f3e875bceb2cd654099f50746d7db9ee65a7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 5 Feb 2022 13:45:49 +0000
Subject: [PATCH 059/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220203.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22103.1
---
 eng/Version.Details.xml                     | 8 ++++----
 eng/common/templates/job/job.yml            | 1 +
 eng/common/templates/steps/source-build.yml | 4 ++--
 global.json                                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7e52b090820cd..5271aac856c25 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22080.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index c5c2a9915121b..92e98af7ebd5c 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -140,6 +140,7 @@ jobs:
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
       - task: ComponentGovernanceComponentDetection@0
+        continueOnError: true
 
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index d85d6d07d5c7b..12a8ff94d8e96 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -43,8 +43,8 @@ steps:
     # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
     # in the default public locations.
     internalRuntimeDownloadArgs=
-    if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
-      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
+    if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
     fi
 
     buildConfig=Release
diff --git a/global.json b/global.json
index 32a06f022dd57..4c24d45d68a88 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1"
   }
 }

From 26ec1b739fb1fa8ba162d0e93dcdafc22f46da0d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:57:07 +0000
Subject: [PATCH 060/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220208.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22108.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5271aac856c25..fcae6ee946b8a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22108.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
+      <Sha>dda61e4601d38b5d9d972f0541ff652ba5a16ad6</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22108.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
+      <Sha>dda61e4601d38b5d9d972f0541ff652ba5a16ad6</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 4c24d45d68a88..eed77c0351e8c 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22108.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22108.1"
   }
 }

From 0135ab505715e55fc76f82806dc0b85cc64ca138 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 13:41:28 +0000
Subject: [PATCH 061/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220209.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22109.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fcae6ee946b8a..bc65557f757f1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22108.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22109.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>dda61e4601d38b5d9d972f0541ff652ba5a16ad6</Sha>
+      <Sha>00b6cce8983065a9cf9fb108a724f28ec44eaf75</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22108.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22109.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>dda61e4601d38b5d9d972f0541ff652ba5a16ad6</Sha>
+      <Sha>00b6cce8983065a9cf9fb108a724f28ec44eaf75</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index eed77c0351e8c..6e85314ae4605 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22108.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22108.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22109.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22109.1"
   }
 }

From b2bbd8a8389b05c3122eacb08702f4c33a699ac1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 13:44:01 +0000
Subject: [PATCH 062/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220210.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22110.7
---
 eng/Version.Details.xml                      |  8 ++--
 eng/common/cross/build-rootfs.sh             |  9 +++++
 eng/common/cross/ppc64le/sources.list.bionic | 11 +++++
 eng/common/cross/toolchain.cmake             |  7 +++-
 eng/common/generate-sbom-prep.ps1            | 19 +++++++++
 eng/common/generate-sbom-prep.sh             | 22 ++++++++++
 eng/common/templates/job/job.yml             | 11 +++++
 eng/common/templates/jobs/jobs.yml           |  5 +++
 eng/common/templates/steps/generate-sbom.yml | 42 ++++++++++++++++++++
 global.json                                  |  4 +-
 10 files changed, 130 insertions(+), 8 deletions(-)
 create mode 100644 eng/common/cross/ppc64le/sources.list.bionic
 create mode 100644 eng/common/generate-sbom-prep.ps1
 create mode 100644 eng/common/generate-sbom-prep.sh
 create mode 100644 eng/common/templates/steps/generate-sbom.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bc65557f757f1..8bbfba6906647 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22109.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22110.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>00b6cce8983065a9cf9fb108a724f28ec44eaf75</Sha>
+      <Sha>78eaf78761027d225030be2b28aaf4e8bf392929</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22109.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22110.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>00b6cce8983065a9cf9fb108a724f28ec44eaf75</Sha>
+      <Sha>78eaf78761027d225030be2b28aaf4e8bf392929</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index f97dca7705408..7e4be9a0ccfbf 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -120,6 +120,15 @@ while :; do
             __UbuntuRepo="http://ftp.debian.org/debian/"
             __CodeName=jessie
             ;;
+        ppc64le)
+            __BuildArch=ppc64le
+            __UbuntuArch=ppc64el
+            __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
+            unset __LLDB_Package
+            ;;
         s390x)
             __BuildArch=s390x
             __UbuntuArch=s390x
diff --git a/eng/common/cross/ppc64le/sources.list.bionic b/eng/common/cross/ppc64le/sources.list.bionic
new file mode 100644
index 0000000000000..2109557409576
--- /dev/null
+++ b/eng/common/cross/ppc64le/sources.list.bionic
@@ -0,0 +1,11 @@
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
+
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
+
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
+
+deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index fba2afda438b6..9fd345bde6d40 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -54,6 +54,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   if(TIZEN)
     set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
+  set(CMAKE_SYSTEM_PROCESSOR ppc64le)
+  set(TOOLCHAIN "powerpc64le-linux-gnu")
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   set(CMAKE_SYSTEM_PROCESSOR s390x)
   set(TOOLCHAIN "s390x-linux-gnu")
@@ -67,7 +70,7 @@ elseif (ILLUMOS)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(TOOLCHAIN "x86_64-illumos")
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -201,7 +204,7 @@ endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
new file mode 100644
index 0000000000000..a733a8885824a
--- /dev/null
+++ b/eng/common/generate-sbom-prep.ps1
@@ -0,0 +1,19 @@
+Param(
+    [Parameter(Mandatory=$true)][string] $ManifestDirPath    # Manifest directory where sbom will be placed
+)
+
+Write-Host "Creating dir $ManifestDirPath"
+# create directory for sbom manifest to be placed
+if (!(Test-Path -path $ManifestDirPath))
+{
+  New-Item -ItemType Directory -path $ManifestDirPath
+  Write-Host "Successfully created directory $ManifestDirPath"
+}
+else{
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+}
+
+Write-Host "Updating artifact name"
+$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
+Write-Host "Artifact name $artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
new file mode 100644
index 0000000000000..f6c77453142a2
--- /dev/null
+++ b/eng/common/generate-sbom-prep.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+manifest_dir=$1
+
+if [ ! -d "$manifest_dir" ] ; then
+  mkdir -p "$manifest_dir"
+  echo "Sbom directory created." $manifest_dir
+else
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+fi
+
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+echo "Artifact name before : "$artifact_name
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+echo "Artifact name after : "$safe_artifact_name
+export ARTIFACT_NAME=$safe_artifact_name
+echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
+
+exit 0
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 92e98af7ebd5c..e3ba9398016be 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -31,6 +31,10 @@ parameters:
   name: ''
   preSteps: []
   runAsPublic: false
+# Sbom related params
+  enableSbom: true
+  PackageVersion: 7.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -248,3 +252,10 @@ jobs:
         ArtifactName: AssetManifests
       continueOnError: ${{ parameters.continueOnError }}
       condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+    - template: /eng/common/templates/steps/generate-sbom.yml
+      parameters:
+        PackageVersion: ${{ parameters.packageVersion}}
+        BuildDropPath: ${{ parameters.buildDropPath }}
+
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 70d44735ace4a..6976330862c20 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -41,6 +41,11 @@ parameters:
 # Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
 # and some (Microbuild) should only be applied to non-PR cases for internal builds.
 
+# Sbom related params
+  enableSbom: true
+  PackageVersion: 7.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+
 jobs:
 - ${{ each job in parameters.jobs }}:
   - template: ../job/job.yml
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
new file mode 100644
index 0000000000000..3acba705f177c
--- /dev/null
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -0,0 +1,42 @@
+# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
+# PackageName - The name of the package this SBOM represents.
+# PackageVersion - The version of the package this SBOM represents. 
+# ManifestDirPath - The path of the directory where the generated manifest files will be placed
+
+parameters:
+  PackageVersion: 7.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  PackageName: '.NET'
+  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
+  sbomContinueOnError: true
+
+steps:
+- task: PowerShell@2 
+  displayName: Prep for SBOM generation in (Non-linux)
+  condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
+  inputs: 
+    filePath: ./eng/common/generate-sbom-prep.ps1
+    arguments: ${{parameters.manifestDirPath}}
+
+- script: |
+    ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
+  displayName: Prep for SBOM generation in (Linux)
+  condition: eq(variables['Agent.Os'], 'Linux')
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+  displayName: 'Generate SBOM manifest'
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+  inputs:
+      PackageName: ${{ parameters.packageName }}
+      BuildDropPath: ${{ parameters.buildDropPath }}
+      PackageVersion: ${{ parameters.packageVersion }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}
+
+- task: PublishPipelineArtifact@1
+  displayName: Publish SBOM manifest
+  continueOnError: ${{parameters.sbomContinueOnError}}
+  inputs:
+    targetPath: '${{parameters.manifestDirPath}}'
+    artifactName: $(ARTIFACT_NAME)
+
diff --git a/global.json b/global.json
index 6e85314ae4605..f440efb98de4b 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22109.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22109.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22110.7"
   }
 }

From 014e42e29a4256fc04209a0c77d4293441c42337 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 12 Feb 2022 13:34:15 +0000
Subject: [PATCH 063/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220211.10

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22111.10
---
 eng/Version.Details.xml                      | 8 ++++----
 eng/common/templates/steps/generate-sbom.yml | 2 ++
 global.json                                  | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8bbfba6906647..21d42ac4edf21 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22110.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22111.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>78eaf78761027d225030be2b28aaf4e8bf392929</Sha>
+      <Sha>ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22110.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22111.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>78eaf78761027d225030be2b28aaf4e8bf392929</Sha>
+      <Sha>ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
index 3acba705f177c..4cea8c33187c9 100644
--- a/eng/common/templates/steps/generate-sbom.yml
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -18,7 +18,9 @@ steps:
     filePath: ./eng/common/generate-sbom-prep.ps1
     arguments: ${{parameters.manifestDirPath}}
 
+# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
 - script: |
+    chmod +x ./eng/common/generate-sbom-prep.sh
     ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
   displayName: Prep for SBOM generation in (Linux)
   condition: eq(variables['Agent.Os'], 'Linux')
diff --git a/global.json b/global.json
index f440efb98de4b..717882aed4985 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22110.7"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22111.10",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22111.10"
   }
 }

From 9463d212090934b5c9bbaea8cdeef77bd5d519bf Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 13:46:33 +0000
Subject: [PATCH 064/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220214.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22114.7
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 21d42ac4edf21..cdb3b4238c933 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22111.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22114.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb</Sha>
+      <Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22111.10">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22114.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb</Sha>
+      <Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 717882aed4985..b5f4f210c8bae 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22111.10",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22111.10"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22114.7",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22114.7"
   }
 }

From 209639420076bf367ce4c869bfce6dfa522cd5e8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 19 Feb 2022 13:40:55 +0000
Subject: [PATCH 065/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220217.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22117.2
---
 eng/Version.Details.xml                     |  8 ++--
 eng/common/retain-build.ps1                 | 47 +++++++++++++++++++++
 eng/common/templates/jobs/jobs.yml          |  9 ----
 eng/common/templates/steps/retain-build.yml | 28 ++++++++++++
 global.json                                 |  4 +-
 5 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100644 eng/common/retain-build.ps1
 create mode 100644 eng/common/templates/steps/retain-build.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cdb3b4238c933..4d003fda87823 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22114.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22117.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
+      <Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22114.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22117.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
+      <Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1
new file mode 100644
index 0000000000000..e08fc227b2103
--- /dev/null
+++ b/eng/common/retain-build.ps1
@@ -0,0 +1,47 @@
+
+Param(
+[Parameter(Mandatory=$true)][int] $buildId,
+[Parameter(Mandatory=$true)][string] $azdoOrgUri, 
+[Parameter(Mandatory=$true)][string] $azdoProject,
+[Parameter(Mandatory=$true)][string] $token
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+. $PSScriptRoot\tools.ps1
+
+
+function Get-AzDOHeaders(
+    [string] $token)
+{
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}"))
+    $headers = @{"Authorization"="Basic $base64AuthInfo"}
+    return $headers
+}
+
+function Update-BuildRetention(
+    [string] $azdoOrgUri,
+    [string] $azdoProject,
+    [int] $buildId,
+    [string] $token)
+{
+    $headers = Get-AzDOHeaders -token $token
+    $requestBody = "{
+        `"keepForever`": `"true`"
+    }"
+
+    $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0"
+    write-Host "Attempting to retain build using the following URI: ${requestUri} ..."
+
+    try {
+        Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json"
+        Write-Host "Updated retention settings for build ${buildId}."
+    }
+    catch {
+        Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
+        ExitWithExitCode 1
+    }
+}
+
+Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
+ExitWithExitCode 0
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 6976330862c20..554e71cfc436d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,10 +8,6 @@ parameters:
   # Optional: Enable publishing using release pipelines
   enablePublishUsingPipelines: false
 
-  # Optional: Disable component governance detection. In general, component governance
-  # should be on for all jobs. Use only in the event of issues.
-  disableComponentGovernance: false
-
   # Optional: Enable running the source-build jobs to build repo from source
   enableSourceBuild: false
 
@@ -41,11 +37,6 @@ parameters:
 # Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
 # and some (Microbuild) should only be applied to non-PR cases for internal builds.
 
-# Sbom related params
-  enableSbom: true
-  PackageVersion: 7.0.0
-  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
-
 jobs:
 - ${{ each job in parameters.jobs }}:
   - template: ../job/job.yml
diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml
new file mode 100644
index 0000000000000..83d97a26a01ff
--- /dev/null
+++ b/eng/common/templates/steps/retain-build.yml
@@ -0,0 +1,28 @@
+parameters:
+  # Optional azure devops PAT with build execute permissions for the build's organization,
+  # only needed if the build that should be retained ran on a different organization than 
+  # the pipeline where this template is executing from
+  Token: ''
+  # Optional BuildId to retain, defaults to the current running build
+  BuildId: ''
+  # Azure devops Organization URI for the build in the https://dev.azure.com/<organization> format.
+  # Defaults to the organization the current pipeline is running on
+  AzdoOrgUri: '$(System.CollectionUri)'
+  # Azure devops project for the build. Defaults to the project the current pipeline is running on
+  AzdoProject: '$(System.TeamProject)'
+
+steps:
+  - task: powershell@2
+    inputs:
+      targetType: 'filePath'
+      filePath: eng/common/retain-build.ps1
+      pwsh: true
+      arguments: >
+        -AzdoOrgUri: ${{parameters.AzdoOrgUri}}
+        -AzdoProject ${{parameters.AzdoProject}}
+        -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }}
+        -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}}
+    displayName: Enable permanent build retention
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      BUILD_ID: $(Build.BuildId)
\ No newline at end of file
diff --git a/global.json b/global.json
index b5f4f210c8bae..674e885b32793 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22114.7",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22114.7"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22117.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22117.2"
   }
 }

From d7ccaa93a99f47c450f9847842ab04b83d381b31 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 13:47:37 +0000
Subject: [PATCH 066/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220222.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22122.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4d003fda87823..b47fd474d1354 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22117.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22122.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
+      <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22117.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22122.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
+      <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 674e885b32793..fb603188aedf9 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22117.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22117.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22122.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22122.3"
   }
 }

From b69c663851827ba26940cd698c40b1644e82e8b8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 24 Feb 2022 13:38:02 +0000
Subject: [PATCH 067/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220223.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22123.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b47fd474d1354..6c86d8cce996b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22122.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22123.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha>
+      <Sha>3bb832ddfb3bb788074c7f8c6528fa0e632e642c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22122.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22123.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha>
+      <Sha>3bb832ddfb3bb788074c7f8c6528fa0e632e642c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index fb603188aedf9..d18bd69ce2caa 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22122.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22122.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22123.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22123.1"
   }
 }

From e43b887b4b0d4b121ac1ee48ff80746ce5b6d05e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 13:37:20 +0000
Subject: [PATCH 068/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220224.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22124.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6c86d8cce996b..8d36879681630 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22123.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22124.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb832ddfb3bb788074c7f8c6528fa0e632e642c</Sha>
+      <Sha>eac1a3f1eb7404c0438664381b58d7238600aafc</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22123.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22124.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb832ddfb3bb788074c7f8c6528fa0e632e642c</Sha>
+      <Sha>eac1a3f1eb7404c0438664381b58d7238600aafc</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index d18bd69ce2caa..9f2ffad42958b 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22123.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22123.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.1"
   }
 }

From ac12d1393d5615d6ac96b54abbcc1002735f254b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 27 Feb 2022 13:35:52 +0000
Subject: [PATCH 069/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220224.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22124.4
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8d36879681630..02f27dfc13528 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22124.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22124.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>eac1a3f1eb7404c0438664381b58d7238600aafc</Sha>
+      <Sha>f7136626d0109856df867481219eb7366951985d</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22124.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22124.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>eac1a3f1eb7404c0438664381b58d7238600aafc</Sha>
+      <Sha>f7136626d0109856df867481219eb7366951985d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 9f2ffad42958b..549cfc600ee6f 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.4"
   }
 }

From c378c259b63fda9c925b9c7c7ec95265f2fed951 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 13:42:57 +0000
Subject: [PATCH 070/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220301.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22151.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 02f27dfc13528..40b1c3528b111 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22124.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22151.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f7136626d0109856df867481219eb7366951985d</Sha>
+      <Sha>801ca3a61b946c160070168bf4ba35f5ecaceba6</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22124.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22151.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f7136626d0109856df867481219eb7366951985d</Sha>
+      <Sha>801ca3a61b946c160070168bf4ba35f5ecaceba6</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 549cfc600ee6f..b3a7c8edce2eb 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22124.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22124.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22151.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22151.1"
   }
 }

From 46b261669a81ab1ae816a2ca2ab8c3595bba65ed Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Mar 2022 13:43:28 +0000
Subject: [PATCH 071/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220302.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22152.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 40b1c3528b111..a2d4518b1a274 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22151.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22152.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>801ca3a61b946c160070168bf4ba35f5ecaceba6</Sha>
+      <Sha>566e5fb87e4f84eeb898500fd3b3d2fd96662d13</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22151.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22152.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>801ca3a61b946c160070168bf4ba35f5ecaceba6</Sha>
+      <Sha>566e5fb87e4f84eeb898500fd3b3d2fd96662d13</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index b3a7c8edce2eb..822d872f231b1 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22151.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22151.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22152.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22152.1"
   }
 }

From e096c386404271fad0b925c09faa92168560aa4a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:43:21 +0000
Subject: [PATCH 072/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220303.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22153.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a2d4518b1a274..6d0c6a4e51455 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22152.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22153.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>566e5fb87e4f84eeb898500fd3b3d2fd96662d13</Sha>
+      <Sha>a19c29a391b292519a08217314bc53de6fb2d12c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22152.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22153.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>566e5fb87e4f84eeb898500fd3b3d2fd96662d13</Sha>
+      <Sha>a19c29a391b292519a08217314bc53de6fb2d12c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 822d872f231b1..66360dcfe0bbc 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22152.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22152.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22153.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22153.1"
   }
 }

From 4238b9893b854d31161673bb11d4cd39a7a7e1e4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 13:43:46 +0000
Subject: [PATCH 073/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220304.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22154.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6d0c6a4e51455..0b90d3b47af05 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22153.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22154.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a19c29a391b292519a08217314bc53de6fb2d12c</Sha>
+      <Sha>8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22153.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22154.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a19c29a391b292519a08217314bc53de6fb2d12c</Sha>
+      <Sha>8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 66360dcfe0bbc..3dc8eab7f404b 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22153.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22153.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22154.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22154.3"
   }
 }

From b4957ac976d67aee11f8e0de1b1ed6ebca30b42b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 13:46:05 +0000
Subject: [PATCH 074/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220307.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22157.6
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0b90d3b47af05..581f409cc690d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22154.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22157.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2</Sha>
+      <Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22154.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22157.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2</Sha>
+      <Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 3dc8eab7f404b..31130ececb8c8 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22154.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22154.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6"
   }
 }

From 5c7b61cba75a0c5f153f6f937bd00790a8668758 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 15 Mar 2022 20:31:26 -0700
Subject: [PATCH 075/413] WIP

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  2 +
 .../StringCopyPasteCommandHandler.cs          | 98 ++++++++++++++-----
 .../UnknownSourcePasteProcessor.cs            |  2 +-
 .../WpfStringCopyPasteService.cs              | 50 ++++++++++
 .../IStringCopyPasteService.cs                | 41 ++++++++
 5 files changed, 168 insertions(+), 25 deletions(-)
 create mode 100644 src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
 create mode 100644 src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 7b56320ecf29c..ee13bbea7e820 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -136,6 +136,8 @@ protected AbstractPasteProcessor(
             Contract.ThrowIfTrue(TextContentsSpansBeforePaste.IsEmpty);
         }
 
+        public abstract ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken);
+
         /// <summary>
         /// Takes a span in <see cref="SnapshotBeforePaste"/> and maps it appropriately (in an <see
         /// cref="SpanTrackingMode.EdgeInclusive"/> manner) to <see cref="SnapshotAfterPaste"/>.
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 491f047530587..bb076a98e9be6 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -3,12 +3,15 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Immutable;
 using System.ComponentModel.Composition;
+using System.Globalization;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -19,6 +22,7 @@
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
 using Microsoft.VisualStudio.Text.Operations;
+using Roslyn.Utilities;
 using VSUtilities = Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
@@ -42,19 +46,24 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     [VSUtilities.Name(nameof(StringCopyPasteCommandHandler))]
     internal partial class StringCopyPasteCommandHandler : IChainedCommandHandler<CopyCommandArgs>, IChainedCommandHandler<PasteCommandArgs>
     {
+        private const string CopyId = "RoslynStringCopyPasteId";
+        private readonly IThreadingContext _threadingContext;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
         private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
         private readonly IGlobalOptionService _globalOptions;
 
         private NormalizedSnapshotSpanCollection? _lastSelectedSpans;
+        private int? _lastClipboardSequenceNumber;
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public StringCopyPasteCommandHandler(
+            IThreadingContext threadingContext,
             ITextUndoHistoryRegistry undoHistoryRegistry,
             IEditorOperationsFactoryService editorOperationsFactoryService,
             IGlobalOptionService globalOptions)
         {
+            _threadingContext = threadingContext;
             _undoHistoryRegistry = undoHistoryRegistry;
             _editorOperationsFactoryService = editorOperationsFactoryService;
             _globalOptions = globalOptions;
@@ -69,12 +78,26 @@ public CommandState GetCommandState(CopyCommandArgs args, Func<CommandState> nex
 
         public void ExecuteCommand(CopyCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
         {
+            Contract.ThrowIfFalse(_threadingContext.HasMainThread);
+
             // Ensure that the copy always goes through all other handlers.
             nextCommandHandler();
 
             var textView = args.TextView;
             var subjectBuffer = args.SubjectBuffer;
 
+            _lastClipboardSequenceNumber = null;
+            _lastSelectedSpans = null;
+
+            var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
+            var copyPasteService = document?.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+            if (copyPasteService == null)
+                return;
+
+            if (!copyPasteService.TryGetClipboardSequenceNumber(out var sequenceNumber))
+                return;
+
+            _lastClipboardSequenceNumber = sequenceNumber;
             _lastSelectedSpans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
         }
 
@@ -85,6 +108,8 @@ public CommandState GetCommandState(PasteCommandArgs args, Func<CommandState> ne
 
         public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
         {
+            Contract.ThrowIfFalse(_threadingContext.HasMainThread);
+
             var textView = args.TextView;
             var subjectBuffer = args.SubjectBuffer;
 
@@ -95,6 +120,10 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             // include our changes that we can undo back to.
             nextCommandHandler();
 
+            // If we don't even see any changes from the paste, there's nothing we can do.
+            if (snapshotBeforePaste.Version.Changes is null)
+                return;
+
             // If the user has the option off, then don't bother doing anything once we've sent the paste through.
             if (!_globalOptions.GetOption(FeatureOnOffOptions.AutomaticallyFixStringContentsOnPaste, LanguageNames.CSharp))
                 return;
@@ -119,30 +148,22 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
 
             var cancellationToken = executionContext.OperationContext.UserCancellationToken;
 
-            var rootBeforePaste = documentBeforePaste.GetRequiredSyntaxRootSynchronously(cancellationToken);
-
             // When pasting, only do anything special if the user selections were entirely inside a single string
             // literal token.  Otherwise, we have a multi-selection across token kinds which will be extremely 
             // complex to try to reconcile.
             var stringExpressionBeforePaste = TryGetCompatibleContainingStringExpression(
-                rootBeforePaste, snapshotBeforePaste.AsText(), selectionsBeforePaste);
+                selectionsBeforePaste, cancellationToken);
             if (stringExpressionBeforePaste == null)
                 return;
 
-            // TODO: add support for pasting content that came from within the editor.  We can exactly know what that
-            // content meant, and how to insert it into our string expression.
-
             var pasteWasSuccessful = PasteWasSuccessful(
                 snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
 
-            var processor = new UnknownSourcePasteProcessor(
-                snapshotBeforePaste,
-                snapshotAfterPaste,
-                documentBeforePaste,
-                documentAfterPaste,
-                stringExpressionBeforePaste,
-                textView.Options.GetNewLineCharacter(),
-                pasteWasSuccessful);
+            var newLine = textView.Options.GetNewLineCharacter();
+            var processor = GetPasteProcessor();
+            if (processor == null)
+                return;
+
             var textChanges = processor.GetEdits(cancellationToken);
 
             // If we didn't get any viable changes back, don't do anything.
@@ -182,6 +203,28 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             edit2.Apply();
 
             transaction.Complete();
+
+            UnknownSourcePasteProcessor? GetPasteProcessor()
+            {
+                var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+
+                // See if this is a paste of the last copy that we heard about.
+                if (service != null &&
+                    service.TryGetClipboardSequenceNumber(out var sequenceNumber) &&
+                    _lastClipboardSequenceNumber == sequenceNumber &&
+                    _lastSelectedSpans != null)
+                {
+                    var stringExpressionCopiedFrom = TryGetCompatibleContainingStringExpression(
+                        _lastSelectedSpans, cancellationToken);
+                    if (stringExpressionCopiedFrom != null)
+                    {
+
+                    }
+                }
+
+                return new UnknownSourcePasteProcessor(
+                    snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste, newLine, pasteWasSuccessful);
+            }
         }
 
         /// <summary>
@@ -242,21 +285,31 @@ private static bool ContentsAreSame(
         /// anything special as trying to correct in this scenario is too difficult.
         /// </summary>
         private static ExpressionSyntax? TryGetCompatibleContainingStringExpression(
-            SyntaxNode root,
-            SourceText text,
-            NormalizedSnapshotSpanCollection selectionsBeforePaste)
+            NormalizedSnapshotSpanCollection spans, CancellationToken cancellationToken)
         {
+            if (spans.Count == 0)
+                return null;
+
+            var snapshot = spans[0].Snapshot;
+            var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
+            if (document == null)
+                return null;
+
+            var root = document.GetSyntaxRootSynchronously(cancellationToken);
+            if (root == null)
+                return null;
+
             // First, try to see if all the selections are at least contained within a single string literal expression.
-            var stringExpression = FindCommonContainingStringExpression(root, selectionsBeforePaste);
+            var stringExpression = FindCommonContainingStringExpression(root, spans);
             if (stringExpression == null)
                 return null;
 
             // Now, given that string expression, find the inside 'text' spans of the expression.  These are the parts
             // of the literal between the quotes.  It does not include the interpolation holes in an interpolated
             // string.  These spans may be empty (for an empty string, or empty text gap between interpolations).
-            var contentSpans = GetTextContentSpans(text, stringExpression, out _, out _);
+            var contentSpans = GetTextContentSpans(snapshot.AsText(), stringExpression, out _, out _);
 
-            foreach (var snapshotSpan in selectionsBeforePaste)
+            foreach (var snapshotSpan in spans)
             {
                 var startIndex = contentSpans.BinarySearch(snapshotSpan.Span.Start, FindIndex);
                 var endIndex = contentSpans.BinarySearch(snapshotSpan.Span.End, FindIndex);
@@ -279,15 +332,13 @@ static int FindIndex(TextSpan span, int position)
             }
         }
 
-#if false
-            private bool PastedTextEqualsLastCopiedText(ITextBuffer subjectBuffer)
+        private bool PastedTextEqualsLastCopiedText(INormalizedTextChangeCollection pastedChanges)
         {
             // If we have no history of any copied text, then there's nothing in the past we can compare to.
             if (_lastSelectedSpans == null)
                 return false;
 
             var copiedSpans = _lastSelectedSpans;
-            var pastedChanges = subjectBuffer.CurrentSnapshot.Version.Changes;
 
             // If we don't have any actual changes to compare, we can't consider these the same.
             if (copiedSpans.Count == 0 || pastedChanges.Count == 0)
@@ -313,6 +364,5 @@ private bool PastedTextEqualsLastCopiedText(ITextBuffer subjectBuffer)
 
             return true;
         }
-#endif
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index e8c6eaf0859e1..f82cfc4f7f47c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -40,7 +40,7 @@ public UnknownSourcePasteProcessor(
         {
         }
 
-        public ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+        public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
         {
             // If we have a raw-string, then we always want to check for changes to make, even if the paste was
             // technically legal.  This is because we may want to touch up things like indentation to make the
diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
new file mode 100644
index 0000000000000..d85abd0b5970a
--- /dev/null
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -0,0 +1,50 @@
+// 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.Runtime.InteropServices;
+using System.Windows;
+using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
+{
+    [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
+    internal class WpfStringCopyPasteService : IStringCopyPasteService
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public WpfStringCopyPasteService()
+        {
+        }
+
+        public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
+        {
+            try
+            {
+                var dataObject = Clipboard.GetDataObject();
+                if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
+                {
+                    var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
+                               dataObject.GetData(DataFormats.Text) as string;
+                    if (data != null)
+                    {
+                        sequenceNumber = (int)GetClipboardSequenceNumber();
+                        return true;
+                    }
+                }
+            }
+            catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
+            {
+            }
+
+            sequenceNumber = 0;
+            return false;
+        }
+
+        [DllImport("user32.dll")]
+        private static extern uint GetClipboardSequenceNumber();
+    }
+}
diff --git a/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
new file mode 100644
index 0000000000000..9a1333df5c185
--- /dev/null
+++ b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
@@ -0,0 +1,41 @@
+// 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.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
+{
+    internal interface IStringCopyPasteService : IWorkspaceService
+    {
+        /// <summary>
+        /// Attempts to retrieve a monotonically increasing value representing which copy value the clipboard currently
+        /// has on it.  Can be used to determine if another copy to the clipboard happened between different times.
+        /// </summary>
+        bool TryGetClipboardSequenceNumber(out int sequenceNumber);
+    }
+
+    [ExportWorkspaceService(typeof(IStringCopyPasteService)), Shared]
+    internal class DefaultStringCopyPasteService : IStringCopyPasteService
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public DefaultStringCopyPasteService()
+        {
+        }
+
+        // Note: we very intentionally do not try to store/retrieve any data in this default implementation. at this
+        // layer we have no information about the clipboard, so it would be dangerous to presume that that information
+        // had been validly associated with latest clipboard operation and had not been affected by things outside our
+        // awareness.
+
+        public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
+        {
+            sequenceNumber = 0;
+            return false;
+        }
+    }
+}

From 3fad6739ab2ef0b1ee54ee5ab4d6556e090e48d6 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 15 Mar 2022 20:44:01 -0700
Subject: [PATCH 076/413] In progress

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs       | 6 ------
 .../StringCopyPaste/StringCopyPasteCommandHandler.cs       | 7 +++++--
 .../CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs  | 6 ++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index ee13bbea7e820..df51c6a5b44d0 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -101,12 +101,6 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly int DelimiterDollarCount;
 
-        /// <summary>
-        /// The set of <see cref="ITextChange"/>'s that produced <see cref="SnapshotAfterPaste"/> from <see
-        /// cref="SnapshotBeforePaste"/>.
-        /// </summary>
-        protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
-
         protected AbstractPasteProcessor(
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 27672a53f9b15..fb7b9560418e9 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -225,12 +225,15 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
                         _lastSelectedSpans, cancellationToken);
                     if (stringExpressionCopiedFrom != null)
                     {
-
+                        return new KnownSourcePasteProcessor(
+                            snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                            stringExpressionBeforePaste, newLine, pasteWasSuccessful);
                     }
                 }
 
                 return new UnknownSourcePasteProcessor(
-                    snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste, newLine, pasteWasSuccessful);
+                    snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, 
+                    stringExpressionBeforePaste, newLine, pasteWasSuccessful);
             }
         }
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index f82cfc4f7f47c..286c4269a19cf 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -28,6 +28,12 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// </summary>
     internal class UnknownSourcePasteProcessor : AbstractPasteProcessor
     {
+        /// <summary>
+        /// The set of <see cref="ITextChange"/>'s that produced <see cref="AbstractPasteProcessor.SnapshotAfterPaste"/>
+        /// from <see cref="AbstractPasteProcessor.SnapshotBeforePaste"/>.
+        /// </summary>
+        protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
+
         public UnknownSourcePasteProcessor(
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,

From 88c29eb38ed77146dd60d71dca053ab915925de3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 16 Mar 2022 10:29:28 -0700
Subject: [PATCH 077/413] in progress

---
 .../StringCopyPaste/AbstractPasteProcessor.cs | 16 +---
 .../KnownSourcePasteProcessor.cs              | 33 +++++++++
 .../StringCopyPasteCommandHandler.cs          | 74 +++++++++++++++++--
 .../UnknownSourcePasteProcessor.cs            | 12 ++-
 4 files changed, 114 insertions(+), 21 deletions(-)
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index df51c6a5b44d0..00d0b1e9bc3af 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -83,13 +83,6 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly ImmutableArray<TextSpan> TextContentsSpansAfterPaste;
 
-        /// <summary>
-        /// Whether or not the string expression remained successfully parseable after the paste.  <see
-        /// cref="StringCopyPasteCommandHandler.PasteWasSuccessful"/>.  If it can still be successfully parsed subclasses
-        /// can adjust their view on which pieces of content need to be escaped or not.
-        /// </summary>
-        protected readonly bool PasteWasSuccessful;
-
         /// <summary>
         /// Number of quotes in the delimiter of the string being pasted into.  Given that the string should have no
         /// errors in it, this quote count should be the same for the start and end delimiter.
@@ -102,13 +95,12 @@ internal abstract class AbstractPasteProcessor
         protected readonly int DelimiterDollarCount;
 
         protected AbstractPasteProcessor(
+            string newLine,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
-            ExpressionSyntax stringExpressionBeforePaste,
-            string newLine,
-            bool pasteWasSuccessful)
+            ExpressionSyntax stringExpressionBeforePaste)
         {
             SnapshotBeforePaste = snapshotBeforePaste;
             SnapshotAfterPaste = snapshotAfterPaste;
@@ -119,14 +111,12 @@ protected AbstractPasteProcessor(
             DocumentBeforePaste = documentBeforePaste;
             DocumentAfterPaste = documentAfterPaste;
 
-            StringExpressionBeforePaste = stringExpressionBeforePaste;
             NewLine = newLine;
+            StringExpressionBeforePaste = stringExpressionBeforePaste;
 
             TextContentsSpansBeforePaste = GetTextContentSpans(TextBeforePaste, stringExpressionBeforePaste, out DelimiterQuoteCount, out DelimiterDollarCount);
             TextContentsSpansAfterPaste = TextContentsSpansBeforePaste.SelectAsArray(MapSpanForward);
 
-            PasteWasSuccessful = pasteWasSuccessful;
-
             Contract.ThrowIfTrue(TextContentsSpansBeforePaste.IsEmpty);
         }
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
new file mode 100644
index 0000000000000..f1a0b34b82444
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -0,0 +1,33 @@
+// 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;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
+{
+    internal class KnownSourcePasteProcessor : AbstractPasteProcessor
+    {
+        public KnownSourcePasteProcessor(
+            string newLine,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
+            Document documentBeforePaste,
+            Document documentAfterPaste,
+            ExpressionSyntax stringExpressionBeforePaste,
+            ImmutableArray<(VirtualCharSequence virtualChars, InterpolationSyntax? interpolation)> copiedPieces)
+            : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
+        {
+        }
+
+        public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+        {
+            if (StringExpressionBeforePaste is LiteralExpressionSyntax)
+        }
+    }
+}
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index fb7b9560418e9..e08feb0c635f7 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -7,13 +7,19 @@
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.Threading;
+using ICSharpCode.Decompiler.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Collections;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
@@ -211,7 +217,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
 
             transaction.Complete();
 
-            UnknownSourcePasteProcessor? GetPasteProcessor()
+            AbstractPasteProcessor? GetPasteProcessor()
             {
                 var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
 
@@ -225,18 +231,74 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
                         _lastSelectedSpans, cancellationToken);
                     if (stringExpressionCopiedFrom != null)
                     {
-                        return new KnownSourcePasteProcessor(
-                            snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
-                            stringExpressionBeforePaste, newLine, pasteWasSuccessful);
+                        var contentsToAdd = GetContentsToAdd(_lastSelectedSpans, stringExpressionCopiedFrom);
+                        if (!contentsToAdd.IsDefaultOrEmpty)
+                        {
+                            return new KnownSourcePasteProcessor(
+                                newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                                stringExpressionBeforePaste, contentsToAdd);
+                        }
                     }
                 }
 
                 return new UnknownSourcePasteProcessor(
-                    snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, 
-                    stringExpressionBeforePaste, newLine, pasteWasSuccessful);
+                    newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                    stringExpressionBeforePaste, pasteWasSuccessful);
             }
         }
 
+        private ImmutableArray<(VirtualCharSequence virtualChars, InterpolationSyntax? interpolation)> GetContentsToAdd(
+            NormalizedSnapshotSpanCollection lastSelectedSpans,
+            ExpressionSyntax stringExpressionCopiedFrom)
+        {
+            if (stringExpressionCopiedFrom is LiteralExpressionSyntax literalExpression)
+            {
+                // For normal strings, or single-line raw strings, we can just grab their virtual chars and use those.
+                if (literalExpression.Token.Kind() is SyntaxKind.StringLiteralToken or SyntaxKind.SingleLineRawStringLiteralToken)
+                {
+                    var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(literalExpression.Token);
+                    virtualChars = FilterToSpans(virtualChars, lastSelectedSpans);
+                    return virtualChars.IsDefaultOrEmpty ? default : ImmutableArray.Create((virtualChars, (InterpolationSyntax?)null));
+                }
+                else if (literalExpression.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
+                {
+                }
+                return default;
+            }
+            else if (stringExpressionCopiedFrom is InterpolatedStringExpressionSyntax interpolatedString)
+            {
+                return default;
+            }
+            else
+            {
+                throw ExceptionUtilities.UnexpectedValue(stringExpressionCopiedFrom);
+            }
+        }
+
+        private static VirtualCharSequence FilterToSpans(VirtualCharSequence virtualChars, NormalizedSnapshotSpanCollection lastSelectedSpans)
+        {
+            if (virtualChars.IsDefault)
+                return default;
+
+            var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
+            foreach (var vc in virtualChars)
+            {
+                if (Overlaps(vc.Span, lastSelectedSpans))
+                    result.Add(vc);
+            }
+
+            if (result.Count == 0)
+                return default;
+
+            return VirtualCharSequence.Create(result.ToImmutable());
+        }
+
+        private static bool Overlaps(TextSpan span, NormalizedSnapshotSpanCollection lastSelectedSpans)
+        {
+            var snapshotSpan = new SnapshotSpan(lastSelectedSpans[0].Snapshot, span.ToSpan());
+            return lastSelectedSpans.OverlapsWith(snapshotSpan);
+        }
+
         /// <summary>
         /// Returns true if the paste resulted in legal code for the string literal.  The string literal is
         /// considered legal if it has the same span as the original string (adjusted as per the edit) and that
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 286c4269a19cf..589f44ad85878 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -28,6 +28,13 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// </summary>
     internal class UnknownSourcePasteProcessor : AbstractPasteProcessor
     {
+        /// <summary>
+        /// Whether or not the string expression remained successfully parseable after the paste.  <see
+        /// cref="StringCopyPasteCommandHandler.PasteWasSuccessful"/>.  If it can still be successfully parsed subclasses
+        /// can adjust their view on which pieces of content need to be escaped or not.
+        /// </summary>
+        protected readonly bool PasteWasSuccessful;
+
         /// <summary>
         /// The set of <see cref="ITextChange"/>'s that produced <see cref="AbstractPasteProcessor.SnapshotAfterPaste"/>
         /// from <see cref="AbstractPasteProcessor.SnapshotBeforePaste"/>.
@@ -35,15 +42,16 @@ internal class UnknownSourcePasteProcessor : AbstractPasteProcessor
         protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
 
         public UnknownSourcePasteProcessor(
+            string newLine,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
-            string newLine,
             bool pasteWasSuccessful)
-            : base(snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste, newLine, pasteWasSuccessful)
+            : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
+            PasteWasSuccessful = pasteWasSuccessful;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)

From 8f2223515a5076c6535ea52180dcbddcb5be8554 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 17 Mar 2022 12:58:08 +0000
Subject: [PATCH 078/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220316.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22166.1
---
 eng/Version.Details.xml                    |   8 +-
 eng/common/cross/build-rootfs.sh           |   4 +-
 eng/common/cross/toolchain.cmake           |  16 +-
 eng/common/cross/x86/tizen-build-rootfs.sh |  35 +++++
 eng/common/cross/x86/tizen-fetch.sh        | 170 +++++++++++++++++++++
 eng/common/cross/x86/tizen/tizen.patch     |   9 ++
 eng/common/retain-build.ps1                |   8 +-
 global.json                                |   4 +-
 8 files changed, 240 insertions(+), 14 deletions(-)
 create mode 100644 eng/common/cross/x86/tizen-build-rootfs.sh
 create mode 100644 eng/common/cross/x86/tizen-fetch.sh
 create mode 100644 eng/common/cross/x86/tizen/tizen.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 581f409cc690d..5fbfb169dcfc9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22157.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22166.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
+      <Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22157.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22166.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
+      <Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 7e4be9a0ccfbf..e784c9c005a2a 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -194,8 +194,8 @@ while :; do
             __LLDB_Package="liblldb-6.0-dev"
             ;;
         tizen)
-            if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
-                echo "Tizen is available only for arm, armel and arm64."
+            if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then
+                echo "Tizen is available only for arm, armel, arm64 and x86."
                 usage;
                 exit 1;
             fi
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 9fd345bde6d40..eaeeab38fa1f3 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -63,6 +63,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   set(CMAKE_SYSTEM_PROCESSOR i686)
   set(TOOLCHAIN "i686-linux-gnu")
+  if(TIZEN)
+    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
+  endif()
 elseif (FREEBSD)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(triple "x86_64-unknown-freebsd12")
@@ -91,6 +94,10 @@ if(TIZEN)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
   endif()
+  if(TARGET_ARCH_NAME STREQUAL "x86")
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
+  endif()
 endif()
 
 if(ANDROID)
@@ -197,6 +204,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   add_toolchain_linker_flag(-m32)
+
+  if(TIZEN)
+    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+  endif()
 elseif(ILLUMOS)
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -232,7 +246,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
 endif()
 
 if(TIZEN)
-  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
   endif()
diff --git a/eng/common/cross/x86/tizen-build-rootfs.sh b/eng/common/cross/x86/tizen-build-rootfs.sh
new file mode 100644
index 0000000000000..f5f955dc8f267
--- /dev/null
+++ b/eng/common/cross/x86/tizen-build-rootfs.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+__X86_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+__TIZEN_CROSSDIR="$__X86_CrossDir/tizen"
+
+if [[ -z "$ROOTFS_DIR" ]]; then
+    echo "ROOTFS_DIR is not defined."
+    exit 1;
+fi
+
+TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
+mkdir -p $TIZEN_TMP_DIR
+
+# Download files
+echo ">>Start downloading files"
+VERBOSE=1 $__X86_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
+echo "<<Finish downloading files"
+
+echo ">>Start constructing Tizen rootfs"
+TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
+cd $ROOTFS_DIR
+for f in $TIZEN_RPM_FILES; do
+    rpm2cpio $f  | cpio -idm --quiet
+done
+echo "<<Finish constructing Tizen rootfs"
+
+# Cleanup tmp
+rm -rf $TIZEN_TMP_DIR
+
+# Configure Tizen rootfs
+echo ">>Start configuring Tizen rootfs"
+ln -sfn asm-x86 ./usr/include/asm
+patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/x86/tizen-fetch.sh b/eng/common/cross/x86/tizen-fetch.sh
new file mode 100644
index 0000000000000..fa5f88b7d6c0d
--- /dev/null
+++ b/eng/common/cross/x86/tizen-fetch.sh
@@ -0,0 +1,170 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
+	VERBOSE=0
+fi
+
+Log()
+{
+	if [ $VERBOSE -ge $1 ]; then
+		echo ${@:2}
+	fi
+}
+
+Inform()
+{
+	Log 1 -e "\x1B[0;34m$@\x1B[m"
+}
+
+Debug()
+{
+	Log 2 -e "\x1B[0;32m$@\x1B[m"
+}
+
+Error()
+{
+	>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
+}
+
+Fetch()
+{
+	URL=$1
+	FILE=$2
+	PROGRESS=$3
+	if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
+		CURL_OPT="--progress-bar"
+	else
+		CURL_OPT="--silent"
+	fi
+	curl $CURL_OPT $URL > $FILE
+}
+
+hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
+hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
+hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
+
+TMPDIR=$1
+if [ ! -d $TMPDIR ]; then
+	TMPDIR=./tizen_tmp
+	Debug "Create temporary directory : $TMPDIR"
+	mkdir -p $TMPDIR 
+fi
+
+TIZEN_URL=http://download.tizen.org/snapshots/tizen
+BUILD_XML=build.xml
+REPOMD_XML=repomd.xml
+PRIMARY_XML=primary.xml
+TARGET_URL="http://__not_initialized"
+
+Xpath_get()
+{
+	XPATH_RESULT=''
+	XPATH=$1
+	XML_FILE=$2
+	RESULT=$(xmllint --xpath $XPATH $XML_FILE)
+	if [[ -z ${RESULT// } ]]; then
+		Error "Can not find target from $XML_FILE"
+		Debug "Xpath = $XPATH"
+		exit 1
+	fi
+	XPATH_RESULT=$RESULT
+}
+
+fetch_tizen_pkgs_init()
+{
+	TARGET=$1
+	PROFILE=$2
+	Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
+
+	TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
+	if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
+	mkdir -p $TMP_PKG_DIR
+
+	PKG_URL=$TIZEN_URL/$PROFILE/latest
+
+	BUILD_XML_URL=$PKG_URL/$BUILD_XML
+	TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
+	TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
+	TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
+	TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
+
+	Fetch $BUILD_XML_URL $TMP_BUILD
+
+	Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
+
+	TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
+	Xpath_get $TARGET_XPATH $TMP_BUILD
+	TARGET_PATH=$XPATH_RESULT
+	TARGET_URL=$PKG_URL/$TARGET_PATH
+
+	REPOMD_URL=$TARGET_URL/repodata/repomd.xml
+	PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
+
+	Fetch $REPOMD_URL $TMP_REPOMD
+
+	Debug "fetch $REPOMD_URL to $TMP_REPOMD"
+
+	Xpath_get $PRIMARY_XPATH $TMP_REPOMD
+	PRIMARY_XML_PATH=$XPATH_RESULT
+	PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
+
+	Fetch $PRIMARY_URL $TMP_PRIMARYGZ
+
+	Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
+
+	gunzip $TMP_PRIMARYGZ 
+
+	Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" 
+}
+
+fetch_tizen_pkgs()
+{
+	ARCH=$1
+	PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
+
+	PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
+
+	for pkg in ${@:2}
+	do
+		Inform "Fetching... $pkg"
+		XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		PKG_PATH=$XPATH_RESULT
+
+		XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		CHECKSUM=$XPATH_RESULT
+
+		PKG_URL=$TARGET_URL/$PKG_PATH
+		PKG_FILE=$(basename $PKG_PATH)
+		PKG_PATH=$TMPDIR/$PKG_FILE
+
+		Debug "Download $PKG_URL to $PKG_PATH"
+		Fetch $PKG_URL $PKG_PATH true
+
+		echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
+		if [ $? -ne 0 ]; then
+			Error "Fail to fetch $PKG_URL to $PKG_PATH"
+			Debug "Checksum = $CHECKSUM"
+			exit 1
+		fi
+	done
+}
+
+Inform "Initialize i686 base"
+fetch_tizen_pkgs_init standard base
+Inform "fetch common packages"
+fetch_tizen_pkgs i686 gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
+Inform "fetch coreclr packages"
+fetch_tizen_pkgs i686 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+Inform "fetch corefx packages"
+fetch_tizen_pkgs i686 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
+
+Inform "Initialize standard unified"
+fetch_tizen_pkgs_init standard unified
+Inform "fetch corefx packages"
+fetch_tizen_pkgs i686 gssdp gssdp-devel tizen-release
+
diff --git a/eng/common/cross/x86/tizen/tizen.patch b/eng/common/cross/x86/tizen/tizen.patch
new file mode 100644
index 0000000000000..f4fe8838ad668
--- /dev/null
+++ b/eng/common/cross/x86/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf32-i386)
+-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux.so.2 ) )
diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1
index e08fc227b2103..e7ba975adeb6b 100644
--- a/eng/common/retain-build.ps1
+++ b/eng/common/retain-build.ps1
@@ -8,8 +8,6 @@ Param(
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
-. $PSScriptRoot\tools.ps1
-
 
 function Get-AzDOHeaders(
     [string] $token)
@@ -38,10 +36,10 @@ function Update-BuildRetention(
         Write-Host "Updated retention settings for build ${buildId}."
     }
     catch {
-        Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
-        ExitWithExitCode 1
+        Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
+        exit 1
     }
 }
 
 Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
-ExitWithExitCode 0
+exit 0
diff --git a/global.json b/global.json
index 31130ececb8c8..99ec8d540bff3 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22166.1"
   }
 }

From c06efff1e20a0ed588738dbfe7ab8f60ebb04695 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Thu, 17 Mar 2022 15:09:22 -0700
Subject: [PATCH 079/413] Update BuildValidator to exclude refint folders.

Backport of https://github.com/dotnet/roslyn/pull/59462
---
 src/Tools/BuildValidator/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tools/BuildValidator/Program.cs b/src/Tools/BuildValidator/Program.cs
index 63915f3292d52..609b95eef9a0f 100644
--- a/src/Tools/BuildValidator/Program.cs
+++ b/src/Tools/BuildValidator/Program.cs
@@ -72,6 +72,7 @@ static int HandleCommand(string[] assembliesPath, string[]? exclude, string sour
             var excludes = new List<string>(exclude ?? Array.Empty<string>());
             excludes.Add(Path.DirectorySeparatorChar + "runtimes" + Path.DirectorySeparatorChar);
             excludes.Add(Path.DirectorySeparatorChar + "ref" + Path.DirectorySeparatorChar);
+            excludes.Add(Path.DirectorySeparatorChar + "refint" + Path.DirectorySeparatorChar);
             excludes.Add(@".resources.dll");
 
             var options = new Options(assembliesPath, referencesPath, excludes.ToArray(), sourcePath, verbose, quiet, debug, debugPath);

From d49daaeda5bc113e507478074a25375e0bebc8d7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 18 Mar 2022 12:53:11 +0000
Subject: [PATCH 080/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220317.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22167.4
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5fbfb169dcfc9..56af6fc8591f2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22166.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22167.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
+      <Sha>251034e7687335886c3774a0138a8584a782b0eb</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22166.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22167.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
+      <Sha>251034e7687335886c3774a0138a8584a782b0eb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 99ec8d540bff3..6e7512454cadf 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22166.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22167.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22167.4"
   }
 }

From 8bbb47c130c71fb79a44bcce2e4997a23bf81a20 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 19 Mar 2022 12:48:54 +0000
Subject: [PATCH 081/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220318.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22168.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 56af6fc8591f2..b6d4064dc7fc2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22167.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22168.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>251034e7687335886c3774a0138a8584a782b0eb</Sha>
+      <Sha>bafd55901b50d6fc3507c8ed96a7777fcca1796f</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22167.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22168.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>251034e7687335886c3774a0138a8584a782b0eb</Sha>
+      <Sha>bafd55901b50d6fc3507c8ed96a7777fcca1796f</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 6e7512454cadf..5f993f16a3a85 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22167.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22167.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22168.2"
   }
 }

From a64509d79f45d4c16fb0997c5bad7a3054407ef2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 22 Mar 2022 12:54:08 +0000
Subject: [PATCH 082/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220321.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22171.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b6d4064dc7fc2..fb428cd193737 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22168.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22171.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bafd55901b50d6fc3507c8ed96a7777fcca1796f</Sha>
+      <Sha>c8a95297e2622251c125aa5c0ef7c822275a792d</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22168.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22171.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bafd55901b50d6fc3507c8ed96a7777fcca1796f</Sha>
+      <Sha>c8a95297e2622251c125aa5c0ef7c822275a792d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 5f993f16a3a85..1a6a75b8d9ed9 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22168.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22171.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22171.2"
   }
 }

From 841fd24747e73f53a285a39245f4ff18b9f5a3ca Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 16:43:13 -0700
Subject: [PATCH 083/413] In progrss

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |   6 +
 .../KnownSourcePasteProcessor.cs              | 103 ++++++++++++-
 .../StringCopyPasteCommandHandler.cs          |  38 +----
 .../StringCopyPaste/StringCopyPasteHelpers.cs | 137 ++++++++++++++----
 .../UnknownSourcePasteProcessor.cs            |   6 -
 5 files changed, 215 insertions(+), 75 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 00d0b1e9bc3af..b10b62b91cb80 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -94,6 +94,12 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly int DelimiterDollarCount;
 
+        /// <summary>
+        /// The set of <see cref="ITextChange"/>'s that produced <see cref="AbstractPasteProcessor.SnapshotAfterPaste"/>
+        /// from <see cref="AbstractPasteProcessor.SnapshotBeforePaste"/>.
+        /// </summary>
+        protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
+
         protected AbstractPasteProcessor(
             string newLine,
             ITextSnapshot snapshotBeforePaste,
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index f1a0b34b82444..7df12d81cccf8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -2,17 +2,27 @@
 // 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 Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
+    using static StringCopyPasteHelpers;
+
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
+        private readonly ExpressionSyntax _stringExpressionCopiedFrom;
+        private readonly ITextSnapshot _snapshotCopiedFrom;
+
         public KnownSourcePasteProcessor(
             string newLine,
             ITextSnapshot snapshotBeforePaste,
@@ -20,14 +30,103 @@ public KnownSourcePasteProcessor(
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
-            ImmutableArray<(VirtualCharSequence virtualChars, InterpolationSyntax? interpolation)> copiedPieces)
+            ExpressionSyntax stringExpressionCopiedFrom,
+            ITextSnapshot snapshotCopiedFrom)
             : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
+            _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
+            _snapshotCopiedFrom = snapshotCopiedFrom;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
         {
-            if (StringExpressionBeforePaste is LiteralExpressionSyntax)
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
+
+            foreach (var change in Changes)
+            {
+                var wrappedChange = WrapChangeWithOriginalQuotes(change.NewText);
+                var parsedChange = SyntaxFactory.ParseExpression(wrappedChange);
+
+                // If for some reason we can't actually successfully parse this copied text, then bail out.
+                if (ContainsError(parsedChange))
+                    return default;
+
+                var modifiedText = TransformValueToDestinationKind(parsedChange);
+                edits.Add(new TextChange(change.OldSpan, modifiedText));
+            }
+
+            return edits.ToImmutable();
+        }
+
+        /// <summary>
+        /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
+        /// string it came from.  With this we can determine how to interpret things like the escapes in their original
+        /// context.  We can also figure out how to deal with copied interpolations.
+        /// </summary>
+        private string WrapChangeWithOriginalQuotes(string text)
+        {
+            var textCopiedFrom = _snapshotCopiedFrom.AsText();
+            GetTextContentSpans(
+                textCopiedFrom, _stringExpressionCopiedFrom, out _, out _,
+                out var startQuoteSpan, out var endQuoteSpan);
+
+            var startQuote = textCopiedFrom.ToString(startQuoteSpan);
+            var endQuote = textCopiedFrom.ToString(endQuoteSpan);
+            if (!IsAnyRawStringExpression(_stringExpressionCopiedFrom))
+                return $"{startQuote}{text}{endQuote}";
+
+            // With a raw string we have the issue that the contents may need to be indented properly in order for the
+            // string to parsed successfully.  Because we're using the original start/end quote to wrap the text that
+            // was pasted this normally is not an issue.  However, it can be a problem in the following case:
+            //
+            //      var source = """
+            //              exiting text
+            //              [|copy
+            //              this|]
+            //              existing text
+            //              """
+            //
+            // In this case, the first line of the text will not start with enough indentation and we will generate:
+            //
+            // """
+            // copy
+            //              this
+            //              """
+            //
+            // To address this.  We ensure that if the content starts with spaces to not be a problem.
+            var end = _stringExpressionCopiedFrom.Span.End;
+            while (end > 0 && text[end - 1] == '"')
+                end--;
+
+            var whitespaceEnd = end;
+            var whitespaceStart = whitespaceEnd;
+            while (whitespaceStart > 0 && SyntaxFacts.IsWhitespace(text[whitespaceStart - 1]))
+                whitespaceStart--;
+
+            var rawStringIndentation = textCopiedFrom.ToString(TextSpan.FromBounds(whitespaceStart, whitespaceEnd));
+
+            var leadingWhitespace = text.GetLeadingWhitespace();
+
+            // First, if we don't have enough indentation whitespace in the string, but we do have a portion of the
+            // necessary whitespace, then synthesize the remainder we need.
+            if (leadingWhitespace.Length < rawStringIndentation.Length)
+            {
+                if (rawStringIndentation.EndsWith(leadingWhitespace))
+                    return $"{startQuote}{rawStringIndentation[..^leadingWhitespace.Length]}{text}{endQuote}";
+            }
+            else
+            {
+                // we have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
+                // nothing to do.
+                if (leadingWhitespace.StartsWith(rawStringIndentation))
+                    return $"{startQuote}{text}{endQuote}";
+            }
+
+            // We have something with whitespace incompatible with the raw string indentation.  Just add the required
+            // indentation we need to ensure this can parse.  Note: this is a heuristic, and it's possible we could
+            // figure out something better here (for example copying just enough indentation whitespace to make things
+            // successfully parse).
+            return $"{startQuote}{rawStringIndentation}{text}{endQuote}";
         }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index e08feb0c635f7..f3a9bf9c62d3c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -231,13 +231,9 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
                         _lastSelectedSpans, cancellationToken);
                     if (stringExpressionCopiedFrom != null)
                     {
-                        var contentsToAdd = GetContentsToAdd(_lastSelectedSpans, stringExpressionCopiedFrom);
-                        if (!contentsToAdd.IsDefaultOrEmpty)
-                        {
-                            return new KnownSourcePasteProcessor(
-                                newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
-                                stringExpressionBeforePaste, contentsToAdd);
-                        }
+                        return new KnownSourcePasteProcessor(
+                            newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                            stringExpressionBeforePaste, stringExpressionCopiedFrom, _lastSelectedSpans[0].Snapshot);
                     }
                 }
 
@@ -247,34 +243,6 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             }
         }
 
-        private ImmutableArray<(VirtualCharSequence virtualChars, InterpolationSyntax? interpolation)> GetContentsToAdd(
-            NormalizedSnapshotSpanCollection lastSelectedSpans,
-            ExpressionSyntax stringExpressionCopiedFrom)
-        {
-            if (stringExpressionCopiedFrom is LiteralExpressionSyntax literalExpression)
-            {
-                // For normal strings, or single-line raw strings, we can just grab their virtual chars and use those.
-                if (literalExpression.Token.Kind() is SyntaxKind.StringLiteralToken or SyntaxKind.SingleLineRawStringLiteralToken)
-                {
-                    var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(literalExpression.Token);
-                    virtualChars = FilterToSpans(virtualChars, lastSelectedSpans);
-                    return virtualChars.IsDefaultOrEmpty ? default : ImmutableArray.Create((virtualChars, (InterpolationSyntax?)null));
-                }
-                else if (literalExpression.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
-                {
-                }
-                return default;
-            }
-            else if (stringExpressionCopiedFrom is InterpolatedStringExpressionSyntax interpolatedString)
-            {
-                return default;
-            }
-            else
-            {
-                throw ExceptionUtilities.UnexpectedValue(stringExpressionCopiedFrom);
-            }
-        }
-
         private static VirtualCharSequence FilterToSpans(VirtualCharSequence virtualChars, NormalizedSnapshotSpanCollection lastSelectedSpans)
         {
             if (virtualChars.IsDefault)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 61bffe8142939..6dd6d0b5e5b80 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -8,8 +8,10 @@
 using System.Globalization;
 using System.Linq;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.InheritanceMargin;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Collections;
 using Microsoft.CodeAnalysis.Text;
@@ -24,6 +26,12 @@ internal static class StringCopyPasteHelpers
         public static bool HasNewLine(TextLine line)
             => line.Span.End != line.SpanIncludingLineBreak.End;
 
+        /// <summary>
+        /// Gets the character at the requested position, or <c>\0</c> if out of bounds. 
+        /// </summary>
+        private static char SafeCharAt(SourceText text, int index)
+            => index >= 0 && index < text.Length ? text[index] : '\0';
+
         /// <summary>
         /// True if the string literal contains an error diagnostic that indicates a parsing problem with it. For
         /// interpolated strings, this only includes the text sections, and not any interpolation holes in the literal.
@@ -166,16 +174,22 @@ public static bool IsRawStringLiteral(LiteralExpressionSyntax literal)
         /// </summary>
         public static ImmutableArray<TextSpan> GetTextContentSpans(
             SourceText text, ExpressionSyntax stringExpression,
-            out int delimiterQuoteCount, out int delimiterDollarCount)
+            out int delimiterQuoteCount, out int delimiterDollarCount,
+            out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
         {
             if (stringExpression is LiteralExpressionSyntax literal)
             {
                 delimiterDollarCount = 0;
-                return ImmutableArray.Create(GetStringLiteralTextContentSpan(text, literal, out delimiterQuoteCount));
+                return ImmutableArray.Create(GetStringLiteralTextContentSpan(
+                    text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan));
             }
             else if (stringExpression is InterpolatedStringExpressionSyntax interpolatedString)
             {
-                return GetInterpolatedStringTextContentSpans(text, interpolatedString, out delimiterQuoteCount, out delimiterDollarCount);
+                startQuoteSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
+                endQuoteSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
+
+                return GetInterpolatedStringTextContentSpans(
+                    text, interpolatedString, out delimiterQuoteCount, out delimiterDollarCount);
             }
             else
             {
@@ -183,11 +197,11 @@ public static ImmutableArray<TextSpan> GetTextContentSpans(
             }
         }
 
-        private static int SkipU8Suffix(SourceText text, int start, int end)
+        private static int SkipU8Suffix(SourceText text, int end)
         {
-            if (end > start && text[end - 1] == '8')
+            if (SafeCharAt(text, end - 1) == '8')
                 end--;
-            if (end > start && text[end - 1] is 'u' or 'U')
+            if (SafeCharAt(text, end - 1) is 'u' or 'U')
                 end--;
             return end;
         }
@@ -200,7 +214,7 @@ private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
             //
             // Skip past the leading and trailing delimiters.
             var start = interpolatedString.SpanStart;
-            while (start < text.Length && text[start] is '@' or '$')
+            while (SafeCharAt(text, start) is '@' or '$')
                 start++;
             delimiterDollarCount = start - interpolatedString.SpanStart;
 
@@ -211,7 +225,7 @@ private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
 
             var end = interpolatedString.Span.End;
 
-            end = SkipU8Suffix(text, start, end);
+            end = SkipU8Suffix(text, end);
             while (end > interpolatedString.StringEndToken.Span.Start && text[end - 1] == '"')
                 end--;
 
@@ -232,7 +246,12 @@ private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
             return result.ToImmutableAndClear();
         }
 
-        private static TextSpan GetStringLiteralTextContentSpan(SourceText text, LiteralExpressionSyntax literal, out int delimiterQuoteCount)
+        private static TextSpan GetStringLiteralTextContentSpan(
+            SourceText text,
+            LiteralExpressionSyntax literal,
+            out int delimiterQuoteCount,
+            out TextSpan startQuoteSpan,
+            out TextSpan endQuoteSpan)
         {
             // simple string literal (normal, verbatim or raw).
             //
@@ -241,40 +260,94 @@ private static TextSpan GetStringLiteralTextContentSpan(SourceText text, Literal
             // The two cases look similar but are subtly different.  Ignoring the fact that raw strings don't start with
             // '@', there's also the issue that normal strings just have a single starting/ending quote, where as
             // raw-strings can have an unbounded number of them.
-            if (IsRawStringLiteral(literal))
+            return IsRawStringLiteral(literal)
+                ? GetRawStringLiteralTextContentSpan(text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan)
+                : GetNormalStringLiteralTextContentSpan(text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan);
+        }
+
+        private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, LiteralExpressionSyntax literal, out int delimiterQuoteCount, out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
+        {
+            var start = literal.SpanStart;
+            while (SafeCharAt(text, start) == '"')
+                start++;
+            delimiterQuoteCount = start - literal.SpanStart;
+
+            var end = literal.Span.End;
+
+            end = SkipU8Suffix(text, end);
+            while (end > start && text[end - 1] == '"')
+                end--;
+
+            if (literal.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
+            {
+                startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, start);
+                endQuoteSpan = TextSpan.FromBounds(end, literal.Span.End);
+            }
+            else if (literal.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
             {
-                var start = literal.SpanStart;
-                while (start < text.Length && text[start] == '"')
-                    start++;
-                delimiterQuoteCount = start - literal.SpanStart;
+                // Consume the whitespace and newline after the initial quotes.
+                var rawStart = start;
+                while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawStart)))
+                    rawStart++;
+
+                if (SafeCharAt(text, rawStart) == '\r' && SafeCharAt(text, rawStart + 1) == '\n')
+                {
+                    rawStart += 2;
+                }
+                else
+                {
+                    // Guaranteed by us not having any syntax errors on the node.
+                    Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawStart]));
+                    rawStart++;
+                }
 
-                var end = literal.Span.End;
+                // Consume the whitespace and newline preceding the end quote.
+                var rawEnd = end;
+                while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawEnd - 1)))
+                    rawEnd--;
 
-                end = SkipU8Suffix(text, start, end);
-                while (end > start && text[end - 1] == '"')
-                    end--;
+                if (SafeCharAt(text, rawEnd - 2) == '\r' && SafeCharAt(text, rawEnd - 1) == '\n')
+                {
+                    rawEnd -= 2;
+                }
+                else
+                {
+                    Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawEnd - 1]));
+                    rawEnd--;
+                }
 
-                return TextSpan.FromBounds(start, end);
+                startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, rawStart);
+                endQuoteSpan = TextSpan.FromBounds(rawEnd, literal.Span.End);
             }
             else
             {
-                var start = literal.SpanStart;
-                if (start < text.Length && text[start] == '@')
-                    start++;
+                throw ExceptionUtilities.UnexpectedValue(literal.Kind());
+            }
 
-                var position = start;
-                if (start < text.Length && text[start] == '"')
-                    start++;
-                delimiterQuoteCount = start - position;
+            return TextSpan.FromBounds(start, end);
+        }
 
-                var end = literal.Span.End;
+        private static TextSpan GetNormalStringLiteralTextContentSpan(SourceText text, LiteralExpressionSyntax literal, out int delimiterQuoteCount, out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
+        {
+            var start = literal.SpanStart;
+            if (SafeCharAt(text, start) == '@')
+                start++;
 
-                end = SkipU8Suffix(text, start, end);
-                if (end > start && text[end - 1] == '"')
-                    end--;
+            var position = start;
+            if (SafeCharAt(text, start) == '"')
+                start++;
+            delimiterQuoteCount = start - position;
 
-                return TextSpan.FromBounds(start, end);
-            }
+            var end = literal.Span.End;
+
+            end = SkipU8Suffix(text, end);
+            if (end > start && text[end - 1] == '"')
+                end--;
+
+            startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, start);
+            endQuoteSpan = TextSpan.FromBounds(end, literal.Span.End);
+
+            return TextSpan.FromBounds(start, end);
         }
 
         /// <summary>
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 589f44ad85878..fc9646b64956f 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -35,12 +35,6 @@ internal class UnknownSourcePasteProcessor : AbstractPasteProcessor
         /// </summary>
         protected readonly bool PasteWasSuccessful;
 
-        /// <summary>
-        /// The set of <see cref="ITextChange"/>'s that produced <see cref="AbstractPasteProcessor.SnapshotAfterPaste"/>
-        /// from <see cref="AbstractPasteProcessor.SnapshotBeforePaste"/>.
-        /// </summary>
-        protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
-
         public UnknownSourcePasteProcessor(
             string newLine,
             ITextSnapshot snapshotBeforePaste,

From 87d4609087fbf18dea2a23551186d4d9a38c099b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 16:48:56 -0700
Subject: [PATCH 084/413] In progess

---
 .../KnownSourcePasteProcessor.cs              | 34 +++++++------------
 .../StringCopyPaste/StringCopyPasteHelpers.cs |  4 +++
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 7df12d81cccf8..5076f74655cb6 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -63,7 +63,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
         /// string it came from.  With this we can determine how to interpret things like the escapes in their original
         /// context.  We can also figure out how to deal with copied interpolations.
         /// </summary>
-        private string WrapChangeWithOriginalQuotes(string text)
+        private string WrapChangeWithOriginalQuotes(string pastedText)
         {
             var textCopiedFrom = _snapshotCopiedFrom.AsText();
             GetTextContentSpans(
@@ -72,8 +72,8 @@ private string WrapChangeWithOriginalQuotes(string text)
 
             var startQuote = textCopiedFrom.ToString(startQuoteSpan);
             var endQuote = textCopiedFrom.ToString(endQuoteSpan);
-            if (!IsAnyRawStringExpression(_stringExpressionCopiedFrom))
-                return $"{startQuote}{text}{endQuote}";
+            if (!IsAnyMultiLineRawStringExpression(_stringExpressionCopiedFrom))
+                return $"{startQuote}{pastedText}{endQuote}";
 
             // With a raw string we have the issue that the contents may need to be indented properly in order for the
             // string to parsed successfully.  Because we're using the original start/end quote to wrap the text that
@@ -94,39 +94,31 @@ private string WrapChangeWithOriginalQuotes(string text)
             //              """
             //
             // To address this.  We ensure that if the content starts with spaces to not be a problem.
-            var end = _stringExpressionCopiedFrom.Span.End;
-            while (end > 0 && text[end - 1] == '"')
-                end--;
+            var endLine = textCopiedFrom.Lines.GetLineFromPosition(_stringExpressionCopiedFrom.Span.End);
+            var rawStringIndentation = endLine.GetLeadingWhitespace();
 
-            var whitespaceEnd = end;
-            var whitespaceStart = whitespaceEnd;
-            while (whitespaceStart > 0 && SyntaxFacts.IsWhitespace(text[whitespaceStart - 1]))
-                whitespaceStart--;
-
-            var rawStringIndentation = textCopiedFrom.ToString(TextSpan.FromBounds(whitespaceStart, whitespaceEnd));
-
-            var leadingWhitespace = text.GetLeadingWhitespace();
+            var pastedTextWhitespace = pastedText.GetLeadingWhitespace();
 
             // First, if we don't have enough indentation whitespace in the string, but we do have a portion of the
             // necessary whitespace, then synthesize the remainder we need.
-            if (leadingWhitespace.Length < rawStringIndentation.Length)
+            if (pastedTextWhitespace.Length < rawStringIndentation.Length)
             {
-                if (rawStringIndentation.EndsWith(leadingWhitespace))
-                    return $"{startQuote}{rawStringIndentation[..^leadingWhitespace.Length]}{text}{endQuote}";
+                if (rawStringIndentation.EndsWith(pastedTextWhitespace))
+                    return $"{startQuote}{rawStringIndentation[..^pastedTextWhitespace.Length]}{pastedText}{endQuote}";
             }
             else
             {
-                // we have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
+                // We have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
                 // nothing to do.
-                if (leadingWhitespace.StartsWith(rawStringIndentation))
-                    return $"{startQuote}{text}{endQuote}";
+                if (pastedTextWhitespace.StartsWith(rawStringIndentation))
+                    return $"{startQuote}{pastedText}{endQuote}";
             }
 
             // We have something with whitespace incompatible with the raw string indentation.  Just add the required
             // indentation we need to ensure this can parse.  Note: this is a heuristic, and it's possible we could
             // figure out something better here (for example copying just enough indentation whitespace to make things
             // successfully parse).
-            return $"{startQuote}{rawStringIndentation}{text}{endQuote}";
+            return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 6dd6d0b5e5b80..95d9a6bc98978 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -159,6 +159,10 @@ public static bool IsAnyRawStringExpression(ExpressionSyntax expression)
                 ? IsRawStringLiteral(literal)
                 : IsRawStringLiteral((InterpolatedStringExpressionSyntax)expression);
 
+        public static bool IsAnyMultiLineRawStringExpression(ExpressionSyntax expression)
+            => expression.Kind() is SyntaxKind.MultiLineRawStringLiteralToken ||
+               expression is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken });
+
         public static bool IsRawStringLiteral(InterpolatedStringExpressionSyntax interpolatedString)
             => interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedMultiLineRawStringStartToken;
 

From e16fe0e23668ae688a482338b7b029b45e4a10af Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 17:02:29 -0700
Subject: [PATCH 085/413] In progress

---
 .../KnownSourcePasteProcessor.cs              | 60 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 5076f74655cb6..48939eb07ffec 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
@@ -52,12 +52,68 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
                     return default;
 
                 var modifiedText = TransformValueToDestinationKind(parsedChange);
-                edits.Add(new TextChange(change.OldSpan, modifiedText));
+                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), modifiedText));
             }
 
             return edits.ToImmutable();
         }
 
+        private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
+        {
+            // we have a matrix of every string source type to every string destination type.
+            // 
+            // Normal string
+            // Interpolated string
+            // Verbatim string
+            // Verbatim interpolated string
+            // Raw single line string
+            // Raw multi line string
+            // Raw interpolated line string
+            // Raw interpolated multi-line string.
+            return (parsedChange, StringExpressionBeforePaste) switch
+            {
+                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto) => TransformLiteralToLiteral(pastedText, pastedInto),
+                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto) => TransformLiteralToInterpolatedString(pastedText, pastedInto),
+                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto) => TransformInterpolatedStringToLiteral(pastedText, pastedInto),
+                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto) => TransformInterpolatedStringToInterpolatedString(pastedText, pastedInto),
+                _ => throw ExceptionUtilities.Unreachable,
+            };
+        }
+
+        private string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+        {
+            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
+            // a multi-line raw string has indentation whitespace we have to respect.
+            if (IsAnyRawStringExpression(pastedInto))
+                TransformLiteralToRawStringLiteral(pastedText, pastedInto);
+
+            // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
+            // the string we're pasting.  So we just need to get that value and ensure it is properly
+            var textValue = pastedText.Token.ValueText;
+            return EscapeForNonRawStringLiteral(
+                pastedInto.Token.IsVerbatimStringLiteral(), isInterpolated: false, textValue);
+        }
+
+        private void TransformLiteralToRawStringLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+        {
+            throw new NotImplementedException();
+        }
+
+        private string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        private string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+        {
+            throw new NotImplementedException();
+        }
+
+        private string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
         /// string it came from.  With this we can determine how to interpret things like the escapes in their original

From 4d4069b58017fd4a20fd35f28f56962276ac3a01 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 17:20:23 -0700
Subject: [PATCH 086/413] Test pass

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  5 ++-
 .../StringCopyPasteCommandHandler.cs          | 34 +++++++++++--------
 .../StringCopyPaste/StringCopyPasteHelpers.cs |  6 ++--
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index b10b62b91cb80..2c2795f988db1 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -120,7 +120,10 @@ protected AbstractPasteProcessor(
             NewLine = newLine;
             StringExpressionBeforePaste = stringExpressionBeforePaste;
 
-            TextContentsSpansBeforePaste = GetTextContentSpans(TextBeforePaste, stringExpressionBeforePaste, out DelimiterQuoteCount, out DelimiterDollarCount);
+            TextContentsSpansBeforePaste = GetTextContentSpans(
+                TextBeforePaste, stringExpressionBeforePaste,
+                out DelimiterQuoteCount, out DelimiterDollarCount,
+                out _, out _);
             TextContentsSpansAfterPaste = TextContentsSpansBeforePaste.SelectAsArray(MapSpanForward);
 
             Contract.ThrowIfTrue(TextContentsSpansBeforePaste.IsEmpty);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index f3a9bf9c62d3c..ed08e6e9fee3c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -158,7 +158,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             // literal token.  Otherwise, we have a multi-selection across token kinds which will be extremely 
             // complex to try to reconcile.
             var stringExpressionBeforePaste = TryGetCompatibleContainingStringExpression(
-                selectionsBeforePaste, cancellationToken);
+                documentBeforePaste, selectionsBeforePaste, cancellationToken);
             if (stringExpressionBeforePaste == null)
                 return;
 
@@ -223,17 +223,23 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
 
                 // See if this is a paste of the last copy that we heard about.
                 if (service != null &&
+                    _lastSelectedSpans?.Count > 0 &&
+                    _lastClipboardSequenceNumber != null &&
                     service.TryGetClipboardSequenceNumber(out var sequenceNumber) &&
-                    _lastClipboardSequenceNumber == sequenceNumber &&
-                    _lastSelectedSpans != null)
+                    _lastClipboardSequenceNumber == sequenceNumber)
                 {
-                    var stringExpressionCopiedFrom = TryGetCompatibleContainingStringExpression(
-                        _lastSelectedSpans, cancellationToken);
-                    if (stringExpressionCopiedFrom != null)
+                    var lastSelectedSnapshot = _lastSelectedSpans[0].Snapshot;
+                    var lastSelectedDocument = lastSelectedSnapshot.GetOpenDocumentInCurrentContextWithChanges();
+                    if (lastSelectedDocument != null)
                     {
-                        return new KnownSourcePasteProcessor(
-                            newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
-                            stringExpressionBeforePaste, stringExpressionCopiedFrom, _lastSelectedSpans[0].Snapshot);
+                        var stringExpressionCopiedFrom = TryGetCompatibleContainingStringExpression(
+                            lastSelectedDocument, _lastSelectedSpans, cancellationToken);
+                        if (stringExpressionCopiedFrom != null)
+                        {
+                            return new KnownSourcePasteProcessor(
+                                newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                                stringExpressionBeforePaste, stringExpressionCopiedFrom, _lastSelectedSpans[0].Snapshot);
+                        }
                     }
                 }
 
@@ -325,16 +331,12 @@ private static bool ContentsAreSame(
         /// anything special as trying to correct in this scenario is too difficult.
         /// </summary>
         private static ExpressionSyntax? TryGetCompatibleContainingStringExpression(
-            NormalizedSnapshotSpanCollection spans, CancellationToken cancellationToken)
+            Document document, NormalizedSnapshotSpanCollection spans, CancellationToken cancellationToken)
         {
             if (spans.Count == 0)
                 return null;
 
             var snapshot = spans[0].Snapshot;
-            var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
-            if (document == null)
-                return null;
-
             var root = document.GetSyntaxRootSynchronously(cancellationToken);
             if (root == null)
                 return null;
@@ -347,7 +349,9 @@ private static bool ContentsAreSame(
             // Now, given that string expression, find the inside 'text' spans of the expression.  These are the parts
             // of the literal between the quotes.  It does not include the interpolation holes in an interpolated
             // string.  These spans may be empty (for an empty string, or empty text gap between interpolations).
-            var contentSpans = GetTextContentSpans(snapshot.AsText(), stringExpression, out _, out _);
+            var contentSpans = GetTextContentSpans(
+                snapshot.AsText(), stringExpression,
+                out _, out _, out _, out _);
 
             foreach (var snapshotSpan in spans)
             {
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 95d9a6bc98978..9847cda8b2786 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -161,7 +161,7 @@ public static bool IsAnyRawStringExpression(ExpressionSyntax expression)
 
         public static bool IsAnyMultiLineRawStringExpression(ExpressionSyntax expression)
             => expression.Kind() is SyntaxKind.MultiLineRawStringLiteralToken ||
-               expression is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken });
+               expression is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken };
 
         public static bool IsRawStringLiteral(InterpolatedStringExpressionSyntax interpolatedString)
             => interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedMultiLineRawStringStartToken;
@@ -282,12 +282,12 @@ private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, Lite
             while (end > start && text[end - 1] == '"')
                 end--;
 
-            if (literal.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
+            if (literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
             {
                 startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, start);
                 endQuoteSpan = TextSpan.FromBounds(end, literal.Span.End);
             }
-            else if (literal.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
+            else if (literal.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
             {
                 // Consume the whitespace and newline after the initial quotes.
                 var rawStart = start;

From 512bf1f05c686b0437aaa583137ea69285ba0228 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 17:53:39 -0700
Subject: [PATCH 087/413] Test mock

---
 .../StringCopyPasteCommandHandler.cs          | 67 ++-----------------
 .../StringCopyPasteCommandHandler_CutCopy.cs  | 59 ++++++++++++++++
 .../PasteKnownSourceIntoNormalStringTests.cs  | 28 ++++++++
 ...ntoSingleLineInterpolatedRawStringTests.cs |  1 -
 ...CopyPasteCommandHandlerKnownSourceTests.cs | 20 ++++++
 .../StringCopyPasteCommandHandlerTests.cs     | 64 ++++++++++++------
 ...pyPasteCommandHandlerUnknownSourceTests.cs |  4 +-
 7 files changed, 154 insertions(+), 89 deletions(-)
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index ed08e6e9fee3c..79776fce162f8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -3,14 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Immutable;
 using System.ComponentModel.Composition;
-using System.Globalization;
 using System.Threading;
-using ICSharpCode.Decompiler.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Collections;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
@@ -19,7 +14,6 @@
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
@@ -50,7 +44,10 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     [Export(typeof(ICommandHandler))]
     [VSUtilities.ContentType(ContentTypeNames.CSharpContentType)]
     [VSUtilities.Name(nameof(StringCopyPasteCommandHandler))]
-    internal partial class StringCopyPasteCommandHandler : IChainedCommandHandler<CopyCommandArgs>, IChainedCommandHandler<PasteCommandArgs>
+    internal partial class StringCopyPasteCommandHandler :
+        IChainedCommandHandler<CutCommandArgs>,
+        IChainedCommandHandler<CopyCommandArgs>,
+        IChainedCommandHandler<PasteCommandArgs>
     {
         private const string CopyId = "RoslynStringCopyPasteId";
         private readonly IThreadingContext _threadingContext;
@@ -77,41 +74,9 @@ public StringCopyPasteCommandHandler(
 
         public string DisplayName => nameof(StringCopyPasteCommandHandler);
 
-        #region Copy
-
-        public CommandState GetCommandState(CopyCommandArgs args, Func<CommandState> nextCommandHandler)
-            => nextCommandHandler();
-
-        public void ExecuteCommand(CopyCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
-        {
-            Contract.ThrowIfFalse(_threadingContext.HasMainThread);
-
-            // Ensure that the copy always goes through all other handlers.
-            nextCommandHandler();
-
-            var textView = args.TextView;
-            var subjectBuffer = args.SubjectBuffer;
-
-            _lastClipboardSequenceNumber = null;
-            _lastSelectedSpans = null;
-
-            var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
-            var copyPasteService = document?.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
-            if (copyPasteService == null)
-                return;
-
-            if (!copyPasteService.TryGetClipboardSequenceNumber(out var sequenceNumber))
-                return;
-
-            _lastClipboardSequenceNumber = sequenceNumber;
-            _lastSelectedSpans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-        }
-
         public CommandState GetCommandState(PasteCommandArgs args, Func<CommandState> nextCommandHandler)
             => nextCommandHandler();
 
-        #endregion
-
         public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
         {
             Contract.ThrowIfFalse(_threadingContext.HasMainThread);
@@ -249,30 +214,6 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             }
         }
 
-        private static VirtualCharSequence FilterToSpans(VirtualCharSequence virtualChars, NormalizedSnapshotSpanCollection lastSelectedSpans)
-        {
-            if (virtualChars.IsDefault)
-                return default;
-
-            var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
-            foreach (var vc in virtualChars)
-            {
-                if (Overlaps(vc.Span, lastSelectedSpans))
-                    result.Add(vc);
-            }
-
-            if (result.Count == 0)
-                return default;
-
-            return VirtualCharSequence.Create(result.ToImmutable());
-        }
-
-        private static bool Overlaps(TextSpan span, NormalizedSnapshotSpanCollection lastSelectedSpans)
-        {
-            var snapshotSpan = new SnapshotSpan(lastSelectedSpans[0].Snapshot, span.ToSpan());
-            return lastSelectedSpans.OverlapsWith(snapshotSpan);
-        }
-
         /// <summary>
         /// Returns true if the paste resulted in legal code for the string literal.  The string literal is
         /// considered legal if it has the same span as the original string (adjusted as per the edit) and that
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
new file mode 100644
index 0000000000000..cbfa88c43a5c1
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -0,0 +1,59 @@
+// 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.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Commanding;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
+{
+    internal partial class StringCopyPasteCommandHandler :
+        IChainedCommandHandler<CutCommandArgs>,
+        IChainedCommandHandler<CopyCommandArgs>
+    {
+        public CommandState GetCommandState(CutCommandArgs args, Func<CommandState> nextCommandHandler)
+            => nextCommandHandler();
+
+        public CommandState GetCommandState(CopyCommandArgs args, Func<CommandState> nextCommandHandler)
+            => nextCommandHandler();
+
+        public void ExecuteCommand(CutCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
+            => ExecuteCommand(args.TextView, args.SubjectBuffer, nextCommandHandler);
+
+        public void ExecuteCommand(CopyCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
+            => ExecuteCommand(args.TextView, args.SubjectBuffer, nextCommandHandler);
+
+        private void ExecuteCommand(ITextView textView, ITextBuffer subjectBuffer, Action nextCommandHandler)
+        {
+            Contract.ThrowIfFalse(_threadingContext.HasMainThread);
+            CaptureCutCopyInformation(textView, subjectBuffer);
+
+            // Ensure that the copy always goes through all other handlers.
+            nextCommandHandler();
+        }
+
+        private void CaptureCutCopyInformation(ITextView textView, ITextBuffer subjectBuffer)
+        {
+            _lastClipboardSequenceNumber = null;
+            _lastSelectedSpans = null;
+
+            var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
+            var copyPasteService = document?.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+            if (copyPasteService == null)
+                return;
+
+            if (!copyPasteService.TryGetClipboardSequenceNumber(out var sequenceNumber))
+                return;
+
+            _lastClipboardSequenceNumber = sequenceNumber;
+            _lastSelectedSpans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
+        }
+    }
+}
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
new file mode 100644
index 0000000000000..b4a87f356211a
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -0,0 +1,28 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoNormalStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+    }
+}
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
index 99cb1894d2d85..b52f58fcd190d 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
@@ -2,7 +2,6 @@
 // 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.Test.Utilities;
 using Roslyn.Test.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs
new file mode 100644
index 0000000000000..74b57bd4a3994
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs
@@ -0,0 +1,20 @@
+// 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 Roslyn.Test.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public abstract class StringCopyPasteCommandHandlerKnownSourceTests
+        : StringCopyPasteCommandHandlerTests
+    {
+        protected static void TestCopyPaste(string copyFileMarkup, string pasteFileMarkup, string expectedMarkup, string afterUndo)
+        {
+            using var state = StringCopyPasteTestState.CreateTestState(
+                copyFileMarkup, pasteFileMarkup);
+
+            state.TestCopyPaste(expectedMarkup, pasteText: null, afterUndo);
+        }
+    }
+}
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index cd0d083c15fc8..330e45fcea3ca 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -2,14 +2,18 @@
 // 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.Data.SqlTypes;
 using System.Linq;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste;
+using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
@@ -29,30 +33,54 @@ public abstract class StringCopyPasteCommandHandlerTests
     {
         internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
         {
-            private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf.AddParts(
-                typeof(StringCopyPasteCommandHandler));
+            [Export(typeof(IStringCopyPasteService))]
+            [Shared]
+            [PartNotDiscoverable]
+            private class MockStringCopyPasteService : IStringCopyPasteService
+            {
+                [ImportingConstructor]
+                [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+                public MockStringCopyPasteService()
+                {
+                }
+
+                public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
+                {
+                    sequenceNumber = 0;
+                    return true;
+                }
+            }
+
+            private static readonly TestComposition s_compositionWithUnknownCopy =
+                EditorTestCompositions.EditorFeaturesWpf
+                    .AddParts(typeof(StringCopyPasteCommandHandler))
+                    .AddExcludedPartTypes(typeof(WpfStringCopyPasteService));
+            private static readonly TestComposition s_compositionWithKnownCopy =
+                s_compositionWithUnknownCopy.AddParts(typeof(MockStringCopyPasteService));
 
             private readonly StringCopyPasteCommandHandler _commandHandler;
 
-            public StringCopyPasteTestState(XElement workspaceElement)
-                : base(workspaceElement, s_composition)
+            public StringCopyPasteTestState(XElement workspaceElement, bool unknownCopy)
+                : base(workspaceElement, unknownCopy ? s_compositionWithUnknownCopy : s_compositionWithKnownCopy)
             {
                 _commandHandler = (StringCopyPasteCommandHandler)GetExportedValues<ICommandHandler>().
                     Single(c => c is StringCopyPasteCommandHandler);
             }
 
-            public static StringCopyPasteTestState CreateTestState(string markup)
-                => new(GetWorkspaceXml(markup));
+            public static StringCopyPasteTestState CreateTestState(string? copyFileMarkup, string pasteFileMarkup)
+                => new(GetWorkspaceXml(copyFileMarkup, pasteFileMarkup), unknownCopy: copyFileMarkup == null);
 
-            public static XElement GetWorkspaceXml(string markup)
-                => markup.Contains("<Workspace>")
-                    ? XElement.Parse(markup)
-                    : XElement.Parse(string.Format(@"
+            public static XElement GetWorkspaceXml(string? copyFileMarkup, string pasteFileMarkup)
+                => XElement.Parse(($@"
 <Workspace>
     <Project Language=""C#"" CommonReferences=""true"">
-        <Document Markup=""SpansOnly"">{0}</Document>
+        <Document Markup=""SpansOnly"">{pasteFileMarkup}</Document>
     </Project>
-</Workspace>", markup));
+    {(copyFileMarkup == null ? "" : $@"
+    <Project Language=""C#"" CommonReferences=""true"">
+        <Document Markup=""SpansOnly"">{copyFileMarkup}</Document>
+    </Project>")}
+</Workspace>"));
 
             internal void AssertCodeIs(string expectedCode)
             {
@@ -157,17 +185,9 @@ private static void SetSelection(
                 textBuffer2 = textBuffer;
                 var broker = textView.GetMultiSelectionBroker();
 
-                broker.AddSelectionRange(copySpans.Select(s => new Selection(s.ToSnapshotSpan(textBuffer.CurrentSnapshot))));
+                var selections = copySpans.Select(s => new Selection(s.ToSnapshotSpan(textBuffer.CurrentSnapshot))).ToArray();
+                broker.SetSelectionRange(selections, selections.First());
             }
         }
-
-#if false
-        private static void TestCopyPaste(string markup, string expectedMarkup, string afterUndo)
-        {
-            using var state = StringCopyPasteTestState.CreateTestState(markup);
-
-            state.TestCopyPaste(expectedMarkup, pasteText: null, afterUndo);
-        }
-#endif
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
index 942ce97c4bc56..49663dffd4118 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
@@ -2,8 +2,6 @@
 // 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.Test.Utilities;
-
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
 {
     public abstract class StringCopyPasteCommandHandlerUnknownSourceTests
@@ -11,7 +9,7 @@ public abstract class StringCopyPasteCommandHandlerUnknownSourceTests
     {
         protected static void TestPasteUnknownSource(string pasteText, string markup, string expectedMarkup, string afterUndo)
         {
-            using var state = StringCopyPasteTestState.CreateTestState(markup);
+            using var state = StringCopyPasteTestState.CreateTestState(copyFileMarkup: null, pasteFileMarkup: markup);
 
             state.TestCopyPaste(expectedMarkup, pasteText, afterUndo);
         }

From e09ad6a4d87896bcac0d7d35f1b6658fd1663deb Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:13:19 -0700
Subject: [PATCH 088/413] Add tests

---
 .../StringCopyPasteCommandHandler.cs          | 36 ++++++---
 .../PasteKnownSourceIntoNormalStringTests.cs  | 80 +++++++++++++++++++
 .../StringCopyPasteCommandHandlerTests.cs     |  3 +-
 3 files changed, 105 insertions(+), 14 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 79776fce162f8..9783453665483 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis.Collections;
@@ -130,12 +131,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var pasteWasSuccessful = PasteWasSuccessful(
                 snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
 
-            var newLine = textView.Options.GetNewLineCharacter();
-            var processor = GetPasteProcessor();
-            if (processor == null)
-                return;
-
-            var textChanges = processor.GetEdits(cancellationToken);
+            var textChanges = GetEdits(cancellationToken);
 
             // If we didn't get any viable changes back, don't do anything.
             if (textChanges.IsDefaultOrEmpty)
@@ -181,12 +177,27 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             }
 
             transaction.Complete();
+            return;
 
-            AbstractPasteProcessor? GetPasteProcessor()
+            ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
             {
-                var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+                var newLine = textView.Options.GetNewLineCharacter();
 
                 // See if this is a paste of the last copy that we heard about.
+                var edits = TryGetEditsFromKnownCopySource(cancellationToken);
+                if (!edits.IsDefaultOrEmpty)
+                    return edits;
+
+                // If not, then just go through teh fallback code path that applies more heuristics.
+                var unknownPasteProcessor = new UnknownSourcePasteProcessor(
+                    newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
+                    stringExpressionBeforePaste, pasteWasSuccessful);
+                return unknownPasteProcessor.GetEdits(cancellationToken);
+            }
+
+            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(CancellationToken cancellationToken)
+            {
+                var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
                 if (service != null &&
                     _lastSelectedSpans?.Count > 0 &&
                     _lastClipboardSequenceNumber != null &&
@@ -201,16 +212,17 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
                             lastSelectedDocument, _lastSelectedSpans, cancellationToken);
                         if (stringExpressionCopiedFrom != null)
                         {
-                            return new KnownSourcePasteProcessor(
+                            var newLine = textView.Options.GetNewLineCharacter();
+
+                            var knownProcessor = new KnownSourcePasteProcessor(
                                 newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
                                 stringExpressionBeforePaste, stringExpressionCopiedFrom, _lastSelectedSpans[0].Snapshot);
+                            return knownProcessor.GetEdits(cancellationToken);
                         }
                     }
                 }
 
-                return new UnknownSourcePasteProcessor(
-                    newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
-                    stringExpressionBeforePaste, pasteWasSuccessful);
+                return default;
             }
         }
 
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index b4a87f356211a..3411ef9a117de 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -21,6 +21,86 @@ public void TestPasteSimpleNormalLiteralContent()
 var dest =
     ""goo[||]"";",
 @"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""o[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""n[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\n[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""[||]"";",
+@"
+var dest =
+    """"[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""[||]"";",
+@"
 var dest =
     ""[||]"";");
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 330e45fcea3ca..44679d3810875 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -33,8 +33,7 @@ public abstract class StringCopyPasteCommandHandlerTests
     {
         internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
         {
-            [Export(typeof(IStringCopyPasteService))]
-            [Shared]
+            [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
             [PartNotDiscoverable]
             private class MockStringCopyPasteService : IStringCopyPasteService
             {

From 58f9efffc81ee41e987ee126c5be13693b60724e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:18:03 -0700
Subject: [PATCH 089/413] Add tests

---
 .../PasteKnownSourceIntoNormalStringTests.cs  | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index 3411ef9a117de..ce6da7b810e65 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -104,5 +104,66 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent()
 var dest =
     ""[||]"";");
         }
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""o[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\r\n[||]"";",
+"\r\nvar dest =\r\n    \"\r\n[||]\";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""[||]"";",
+@"
+var dest =
+    """"""[||]"";");
+        }
     }
 }

From 5f44f9a0cc24b299fced36f97a962aa35a9c6efc Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:28:46 -0700
Subject: [PATCH 090/413] Add tests

---
 .../StringCopyPaste/StringCopyPasteHelpers.cs |  4 +-
 .../PasteKnownSourceIntoNormalStringTests.cs  | 90 +++++++++++++++++++
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 9847cda8b2786..32f8f5949c0a8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -160,8 +160,8 @@ public static bool IsAnyRawStringExpression(ExpressionSyntax expression)
                 : IsRawStringLiteral((InterpolatedStringExpressionSyntax)expression);
 
         public static bool IsAnyMultiLineRawStringExpression(ExpressionSyntax expression)
-            => expression.Kind() is SyntaxKind.MultiLineRawStringLiteralToken ||
-               expression is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken };
+            => expression is LiteralExpressionSyntax { Token.RawKind: (int)SyntaxKind.MultiLineRawStringLiteralToken } or
+                             InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken };
 
         public static bool IsRawStringLiteral(InterpolatedStringExpressionSyntax interpolatedString)
             => interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedMultiLineRawStringStartToken;
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index ce6da7b810e65..50d8ec151ab5b 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -165,5 +165,95 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
 var dest =
     """"""[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    "" \""\"" [||]"";",
+@"
+var dest =
+    "" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo\r\nbar[||]"";",
+@"
+var dest =
+    ""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""goo\r\nbar[||]"";",
+@"
+var dest =
+    ""    goo
+    bar[||]"";");
+        }
     }
 }

From 8d9685ff9a21db794273cb41e9c1498bda4f87dd Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:44:07 -0700
Subject: [PATCH 091/413] Add tests

---
 .../KnownSourcePasteProcessor.cs              |   2 +-
 .../StringCopyPaste/StringCopyPasteHelpers.cs |  12 +-
 .../UnknownSourcePasteProcessor.cs            |   8 +-
 ...PasteKnownSourceIntoVerbatimStringTests.cs | 265 ++++++++++++++++++
 4 files changed, 279 insertions(+), 8 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 48939eb07ffec..299d735e20b38 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -91,7 +91,7 @@ private string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, Lit
             // the string we're pasting.  So we just need to get that value and ensure it is properly
             var textValue = pastedText.Token.ValueText;
             return EscapeForNonRawStringLiteral(
-                pastedInto.Token.IsVerbatimStringLiteral(), isInterpolated: false, textValue);
+                pastedInto.Token.IsVerbatimStringLiteral(), isInterpolated: false, trySkipExistingEscapes: false, textValue);
         }
 
         private void TransformLiteralToRawStringLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 32f8f5949c0a8..e237a219fade1 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -464,10 +464,10 @@ public static bool IsSupportedStringExpression(ExpressionSyntax expression)
             return false;
         }
 
-        public static string EscapeForNonRawStringLiteral(bool isVerbatim, bool isInterpolated, string value)
+        public static string EscapeForNonRawStringLiteral(bool isVerbatim, bool isInterpolated, bool trySkipExistingEscapes, string value)
         {
             if (isVerbatim)
-                return EscapeForNonRawVerbatimStringLiteral(isInterpolated, value);
+                return EscapeForNonRawVerbatimStringLiteral(isInterpolated, trySkipExistingEscapes, value);
 
             // Standard strings have a much larger set of cases to consider.
             using var _ = PooledStringBuilder.GetInstance(out var builder);
@@ -512,7 +512,7 @@ public static string EscapeForNonRawStringLiteral(bool isVerbatim, bool isInterp
                     // Otherwise, if it's not already escaped, then escape it.
                     if (isInterpolated && ch is '{' or '}')
                     {
-                        if (nextCh == ch)
+                        if (trySkipExistingEscapes && nextCh == ch)
                             i++;
                         else
                             builder.Append(ch);
@@ -587,7 +587,7 @@ static bool NeedsEscaping(UnicodeCategory category)
             }
         }
 
-        private static string EscapeForNonRawVerbatimStringLiteral(bool isInterpolated, string value)
+        private static string EscapeForNonRawVerbatimStringLiteral(bool isInterpolated, bool trySkipExistingEscapes, string value)
         {
             using var _ = PooledStringBuilder.GetInstance(out var builder);
 
@@ -602,14 +602,14 @@ private static string EscapeForNonRawVerbatimStringLiteral(bool isInterpolated,
                 // Otherwise, if it's not already escaped, then escape it.
                 if (ch == '"')
                 {
-                    if (nextCh == ch)
+                    if (trySkipExistingEscapes && nextCh == ch)
                         i++;
                     else
                         builder.Append(ch);
                 }
                 else if (isInterpolated && ch is '{' or '}')
                 {
-                    if (nextCh == ch)
+                    if (trySkipExistingEscapes && nextCh == ch)
                         i++;
                     else
                         builder.Append(ch);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index fc9646b64956f..c1d3f29da018e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -89,7 +89,13 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             using var textChanges = TemporaryArray<TextChange>.Empty;
 
             foreach (var change in Changes)
-                textChanges.Add(new TextChange(change.OldSpan.ToTextSpan(), EscapeForNonRawStringLiteral(isVerbatim, isInterpolated, change.NewText)));
+            {
+                // We're pasting from an unknown source.  If we see a viable escape in that source treat it as an escape
+                // instead of escaping it one more time upon paste.
+                textChanges.Add(new TextChange(
+                    change.OldSpan.ToTextSpan(),
+                    EscapeForNonRawStringLiteral(isVerbatim, isInterpolated, trySkipExistingEscapes: true, change.NewText)));
+            }
 
             return textChanges.ToImmutableAndClear();
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
new file mode 100644
index 0000000000000..2881418b5c54e
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -0,0 +1,265 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoVerbatimStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""o[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""n[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\r\n|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""
+[||]"";",
+@"
+var dest =
+    @""\r\n[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""[||]"";",
+@"
+var dest =
+    @""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""[||]"";",
+@"
+var dest =
+    @""\""[||]"";");
+        }
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""o[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""
+[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @"" """""""" [||]"";",
+@"
+var dest =
+    @"" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo
+bar[||]"";",
+@"
+var dest =
+    @""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""goo
+bar[||]"";",
+@"
+var dest =
+    @""    goo
+    bar[||]"";");
+        }
+    }
+}

From a173b1aaf13d246c38469786a0d8e93fad81ca0e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:55:02 -0700
Subject: [PATCH 092/413] Add tests

---
 .../KnownSourcePasteProcessor.cs              |  20 +-
 ...SourceIntoNormalInterpolatedStringTests.cs | 310 ++++++++++++++++++
 2 files changed, 328 insertions(+), 2 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 299d735e20b38..0ad1d6b5ac147 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -91,7 +91,8 @@ private string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, Lit
             // the string we're pasting.  So we just need to get that value and ensure it is properly
             var textValue = pastedText.Token.ValueText;
             return EscapeForNonRawStringLiteral(
-                pastedInto.Token.IsVerbatimStringLiteral(), isInterpolated: false, trySkipExistingEscapes: false, textValue);
+                pastedInto.Token.IsVerbatimStringLiteral(),
+                isInterpolated: false, trySkipExistingEscapes: false, textValue);
         }
 
         private void TransformLiteralToRawStringLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
@@ -99,7 +100,22 @@ private void TransformLiteralToRawStringLiteral(LiteralExpressionSyntax pastedTe
             throw new NotImplementedException();
         }
 
-        private string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInfo)
+        private string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+        {
+            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
+            // a multi-line raw string has indentation whitespace we have to respect.
+            if (IsAnyRawStringExpression(pastedInto))
+                TransformLiteralToInterpolatedRawStringLiteral(pastedText, pastedInto);
+
+            // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
+            // the string we're pasting.  So we just need to get that value and ensure it is properly
+            var textValue = pastedText.Token.ValueText;
+            return EscapeForNonRawStringLiteral(
+                pastedInto.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken,
+                isInterpolated: true, trySkipExistingEscapes: false, textValue);
+        }
+
+        private void TransformLiteralToInterpolatedRawStringLiteral(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
         {
             throw new NotImplementedException();
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
new file mode 100644
index 0000000000000..d8189e8c33d56
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
@@ -0,0 +1,310 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoNormalInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{{[||]"";",
+@"
+var dest =
+    $""{[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{{}}[||]"";",
+@"
+var dest =
+    $""{}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{{0}}[||]"";",
+@"
+var dest =
+    $""{0}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""\n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""\r\n[||]"";",
+@"
+var dest =
+    $""
+[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $"" \""\"" [||]"";",
+@"
+var dest =
+    $"" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""    goo
+    bar[||]"";");
+        }
+    }
+}

From c471e00cba35f402dbd1a470351f27a9ed364058 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 18:59:38 -0700
Subject: [PATCH 093/413] Add tests

---
 ...urceIntoVerbatimInterpolatedStringTests.cs | 313 ++++++++++++++++++
 1 file changed, 313 insertions(+)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
new file mode 100644
index 0000000000000..c2af9b6905a2f
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -0,0 +1,313 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoVerbatimInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{{[||]"";",
+@"
+var dest =
+    $@""{[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{{}}[||]"";",
+@"
+var dest =
+    $@""{}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{{0}}[||]"";",
+@"
+var dest =
+    $@""{0}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""o[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""n[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\r\n|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""
+[||]"";",
+@"
+var dest =
+    $@""\r\n[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""""""[||]"";",
+@"
+var dest =
+    $@""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""""""[||]"";",
+@"
+var dest =
+    $@""\""[||]"";");
+        }
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""o[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""
+[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""""""[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@"" """""""" [||]"";",
+@"
+var dest =
+    $@"" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo
+bar[||]"";",
+@"
+var dest =
+    $@""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""goo
+bar[||]"";",
+@"
+var dest =
+    $@""    goo
+    bar[||]"";");
+        }
+    }
+}

From dbaa68cccf919c06bbeb99e41c9f3e718456b2b2 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:16:54 -0700
Subject: [PATCH 094/413] Add tests

---
 .../KnownSourcePasteProcessor.cs              | 32 +++++++++
 .../PasteKnownSourceIntoNormalStringTests.cs  | 65 +++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 0ad1d6b5ac147..390ca52e1e48b 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -121,6 +121,38 @@ private void TransformLiteralToInterpolatedRawStringLiteral(LiteralExpressionSyn
         }
 
         private string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+        {
+            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
+            // a multi-line raw string has indentation whitespace we have to respect.
+            if (IsAnyRawStringExpression(pastedInto))
+                TransformInterpolatedStringToRawStringLiteral(pastedText, pastedInto);
+
+            var isVerbatim = pastedInto.Token.IsVerbatimStringLiteral();
+            using var _ = PooledStringBuilder.GetInstance(out var builder);
+            foreach (var content in pastedText.Contents)
+            {
+                if (content is InterpolatedStringTextSyntax stringText)
+                {
+                    builder.Append(EscapeForNonRawStringLiteral(
+                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                }
+                else if (content is InterpolationSyntax interpolation)
+                {
+                    // we're copying an interpolation from an interpolated string to a string literal. For example,
+                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
+                    // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
+                    // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
+                    // for now, we do the simple thing and just treat the interpolation as raw text that should just be
+                    // escaped as appropriate into the destination.
+                    builder.Append(EscapeForNonRawStringLiteral(
+                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private void TransformInterpolatedStringToRawStringLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
         {
             throw new NotImplementedException();
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index 50d8ec151ab5b..45d709af87de1 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -104,6 +104,7 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent()
 var dest =
     ""[||]"";");
         }
+
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
@@ -255,5 +256,69 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
     ""    goo
     bar[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0}[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{\""goo\""}[||]"";",
+@"
+var dest =
+    ""{""goo""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""X{\""goo\""}Y[||]"";",
+@"
+var dest =
+    ""X{""goo""}Y[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""X{\""goo\""}Y\""[||]"";",
+@"
+var dest =
+    ""\""X{""goo""}Y\""[||]"";");
+        }
     }
 }

From 15d59ffaf0a16d7e26bc620a0a72ba410cb7788d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:23:20 -0700
Subject: [PATCH 095/413] Add tests

---
 .../PasteKnownSourceIntoNormalStringTests.cs  | 102 +++++++++++++++++-
 1 file changed, 99 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index 45d709af87de1..2a4c03d53ff5e 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -274,7 +274,7 @@ public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
         }
 
         [WpfFact]
-        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent1()
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
 @"var v = $""{|Copy:{""goo""}|}"";",
@@ -290,7 +290,7 @@ public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent
         }
 
         [WpfFact]
-        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent2()
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
 @"var v = $""{|Copy:X{""goo""}Y|}"";",
@@ -306,7 +306,7 @@ public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent
         }
 
         [WpfFact]
-        public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent3()
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
 @"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
@@ -320,5 +320,101 @@ public void TestPasteInterpolationWIthStringFromInterpolatedStringLiteralContent
 var dest =
     ""\""X{""goo""}Y\""[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""X{@\""goo\""}Y\""[||]"";",
+@"
+var dest =
+    ""\""X{@""goo""}Y\""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0}[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{\""goo\""}[||]"";",
+@"
+var dest =
+    ""{""goo""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""X{\""goo\""}Y[||]"";",
+@"
+var dest =
+    ""X{""goo""}Y[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""X{\""goo\""}Y\""[||]"";",
+@"
+var dest =
+    """"""X{""goo""}Y""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""\""X{@\""goo\""}Y\""[||]"";",
+@"
+var dest =
+    """"""X{@""goo""}Y""""[||]"";");
+        }
     }
 }

From 5225749dd12e75c2437893fcd2ce2361efbad996 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:28:51 -0700
Subject: [PATCH 096/413] Add tests

---
 ...PasteKnownSourceIntoVerbatimStringTests.cs | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
index 2881418b5c54e..3dc39faa9ee65 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -261,5 +261,165 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
     @""    goo
     bar[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0}[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{""""goo""""}[||]"";",
+@"
+var dest =
+    @""{""goo""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""X{""""goo""""}Y[||]"";",
+@"
+var dest =
+    @""X{""goo""}Y[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""X{""""goo""""}Y""""[||]"";",
+@"
+var dest =
+    @""\""X{""goo""}Y\""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""X{@""""goo""""}Y""""[||]"";",
+@"
+var dest =
+    @""\""X{@""goo""}Y\""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0}[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{""""goo""""}[||]"";",
+@"
+var dest =
+    @""{""goo""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""X{""""goo""""}Y[||]"";",
+@"
+var dest =
+    @""X{""goo""}Y[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""X{""""goo""""}Y""""[||]"";",
+@"
+var dest =
+    @""""""X{""goo""}Y""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""""""X{@""""goo""""}Y""""[||]"";",
+@"
+var dest =
+    @""""""X{@""goo""}Y""""[||]"";");
+        }
     }
 }

From adcfe44721a2cba79b04540cbbf8925a0b315153 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:42:17 -0700
Subject: [PATCH 097/413] Oops

---
 .../KnownSourcePasteProcessor.cs              | 57 ++++++++++++++---
 .../PasteKnownSourceIntoNormalStringTests.cs  | 64 +++++++++++++++++++
 ...PasteKnownSourceIntoVerbatimStringTests.cs | 64 +++++++++++++++++++
 3 files changed, 177 insertions(+), 8 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 390ca52e1e48b..cff8beadcf244 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -17,6 +17,7 @@
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
     using static StringCopyPasteHelpers;
+    using static SyntaxFactory;
 
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
@@ -91,7 +92,7 @@ private string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, Lit
             // the string we're pasting.  So we just need to get that value and ensure it is properly
             var textValue = pastedText.Token.ValueText;
             return EscapeForNonRawStringLiteral(
-                pastedInto.Token.IsVerbatimStringLiteral(),
+                IsVerbatimStringExpression(pastedInto),
                 isInterpolated: false, trySkipExistingEscapes: false, textValue);
         }
 
@@ -127,7 +128,52 @@ private string TransformInterpolatedStringToLiteral(InterpolatedStringExpression
             if (IsAnyRawStringExpression(pastedInto))
                 TransformInterpolatedStringToRawStringLiteral(pastedText, pastedInto);
 
-            var isVerbatim = pastedInto.Token.IsVerbatimStringLiteral();
+            var isVerbatim = IsVerbatimStringExpression(pastedInto);
+            using var _ = PooledStringBuilder.GetInstance(out var builder);
+            foreach (var content in pastedText.Contents)
+            {
+                if (content is InterpolatedStringTextSyntax stringText)
+                {
+                    builder.Append(EscapeForNonRawStringLiteral(
+                        isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                }
+                else if (content is InterpolationSyntax interpolation)
+                {
+                    // we're moving an interpolation from one interpolation to another.  This can just be copied
+                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                    // for the destination type.
+                    if (interpolation.FormatClause is not null)
+                    {
+                        var oldToken = interpolation.FormatClause.FormatStringToken;
+                        var newToken = Token(
+                            oldToken.LeadingTrivia, oldToken.Kind(),
+                            EscapeForNonRawStringLiteral(
+                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
+                            oldToken.ValueText, oldToken.TrailingTrivia);
+
+                        interpolation = interpolation.ReplaceToken(oldToken, newToken);
+                    }
+
+                    builder.Append(interpolation.ToString());
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private void TransformInterpolatedStringToRawStringLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+        {
+            throw new NotImplementedException();
+        }
+
+        private string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+        {
+            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
+            // a multi-line raw string has indentation whitespace we have to respect.
+            if (IsAnyRawStringExpression(pastedInto))
+                TransformInterpolatedStringToRawInterpolatedString(pastedText, pastedInto);
+
+            var isVerbatim = IsVerbatimStringExpression(pastedInto);
             using var _ = PooledStringBuilder.GetInstance(out var builder);
             foreach (var content in pastedText.Contents)
             {
@@ -152,12 +198,7 @@ private string TransformInterpolatedStringToLiteral(InterpolatedStringExpression
             return builder.ToString();
         }
 
-        private void TransformInterpolatedStringToRawStringLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
-        {
-            throw new NotImplementedException();
-        }
-
-        private string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+        private void TransformInterpolatedStringToRawInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
         {
             throw new NotImplementedException();
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index 2a4c03d53ff5e..d70293bad7d71 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -273,6 +273,38 @@ public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
     ""[||]"";");
         }
 
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0:X}[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0:\""X\""}[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
@@ -353,6 +385,38 @@ public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
     ""[||]"";");
         }
 
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0:X}[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    ""[||]"";",
+@"
+var dest =
+    ""{0:\""X\""}[||]"";",
+@"
+var dest =
+    ""{0:""""X""""}[||]"";");
+        }
+
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
index 3dc39faa9ee65..1cf454d0af24f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -278,6 +278,38 @@ public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
     @""[||]"";");
         }
 
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0:X}[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0:""""X""""}[||]"";",
+@"
+var dest =
+    @""{0:\""X\""}[||]"";");
+        }
+
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
@@ -358,6 +390,38 @@ public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
     @""[||]"";");
         }
 
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0:X}[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    @""[||]"";",
+@"
+var dest =
+    @""{0:""""X""""}[||]"";",
+@"
+var dest =
+    @""[||]"";");
+        }
+
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {

From 88dbd3541b970d7ea9b75848ee03e6c4d30ebb32 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:45:38 -0700
Subject: [PATCH 098/413] Add tests

---
 ...SourceIntoNormalInterpolatedStringTests.cs | 64 +++++++++++++++++++
 ...urceIntoVerbatimInterpolatedStringTests.cs | 64 +++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
index d8189e8c33d56..49c6a8cc84cb0 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
@@ -306,5 +306,69 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
     $""    goo
     bar[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $""[||]"";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""{0:""""X""""}[||]"";");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
index c2af9b6905a2f..5860a0e5a1e3a 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -309,5 +309,69 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
     $@""    goo
     bar[||]"";");
         }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{0:X}[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{0:""""X""""}[||]"";",
+@"
+var dest =
+    $@""{0:\""X\""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{0:X}[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $@""[||]"";",
+@"
+var dest =
+    $@""{0:""""X""""}[||]"";",
+@"
+var dest =
+    $@""[||]"";");
+        }
     }
 }

From 7d7f2320a3bf8cd162c602246a0ac897dd39dafc Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:49:14 -0700
Subject: [PATCH 099/413] Fix

---
 .../KnownSourcePasteProcessor.cs              | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index cff8beadcf244..e1c146e9bf43e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -139,22 +139,14 @@ private string TransformInterpolatedStringToLiteral(InterpolatedStringExpression
                 }
                 else if (content is InterpolationSyntax interpolation)
                 {
-                    // we're moving an interpolation from one interpolation to another.  This can just be copied
-                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                    // for the destination type.
-                    if (interpolation.FormatClause is not null)
-                    {
-                        var oldToken = interpolation.FormatClause.FormatStringToken;
-                        var newToken = Token(
-                            oldToken.LeadingTrivia, oldToken.Kind(),
-                            EscapeForNonRawStringLiteral(
-                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
-                            oldToken.ValueText, oldToken.TrailingTrivia);
-
-                        interpolation = interpolation.ReplaceToken(oldToken, newToken);
-                    }
-
-                    builder.Append(interpolation.ToString());
+                    // we're copying an interpolation from an interpolated string to a string literal. For example,
+                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
+                    // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
+                    // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
+                    // for now, we do the simple thing and just treat the interpolation as raw text that should just be
+                    // escaped as appropriate into the destination.
+                    builder.Append(EscapeForNonRawStringLiteral(
+                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
                 }
             }
 
@@ -184,14 +176,22 @@ private string TransformInterpolatedStringToInterpolatedString(InterpolatedStrin
                 }
                 else if (content is InterpolationSyntax interpolation)
                 {
-                    // we're copying an interpolation from an interpolated string to a string literal. For example,
-                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
-                    // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
-                    // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
-                    // for now, we do the simple thing and just treat the interpolation as raw text that should just be
-                    // escaped as appropriate into the destination.
-                    builder.Append(EscapeForNonRawStringLiteral(
-                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                    // we're moving an interpolation from one interpolation to another.  This can just be copied
+                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                    // for the destination type.
+                    if (interpolation.FormatClause is not null)
+                    {
+                        var oldToken = interpolation.FormatClause.FormatStringToken;
+                        var newToken = Token(
+                            oldToken.LeadingTrivia, oldToken.Kind(),
+                            EscapeForNonRawStringLiteral(
+                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
+                            oldToken.ValueText, oldToken.TrailingTrivia);
+
+                        interpolation = interpolation.ReplaceToken(oldToken, newToken);
+                    }
+
+                    builder.Append(interpolation.ToString());
                 }
             }
 

From 3c0939ec45689e1f4980a05ff99a3ef2dedc07ef Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 19:54:55 -0700
Subject: [PATCH 100/413] Add tests

---
 .../PasteKnownSourceIntoNormalStringTests.cs                | 6 +++---
 .../PasteKnownSourceIntoVerbatimStringTests.cs              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index d70293bad7d71..eb03ced423261 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -299,10 +299,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     ""[||]"";",
 @"
 var dest =
-    ""{0:\""X\""}[||]"";",
+    ""{0:\\\""X\\\""}[||]"";",
 @"
 var dest =
-    ""[||]"";");
+    ""{0:\""X\""}[||]"";");
         }
 
         [WpfFact]
@@ -411,7 +411,7 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     ""[||]"";",
 @"
 var dest =
-    ""{0:\""X\""}[||]"";",
+    ""{0:\""\""X\""\""}[||]"";",
 @"
 var dest =
     ""{0:""""X""""}[||]"";");
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
index 1cf454d0af24f..d5996c5886f14 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -304,7 +304,7 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     @""[||]"";",
 @"
 var dest =
-    @""{0:""""X""""}[||]"";",
+    @""{0:\""""X\""""}[||]"";",
 @"
 var dest =
     @""{0:\""X\""}[||]"";");
@@ -416,10 +416,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     @""[||]"";",
 @"
 var dest =
-    @""{0:""""X""""}[||]"";",
+    @""{0:""""""""X""""""""}[||]"";",
 @"
 var dest =
-    @""[||]"";");
+    @""{0:""""X""""}[||]"";");
         }
 
         [WpfFact]

From da1ab91d8a0af58723abbe89689e61286a7bcce7 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 20:02:29 -0700
Subject: [PATCH 101/413] Move

---
 .../KnownSourcePasteProcessor.cs              | 126 +++++++++---------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index e1c146e9bf43e..db78db588c726 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -59,6 +59,69 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             return edits.ToImmutable();
         }
 
+        /// <summary>
+        /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
+        /// string it came from.  With this we can determine how to interpret things like the escapes in their original
+        /// context.  We can also figure out how to deal with copied interpolations.
+        /// </summary>
+        private string WrapChangeWithOriginalQuotes(string pastedText)
+        {
+            var textCopiedFrom = _snapshotCopiedFrom.AsText();
+            GetTextContentSpans(
+                textCopiedFrom, _stringExpressionCopiedFrom, out _, out _,
+                out var startQuoteSpan, out var endQuoteSpan);
+
+            var startQuote = textCopiedFrom.ToString(startQuoteSpan);
+            var endQuote = textCopiedFrom.ToString(endQuoteSpan);
+            if (!IsAnyMultiLineRawStringExpression(_stringExpressionCopiedFrom))
+                return $"{startQuote}{pastedText}{endQuote}";
+
+            // With a raw string we have the issue that the contents may need to be indented properly in order for the
+            // string to parsed successfully.  Because we're using the original start/end quote to wrap the text that
+            // was pasted this normally is not an issue.  However, it can be a problem in the following case:
+            //
+            //      var source = """
+            //              exiting text
+            //              [|copy
+            //              this|]
+            //              existing text
+            //              """
+            //
+            // In this case, the first line of the text will not start with enough indentation and we will generate:
+            //
+            // """
+            // copy
+            //              this
+            //              """
+            //
+            // To address this.  We ensure that if the content starts with spaces to not be a problem.
+            var endLine = textCopiedFrom.Lines.GetLineFromPosition(_stringExpressionCopiedFrom.Span.End);
+            var rawStringIndentation = endLine.GetLeadingWhitespace();
+
+            var pastedTextWhitespace = pastedText.GetLeadingWhitespace();
+
+            // First, if we don't have enough indentation whitespace in the string, but we do have a portion of the
+            // necessary whitespace, then synthesize the remainder we need.
+            if (pastedTextWhitespace.Length < rawStringIndentation.Length)
+            {
+                if (rawStringIndentation.EndsWith(pastedTextWhitespace))
+                    return $"{startQuote}{rawStringIndentation[..^pastedTextWhitespace.Length]}{pastedText}{endQuote}";
+            }
+            else
+            {
+                // We have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
+                // nothing to do.
+                if (pastedTextWhitespace.StartsWith(rawStringIndentation))
+                    return $"{startQuote}{pastedText}{endQuote}";
+            }
+
+            // We have something with whitespace incompatible with the raw string indentation.  Just add the required
+            // indentation we need to ensure this can parse.  Note: this is a heuristic, and it's possible we could
+            // figure out something better here (for example copying just enough indentation whitespace to make things
+            // successfully parse).
+            return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
+        }
+
         private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
         {
             // we have a matrix of every string source type to every string destination type.
@@ -202,68 +265,5 @@ private void TransformInterpolatedStringToRawInterpolatedString(InterpolatedStri
         {
             throw new NotImplementedException();
         }
-
-        /// <summary>
-        /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
-        /// string it came from.  With this we can determine how to interpret things like the escapes in their original
-        /// context.  We can also figure out how to deal with copied interpolations.
-        /// </summary>
-        private string WrapChangeWithOriginalQuotes(string pastedText)
-        {
-            var textCopiedFrom = _snapshotCopiedFrom.AsText();
-            GetTextContentSpans(
-                textCopiedFrom, _stringExpressionCopiedFrom, out _, out _,
-                out var startQuoteSpan, out var endQuoteSpan);
-
-            var startQuote = textCopiedFrom.ToString(startQuoteSpan);
-            var endQuote = textCopiedFrom.ToString(endQuoteSpan);
-            if (!IsAnyMultiLineRawStringExpression(_stringExpressionCopiedFrom))
-                return $"{startQuote}{pastedText}{endQuote}";
-
-            // With a raw string we have the issue that the contents may need to be indented properly in order for the
-            // string to parsed successfully.  Because we're using the original start/end quote to wrap the text that
-            // was pasted this normally is not an issue.  However, it can be a problem in the following case:
-            //
-            //      var source = """
-            //              exiting text
-            //              [|copy
-            //              this|]
-            //              existing text
-            //              """
-            //
-            // In this case, the first line of the text will not start with enough indentation and we will generate:
-            //
-            // """
-            // copy
-            //              this
-            //              """
-            //
-            // To address this.  We ensure that if the content starts with spaces to not be a problem.
-            var endLine = textCopiedFrom.Lines.GetLineFromPosition(_stringExpressionCopiedFrom.Span.End);
-            var rawStringIndentation = endLine.GetLeadingWhitespace();
-
-            var pastedTextWhitespace = pastedText.GetLeadingWhitespace();
-
-            // First, if we don't have enough indentation whitespace in the string, but we do have a portion of the
-            // necessary whitespace, then synthesize the remainder we need.
-            if (pastedTextWhitespace.Length < rawStringIndentation.Length)
-            {
-                if (rawStringIndentation.EndsWith(pastedTextWhitespace))
-                    return $"{startQuote}{rawStringIndentation[..^pastedTextWhitespace.Length]}{pastedText}{endQuote}";
-            }
-            else
-            {
-                // We have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
-                // nothing to do.
-                if (pastedTextWhitespace.StartsWith(rawStringIndentation))
-                    return $"{startQuote}{pastedText}{endQuote}";
-            }
-
-            // We have something with whitespace incompatible with the raw string indentation.  Just add the required
-            // indentation we need to ensure this can parse.  Note: this is a heuristic, and it's possible we could
-            // figure out something better here (for example copying just enough indentation whitespace to make things
-            // successfully parse).
-            return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
-        }
     }
 }

From ce11c1cc7a859ddb007ec7764de209cca282de1e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 20:06:14 -0700
Subject: [PATCH 102/413] SImplify

---
 .../KnownSourcePasteProcessor.cs              | 177 ++++++++----------
 1 file changed, 73 insertions(+), 104 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index db78db588c726..31aeb5bb61a09 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -134,6 +134,12 @@ private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
             // Raw multi line string
             // Raw interpolated line string
             // Raw interpolated multi-line string.
+
+            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
+            // a multi-line raw string has indentation whitespace we have to respect.
+            if (IsAnyRawStringExpression(StringExpressionBeforePaste))
+                return TransformValueForRawStringExpression(parsedChange, StringExpressionBeforePaste);
+
             return (parsedChange, StringExpressionBeforePaste) switch
             {
                 (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto) => TransformLiteralToLiteral(pastedText, pastedInto),
@@ -142,126 +148,89 @@ private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
                 (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto) => TransformInterpolatedStringToInterpolatedString(pastedText, pastedInto),
                 _ => throw ExceptionUtilities.Unreachable,
             };
-        }
-
-        private string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
-        {
-            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
-            // a multi-line raw string has indentation whitespace we have to respect.
-            if (IsAnyRawStringExpression(pastedInto))
-                TransformLiteralToRawStringLiteral(pastedText, pastedInto);
-
-            // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
-            // the string we're pasting.  So we just need to get that value and ensure it is properly
-            var textValue = pastedText.Token.ValueText;
-            return EscapeForNonRawStringLiteral(
-                IsVerbatimStringExpression(pastedInto),
-                isInterpolated: false, trySkipExistingEscapes: false, textValue);
-        }
-
-        private void TransformLiteralToRawStringLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
-        {
-            throw new NotImplementedException();
-        }
-
-        private string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
-        {
-            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
-            // a multi-line raw string has indentation whitespace we have to respect.
-            if (IsAnyRawStringExpression(pastedInto))
-                TransformLiteralToInterpolatedRawStringLiteral(pastedText, pastedInto);
-
-            // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
-            // the string we're pasting.  So we just need to get that value and ensure it is properly
-            var textValue = pastedText.Token.ValueText;
-            return EscapeForNonRawStringLiteral(
-                pastedInto.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken,
-                isInterpolated: true, trySkipExistingEscapes: false, textValue);
-        }
 
-        private void TransformLiteralToInterpolatedRawStringLiteral(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
-        {
-            throw new NotImplementedException();
-        }
+            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+            {
+                var textValue = pastedText.Token.ValueText;
+                return EscapeForNonRawStringLiteral(
+                    IsVerbatimStringExpression(pastedInto),
+                    isInterpolated: false, trySkipExistingEscapes: false, textValue);
+            }
 
-        private string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
-        {
-            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
-            // a multi-line raw string has indentation whitespace we have to respect.
-            if (IsAnyRawStringExpression(pastedInto))
-                TransformInterpolatedStringToRawStringLiteral(pastedText, pastedInto);
+            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+            {
+                // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
+                // the string we're pasting.  So we just need to get that value and ensure it is properly
+                var textValue = pastedText.Token.ValueText;
+                return EscapeForNonRawStringLiteral(
+                    pastedInto.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken,
+                    isInterpolated: true, trySkipExistingEscapes: false, textValue);
+            }
 
-            var isVerbatim = IsVerbatimStringExpression(pastedInto);
-            using var _ = PooledStringBuilder.GetInstance(out var builder);
-            foreach (var content in pastedText.Contents)
+            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
             {
-                if (content is InterpolatedStringTextSyntax stringText)
+                var isVerbatim = IsVerbatimStringExpression(pastedInto);
+                using var _ = PooledStringBuilder.GetInstance(out var builder);
+                foreach (var content in pastedText.Contents)
                 {
-                    builder.Append(EscapeForNonRawStringLiteral(
-                        isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                }
-                else if (content is InterpolationSyntax interpolation)
-                {
-                    // we're copying an interpolation from an interpolated string to a string literal. For example,
-                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
-                    // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
-                    // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
-                    // for now, we do the simple thing and just treat the interpolation as raw text that should just be
-                    // escaped as appropriate into the destination.
-                    builder.Append(EscapeForNonRawStringLiteral(
-                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                    if (content is InterpolatedStringTextSyntax stringText)
+                    {
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                    }
+                    else if (content is InterpolationSyntax interpolation)
+                    {
+                        // we're copying an interpolation from an interpolated string to a string literal. For example,
+                        // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
+                        // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
+                        // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
+                        // for now, we do the simple thing and just treat the interpolation as raw text that should just be
+                        // escaped as appropriate into the destination.
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                    }
                 }
-            }
-
-            return builder.ToString();
-        }
-
-        private void TransformInterpolatedStringToRawStringLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
-        {
-            throw new NotImplementedException();
-        }
 
-        private string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
-        {
-            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
-            // a multi-line raw string has indentation whitespace we have to respect.
-            if (IsAnyRawStringExpression(pastedInto))
-                TransformInterpolatedStringToRawInterpolatedString(pastedText, pastedInto);
+                return builder.ToString();
+            }
 
-            var isVerbatim = IsVerbatimStringExpression(pastedInto);
-            using var _ = PooledStringBuilder.GetInstance(out var builder);
-            foreach (var content in pastedText.Contents)
+            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
             {
-                if (content is InterpolatedStringTextSyntax stringText)
-                {
-                    builder.Append(EscapeForNonRawStringLiteral(
-                        isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                }
-                else if (content is InterpolationSyntax interpolation)
+                var isVerbatim = IsVerbatimStringExpression(pastedInto);
+                using var _ = PooledStringBuilder.GetInstance(out var builder);
+                foreach (var content in pastedText.Contents)
                 {
-                    // we're moving an interpolation from one interpolation to another.  This can just be copied
-                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                    // for the destination type.
-                    if (interpolation.FormatClause is not null)
+                    if (content is InterpolatedStringTextSyntax stringText)
                     {
-                        var oldToken = interpolation.FormatClause.FormatStringToken;
-                        var newToken = Token(
-                            oldToken.LeadingTrivia, oldToken.Kind(),
-                            EscapeForNonRawStringLiteral(
-                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
-                            oldToken.ValueText, oldToken.TrailingTrivia);
-
-                        interpolation = interpolation.ReplaceToken(oldToken, newToken);
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                    }
+                    else if (content is InterpolationSyntax interpolation)
+                    {
+                        // we're moving an interpolation from one interpolation to another.  This can just be copied
+                        // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                        // for the destination type.
+                        if (interpolation.FormatClause is not null)
+                        {
+                            var oldToken = interpolation.FormatClause.FormatStringToken;
+                            var newToken = Token(
+                                oldToken.LeadingTrivia, oldToken.Kind(),
+                                EscapeForNonRawStringLiteral(
+                                    isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
+                                oldToken.ValueText, oldToken.TrailingTrivia);
+
+                            interpolation = interpolation.ReplaceToken(oldToken, newToken);
+                        }
+
+                        builder.Append(interpolation.ToString());
                     }
-
-                    builder.Append(interpolation.ToString());
                 }
-            }
 
-            return builder.ToString();
+                return builder.ToString();
+            }
         }
 
-        private void TransformInterpolatedStringToRawInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+        private string TransformValueForRawStringExpression(ExpressionSyntax parsedChange, ExpressionSyntax stringExpressionBeforePaste)
         {
             throw new NotImplementedException();
         }

From 4588c29b0901dfeb0d87276ff76c10563a52931f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 20:17:03 -0700
Subject: [PATCH 103/413] SImplify

---
 .../KnownSourcePasteProcessor.cs              | 69 +++++++++++++------
 .../UnknownSourcePasteProcessor.cs            |  9 +--
 2 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 31aeb5bb61a09..6d646b1af141f 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -46,7 +46,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             foreach (var change in Changes)
             {
                 var wrappedChange = WrapChangeWithOriginalQuotes(change.NewText);
-                var parsedChange = SyntaxFactory.ParseExpression(wrappedChange);
+                var parsedChange = ParseExpression(wrappedChange);
 
                 // If for some reason we can't actually successfully parse this copied text, then bail out.
                 if (ContainsError(parsedChange))
@@ -140,43 +140,40 @@ private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
             if (IsAnyRawStringExpression(StringExpressionBeforePaste))
                 return TransformValueForRawStringExpression(parsedChange, StringExpressionBeforePaste);
 
+            var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
+
             return (parsedChange, StringExpressionBeforePaste) switch
             {
-                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto) => TransformLiteralToLiteral(pastedText, pastedInto),
-                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto) => TransformLiteralToInterpolatedString(pastedText, pastedInto),
-                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto) => TransformInterpolatedStringToLiteral(pastedText, pastedInto),
-                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto) => TransformInterpolatedStringToInterpolatedString(pastedText, pastedInto),
+                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
+                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
+                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
+                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
                 _ => throw ExceptionUtilities.Unreachable,
             };
 
-            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
             {
                 var textValue = pastedText.Token.ValueText;
                 return EscapeForNonRawStringLiteral(
-                    IsVerbatimStringExpression(pastedInto),
-                    isInterpolated: false, trySkipExistingEscapes: false, textValue);
+                    isVerbatim: pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, textValue);
             }
 
-            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
             {
-                // All other literal->literal pastes are trivial.  The compiler has already determined the 'value' of the
-                // the string we're pasting.  So we just need to get that value and ensure it is properly
                 var textValue = pastedText.Token.ValueText;
                 return EscapeForNonRawStringLiteral(
-                    pastedInto.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken,
-                    isInterpolated: true, trySkipExistingEscapes: false, textValue);
+                    isVerbatim: pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, textValue);
             }
 
-            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax pastedInto)
+            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
             {
-                var isVerbatim = IsVerbatimStringExpression(pastedInto);
                 using var _ = PooledStringBuilder.GetInstance(out var builder);
                 foreach (var content in pastedText.Contents)
                 {
                     if (content is InterpolatedStringTextSyntax stringText)
                     {
                         builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                            pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
                     }
                     else if (content is InterpolationSyntax interpolation)
                     {
@@ -187,23 +184,22 @@ string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax p
                         // for now, we do the simple thing and just treat the interpolation as raw text that should just be
                         // escaped as appropriate into the destination.
                         builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                            pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
                     }
                 }
 
                 return builder.ToString();
             }
 
-            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax pastedInto)
+            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
             {
-                var isVerbatim = IsVerbatimStringExpression(pastedInto);
                 using var _ = PooledStringBuilder.GetInstance(out var builder);
                 foreach (var content in pastedText.Contents)
                 {
                     if (content is InterpolatedStringTextSyntax stringText)
                     {
                         builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                            pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
                     }
                     else if (content is InterpolationSyntax interpolation)
                     {
@@ -216,7 +212,7 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
                             var newToken = Token(
                                 oldToken.LeadingTrivia, oldToken.Kind(),
                                 EscapeForNonRawStringLiteral(
-                                    isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
+                                    pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
                                 oldToken.ValueText, oldToken.TrailingTrivia);
 
                             interpolation = interpolation.ReplaceToken(oldToken, newToken);
@@ -232,7 +228,36 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
 
         private string TransformValueForRawStringExpression(ExpressionSyntax parsedChange, ExpressionSyntax stringExpressionBeforePaste)
         {
-            throw new NotImplementedException();
+            return (parsedChange, StringExpressionBeforePaste) switch
+            {
+                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
+                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
+                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
+                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
+                _ => throw ExceptionUtilities.Unreachable,
+            };
+
+            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
+            {
+                // Pasting literal content into raw string.  Not too difficult *unless* this forces us to convert the
+                // raw literal 
+                throw new NotImplementedException();
+            }
+
+            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
+            {
+                throw new NotImplementedException();
+            }
+
+            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
+            {
+                throw new NotImplementedException();
+            }
+
+            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
+            {
+                throw new NotImplementedException();
+            }
         }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index c1d3f29da018e..8b014b1738e26 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -165,14 +165,11 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
                 editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
 
             // Then add the actual changes in the content.
-            var isSingleLine =
-                StringExpressionBeforePaste is LiteralExpressionSyntax { Token.RawKind: (int)SyntaxKind.SingleLineRawStringLiteralToken } ||
-                StringExpressionBeforePaste is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedSingleLineRawStringStartToken };
 
-            if (isSingleLine)
-                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(editsToMake, cancellationToken);
-            else
+            if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
                 AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(editsToMake);
+            else
+                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(editsToMake, cancellationToken);
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)

From bb6cbc62cfd6ef59758d429a1dba61232bb338f4 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 20:35:33 -0700
Subject: [PATCH 104/413] Add test

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  2 +
 .../KnownSourcePasteProcessor.cs              | 89 ++++++++++++-------
 .../UnknownSourcePasteProcessor.cs            | 12 +--
 ...knownSourceIntoSingleLineRawStringTests.cs | 11 +++
 4 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 2c2795f988db1..d2b00f5d4b2b1 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -2,7 +2,9 @@
 // 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.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 6d646b1af141f..79f9097059430 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -40,6 +41,16 @@ public KnownSourcePasteProcessor(
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+        {
+            // For pastes into non-raw strings, we can just determine how the change should be escaped in-line at that
+            // same location the paste originally happened at.  For raw-strings things get more complex as we have to
+            // deal with things like indentation and potentially adding newlines to make things legal.
+            return IsAnyRawStringExpression(StringExpressionBeforePaste)
+                ? GetEditsForRawString(cancellationToken)
+                : GetEditsForNonRawString();
+        }
+
+        private ImmutableArray<TextChange> GetEditsForNonRawString()
         {
             using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
 
@@ -134,12 +145,6 @@ private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
             // Raw multi line string
             // Raw interpolated line string
             // Raw interpolated multi-line string.
-
-            // Pasting into raw strings can be complex.  A single-line raw string may need to become multi-line, and
-            // a multi-line raw string has indentation whitespace we have to respect.
-            if (IsAnyRawStringExpression(StringExpressionBeforePaste))
-                return TransformValueForRawStringExpression(parsedChange, StringExpressionBeforePaste);
-
             var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
 
             return (parsedChange, StringExpressionBeforePaste) switch
@@ -226,38 +231,56 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
             }
         }
 
-        private string TransformValueForRawStringExpression(ExpressionSyntax parsedChange, ExpressionSyntax stringExpressionBeforePaste)
+        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
-            return (parsedChange, StringExpressionBeforePaste) switch
-            {
-                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
-                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
-                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
-                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
-                _ => throw ExceptionUtilities.Unreachable,
-            };
+            // Determine the basic updates to the pasted pieces we need to make to properly unescape the pieces for a
+            // raw string.
 
-            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
-            {
-                // Pasting literal content into raw string.  Not too difficult *unless* this forces us to convert the
-                // raw literal 
-                throw new NotImplementedException();
-            }
+            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
+            // quotes in it now).  Update the delimiters to make the content legal if necessary.
+            // if the content we're going to add itself contains quotes, then figure out how many start/end quotes the
+            // final string literal will need (which also gives us the number of quotes to add to the start/end).
+            //
+            // note: we don't have to do this if the paste was successful.  Instead, we'll just process the contents,
+            // adjusting whitespace below.
+            var contentChanges = GetRawStringContentChanges(cancellationToken);
 
-            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
-            {
-                throw new NotImplementedException();
-            }
+            var quotesToAdd = GetQuotesToAddToRawString();
+            var dollarSignsToAdd = GetDollarSignsToAddToRawString();
 
-            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
-            {
-                throw new NotImplementedException();
-            }
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var editsToMake);
 
-            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
-            {
-                throw new NotImplementedException();
-            }
+            // First, add any extra dollar signs needed.
+            if (dollarSignsToAdd != null)
+                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
+
+            // Then any quotes to your starting delimiter
+            if (quotesToAdd != null)
+                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+
+            // Then add the actual changes in the content.
+            editsToMake.AddRange(contentChanges);
+
+            // Then add any extra end quotes needed.
+            if (quotesToAdd != null)
+                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+
+            return editsToMake.ToImmutable();
+        }
+
+        private string GetDollarSignsToAddToRawString()
+        {
+            throw new NotImplementedException();
+        }
+
+        private string GetQuotesToAddToRawString()
+        {
+            throw new NotImplementedException();
+        }
+
+        private ImmutableArray<TextChange> GetRawStringContentChanges(CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 8b014b1738e26..0fb03d44bb99f 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -26,14 +26,14 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// editor we're in.  In that case, we don't know what any particular piece of text means.  For example, <c>\t</c>
     /// might be a tab or it could be the literal two characters <c>\</c> and <c>t</c>.
     /// </summary>
-    internal class UnknownSourcePasteProcessor : AbstractPasteProcessor
+    internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
     {
         /// <summary>
         /// Whether or not the string expression remained successfully parseable after the paste.  <see
         /// cref="StringCopyPasteCommandHandler.PasteWasSuccessful"/>.  If it can still be successfully parsed subclasses
         /// can adjust their view on which pieces of content need to be escaped or not.
         /// </summary>
-        protected readonly bool PasteWasSuccessful;
+        private readonly bool _pasteWasSuccessful;
 
         public UnknownSourcePasteProcessor(
             string newLine,
@@ -45,7 +45,7 @@ public UnknownSourcePasteProcessor(
             bool pasteWasSuccessful)
             : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
-            PasteWasSuccessful = pasteWasSuccessful;
+            _pasteWasSuccessful = pasteWasSuccessful;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
@@ -58,7 +58,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             if (!IsAnyRawStringExpression(StringExpressionBeforePaste) && !ShouldAlwaysEscapeTextForNonRawString())
             {
                 // If the pasting was successful, then no need to change anything.
-                if (PasteWasSuccessful)
+                if (_pasteWasSuccessful)
                     return default;
             }
 
@@ -151,8 +151,8 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             //
             // note: we don't have to do this if the paste was successful.  Instead, we'll just process the contents,
             // adjusting whitespace below.
-            var quotesToAdd = PasteWasSuccessful ? null : GetQuotesToAddToRawString();
-            var dollarSignsToAdd = PasteWasSuccessful ? null : GetDollarSignsToAddToRawString();
+            var quotesToAdd = _pasteWasSuccessful ? null : GetQuotesToAddToRawString();
+            var dollarSignsToAdd = _pasteWasSuccessful ? null : GetDollarSignsToAddToRawString();
 
             using var _ = ArrayBuilder<TextChange>.GetInstance(out var editsToMake);
 
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
index f9b3175204aeb..26219b0d8e3c9 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
@@ -169,6 +169,17 @@ public void TestTripleQuoteIntoSingleLineRawString1_B()
 @"var x = """""" """"""[||]""""""");
         }
 
+        [WpfFact]
+        public void TestTwoQuotesIntoSingleLineRawString3()
+        {
+            TestPasteUnknownSource(
+                pasteText: "\"\"",
+@"var x = """""" ""[||] """"""",
+@"var x = """""""" """"""[||] """"""""",
+                afterUndo:
+@"var x = """""" """"""[||] """"""");
+        }
+
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {

From 826ca9ead323332b78ea78d70fdeeab90c5e8f8c Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 22 Mar 2022 20:43:24 -0700
Subject: [PATCH 105/413] In progress

---
 .../KnownSourcePasteProcessor.cs              | 196 +++++++++---------
 .../StringCopyPasteCommandHandler.cs          |   5 +-
 2 files changed, 101 insertions(+), 100 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 79f9097059430..3d9e97877a89c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -68,6 +68,104 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             }
 
             return edits.ToImmutable();
+
+            string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
+            {
+                // we have a matrix of every string source type to every string destination type.
+                // 
+                // Normal string
+                // Interpolated string
+                // Verbatim string
+                // Verbatim interpolated string
+                // Raw single line string
+                // Raw multi line string
+                // Raw interpolated line string
+                // Raw interpolated multi-line string.
+                var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
+
+                return (parsedChange, StringExpressionBeforePaste) switch
+                {
+                    (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
+                    (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
+                    (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
+                    (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
+                    _ => throw ExceptionUtilities.Unreachable,
+                };
+
+                string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
+                {
+                    var textValue = pastedText.Token.ValueText;
+                    return EscapeForNonRawStringLiteral(
+                        isVerbatim: pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, textValue);
+                }
+
+                string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
+                {
+                    var textValue = pastedText.Token.ValueText;
+                    return EscapeForNonRawStringLiteral(
+                        isVerbatim: pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, textValue);
+                }
+
+                string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
+                {
+                    using var _ = PooledStringBuilder.GetInstance(out var builder);
+                    foreach (var content in pastedText.Contents)
+                    {
+                        if (content is InterpolatedStringTextSyntax stringText)
+                        {
+                            builder.Append(EscapeForNonRawStringLiteral(
+                                pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                        }
+                        else if (content is InterpolationSyntax interpolation)
+                        {
+                            // we're copying an interpolation from an interpolated string to a string literal. For example,
+                            // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
+                            // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
+                            // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
+                            // for now, we do the simple thing and just treat the interpolation as raw text that should just be
+                            // escaped as appropriate into the destination.
+                            builder.Append(EscapeForNonRawStringLiteral(
+                                pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
+                        }
+                    }
+
+                    return builder.ToString();
+                }
+
+                string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
+                {
+                    using var _ = PooledStringBuilder.GetInstance(out var builder);
+                    foreach (var content in pastedText.Contents)
+                    {
+                        if (content is InterpolatedStringTextSyntax stringText)
+                        {
+                            builder.Append(EscapeForNonRawStringLiteral(
+                                pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
+                        }
+                        else if (content is InterpolationSyntax interpolation)
+                        {
+                            // we're moving an interpolation from one interpolation to another.  This can just be copied
+                            // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                            // for the destination type.
+                            if (interpolation.FormatClause is not null)
+                            {
+                                var oldToken = interpolation.FormatClause.FormatStringToken;
+                                var newToken = Token(
+                                    oldToken.LeadingTrivia, oldToken.Kind(),
+                                    EscapeForNonRawStringLiteral(
+                                        pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
+                                    oldToken.ValueText, oldToken.TrailingTrivia);
+
+                                interpolation = interpolation.ReplaceToken(oldToken, newToken);
+                            }
+
+                            builder.Append(interpolation.ToString());
+                        }
+                    }
+
+                    return builder.ToString();
+                }
+            }
         }
 
         /// <summary>
@@ -133,104 +231,6 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
 
-        private string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
-        {
-            // we have a matrix of every string source type to every string destination type.
-            // 
-            // Normal string
-            // Interpolated string
-            // Verbatim string
-            // Verbatim interpolated string
-            // Raw single line string
-            // Raw multi line string
-            // Raw interpolated line string
-            // Raw interpolated multi-line string.
-            var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
-
-            return (parsedChange, StringExpressionBeforePaste) switch
-            {
-                (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
-                (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
-                (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
-                (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
-                _ => throw ExceptionUtilities.Unreachable,
-            };
-
-            string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
-            {
-                var textValue = pastedText.Token.ValueText;
-                return EscapeForNonRawStringLiteral(
-                    isVerbatim: pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, textValue);
-            }
-
-            string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
-            {
-                var textValue = pastedText.Token.ValueText;
-                return EscapeForNonRawStringLiteral(
-                    isVerbatim: pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, textValue);
-            }
-
-            string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
-            {
-                using var _ = PooledStringBuilder.GetInstance(out var builder);
-                foreach (var content in pastedText.Contents)
-                {
-                    if (content is InterpolatedStringTextSyntax stringText)
-                    {
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                    }
-                    else if (content is InterpolationSyntax interpolation)
-                    {
-                        // we're copying an interpolation from an interpolated string to a string literal. For example,
-                        // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
-                        // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
-                        // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
-                        // for now, we do the simple thing and just treat the interpolation as raw text that should just be
-                        // escaped as appropriate into the destination.
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
-                    }
-                }
-
-                return builder.ToString();
-            }
-
-            string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
-            {
-                using var _ = PooledStringBuilder.GetInstance(out var builder);
-                foreach (var content in pastedText.Contents)
-                {
-                    if (content is InterpolatedStringTextSyntax stringText)
-                    {
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                    }
-                    else if (content is InterpolationSyntax interpolation)
-                    {
-                        // we're moving an interpolation from one interpolation to another.  This can just be copied
-                        // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                        // for the destination type.
-                        if (interpolation.FormatClause is not null)
-                        {
-                            var oldToken = interpolation.FormatClause.FormatStringToken;
-                            var newToken = Token(
-                                oldToken.LeadingTrivia, oldToken.Kind(),
-                                EscapeForNonRawStringLiteral(
-                                    pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
-                                oldToken.ValueText, oldToken.TrailingTrivia);
-
-                            interpolation = interpolation.ReplaceToken(oldToken, newToken);
-                        }
-
-                        builder.Append(interpolation.ToString());
-                    }
-                }
-
-                return builder.ToString();
-            }
-        }
-
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
             // Determine the basic updates to the pasted pieces we need to make to properly unescape the pieces for a
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 9783453665483..9c2009f9358bf 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -6,13 +6,11 @@
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.Threading;
-using Microsoft.CodeAnalysis.Collections;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
-using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -53,6 +51,7 @@ internal partial class StringCopyPasteCommandHandler :
         private const string CopyId = "RoslynStringCopyPasteId";
         private readonly IThreadingContext _threadingContext;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
+        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
         private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
         private readonly IGlobalOptionService _globalOptions;
 
@@ -64,11 +63,13 @@ internal partial class StringCopyPasteCommandHandler :
         public StringCopyPasteCommandHandler(
             IThreadingContext threadingContext,
             ITextUndoHistoryRegistry undoHistoryRegistry,
+            ITextBufferFactoryService3 textBufferFactoryService,
             IEditorOperationsFactoryService editorOperationsFactoryService,
             IGlobalOptionService globalOptions)
         {
             _threadingContext = threadingContext;
             _undoHistoryRegistry = undoHistoryRegistry;
+            _textBufferFactoryService = textBufferFactoryService;
             _editorOperationsFactoryService = editorOperationsFactoryService;
             _globalOptions = globalOptions;
         }

From ba45394dd13657e44056e5e61bb04907189d1315 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 23 Mar 2022 09:38:54 -0700
Subject: [PATCH 106/413] in progrss

---
 .../StringCopyPaste/AbstractPasteProcessor.cs | 45 +++++++++++++++++--
 .../KnownSourcePasteProcessor.cs              | 15 +++++--
 .../UnknownSourcePasteProcessor.cs            | 35 ++-------------
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index d2b00f5d4b2b1..a293f4a724fd7 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -27,13 +27,13 @@ internal abstract class AbstractPasteProcessor
         /// <summary>
         /// The buffer's snapshot prior to the paste application.
         /// </summary>
-        protected readonly ITextSnapshot SnapshotBeforePaste;
+        protected readonly ITextSnapshot2 SnapshotBeforePaste;
 
         /// <summary>
         /// The buffer's snapshot right after the paste application.  Guaranteed to be exactly one version ahead of <see
         /// cref="SnapshotBeforePaste"/>.
         /// </summary>
-        protected readonly ITextSnapshot SnapshotAfterPaste;
+        protected readonly ITextSnapshot2 SnapshotAfterPaste;
 
         /// <summary>
         /// Roslyn SourceText corresponding to <see cref="SnapshotBeforePaste"/>.
@@ -104,8 +104,8 @@ internal abstract class AbstractPasteProcessor
 
         protected AbstractPasteProcessor(
             string newLine,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste)
@@ -142,5 +142,42 @@ protected TextSpan MapSpanForward(TextSpan span)
             var trackingSpan = SnapshotBeforePaste.CreateTrackingSpan(span.ToSpan(), SpanTrackingMode.EdgeInclusive);
             return trackingSpan.GetSpan(SnapshotAfterPaste).Span.ToTextSpan();
         }
+
+        /// <summary>
+        /// Given an initial raw string literal, and the changes made to it by the paste, determines how many quotes to
+        /// add to the start and end to keep things parsing properly.
+        /// </summary>
+        protected string? GetQuotesToAddToRawString(
+            SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
+        {
+            Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
+
+            var longestQuoteSequence = textContentSpansAfterChange.Max(ts => GetLongestQuoteSequence(textAfterChange, ts));
+
+            var quotesToAddCount = (longestQuoteSequence - DelimiterQuoteCount) + 1;
+            return quotesToAddCount <= 0 ? null : new string('"', quotesToAddCount);
+        }
+
+        /// <summary>
+        /// Given an initial raw string literal, and the changes made to it by the paste, determines how many dollar
+        /// signs to add to the start to keep things parsing properly.
+        /// </summary>
+        protected string? GetDollarSignsToAddToRawString(
+            SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
+        {
+            Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
+
+            // Only have to do this for interpolated strings.  Other strings never have a $ in their starting delimiter.
+            if (StringExpressionBeforePaste is not InterpolatedStringExpressionSyntax)
+                return null;
+
+            var longestBraceSequence = textContentSpansAfterChange.Max(
+                ts => Math.Max(
+                    GetLongestOpenBraceSequence(textAfterChange, ts),
+                    GetLongestCloseBraceSequence(textAfterChange, ts)));
+
+            var dollarsToAddCount = (longestBraceSequence - DelimiterDollarCount) + 1;
+            return dollarsToAddCount <= 0 ? null : new string('$', dollarsToAddCount);
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 3d9e97877a89c..82233082fbf61 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -12,6 +12,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.VisualStudio.Text;
 using Roslyn.Utilities;
 
@@ -22,10 +23,12 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
+        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
         private readonly ExpressionSyntax _stringExpressionCopiedFrom;
         private readonly ITextSnapshot _snapshotCopiedFrom;
 
         public KnownSourcePasteProcessor(
+            ITextBufferFactoryService3 textBufferFactoryService,
             string newLine,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
@@ -36,6 +39,7 @@ public KnownSourcePasteProcessor(
             ITextSnapshot snapshotCopiedFrom)
             : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
+            _textBufferFactoryService = textBufferFactoryService;
             _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
             _snapshotCopiedFrom = snapshotCopiedFrom;
         }
@@ -241,9 +245,14 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             // if the content we're going to add itself contains quotes, then figure out how many start/end quotes the
             // final string literal will need (which also gives us the number of quotes to add to the start/end).
             //
-            // note: we don't have to do this if the paste was successful.  Instead, we'll just process the contents,
-            // adjusting whitespace below.
-            var contentChanges = GetRawStringContentChanges(cancellationToken);
+            var internalContentChanges = GetRawStringContentChanges(cancellationToken);
+            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
+            var clonedSnapshotBeforePaste = clonedBuffer.CurrentSnapshot;
+            var edit = clonedBuffer.CreateEdit();
+            foreach (var change in internalContentChanges)
+                edit.Replace(change.Span.ToSpan(), change.NewText);
+            edit.Apply();
+            var clonedSnapshotAfterPaste = clonedBuffer.CurrentSnapshot;
 
             var quotesToAdd = GetQuotesToAddToRawString();
             var dollarSignsToAdd = GetDollarSignsToAddToRawString();
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 0fb03d44bb99f..f87f076df4be7 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -100,40 +100,13 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             return textChanges.ToImmutableAndClear();
         }
 
-        /// <summary>
-        /// Given an initial raw string literal, and the changes made to it by the paste, determines how many quotes to
-        /// add to the start and end to keep things parsing properly.
-        /// </summary>
+        /// <inheritdoc cref="AbstractPasteProcessor.GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
         private string? GetQuotesToAddToRawString()
-        {
-            Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
-
-            var longestQuoteSequence = TextContentsSpansAfterPaste.Max(ts => GetLongestQuoteSequence(TextAfterPaste, ts));
+            => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
 
-            var quotesToAddCount = (longestQuoteSequence - DelimiterQuoteCount) + 1;
-            return quotesToAddCount <= 0 ? null : new string('"', quotesToAddCount);
-        }
-
-        /// <summary>
-        /// Given an initial raw string literal, and the changes made to it by the paste, determines how many dollar
-        /// signs to add to the start to keep things parsing properly.
-        /// </summary>
+        /// <inheritdoc cref="AbstractPasteProcessor.GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
         private string? GetDollarSignsToAddToRawString()
-        {
-            Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
-
-            // Only have to do this for interpolated strings.  Other strings never have a $ in their starting delimiter.
-            if (StringExpressionBeforePaste is not InterpolatedStringExpressionSyntax)
-                return null;
-
-            var longestBraceSequence = TextContentsSpansAfterPaste.Max(
-                ts => Math.Max(
-                    GetLongestOpenBraceSequence(TextAfterPaste, ts),
-                    GetLongestCloseBraceSequence(TextAfterPaste, ts)));
-
-            var dollarsToAddCount = (longestBraceSequence - DelimiterDollarCount) + 1;
-            return dollarsToAddCount <= 0 ? null : new string('$', dollarsToAddCount);
-        }
+            => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
 
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {

From df04b1ce5455ee9c442128f4292ef36ad1ab7353 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 23 Mar 2022 10:46:19 -0700
Subject: [PATCH 107/413] Another approach

---
 .../KnownSourcePasteProcessor.cs              |  12 +-
 .../StringCopyPasteCommandHandler.cs          |  13 +-
 .../StringCopyPasteCommandHandler_CutCopy.cs  |   6 +-
 .../UnknownSourcePasteProcessor.cs            |   4 +-
 .../StringCopyPasteCommandHandlerTests.cs     |  38 +++---
 .../WpfStringCopyPasteService.cs              | 121 +++++++++++++++++-
 .../IStringCopyPasteService.cs                |   8 +-
 7 files changed, 161 insertions(+), 41 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 82233082fbf61..5cdaa6300da1c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -28,20 +28,20 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
         private readonly ITextSnapshot _snapshotCopiedFrom;
 
         public KnownSourcePasteProcessor(
-            ITextBufferFactoryService3 textBufferFactoryService,
             string newLine,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             ExpressionSyntax stringExpressionCopiedFrom,
-            ITextSnapshot snapshotCopiedFrom)
+            ITextSnapshot snapshotCopiedFrom,
+            ITextBufferFactoryService3 textBufferFactoryService)
             : base(newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
-            _textBufferFactoryService = textBufferFactoryService;
             _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
             _snapshotCopiedFrom = snapshotCopiedFrom;
+            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
@@ -268,7 +268,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
                 editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
 
             // Then add the actual changes in the content.
-            editsToMake.AddRange(contentChanges);
+            editsToMake.AddRange(internalContentChanges);
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 9c2009f9358bf..964a411f21451 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -49,6 +49,9 @@ internal partial class StringCopyPasteCommandHandler :
         IChainedCommandHandler<PasteCommandArgs>
     {
         private const string CopyId = "RoslynStringCopyPasteId";
+
+        private static int s_sequenceNumber = 1;
+
         private readonly IThreadingContext _threadingContext;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
         private readonly ITextBufferFactoryService3 _textBufferFactoryService;
@@ -87,12 +90,14 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var subjectBuffer = args.SubjectBuffer;
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot;
 
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
+            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotBeforePaste)
+                return;
+
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;
@@ -105,7 +110,8 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             if (selectionsBeforePaste.Count == 0)
                 return;
 
-            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot;
+            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotAfterPaste)
+                return;
 
             // If there were multiple changes that already happened, then don't make any changes.  Some other component
             // already did something advanced.
@@ -217,7 +223,8 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(CancellationToken canc
 
                             var knownProcessor = new KnownSourcePasteProcessor(
                                 newLine, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste,
-                                stringExpressionBeforePaste, stringExpressionCopiedFrom, _lastSelectedSpans[0].Snapshot);
+                                stringExpressionBeforePaste, stringExpressionCopiedFrom,
+                                _lastSelectedSpans[0].Snapshot, _textBufferFactoryService);
                             return knownProcessor.GetEdits(cancellationToken);
                         }
                     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index cbfa88c43a5c1..cad235d9a18a6 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Threading;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.Text;
@@ -49,10 +50,11 @@ private void CaptureCutCopyInformation(ITextView textView, ITextBuffer subjectBu
             if (copyPasteService == null)
                 return;
 
-            if (!copyPasteService.TryGetClipboardSequenceNumber(out var sequenceNumber))
+            var nextSequenceNumber = Interlocked.Increment(ref s_sequenceNumber);
+            if (!copyPasteService.TrySetClipboardSequenceNumber(nextSequenceNumber))
                 return;
 
-            _lastClipboardSequenceNumber = sequenceNumber;
+            _lastClipboardSequenceNumber = nextSequenceNumber;
             _lastSelectedSpans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
         }
     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index f87f076df4be7..5c000e4457587 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -37,8 +37,8 @@ internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
 
         public UnknownSourcePasteProcessor(
             string newLine,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 44679d3810875..164b6387e875f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -33,29 +33,29 @@ public abstract class StringCopyPasteCommandHandlerTests
     {
         internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
         {
-            [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
-            [PartNotDiscoverable]
-            private class MockStringCopyPasteService : IStringCopyPasteService
-            {
-                [ImportingConstructor]
-                [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-                public MockStringCopyPasteService()
-                {
-                }
-
-                public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
-                {
-                    sequenceNumber = 0;
-                    return true;
-                }
-            }
+            //[ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
+            //[PartNotDiscoverable]
+            //private class MockStringCopyPasteService : IStringCopyPasteService
+            //{
+            //    [ImportingConstructor]
+            //    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+            //    public MockStringCopyPasteService()
+            //    {
+            //    }
+
+            //    public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
+            //    {
+            //        sequenceNumber = 0;
+            //        return true;
+            //    }
+            //}
 
             private static readonly TestComposition s_compositionWithUnknownCopy =
                 EditorTestCompositions.EditorFeaturesWpf
-                    .AddParts(typeof(StringCopyPasteCommandHandler))
-                    .AddExcludedPartTypes(typeof(WpfStringCopyPasteService));
+                    .AddParts(typeof(StringCopyPasteCommandHandler));
+            // .AddExcludedPartTypes(typeof(WpfStringCopyPasteService));
             private static readonly TestComposition s_compositionWithKnownCopy =
-                s_compositionWithUnknownCopy.AddParts(typeof(MockStringCopyPasteService));
+                s_compositionWithUnknownCopy;//.AddParts(typeof(MockStringCopyPasteService));
 
             private readonly StringCopyPasteCommandHandler _commandHandler;
 
diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index d85abd0b5970a..f84f73062da93 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Composition;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
 using Microsoft.CodeAnalysis.ErrorReporting;
@@ -14,24 +15,46 @@ namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
     [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
     internal class WpfStringCopyPasteService : IStringCopyPasteService
     {
+        private const string RoslynCopyPasteSequenceNumber = nameof(RoslynCopyPasteSequenceNumber);
+        private const int FailureValue = -1;
+
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public WpfStringCopyPasteService()
         {
         }
 
+        public bool TrySetClipboardSequenceNumber(int sequenceNumber)
+        {
+            var dataObject = Clipboard.GetDataObject();
+            if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
+            {
+                var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
+                           dataObject.GetData(DataFormats.Text) as string;
+                if (data != null)
+                {
+                    // Ok, there's viable text on the clipboard.  Try to create a new dataobject, copy everything from
+                    // the current data object to it, and add roslyn's data.
+                    var copy = new DataObjectWrapper(dataObject, sequenceNumber);
+                    Clipboard.SetDataObject(copy);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
         {
             try
             {
                 var dataObject = Clipboard.GetDataObject();
-                if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
+                if (dataObject.GetDataPresent(RoslynCopyPasteSequenceNumber))
                 {
-                    var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
-                               dataObject.GetData(DataFormats.Text) as string;
-                    if (data != null)
+                    var value = dataObject.GetData(RoslynCopyPasteSequenceNumber);
+                    if (value is int intVal && intVal != FailureValue)
                     {
-                        sequenceNumber = (int)GetClipboardSequenceNumber();
+                        sequenceNumber = intVal;
                         return true;
                     }
                 }
@@ -46,5 +69,93 @@ public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
 
         [DllImport("user32.dll")]
         private static extern uint GetClipboardSequenceNumber();
+
+        private class DataObjectWrapper : IDataObject
+        {
+            private readonly IDataObject _dataObject;
+            private int _roslynSequenceNumber;
+
+            public DataObjectWrapper(IDataObject dataObject, int roslynSequenceNumber)
+            {
+                _dataObject = dataObject;
+                _roslynSequenceNumber = roslynSequenceNumber;
+            }
+
+            public object GetData(string format)
+            {
+                return format == RoslynCopyPasteSequenceNumber
+                    ? _roslynSequenceNumber
+                    : _dataObject.GetData(format);
+            }
+
+            public object GetData(Type format)
+            {
+                return _dataObject.GetData(format);
+            }
+
+            public object GetData(string format, bool autoConvert)
+            {
+                return format == RoslynCopyPasteSequenceNumber
+                    ? _roslynSequenceNumber
+                    : _dataObject.GetData(format, autoConvert);
+            }
+
+            public bool GetDataPresent(string format)
+            {
+                return format == RoslynCopyPasteSequenceNumber || _dataObject.GetDataPresent(format);
+            }
+
+            public bool GetDataPresent(Type format)
+            {
+                return _dataObject.GetDataPresent(format);
+            }
+
+            public bool GetDataPresent(string format, bool autoConvert)
+            {
+                return format == RoslynCopyPasteSequenceNumber || _dataObject.GetDataPresent(format, autoConvert);
+            }
+
+            public string[] GetFormats()
+            {
+                var result = _dataObject.GetFormats().ToList();
+                result.Add(RoslynCopyPasteSequenceNumber);
+                return result.ToArray();
+            }
+
+            public string[] GetFormats(bool autoConvert)
+            {
+                var result = _dataObject.GetFormats(autoConvert).ToList();
+                result.Add(RoslynCopyPasteSequenceNumber);
+                return result.ToArray();
+
+            }
+
+            public void SetData(object data)
+            {
+                _dataObject.SetData(data);
+            }
+
+            public void SetData(string format, object data)
+            {
+                if (format == RoslynCopyPasteSequenceNumber)
+                    _roslynSequenceNumber = data is int v ? v : FailureValue;
+                else
+                    _dataObject.SetData(format, data);
+            }
+
+            public void SetData(Type format, object data)
+            {
+                _dataObject.SetData(format, data);
+            }
+
+            public void SetData(string format, object data, bool autoConvert)
+            {
+                if (format == RoslynCopyPasteSequenceNumber)
+                    _roslynSequenceNumber = data is int v ? v : FailureValue;
+                else
+                    _dataObject.SetData(format, data, autoConvert);
+
+            }
+        }
     }
 }
diff --git a/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
index 9a1333df5c185..f9fbd04d462d7 100644
--- a/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
@@ -11,10 +11,7 @@ namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
 {
     internal interface IStringCopyPasteService : IWorkspaceService
     {
-        /// <summary>
-        /// Attempts to retrieve a monotonically increasing value representing which copy value the clipboard currently
-        /// has on it.  Can be used to determine if another copy to the clipboard happened between different times.
-        /// </summary>
+        bool TrySetClipboardSequenceNumber(int sequenceNumber);
         bool TryGetClipboardSequenceNumber(out int sequenceNumber);
     }
 
@@ -32,6 +29,9 @@ public DefaultStringCopyPasteService()
         // had been validly associated with latest clipboard operation and had not been affected by things outside our
         // awareness.
 
+        public bool TrySetClipboardSequenceNumber(int sequenceNumber)
+            => false;
+
         public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
         {
             sequenceNumber = 0;

From 06fd1f33cf025137bd21e962eb1374bb9e66e695 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:48:37 +0000
Subject: [PATCH 108/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220329.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22179.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fb428cd193737..15e8acd552433 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22171.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22179.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c8a95297e2622251c125aa5c0ef7c822275a792d</Sha>
+      <Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22171.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22179.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c8a95297e2622251c125aa5c0ef7c822275a792d</Sha>
+      <Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 1a6a75b8d9ed9..c6e14ad3a3b30 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22171.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22171.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1"
   }
 }

From 8b18d5793ba2148fef1e7c6f64ae518eeb382454 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 12:53:10 +0000
Subject: [PATCH 109/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220331.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22181.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 15e8acd552433..617732a8289c4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22179.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22181.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
+      <Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22179.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22181.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
+      <Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index c6e14ad3a3b30..4905983620248 100644
--- a/global.json
+++ b/global.json
@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100-preview.2.22153.17",
     "allowPrerelease": true,
     "rollForward": "disable"
   },
   "tools": {
-    "dotnet": "6.0.100",
+    "dotnet": "7.0.100-preview.2.22153.17",
     "vs": {
       "version": "16.10"
     },
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2"
   }
 }

From c2a2a553924c8e460b428642de1b7c34c572c382 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Tue, 5 Apr 2022 11:59:58 -0700
Subject: [PATCH 110/413] PR feedback

---
 .../CSharp/Utilities/NullableHelpers/NullableHelpers.cs     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
index a5bc1ca56bec1..77b01ccefc65d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable enable
-
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
@@ -23,7 +21,7 @@ internal static class NullableHelpers
         /// </summary>
         public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel semanticModel, SyntaxNode declarationSyntax, CancellationToken cancellationToken)
         {
-            var declaredType = semanticModel.GetRequiredDeclaredSymbol(declarationSyntax, cancellationToken);
+            var declaredSymbol = semanticModel.GetRequiredDeclaredSymbol(declarationSyntax, cancellationToken);
             var declaredOperation = semanticModel.GetRequiredOperation(declarationSyntax, cancellationToken);
 
             var rootOperation = declaredOperation;
@@ -36,7 +34,7 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
                 rootOperation = rootOperation.Parent;
             }
 
-            return IsSymbolAssignedPossiblyNullValue(semanticModel, rootOperation, declaredType) == true;
+            return IsSymbolAssignedPossiblyNullValue(semanticModel, rootOperation, declaredSymbol) == true;
         }
 
         /// <summary>

From 01428ac5fac533feacbfcec1a2c76c3ff89cf5e9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:52:42 +0000
Subject: [PATCH 111/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220406.10

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22206.10
---
 eng/Version.Details.xml                       |   8 +-
 eng/common/init-tools-native.ps1              | 137 ++++++++++++------
 .../templates/job/publish-build-assets.yml    |  50 +++++--
 eng/common/templates/jobs/jobs.yml            |  11 +-
 .../templates/post-build/post-build.yml       |  76 +++++-----
 global.json                                   |   4 +-
 6 files changed, 188 insertions(+), 98 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 617732a8289c4..7902c56f212a2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22181.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22206.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
+      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22181.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22206.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</Sha>
+      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index db830c00a6f8d..413adea4365b1 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -31,6 +31,10 @@ Wait time between retry attempts in seconds
 .PARAMETER GlobalJsonFile
 File path to global.json file
 
+.PARAMETER PathPromotion
+Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines)
+or break the build if a native tool is not found on the path (on a local dev machine)
+
 .NOTES
 #>
 [CmdletBinding(PositionalBinding=$false)]
@@ -41,7 +45,8 @@ Param (
   [switch] $Force = $False,
   [int] $DownloadRetries = 5,
   [int] $RetryWaitTimeInSeconds = 30,
-  [string] $GlobalJsonFile
+  [string] $GlobalJsonFile,
+  [switch] $PathPromotion
 )
 
 if (!$GlobalJsonFile) {
@@ -77,53 +82,97 @@ try {
                     ConvertFrom-Json |
                     Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue
   if ($NativeTools) {
-    $NativeTools.PSObject.Properties | ForEach-Object {
-      $ToolName = $_.Name
-      $ToolVersion = $_.Value
-      $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
-      $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
-      $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
-      $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
-      $LocalInstallerArguments += @{ Version = "$ToolVersion" }
-
-      if ($Verbose) {
-        $LocalInstallerArguments += @{ Verbose = $True }
-      }
-      if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
-        if($Force) {
-          $LocalInstallerArguments += @{ Force = $True }
-        }
-      }
-      if ($Clean) {
-        $LocalInstallerArguments += @{ Clean = $True }
-      }
-
-      Write-Verbose "Installing $ToolName version $ToolVersion"
-      Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
-      & $InstallerPath @LocalInstallerArguments
-      if ($LASTEXITCODE -Ne "0") {
-        $errMsg = "$ToolName installation failed"
-        if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
-            $showNativeToolsWarning = $true
-            if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
-                $showNativeToolsWarning = $false
+    if ($PathPromotion -eq $True) {
+      if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            if ($ToolVersion -eq "latest") {
+              $ToolVersion = ""
+            }
+            $ArcadeToolsDirectory = "C:\arcade-tools"
+            if (Test-Path $ArcadeToolsDirectory -eq $False) {
+              Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
+              exit 1
             }
-            if ($showNativeToolsWarning) {
-                Write-Warning $errMsg
+            $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
+            if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
+              Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
+              exit 1
             }
-            $toolInstallationFailure = $true
-        } else {
-            # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
-            Write-Host $errMsg
-            exit 1
+            $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
+            if (Test-Path -Path "$BinPathFile" -eq $False) {
+              Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
+              exit 1
+            }
+            $BinPath = Get-Content "$BinPathFile"
+            Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..."
+            Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)"
+          }
+        }
+        exit 0
+      } else {
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
+          }
         }
+        exit 0
+      }
+    } else {
+      $NativeTools.PSObject.Properties | ForEach-Object {
+        $ToolName = $_.Name
+        $ToolVersion = $_.Value
+        $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
+        $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
+        $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
+        $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
+        $LocalInstallerArguments += @{ Version = "$ToolVersion" }
+  
+        if ($Verbose) {
+          $LocalInstallerArguments += @{ Verbose = $True }
+        }
+        if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
+          if($Force) {
+            $LocalInstallerArguments += @{ Force = $True }
+          }
+        }
+        if ($Clean) {
+          $LocalInstallerArguments += @{ Clean = $True }
+        }
+  
+        Write-Verbose "Installing $ToolName version $ToolVersion"
+        Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
+        & $InstallerPath @LocalInstallerArguments
+        if ($LASTEXITCODE -Ne "0") {
+          $errMsg = "$ToolName installation failed"
+          if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
+              $showNativeToolsWarning = $true
+              if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+                  $showNativeToolsWarning = $false
+              }
+              if ($showNativeToolsWarning) {
+                  Write-Warning $errMsg
+              }
+              $toolInstallationFailure = $true
+          } else {
+              # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
+              Write-Host $errMsg
+              exit 1
+          }
+        }
+      }
+  
+      if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
+          # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
+          Write-Host 'Native tools bootstrap failed'
+          exit 1
       }
-    }
-
-    if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
-        # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
-        Write-Host 'Native tools bootstrap failed'
-        exit 1
     }
   }
   else {
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index d91bf9147116f..1cbb6a0c56003 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -23,23 +23,33 @@ parameters:
   # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
   publishUsingPipelines: false
 
+  # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
+  publishAssetsImmediately: false
+
+  artifactsPublishingAdditionalParameters: ''
+
+  signingValidationAdditionalParameters: ''
+
 jobs:
 - job: Asset_Registry_Publish
 
   dependsOn: ${{ parameters.dependsOn }}
 
-  displayName: Publish to Build Asset Registry
+  ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+    displayName: Publish Assets
+  ${{ else }}:
+    displayName: Publish to Build Asset Registry
 
   pool: ${{ parameters.pool }}
 
   variables:
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - name: _BuildConfig
-      value: ${{ parameters.configuration }}
     - group: Publish-Build-Assets
     - group: AzureDevOps-Artifact-Feeds-Pats
     - name: runCodesignValidationInjection
       value: false
+    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+      - template: /eng/common/templates/post-build/common-variables.yml
 
   steps:
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -52,14 +62,13 @@ jobs:
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
     
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: NuGetAuthenticate@0
+    - task: NuGetAuthenticate@0
 
-      - task: PowerShell@2 
-        displayName: Enable cross-org NuGet feed authentication 
-        inputs: 
-          filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 
-          arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) 
+    - task: PowerShell@2 
+      displayName: Enable cross-org NuGet feed authentication 
+      inputs: 
+        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 
+        arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) 
 
     - task: PowerShell@2
       displayName: Publish Build Assets
@@ -70,7 +79,6 @@ jobs:
           /p:BuildAssetRegistryToken=$(MaestroAccessToken)
           /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
           /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
-          /p:Configuration=$(_BuildConfig)
           /p:OfficialBuildId=$(Build.BuildNumber)
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
@@ -114,7 +122,25 @@ jobs:
         PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
         PublishLocation: Container
         ArtifactName: ReleaseConfigs
-        
+
+    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+      - template: /eng/common/templates/post-build/setup-maestro-vars.yml
+        parameters:
+          BARBuildId: ${{ parameters.BARBuildId }}
+          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+      - task: PowerShell@2
+        displayName: Publish Using Darc
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          arguments: -BuildId $(BARBuildId) 
+            -PublishingInfraVersion 3
+            -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+            -MaestroToken '$(MaestroApiAccessToken)'
+            -WaitPublishingFinish true
+            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/templates/steps/publish-logs.yml
         parameters:
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 554e71cfc436d..2cca53c2d1d53 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -27,6 +27,13 @@ parameters:
   # Optional: Override automatically derived dependsOn value for "publish build assets" job
   publishBuildAssetsDependsOn: ''
 
+  # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
+  publishAssetsImmediately: false
+
+  # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
+  artifactsPublishingAdditionalParameters: ''
+  signingValidationAdditionalParameters: ''
+
   # Optional: should run as a public build even in the internal project
   #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
   runAsPublic: false
@@ -68,7 +75,6 @@ jobs:
         ${{ parameter.key }}: ${{ parameter.value }}
 
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-  
   - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
     - template: ../job/publish-build-assets.yml
       parameters:
@@ -94,4 +100,7 @@ jobs:
 
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
+        publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
+        artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+        signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 2f176571f020c..5a9056f6b2fb5 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -82,6 +82,11 @@ parameters:
     default:
     - Validate
 
+  # Optional: Call asset publishing rather than running in a separate stage
+  - name: publishAssetsImmediately
+    type: boolean
+    default: false
+
 stages:
 - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
   - stage: Validate
@@ -99,7 +104,7 @@ stages:
           name: VSEngSS-MicroBuild2022-1ES
           demands: Cmd
         # If it's not devdiv, it's dnceng
-        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        ${{ else }}:
           name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
@@ -136,7 +141,7 @@ stages:
           name: VSEngSS-MicroBuild2022-1ES
           demands: Cmd
         # If it's not devdiv, it's dnceng
-        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        ${{ else }}:
           name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
@@ -196,7 +201,7 @@ stages:
           name: VSEngSS-MicroBuild2022-1ES
           demands: Cmd
         # If it's not devdiv, it's dnceng
-        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        ${{ else }}:
           name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
@@ -235,43 +240,44 @@ stages:
         artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
         downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
 
-- stage: publish_using_darc
-  ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-    dependsOn: ${{ parameters.publishDependsOn }}
-  ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
-    dependsOn: ${{ parameters.validateDependsOn }}
-  displayName: Publish using Darc
-  variables:
-    - template: common-variables.yml
-  jobs:
-  - job:
-    displayName: Publish Using Darc
-    timeoutInMinutes: 120
-    pool:
-      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}:
+  - stage: publish_using_darc
+    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+      dependsOn: ${{ parameters.publishDependsOn }}
+    ${{ else }}:
+      dependsOn: ${{ parameters.validateDependsOn }}
+    displayName: Publish using Darc
+    variables:
+      - template: common-variables.yml
+    jobs:
+    - job:
+      displayName: Publish Using Darc
+      timeoutInMinutes: 120
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
         ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
           name: VSEngSS-MicroBuild2022-1ES
           demands: Cmd
         # If it's not devdiv, it's dnceng
-        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        ${{ else }}:
           name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
-    steps:
-      - template: setup-maestro-vars.yml
-        parameters:
-          BARBuildId: ${{ parameters.BARBuildId }}
-          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+      steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
 
-      - task: NuGetAuthenticate@0
+        - task: NuGetAuthenticate@0
 
-      - task: PowerShell@2
-        displayName: Publish Using Darc
-        inputs:
-          filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-          arguments: -BuildId $(BARBuildId) 
-            -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
-            -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-            -MaestroToken '$(MaestroApiAccessToken)'
-            -WaitPublishingFinish true
-            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
+        - task: PowerShell@2
+          displayName: Publish Using Darc
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+            arguments: -BuildId $(BARBuildId) 
+              -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+              -MaestroToken '$(MaestroApiAccessToken)'
+              -WaitPublishingFinish true
+              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/global.json b/global.json
index 4905983620248..ca806d6affac4 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10"
   }
 }

From c2f45b4147411e8a9e3fcbb003f893d11495206a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:59:35 +0000
Subject: [PATCH 112/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220411.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22211.6
---
 eng/Version.Details.xml      | 8 ++++----
 eng/common/dotnet-install.sh | 4 ++--
 global.json                  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7902c56f212a2..eeb8410e18ffe 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22206.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22211.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
+      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22206.10">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22211.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha>
+      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index 5c94e98632a0a..abd045a3247f0 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -52,7 +52,7 @@ done
 # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
 cpuname=$(uname -m)
 case $cpuname in
-  aarch64)
+  arm64|aarch64)
     buildarch=arm64
     ;;
   loongarch64)
@@ -64,7 +64,7 @@ case $cpuname in
   armv*l)
     buildarch=arm
     ;;
-  i686)
+  i[3-6]86)
     buildarch=x86
     ;;
   *)
diff --git a/global.json b/global.json
index ca806d6affac4..de60b940da837 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6"
   }
 }

From 46aadac6c956f55a4e4ec8c9c8b69068df68b675 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Tue, 12 Apr 2022 21:32:55 -0700
Subject: [PATCH 113/413] Fix formatting

---
 .../UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 396b7316c93f6..bc598efdfff70 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -210,7 +210,7 @@ private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol,
                 SyntaxFactory.Token(SyntaxKind.CloseParenToken))
                 .WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
         }
-        
+
         private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
         {
             // We're going to be passed through the simplifier.  Tell it to not just convert this back to var (as

From fc2bcf679a2eeecb042c4722b68b1f5ed6668c37 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 13 Apr 2022 13:09:39 +0000
Subject: [PATCH 114/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220412.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22212.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index eeb8410e18ffe..9ee71afdbba33 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22211.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22212.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
+      <Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22211.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22212.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d2715c6ef2c3e2847925250f0a8012344fbb9846</Sha>
+      <Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index de60b940da837..760699b3f588e 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2"
   }
 }

From cd7db3ad17f6b8c889ccc913a3379983b1042861 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 12:57:13 +0000
Subject: [PATCH 115/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220413.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22213.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9ee71afdbba33..62cae6d919d03 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22212.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22213.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
+      <Sha>4ec0b54a25d4e2129e8b34f60b4489e325421cb7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22212.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22213.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
+      <Sha>4ec0b54a25d4e2129e8b34f60b4489e325421cb7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 760699b3f588e..d782c8c5df4dd 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2"
   }
 }

From 334b047f0abba40c4f00170bc53445a292af4ceb Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Thu, 14 Apr 2022 12:37:57 -0700
Subject: [PATCH 116/413] PR followup

---
 .../UseExplicitTypeCodeFixProvider.cs                        | 2 --
 .../CSharp/Utilities/NullableHelpers/NullableHelpers.cs      | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index bc598efdfff70..8f67caebb9d32 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -219,8 +219,6 @@ private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSy
                          .GenerateTypeSyntax(allowVar: false)
                          .WithTriviaFrom(typeSyntax);
 
-            Debug.Assert(!newTypeSyntax.ContainsDiagnostics, "Explicit type replacement likely introduced an error in code");
-
             return newTypeSyntax;
         }
     }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
index 77b01ccefc65d..1121e810b1ecd 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Utilities/NullableHelpers/NullableHelpers.cs
@@ -90,6 +90,11 @@ public static bool IsDeclaredSymbolAssignedPossiblyNullValue(SemanticModel seman
             return hasReference ? (bool?)false : null;
         }
 
+        /// <summary>
+        /// Determines if an operations references a specific symbol. Note that this will recurse in some
+        /// cases to work for operations like IAssignmentOperation, which logically references a symbol even if it
+        /// is the Target operation that actually does. 
+        /// </summary>
         private static bool IsSymbolReferencedByOperation(IOperation operation, ISymbol symbol)
             => operation switch
             {

From f8639d8aac34181e1216b6655839f51fea6d97e1 Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Thu, 14 Apr 2022 12:53:13 -0700
Subject: [PATCH 117/413] Throw exceptions when type info is null

---
 .../UseExplicitTypeCodeFixProvider.cs         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
index 8f67caebb9d32..7a7015675a56f 100644
--- a/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
+++ b/src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs
@@ -93,8 +93,7 @@ private static async Task HandleDeclarationExpressionAsync(Document document, Sy
             {
                 RoslynDebug.AssertNotNull(typeSyntax.Parent);
 
-                var tupleTypeSymbol = semanticModel.GetTypeInfo(typeSyntax.Parent, cancellationToken).ConvertedType;
-                RoslynDebug.AssertNotNull(tupleTypeSymbol);
+                var tupleTypeSymbol = GetConvertedType(semanticModel, typeSyntax.Parent, cancellationToken);
 
                 var leadingTrivia = declarationExpression.GetLeadingTrivia()
                     .Concat(variableDesignation.GetAllPrecedingTriviaToPreviousToken().Where(t => !t.IsWhitespace()).Select(t => t.WithoutAnnotations(SyntaxAnnotation.ElasticAnnotation)));
@@ -105,9 +104,7 @@ private static async Task HandleDeclarationExpressionAsync(Document document, Sy
             }
             else
             {
-                var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
-                RoslynDebug.AssertNotNull(typeSymbol);
-
+                var typeSymbol = GetConvertedType(semanticModel, typeSyntax, cancellationToken);
                 editor.ReplaceNode(typeSyntax, GenerateTypeDeclaration(typeSyntax, typeSymbol));
             }
         }
@@ -136,8 +133,7 @@ private static async Task UpdateTypeSyntaxAsync(Document document, SyntaxEditor
             typeSyntax = typeSyntax.StripRefIfNeeded();
 
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
-            RoslynDebug.AssertNotNull(typeSymbol);
+            var typeSymbol = GetConvertedType(semanticModel, typeSyntax, cancellationToken);
 
             typeSymbol = AdjustNullabilityOfTypeSymbol(
                 typeSymbol,
@@ -221,5 +217,16 @@ private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSy
 
             return newTypeSyntax;
         }
+
+        private static ITypeSymbol GetConvertedType(SemanticModel semanticModel, SyntaxNode typeSyntax, CancellationToken cancellationToken)
+        {
+            var typeSymbol = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).ConvertedType;
+            if (typeSymbol is null)
+            {
+                throw ExceptionUtilities.UnexpectedValue(typeSymbol);
+            }
+
+            return typeSymbol;
+        }
     }
 }

From 95965d8644b85cb2b547028cdd5438dbbc94a67e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Apr 2022 12:55:14 +0000
Subject: [PATCH 118/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220414.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22214.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62cae6d919d03..6c49a5bf7dba6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22213.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22214.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ec0b54a25d4e2129e8b34f60b4489e325421cb7</Sha>
+      <Sha>5ef2983363df5e0d85181b2948e2a5b0c16aa41a</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22213.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22214.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ec0b54a25d4e2129e8b34f60b4489e325421cb7</Sha>
+      <Sha>5ef2983363df5e0d85181b2948e2a5b0c16aa41a</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index d782c8c5df4dd..864df9094d3b5 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3"
   }
 }

From ee2ac383307cccc8d1648f13a2f69f7a2dea513e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:55:32 +0000
Subject: [PATCH 119/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220415.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22215.1
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6c49a5bf7dba6..a51e3df35cdd9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22214.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5ef2983363df5e0d85181b2948e2a5b0c16aa41a</Sha>
+      <Sha>c49ad022e8d39db4bf47197aa4eebfe6428b51a7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22214.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22215.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5ef2983363df5e0d85181b2948e2a5b0c16aa41a</Sha>
+      <Sha>c49ad022e8d39db4bf47197aa4eebfe6428b51a7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 864df9094d3b5..754f85f753a89 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1"
   }
 }

From 3d8d53fd7c0614f5ec6726ab87b851dd24a128aa Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 17 Apr 2022 12:45:55 +0000
Subject: [PATCH 120/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220415.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22215.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a51e3df35cdd9..f322812bad3e3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c49ad022e8d39db4bf47197aa4eebfe6428b51a7</Sha>
+      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22215.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22215.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c49ad022e8d39db4bf47197aa4eebfe6428b51a7</Sha>
+      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index 754f85f753a89..4431be6169e2d 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2"
   }
 }

From c1d22d779f395c2d6ec41971df39cd70ac817167 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 19 Apr 2022 12:52:51 +0000
Subject: [PATCH 121/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220418.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22218.3
---
 eng/Version.Details.xml                  | 8 ++++----
 eng/common/templates/job/onelocbuild.yml | 2 +-
 global.json                              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f322812bad3e3..f2e3a1327e702 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22218.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
+      <Sha>8425453874961a7d7d2379e3f39c104f9ad0a0bd</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22215.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22218.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
+      <Sha>8425453874961a7d7d2379e3f39c104f9ad0a0bd</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 9d1e3042d8a6c..3bcd243c46b67 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -72,8 +72,8 @@ jobs:
         lclSource: ${{ parameters.LclSource }}
         lclPackageId: ${{ parameters.LclPackageId }}
         isCreatePrSelected: ${{ parameters.CreatePr }}
+        isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
         ${{ if eq(parameters.CreatePr, true) }}:
-          isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
           isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
           ${{ if eq(parameters.RepoType, 'gitHub') }}:
             isShouldReusePrSelected: ${{ parameters.ReusePr }}
diff --git a/global.json b/global.json
index 4431be6169e2d..53041b8ec08b4 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3"
   }
 }

From 9b9dee9d6da18a8671af58156c618f56d9a80fc6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 12:52:32 +0000
Subject: [PATCH 122/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220420.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22220.6
---
 eng/Version.Details.xml                       |  8 ++++----
 .../templates/job/source-index-stage1.yml     | 19 ++++++++++++-------
 global.json                                   |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f2e3a1327e702..56667481decb8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22218.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22220.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8425453874961a7d7d2379e3f39c104f9ad0a0bd</Sha>
+      <Sha>8e2ccde11b70936d8254669a4a74653c580a1340</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22218.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22220.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8425453874961a7d7d2379e3f39c104f9ad0a0bd</Sha>
+      <Sha>8e2ccde11b70936d8254669a4a74653c580a1340</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 4af724eb1a9ec..c2d51098d35cb 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -7,6 +7,7 @@ parameters:
   binlogPath: artifacts/log/Debug/Build.binlog
   condition: ''
   dependsOn: ''
+  pool: ''
 
 jobs:
 - job: SourceIndexStage1
@@ -22,13 +23,17 @@ jobs:
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: source-dot-net stage1 variables
 
-  pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: NetCore1ESPool-Public
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
-    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-      name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCore1ESPool-Public
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
   steps:
   - ${{ each preStep in parameters.preSteps }}:
     - ${{ preStep }}
diff --git a/global.json b/global.json
index 53041b8ec08b4..a1f96e4e0a6ee 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6"
   }
 }

From b6aaf94bc60595c2154b2121693bce8ce78f7c67 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 12:50:28 +0000
Subject: [PATCH 123/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220421.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22221.2
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 56667481decb8..9d7d6577dc054 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22220.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22221.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8e2ccde11b70936d8254669a4a74653c580a1340</Sha>
+      <Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22220.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22221.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8e2ccde11b70936d8254669a4a74653c580a1340</Sha>
+      <Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
index a1f96e4e0a6ee..822fa99b1f723 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2"
   }
 }

From c8f98522c1576dbcec90b8794d62f3927efd5472 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 22 Apr 2022 15:52:33 -0700
Subject: [PATCH 124/413] Bump NetAnalyzer version to 7.0.0-preview1.22218.1

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 480056346e50e..5b13e51243fb7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,7 +28,7 @@
   <PropertyGroup>
     <!-- Versions used by several individual references below -->
     <RoslynDiagnosticsNugetPackageVersion>3.3.3-beta1.21105.3</RoslynDiagnosticsNugetPackageVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21366.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22218.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.0-beta1.21322.2</MicrosoftCodeAnalysisTestingVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.0.0-3.final</CodeStyleAnalyzerVersion>

From f71f556fdcc6ea5daa8627cd9671f087460d5ee7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 23 Apr 2022 12:45:41 +0000
Subject: [PATCH 125/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220422.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22222.4
---
 eng/Version.Details.xml          |  8 ++++----
 eng/common/cross/build-rootfs.sh | 17 ++++++++++++++++-
 global.json                      |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9d7d6577dc054..c409882024caa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22221.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22222.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
+      <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22221.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22222.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>daab9b4d3afbde7ed92882f0f0c540ef5e015fd2</Sha>
+      <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index e784c9c005a2a..5a59dcff28fb3 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -4,12 +4,13 @@ set -e
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
+    echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
     echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
     echo "                              for FreeBSD can be: freebsd12, freebsd13"
     echo "                              for illumos can be: illumos."
     echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
+    echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
     echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
     exit 1
@@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev"
 __AlpinePackages+=" icu-dev"
 __AlpinePackages+=" libunwind-dev"
 __AlpinePackages+=" lttng-ust-dev"
+__AlpinePackages+=" compiler-rt-static"
 
 # CoreFX dependencies
 __UbuntuPackages+=" libcurl4-openssl-dev"
@@ -164,6 +166,15 @@ while :; do
         no-lldb)
             unset __LLDB_Package
             ;;
+        llvm*)
+            version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
+            parts=(${version//./ })
+            __LLVM_MajorVersion="${parts[0]}"
+            __LLVM_MinorVersion="${parts[1]}"
+            if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
+                __LLVM_MinorVersion=0;
+            fi
+            ;;
         xenial) # Ubuntu 16.04
             if [ "$__CodeName" != "jessie" ]; then
                 __CodeName=xenial
@@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then
 fi
 __UbuntuPackages+=" ${__LLDB_Package:-}"
 
+if [ ! -z "$__LLVM_MajorVersion" ]; then
+    __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev"
+fi
+
 if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
     __RootfsDir=$ROOTFS_DIR
 fi
diff --git a/global.json b/global.json
index 822fa99b1f723..06640694fb2f3 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4"
   }
 }

From 05babf315e169b27455cc75ade3324bc62805c02 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 16:24:43 -0700
Subject: [PATCH 126/413] Initial EA stubs for asp.net

---
 Roslyn.sln                                    | 165 +++++++++---------
 ...ernalAccessAspNetCoreResources.Designer.cs |  64 +++++++
 .../ExternalAccessAspNetCoreResources.resx    | 120 +++++++++++++
 ...eAnalysis.ExternalAccess.AspNetCore.csproj |  67 +++++++
 .../AspNetCore/PublicAPI.Shipped.txt          |   0
 .../AspNetCore/PublicAPI.Unshipped.txt        |   0
 .../ExternalAccessAspNetCoreResources.cs.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.de.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.es.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.fr.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.it.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.ja.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.ko.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.pl.xlf  |   6 +
 ...xternalAccessAspNetCoreResources.pt-BR.xlf |   6 +
 .../ExternalAccessAspNetCoreResources.ru.xlf  |   6 +
 .../ExternalAccessAspNetCoreResources.tr.xlf  |   6 +
 ...ernalAccessAspNetCoreResources.zh-Hans.xlf |   6 +
 ...ernalAccessAspNetCoreResources.zh-Hant.xlf |   6 +
 19 files changed, 415 insertions(+), 79 deletions(-)
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.resx
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/PublicAPI.Shipped.txt
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/PublicAPI.Unshipped.txt
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.cs.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.de.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.es.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.fr.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.it.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ja.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ko.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pl.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pt-BR.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ru.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.tr.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hans.xlf
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hant.xlf

diff --git a/Roslyn.sln b/Roslyn.sln
index cef17ff1428c0..f1e1cec0fb53a 100644
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -501,86 +501,9 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VBCSCompilerCommandLine", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VBCSCompiler-arm64", "src\Compilers\Server\VBCSCompiler-arm64\VBCSCompiler-arm64.csproj", "{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore", "src\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj", "{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}"
+EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
-		src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{0161e25c-918a-4dc8-9648-30fdcc8e31e9}*SharedItemsImports = 5
-		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{0be66736-cdaa-4989-88b1-b3f46ebdca4a}*SharedItemsImports = 5
-		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{1b6c4a1a-413b-41fb-9f85-5c09118e541b}*SharedItemsImports = 13
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
-		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
-		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
-		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
-		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
-		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
-		src\Analyzers\Core\Analyzers\Analyzers.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
-		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
-		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
-		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e35}*SharedItemsImports = 13
-		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e36}*SharedItemsImports = 13
-		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
-		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
-		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{438db8af-f3f0-4ed9-80b5-13fddd5b8787}*SharedItemsImports = 13
-		src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
-		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{5018d049-5870-465a-889b-c742ce1e31cb}*SharedItemsImports = 5
-		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
-		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{58969243-7f59-4236-93d0-c93b81f569b3}*SharedItemsImports = 13
-		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
-		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
-		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
-		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{60db272a-21c9-4e8d-9803-ff4e132392c8}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{699fea05-aea7-403d-827e-53cf4e826955}*SharedItemsImports = 13
-		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1843}*SharedItemsImports = 5
-		src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13
-		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{7b7f4153-ae93-4908-b8f0-430871589f83}*SharedItemsImports = 13
-		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{94faf461-2e74-4dbb-9813-6b2cde6f1880}*SharedItemsImports = 13
-		src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
-		src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{975cd834-45f4-4ea0-a395-cb60dbd0e214}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{99f594b1-3916-471d-a761-a6731fc50e9a}*SharedItemsImports = 13
-		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{9f9ccc78-7487-4127-9d46-db23e501f001}*SharedItemsImports = 13
-		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{a07abcf5-bc43-4ee9-8fd8-b2d77fd54d73}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{a07abcf5-bc43-4ee9-8fd8-b2d77fd54d73}*SharedItemsImports = 5
-		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
-		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
-		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
-		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{aa87bfed-089a-4096-b8d5-690bdc7d5b24}*SharedItemsImports = 5
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{aa87bfed-089a-4096-b8d5-690bdc7d5b24}*SharedItemsImports = 5
-		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{abdbac1e-350e-4dc3-bb45-3504404545ee}*SharedItemsImports = 5
-		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{ac2bcefb-9298-4621-ac48-1ff5e639e48d}*SharedItemsImports = 5
-		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{ace53515-482c-4c6a-e2d2-4242a687dfee}*SharedItemsImports = 5
-		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
-		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bb3ca047-5d00-48d4-b7d3-233c1265c065}*SharedItemsImports = 13
-		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 5
-		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
-		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
-		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{da973826-c985-4128-9948-0b445e638bdb}*SharedItemsImports = 13
-		src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{dc8c78cc-b6fe-47bf-93b1-b65a1c67c08d}*SharedItemsImports = 5
-		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{e512c6c1-f085-4ad7-b0d9-e8f1a0a2a510}*SharedItemsImports = 5
-		src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
-		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
-		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{e919dd77-34f8-4f57-8058-4d3ff4c2b241}*SharedItemsImports = 13
-		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{e9dbfa41-7a9c-49be-bd36-fd71b31aa9fe}*SharedItemsImports = 13
-		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{eaffca55-335b-4860-bb99-efcead123199}*SharedItemsImports = 13
-		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{ec946164-1e17-410b-b7d9-7de7e6268d63}*SharedItemsImports = 13
-		src\Analyzers\Core\Analyzers\Analyzers.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
-		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
-		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
-		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -1290,6 +1213,10 @@ Global
 		{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1517,8 +1444,88 @@ Global
 		{975CD834-45F4-4EA0-A395-CB60DBD0E214} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
 		{D8EF0777-9D65-4849-A7D6-AC81E58E2317} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
 		{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
+		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24} = {8977A560-45C2-4EC2-A849-97335B382C74}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
+		src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{0161e25c-918a-4dc8-9648-30fdcc8e31e9}*SharedItemsImports = 5
+		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{0be66736-cdaa-4989-88b1-b3f46ebdca4a}*SharedItemsImports = 5
+		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{1b6c4a1a-413b-41fb-9f85-5c09118e541b}*SharedItemsImports = 13
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
+		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
+		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
+		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
+		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
+		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
+		src\Analyzers\Core\Analyzers\Analyzers.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
+		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
+		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
+		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e35}*SharedItemsImports = 13
+		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e36}*SharedItemsImports = 13
+		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
+		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
+		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{438db8af-f3f0-4ed9-80b5-13fddd5b8787}*SharedItemsImports = 13
+		src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
+		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{5018d049-5870-465a-889b-c742ce1e31cb}*SharedItemsImports = 5
+		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
+		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{58969243-7f59-4236-93d0-c93b81f569b3}*SharedItemsImports = 13
+		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
+		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{60db272a-21c9-4e8d-9803-ff4e132392c8}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{699fea05-aea7-403d-827e-53cf4e826955}*SharedItemsImports = 13
+		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1843}*SharedItemsImports = 5
+		src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13
+		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{7b7f4153-ae93-4908-b8f0-430871589f83}*SharedItemsImports = 13
+		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{94faf461-2e74-4dbb-9813-6b2cde6f1880}*SharedItemsImports = 13
+		src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
+		src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{975cd834-45f4-4ea0-a395-cb60dbd0e214}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{99f594b1-3916-471d-a761-a6731fc50e9a}*SharedItemsImports = 13
+		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{9f9ccc78-7487-4127-9d46-db23e501f001}*SharedItemsImports = 13
+		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{a07abcf5-bc43-4ee9-8fd8-b2d77fd54d73}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{a07abcf5-bc43-4ee9-8fd8-b2d77fd54d73}*SharedItemsImports = 5
+		src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
+		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
+		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 5
+		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{aa87bfed-089a-4096-b8d5-690bdc7d5b24}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{aa87bfed-089a-4096-b8d5-690bdc7d5b24}*SharedItemsImports = 5
+		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{abdbac1e-350e-4dc3-bb45-3504404545ee}*SharedItemsImports = 5
+		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{ac2bcefb-9298-4621-ac48-1ff5e639e48d}*SharedItemsImports = 5
+		src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{ace53515-482c-4c6a-e2d2-4242a687dfee}*SharedItemsImports = 5
+		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
+		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bb3ca047-5d00-48d4-b7d3-233c1265c065}*SharedItemsImports = 13
+		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 5
+		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
+		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
+		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{da973826-c985-4128-9948-0b445e638bdb}*SharedItemsImports = 13
+		src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{dc8c78cc-b6fe-47bf-93b1-b65a1c67c08d}*SharedItemsImports = 5
+		src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{e512c6c1-f085-4ad7-b0d9-e8f1a0a2a510}*SharedItemsImports = 5
+		src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
+		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
+		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{e919dd77-34f8-4f57-8058-4d3ff4c2b241}*SharedItemsImports = 13
+		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{e9dbfa41-7a9c-49be-bd36-fd71b31aa9fe}*SharedItemsImports = 13
+		src\Analyzers\CSharp\Analyzers\CSharpAnalyzers.projitems*{eaffca55-335b-4860-bb99-efcead123199}*SharedItemsImports = 13
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{ec946164-1e17-410b-b7d9-7de7e6268d63}*SharedItemsImports = 13
+		src\Analyzers\Core\Analyzers\Analyzers.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
+		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
+		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
+		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs b/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs
new file mode 100644
index 0000000000000..3c5373ed28502
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs
@@ -0,0 +1,64 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class ExternalAccessAspNetCoreResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal ExternalAccessAspNetCoreResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.ExternalAccessAspNetCoreResource" +
+                            "s", typeof(ExternalAccessAspNetCoreResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.resx b/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.resx
new file mode 100644
index 0000000000000..1af7de150c99c
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
new file mode 100644
index 0000000000000..aa1caddae5a6f
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.AspNetCore</RootNamespace>
+    <TargetFramework>net472</TargetFramework>
+
+    <!-- NuGet -->
+    <IsPackable>true</IsPackable>
+    <PackageId>Microsoft.CodeAnalysis.ExternalAccess.AspNetCore</PackageId>
+    <PackageDescription>
+      A supporting package for ASP.NET Core:
+      https://github.com/dotnet/aspnetcore
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\IsExternalInit.cs" Link="Internal\Utilities\IsExternalInit.cs" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <!--
+      ⚠ ONLY ASP.NET CORE ASSEMBLIES MAY BE ADDED HERE ⚠
+    -->
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.UnitTests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
+    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
+    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
+    <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
+    <ProjectReference Include="..\..\..\EditorFeatures\CSharp\Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj" />
+    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
+    <ProjectReference Include="..\..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" Version="$(MicrosoftVisualStudioLanguageServerClientVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PublicAPI Include="PublicAPI.Shipped.txt" />
+    <PublicAPI Include="PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.ComponentModel.Composition" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="ExternalAccessAspNetCoreResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ExternalAccessAspNetCoreResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="ExternalAccessAspNetCoreResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ExternalAccessAspNetCoreResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Tools/ExternalAccess/AspNetCore/PublicAPI.Shipped.txt b/src/Tools/ExternalAccess/AspNetCore/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Tools/ExternalAccess/AspNetCore/PublicAPI.Unshipped.txt b/src/Tools/ExternalAccess/AspNetCore/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.cs.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.cs.xlf
new file mode 100644
index 0000000000000..a36dd41ea43da
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.cs.xlf
@@ -0,0 +1,6 @@
+<?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="cs" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.de.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.de.xlf
new file mode 100644
index 0000000000000..60aae0e94304a
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.de.xlf
@@ -0,0 +1,6 @@
+<?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="de" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.es.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.es.xlf
new file mode 100644
index 0000000000000..b6986a36b8294
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.es.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.fr.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.fr.xlf
new file mode 100644
index 0000000000000..a2dd7dc8c6d70
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.fr.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.it.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.it.xlf
new file mode 100644
index 0000000000000..70c721d2c08ae
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.it.xlf
@@ -0,0 +1,6 @@
+<?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="it" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ja.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ja.xlf
new file mode 100644
index 0000000000000..e239cc4d9819f
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ja.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ko.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ko.xlf
new file mode 100644
index 0000000000000..c8c1da7c28cce
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ko.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pl.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pl.xlf
new file mode 100644
index 0000000000000..8a27ae6dd7a7a
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pl.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pt-BR.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pt-BR.xlf
new file mode 100644
index 0000000000000..9845fc1e050a0
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.pt-BR.xlf
@@ -0,0 +1,6 @@
+<?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" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ru.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ru.xlf
new file mode 100644
index 0000000000000..cf901467574fa
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.ru.xlf
@@ -0,0 +1,6 @@
+<?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="ru" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.tr.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.tr.xlf
new file mode 100644
index 0000000000000..f494ba9c379d6
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.tr.xlf
@@ -0,0 +1,6 @@
+<?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="tr" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hans.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hans.xlf
new file mode 100644
index 0000000000000..f52802bfdfde6
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hans.xlf
@@ -0,0 +1,6 @@
+<?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-Hans" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hant.xlf b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hant.xlf
new file mode 100644
index 0000000000000..a0156a0a05d56
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/xlf/ExternalAccessAspNetCoreResources.zh-Hant.xlf
@@ -0,0 +1,6 @@
+<?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-Hant" original="../ExternalAccessAspNetCoreResources.resx">
+    <body />
+  </file>
+</xliff>
\ No newline at end of file

From 7d472e26add8149779a905e76c33bde43549cc96 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 16:44:14 -0700
Subject: [PATCH 127/413] Add EA api for Asp.net core classification of Route
 Syntaxes

---
 ...oft.CodeAnalysis.EditorFeatures.Wpf.csproj |  1 +
 ...crosoft.CodeAnalysis.EditorFeatures.csproj |  1 +
 ...ft.CodeAnalysis.EditorFeatures.Text.csproj |  1 +
 .../Microsoft.CodeAnalysis.Features.csproj    |  1 +
 ...odeAnalysis.LanguageServer.Protocol.csproj |  1 +
 ...reEmbeddedLanguageClassificationContext.cs | 32 +++++++++++++++++++
 ...pNetCoreRouteEmbeddedLanguageClassifier.cs | 17 ++++++++++
 ...pNetCoreRouteEmbeddedLanguageClassifier.cs | 30 +++++++++++++++++
 ...osoft.VisualStudio.LanguageServices.csproj |  1 +
 ...dio.LanguageServices.Implementation.csproj |  1 +
 .../Microsoft.CodeAnalysis.Workspaces.csproj  |  1 +
 11 files changed, 87 insertions(+)
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs

diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
index e84bbb5b2e54b..18f3e3d2b1bfd 100644
--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -49,6 +49,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.ServiceHub" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index e473623bbd306..eb76b9164f532 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -100,6 +100,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.New.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <!-- Eventually a bunch of these unit tests should move into Roslyn.Services.Implementation.UnitTests
diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
index 7416cfa00e739..f2d5a65c01a2d 100644
--- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
@@ -38,6 +38,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.ExternalDependencyServices" WorkItem="https://github.com/dotnet/roslyn/issues/35085" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
index 2a7ad0ec7796f..032dfe3528f34 100644
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -91,6 +91,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" />
diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
index 32fe61f58c89b..377591f9ff454 100644
--- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
+++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
@@ -44,6 +44,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures2.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests" />
diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
new file mode 100644
index 0000000000000..a34de788d48fb
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
@@ -0,0 +1,32 @@
+// 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 Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
+{
+    internal struct AspNetCoreEmbeddedLanguageClassificationContext
+    {
+        private readonly EmbeddedLanguageClassificationContext _context;
+
+        public AspNetCoreEmbeddedLanguageClassificationContext(EmbeddedLanguageClassificationContext context)
+        {
+            _context = context;
+        }
+
+        /// <inheritdoc cref="EmbeddedLanguageClassificationContext.SyntaxToken"/>
+        public SyntaxToken SyntaxToken => _context.SyntaxToken;
+
+        /// <inheritdoc cref="EmbeddedLanguageClassificationContext.SemanticModel"/>
+        public SemanticModel SemanticModel => _context.SemanticModel;
+
+        /// <inheritdoc cref="EmbeddedLanguageClassificationContext.CancellationToken"/>
+        public CancellationToken CancellationToken => _context.CancellationToken;
+
+        public void AddClassification(string classificationType, TextSpan span)
+            => _context.AddClassification(classificationType, span);
+    }
+}
diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
new file mode 100644
index 0000000000000..199a81626b290
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
@@ -0,0 +1,17 @@
+// 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.Tasks;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
+{
+    internal interface IAspNetCoreRouteEmbeddedLanguageClassifier
+    {
+        void RegisterClassifications(AspNetCoreEmbeddedLanguageClassificationContext aspNetCoreEmbeddedLanguageClassificationContext);
+    }
+}
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
new file mode 100644
index 0000000000000..8f7bcefc4dc4a
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
@@ -0,0 +1,30 @@
+// 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.Classification;
+using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
+{
+    [ExportEmbeddedLanguageClassifierInternal(
+        nameof(AspNetCoreRouteEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false, "Route"), Shared]
+    internal class AspNetCoreRouteEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
+    {
+        private readonly IAspNetCoreRouteEmbeddedLanguageClassifier? _classifier;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public AspNetCoreRouteEmbeddedLanguageClassifier(
+            [Import(AllowDefault = true)] IAspNetCoreRouteEmbeddedLanguageClassifier? classifier)
+        {
+            _classifier = classifier;
+        }
+
+        public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
+            => _classifier?.RegisterClassifications(new AspNetCoreEmbeddedLanguageClassificationContext(context));
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 3459e4abdff9c..64db09b708416 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -104,6 +104,7 @@
     <internalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.New.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.ErrorList.UnitTests" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare" />
diff --git a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
index 2263d60566acf..04ae713557190 100644
--- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
+++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
@@ -25,6 +25,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
index 161653267be59..89eeb96b25954 100644
--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
@@ -122,6 +122,7 @@
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" />

From 52834c9e88c512fcf07017f2a1b3a72821b3829f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 16:48:15 -0700
Subject: [PATCH 128/413] Rename

---
 .../IAspNetCoreRouteEmbeddedLanguageClassifier.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
index 199a81626b290..bb55e48b1b632 100644
--- a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
@@ -12,6 +12,6 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
 {
     internal interface IAspNetCoreRouteEmbeddedLanguageClassifier
     {
-        void RegisterClassifications(AspNetCoreEmbeddedLanguageClassificationContext aspNetCoreEmbeddedLanguageClassificationContext);
+        void RegisterClassifications(AspNetCoreEmbeddedLanguageClassificationContext context);
     }
 }

From ca267b2b797e89f7e6831327c397d0d7f588aeb8 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 17:32:28 -0700
Subject: [PATCH 129/413] Need to run in remote for classification to work

---
 .../ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
index d395072ca9a19..d8a20870e4e9b 100644
--- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
+++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
     <ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" />
+    <ProjectReference Include="..\..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
     <ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
   <ItemGroup>

From 1d5a1eeb838a2546a2fb9b9372c61c920558a87b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 17:38:24 -0700
Subject: [PATCH 130/413] model after razor

---
 eng/config/PublishData.json                       |  2 ++
 ...crosoft.CodeAnalysis.EditorFeatures.Wpf.csproj |  1 -
 .../Microsoft.CodeAnalysis.EditorFeatures.csproj  |  1 -
 ...rosoft.CodeAnalysis.EditorFeatures.Text.csproj |  1 -
 .../Microsoft.CodeAnalysis.CSharp.Features.csproj |  1 +
 .../Microsoft.CodeAnalysis.Features.csproj        |  2 +-
 ...ft.CodeAnalysis.LanguageServer.Protocol.csproj |  2 +-
 ....CodeAnalysis.ExternalAccess.AspNetCore.csproj | 15 ++++-----------
 ...Microsoft.VisualStudio.LanguageServices.csproj |  1 -
 ...lStudio.LanguageServices.Implementation.csproj |  1 -
 .../Setup/source.extension.vsixmanifest           |  1 +
 ...icrosoft.CodeAnalysis.CSharp.Workspaces.csproj |  1 +
 .../Microsoft.CodeAnalysis.Workspaces.csproj      |  2 +-
 ...icrosoft.CodeAnalysis.Remote.Workspaces.csproj |  1 +
 14 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json
index eb50c04ae0b43..4eb50c6b31ae9 100644
--- a/eng/config/PublishData.json
+++ b/eng/config/PublishData.json
@@ -50,6 +50,7 @@
       "Microsoft.CodeAnalysis.ExternalAccess.ProjectSystem": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp": "arcade",
+      "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.Razor": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.TypeScript": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.UnitTesting": "vs-impl",
@@ -107,6 +108,7 @@
       "Microsoft.CodeAnalysis.ExternalAccess.ProjectSystem": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp": "arcade",
+      "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.Razor": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.TypeScript": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.UnitTesting": "arcade",
diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
index 18f3e3d2b1bfd..e84bbb5b2e54b 100644
--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -49,7 +49,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.ServiceHub" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.IntegrationTest.Utilities" />
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index eb76b9164f532..e473623bbd306 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -100,7 +100,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.New.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <!-- Eventually a bunch of these unit tests should move into Roslyn.Services.Implementation.UnitTests
diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
index f2d5a65c01a2d..7416cfa00e739 100644
--- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
@@ -38,7 +38,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.VisualBasic" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.ExternalDependencyServices" WorkItem="https://github.com/dotnet/roslyn/issues/35085" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
index a82a820316c48..36bad4d099180 100644
--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
+++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
@@ -28,6 +28,7 @@
     <!-- BEGIN External Access -->
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <!-- END External Access -->
     <!-- BEGIN MONODEVELOP
diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
index 032dfe3528f34..80ff821edb8ef 100644
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -91,7 +91,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" />
@@ -114,6 +113,7 @@
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor" Partner="Razor" Key="$(RazorKey)" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor.Test" Partner="Razor" Key="$(RazorKey)" />
     <InternalsVisibleTo Include="IdeCoreBenchmarks" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
   </ItemGroup>
diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
index 377591f9ff454..808fcc16d623a 100644
--- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
+++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
@@ -43,8 +43,8 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures2.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests" />
diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
index aa1caddae5a6f..68adb7f005d08 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -2,9 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.AspNetCore</RootNamespace>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <!-- NuGet -->
     <IsPackable>true</IsPackable>
@@ -20,6 +19,8 @@
   </ItemGroup>
   
   <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.ServiceHub" />
+
     <!--
       ⚠ ONLY ASP.NET CORE ASSEMBLIES MAY BE ADDED HERE ⚠
     -->
@@ -36,19 +37,11 @@
     <ProjectReference Include="..\..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" Version="$(MicrosoftVisualStudioLanguageServerClientVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <PublicAPI Include="PublicAPI.Shipped.txt" />
     <PublicAPI Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.Composition" />
-  </ItemGroup>
-
+  
   <ItemGroup>
     <Compile Update="ExternalAccessAspNetCoreResources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 64db09b708416..3459e4abdff9c 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -104,7 +104,6 @@
     <internalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.New.IntegrationTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.ErrorList.UnitTests" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.LiveShare" />
diff --git a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
index 04ae713557190..2263d60566acf 100644
--- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
+++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
@@ -25,7 +25,6 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
diff --git a/src/VisualStudio/Setup/source.extension.vsixmanifest b/src/VisualStudio/Setup/source.extension.vsixmanifest
index 1b9aaf715bd16..f6da1017eed39 100644
--- a/src/VisualStudio/Setup/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup/source.extension.vsixmanifest
@@ -62,6 +62,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" />
+    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServices.LiveShare.dll" />
diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
index 78f170de0e965..11e74944eacca 100644
--- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
+++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
@@ -47,6 +47,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities2" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.DiagnosticsTests.Utilities" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"/>
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor"/>
     <InternalsVisibleTo Include="IdeCoreBenchmarks"/>
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
index 89eeb96b25954..888192edc7185 100644
--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
@@ -122,12 +122,12 @@
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Test.Utilities2" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.TypeScript" Key="$(TypeScriptKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35077" />
diff --git a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
index 3607fa110fea3..89f4227205cf5 100644
--- a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
+++ b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
@@ -59,6 +59,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Workspaces.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Workspaces.Test.Utilities" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.Completion.Tests" Key="$(IntelliCodeCSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp.Extraction" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />

From 6ec77876ead63d44c859215f8a1f9e469f70ed5a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 25 Apr 2022 17:38:58 -0700
Subject: [PATCH 131/413] model after razor

---
 ...icrosoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
index 68adb7f005d08..328da7b83d89a 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -29,12 +29,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\CSharp\Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj" />
+    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
+    <ProjectReference Include="..\..\..\Features\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
-    <ProjectReference Include="..\..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
+    <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
 
   <ItemGroup>

From 562086065ffcbac721095290c2a273202cbf9d4f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:45:12 +0000
Subject: [PATCH 132/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220425.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.22225.6
---
 eng/Version.Details.xml | 8 ++++----
 eng/common/sdk-task.ps1 | 2 +-
 eng/common/tools.ps1    | 4 ++--
 global.json             | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c409882024caa..c7256faa3cb7b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22222.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22225.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
+      <Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21469.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c1d8c6f043bc80425c6828455eb57f8a404759c6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22222.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22225.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
+      <Sha>5145e86df0c491e082b589aa31d69eea300adc02</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index b1bca63ab1d82..119a6c660d1a4 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index f1e1cb53953bc..797f05292a851 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview
-  $defaultXCopyMSBuildVersion = '16.10.0-preview2'
+  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview
+  $defaultXCopyMSBuildVersion = '17.1.0'
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
   $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
diff --git a/global.json b/global.json
index 06640694fb2f3..b34c49f8e7f80 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6"
   }
 }

From 024ccb8441f5d34fb320ff297281dc457b02fa1e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 29 Apr 2022 17:54:35 +0000
Subject: [PATCH 133/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220412.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21072.7 -> To Version 1.0.0-beta.22212.4
---
 eng/Version.Details.xml                       |   8 +-
 eng/common/build.ps1                          |  48 ++--
 eng/common/build.sh                           |  26 +-
 eng/common/generate-locproject.ps1            | 110 +++++++++
 eng/common/internal-feed-operations.ps1       |   1 -
 eng/common/internal-feed-operations.sh        |   1 -
 eng/common/pipeline-logging-functions.ps1     | 150 +++++++-----
 eng/common/sdl/configure-sdl-tool.ps1         | 109 +++++++++
 eng/common/sdl/execute-all-sdl-tools.ps1      | 225 +++++++++++-------
 eng/common/sdl/extract-artifact-archives.ps1  |  63 +++++
 eng/common/sdl/extract-artifact-packages.ps1  |  97 ++++----
 eng/common/sdl/init-sdl.ps1                   |  50 ++--
 eng/common/sdl/packages.config                |   2 +-
 eng/common/sdl/push-gdn.ps1                   |  28 ++-
 eng/common/sdl/run-sdl.ps1                    |  78 +++---
 eng/common/templates/job/execute-sdl.yml      |   4 +-
 eng/common/templates/job/job.yml              |   9 +-
 eng/common/templates/job/onelocbuild.yml      |  83 +++++++
 eng/common/templates/jobs/jobs.yml            |   6 +-
 eng/common/templates/phases/base.yml          |   2 +-
 .../templates/post-build/post-build.yml       |  26 +-
 eng/common/tools.ps1                          |  99 ++++++--
 eng/common/tools.sh                           | 113 ++++++---
 global.json                                   |   4 +-
 24 files changed, 975 insertions(+), 367 deletions(-)
 create mode 100644 eng/common/generate-locproject.ps1
 create mode 100644 eng/common/sdl/configure-sdl-tool.ps1
 create mode 100644 eng/common/sdl/extract-artifact-archives.ps1
 create mode 100644 eng/common/templates/job/onelocbuild.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b6ee69fe9de98..50b24614b318d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22212.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
+      <Sha>110afd89a939ac6476282e27d7290583ad3b1715</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-4.21076.10">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>38a96eef7208a443114b778b7f10a3369b4dc6d4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.22212.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
+      <Sha>110afd89a939ac6476282e27d7290583ad3b1715</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index e001ccb481cf0..a2d79b4468c61 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -22,6 +22,8 @@ Param(
   [switch] $ci,
   [switch] $prepareMachine,
   [switch] $help,
+  [string] $runtimeSourceFeed = "",
+  [string] $runtimeSourceFeedKey = "",
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
@@ -29,33 +31,35 @@ Param(
 
 function Print-Usage() {
     Write-Host "Common settings:"
-    Write-Host "  -configuration <value>  Build configuration: 'Debug' or 'Release' (short: -c)"
-    Write-Host "  -platform <value>       Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
-    Write-Host "  -verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
-    Write-Host "  -binaryLog              Output binary log (short: -bl)"
-    Write-Host "  -help                   Print help and exit"
+    Write-Host "  -configuration <value>        Build configuration: 'Debug' or 'Release' (short: -c)"
+    Write-Host "  -platform <value>             Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
+    Write-Host "  -verbosity <value>            Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
+    Write-Host "  -binaryLog                    Output binary log (short: -bl)"
+    Write-Host "  -help                         Print help and exit"
     Write-Host ""
 
     Write-Host "Actions:"
-    Write-Host "  -restore                Restore dependencies (short: -r)"
-    Write-Host "  -build                  Build solution (short: -b)"
-    Write-Host "  -rebuild                Rebuild solution"
-    Write-Host "  -deploy                 Deploy built VSIXes"
-    Write-Host "  -deployDeps             Deploy dependencies (e.g. VSIXes for integration tests)"
-    Write-Host "  -test                   Run all unit tests in the solution (short: -t)"
-    Write-Host "  -integrationTest        Run all integration tests in the solution"
-    Write-Host "  -performanceTest        Run all performance tests in the solution"
-    Write-Host "  -pack                   Package build outputs into NuGet packages and Willow components"
-    Write-Host "  -sign                   Sign build outputs"
-    Write-Host "  -publish                Publish artifacts (e.g. symbols)"
+    Write-Host "  -restore                      Restore dependencies (short: -r)"
+    Write-Host "  -build                        Build solution (short: -b)"
+    Write-Host "  -rebuild                      Rebuild solution"
+    Write-Host "  -deploy                       Deploy built VSIXes"
+    Write-Host "  -deployDeps                   Deploy dependencies (e.g. VSIXes for integration tests)"
+    Write-Host "  -test                         Run all unit tests in the solution (short: -t)"
+    Write-Host "  -integrationTest              Run all integration tests in the solution"
+    Write-Host "  -performanceTest              Run all performance tests in the solution"
+    Write-Host "  -pack                         Package build outputs into NuGet packages and Willow components"
+    Write-Host "  -sign                         Sign build outputs"
+    Write-Host "  -publish                      Publish artifacts (e.g. symbols)"
     Write-Host ""
 
     Write-Host "Advanced settings:"
-    Write-Host "  -projects <value>       Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
-    Write-Host "  -ci                     Set when running on CI server"
-    Write-Host "  -prepareMachine         Prepare machine for CI run, clean up processes after build"
-    Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
-    Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+    Write-Host "  -projects <value>             Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
+    Write-Host "  -ci                           Set when running on CI server"
+    Write-Host "  -prepareMachine               Prepare machine for CI run, clean up processes after build"
+    Write-Host "  -warnAsError <value>          Sets warnaserror msbuild parameter ('true' or 'false')"
+    Write-Host "  -msbuildEngine <value>        Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+    Write-Host "  -runtimeSourceFeed <value>    Alternate feed source for restoring .NET Runtimes and SDKs"
+    Write-Host "  -runtimeSourceFeedKey <value> Key value for non-public values of runtimeSourceFeed"
     Write-Host ""
 
     Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -75,7 +79,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
-  $toolsetBuildProj = InitializeToolset
+  $toolsetBuildProj = InitializeToolset -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
   InitializeCustomToolset
 
   $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 6236fc4d38cd3..230e41ac2e90a 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -29,11 +29,14 @@ usage()
   echo ""
 
   echo "Advanced settings:"
-  echo "  --projects <value>       Project or solution file(s) to build"
-  echo "  --ci                     Set when running on CI server"
-  echo "  --prepareMachine         Prepare machine for CI run, clean up processes after build"
-  echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
-  echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
+  echo "  --projects <value>             Project or solution file(s) to build"
+  echo "  --ci                           Set when running on CI server"
+  echo "  --prepareMachine               Prepare machine for CI run, clean up processes after build"
+  echo "  --nodeReuse <value>            Sets nodereuse msbuild parameter ('true' or 'false')"
+  echo "  --warnAsError <value>          Sets warnaserror msbuild parameter ('true' or 'false')"
+  echo "  --runtimeSourceFeed <value>    Alternate (fallback) source for .NET Runtime and SDK installation"
+  echo "  --runtimeSourceFeedKey <value> Credentials (if needed) for authenticating to runtimeSourceFeed"
+
   echo ""
   echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
@@ -73,6 +76,9 @@ configuration='Debug'
 prepare_machine=false
 verbosity='minimal'
 
+runtimeSourceFeed=''
+runtimeSourceFeedKey=''
+
 properties=''
 
 while [[ $# > 0 ]]; do
@@ -141,6 +147,14 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
+    -runtimesourcefeed)
+      shift
+      runtimeSourceFeed="$1"
+      ;;
+    -runtimesourcefeedkey)
+      shift
+      runtimeSourceFeedKey="$1"
+      ;;
     *)
       properties="$properties $1"
       ;;
@@ -166,7 +180,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
-  InitializeToolset
+  InitializeToolset $runtimeSourceFeed $runtimeSourceFeedKey
   InitializeCustomToolset
 
   if [[ ! -z "$projects" ]]; then
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
new file mode 100644
index 0000000000000..2907f916d6f3e
--- /dev/null
+++ b/eng/common/generate-locproject.ps1
@@ -0,0 +1,110 @@
+Param(
+    [Parameter(Mandatory=$true)][string] $SourcesDirectory,     # Directory where source files live; if using a Localize directory it should live in here
+    [string] $LanguageSet = 'VS_Main_Languages',                # Language set to be used in the LocProject.json
+    [switch] $UseCheckedInLocProjectJson,                       # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one
+    [switch] $CreateNeutralXlfs                                 # Creates neutral xlf files. Only set to false when running locally
+)
+
+# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here:
+# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task
+
+Set-StrictMode -Version 2.0
+$ErrorActionPreference = "Stop"
+. $PSScriptRoot\tools.ps1
+
+Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
+
+$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
+$exclusions = @{ Exclusions = @() }
+if (Test-Path -Path $exclusionsFilePath)
+{
+    $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json
+}
+
+Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work
+
+# Template files
+$jsonFiles = @()
+$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
+$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
+
+$xlfFiles = @()
+
+$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
+$langXlfFiles = @()
+if ($allXlfFiles) {
+    $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf'
+    $firstLangCode = $Matches.1
+    $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
+}
+$langXlfFiles | ForEach-Object {
+    $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
+    
+    $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
+    $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+}
+
+$locFiles = $jsonFiles + $xlfFiles
+
+$locJson = @{
+    Projects = @(
+        @{
+            LanguageSet = $LanguageSet
+            LocItems = @(
+                $locFiles | ForEach-Object {
+                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
+                    $continue = $true
+                    foreach ($exclusion in $exclusions.Exclusions) {
+                        if ($outputPath.Contains($exclusion))
+                        {
+                            $continue = $false
+                        }
+                    }
+                    $sourceFile = ($_.FullName | Resolve-Path -Relative)
+                    if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') {
+                        Remove-Item -Path $sourceFile
+                    }
+                    if ($continue)
+                    {
+                        if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnPath"
+                                OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
+                            }
+                        }
+                        else {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnName"
+                                OutputPath = $outputPath
+                            }
+                        }
+                    }
+                }
+            )
+        }
+    )
+}
+
+$json = ConvertTo-Json $locJson -Depth 5
+Write-Host "LocProject.json generated:`n`n$json`n`n"
+Pop-Location
+
+if (!$UseCheckedInLocProjectJson) {
+    New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
+    Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
+}
+else {
+    New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
+    Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
+
+    if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
+        Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
+        
+        exit 1
+    }
+    else {
+        Write-Host "Generated LocProject.json and current LocProject.json are identical."
+    }
+}
\ No newline at end of file
diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1
index 8b8bafd6a896e..66a4b754d4d15 100644
--- a/eng/common/internal-feed-operations.ps1
+++ b/eng/common/internal-feed-operations.ps1
@@ -64,7 +64,6 @@ function SetupCredProvider {
   }
 
   if (($endpoints | Measure-Object).Count -gt 0) {
-      # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
       $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress
 
      # Create the environment variables the AzDo way
diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh
index 1ff654d2ffcdd..5eb546990dec8 100755
--- a/eng/common/internal-feed-operations.sh
+++ b/eng/common/internal-feed-operations.sh
@@ -62,7 +62,6 @@ function SetupCredProvider {
   endpoints+=']'
 
   if [ ${#endpoints} -gt 2 ]; then 
-      # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
       local endpointCredentials="{\"endpointCredentials\": "$endpoints"}"
 
       echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials"
diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1
index af5f48aacebc6..8e422c561e4bd 100644
--- a/eng/common/pipeline-logging-functions.ps1
+++ b/eng/common/pipeline-logging-functions.ps1
@@ -12,6 +12,7 @@ $script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"
 # TODO: BUG: Escape % ???
 # TODO: Add test to verify don't need to escape "=".
 
+# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set
 function Write-PipelineTelemetryError {
     [CmdletBinding()]
     param(
@@ -25,80 +26,101 @@ function Write-PipelineTelemetryError {
         [string]$SourcePath,
         [string]$LineNumber,
         [string]$ColumnNumber,
-        [switch]$AsOutput)
+        [switch]$AsOutput,
+        [switch]$Force)
 
-        $PSBoundParameters.Remove("Category") | Out-Null
+    $PSBoundParameters.Remove('Category') | Out-Null
 
+    if ($Force -Or ((Test-Path variable:ci) -And $ci)) {
         $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message"
-        $PSBoundParameters.Remove("Message") | Out-Null
-        $PSBoundParameters.Add("Message", $Message)
-
-        Write-PipelineTaskError @PSBoundParameters
+    }
+    $PSBoundParameters.Remove('Message') | Out-Null
+    $PSBoundParameters.Add('Message', $Message)
+    Write-PipelineTaskError @PSBoundParameters
 }
 
+# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set
 function Write-PipelineTaskError {
     [CmdletBinding()]
     param(
-      [Parameter(Mandatory = $true)]
-      [string]$Message,
-      [Parameter(Mandatory = $false)]
-      [string]$Type = 'error',
-      [string]$ErrCode,
-      [string]$SourcePath,
-      [string]$LineNumber,
-      [string]$ColumnNumber,
-      [switch]$AsOutput)
-  
-      if(!$ci) {
-        if($Type -eq 'error') {
-          Write-Host $Message -ForegroundColor Red
-          return
+        [Parameter(Mandatory = $true)]
+        [string]$Message,
+        [Parameter(Mandatory = $false)]
+        [string]$Type = 'error',
+        [string]$ErrCode,
+        [string]$SourcePath,
+        [string]$LineNumber,
+        [string]$ColumnNumber,
+        [switch]$AsOutput,
+        [switch]$Force
+    )
+
+    if (!$Force -And (-Not (Test-Path variable:ci) -Or !$ci)) {
+        if ($Type -eq 'error') {
+            Write-Host $Message -ForegroundColor Red
+            return
         }
         elseif ($Type -eq 'warning') {
-          Write-Host $Message -ForegroundColor Yellow
-          return
+            Write-Host $Message -ForegroundColor Yellow
+            return
         }
-      }
-  
-      if(($Type -ne 'error') -and ($Type -ne 'warning')) {
+    }
+
+    if (($Type -ne 'error') -and ($Type -ne 'warning')) {
         Write-Host $Message
         return
-      }
-      if(-not $PSBoundParameters.ContainsKey('Type')) {
+    }
+    $PSBoundParameters.Remove('Force') | Out-Null      
+    if (-not $PSBoundParameters.ContainsKey('Type')) {
         $PSBoundParameters.Add('Type', 'error')
-      }
-      Write-LogIssue @PSBoundParameters
-  }
+    }
+    Write-LogIssue @PSBoundParameters
+}
   
-  function Write-PipelineSetVariable {
+function Write-PipelineSetVariable {
     [CmdletBinding()]
     param(
-      [Parameter(Mandatory = $true)]
-      [string]$Name,
-      [string]$Value,
-      [switch]$Secret,
-      [switch]$AsOutput,
-      [bool]$IsMultiJobVariable=$true)
-
-      if($ci) {
+        [Parameter(Mandatory = $true)]
+        [string]$Name,
+        [string]$Value,
+        [switch]$Secret,
+        [switch]$AsOutput,
+        [bool]$IsMultiJobVariable = $true)
+
+    if ((Test-Path variable:ci) -And $ci) {
         Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{
-          'variable' = $Name
-          'isSecret' = $Secret
-          'isOutput' = $IsMultiJobVariable
+            'variable' = $Name
+            'isSecret' = $Secret
+            'isOutput' = $IsMultiJobVariable
         } -AsOutput:$AsOutput
-      }
-  }
+    }
+}
   
-  function Write-PipelinePrependPath {
+function Write-PipelinePrependPath {
     [CmdletBinding()]
     param(
-      [Parameter(Mandatory=$true)]
-      [string]$Path,
-      [switch]$AsOutput)
-      if($ci) {
+        [Parameter(Mandatory = $true)]
+        [string]$Path,
+        [switch]$AsOutput)
+
+    if ((Test-Path variable:ci) -And $ci) {
         Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput
-      }
-  }
+    }
+}
+
+function Write-PipelineSetResult {
+    [CmdletBinding()]
+    param(
+        [ValidateSet("Succeeded", "SucceededWithIssues", "Failed", "Cancelled", "Skipped")]
+        [Parameter(Mandatory = $true)]
+        [string]$Result,
+        [string]$Message)
+    if ((Test-Path variable:ci) -And $ci) {
+        Write-LoggingCommand -Area 'task' -Event 'complete' -Data $Message -Properties @{
+            'result' = $Result
+        }
+    }
+}
 
 <########################################
 # Private functions.
@@ -115,7 +137,8 @@ function Format-LoggingCommandData {
         foreach ($mapping in $script:loggingCommandEscapeMappings) {
             $Value = $Value.Replace($mapping.Token, $mapping.Replacement)
         }
-    } else {
+    }
+    else {
         for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) {
             $mapping = $script:loggingCommandEscapeMappings[$i]
             $Value = $Value.Replace($mapping.Replacement, $mapping.Token)
@@ -148,7 +171,8 @@ function Format-LoggingCommand {
                 if ($first) {
                     $null = $sb.Append(' ')
                     $first = $false
-                } else {
+                }
+                else {
                     $null = $sb.Append(';')
                 }
 
@@ -185,7 +209,8 @@ function Write-LoggingCommand {
     $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties
     if ($AsOutput) {
         $command
-    } else {
+    }
+    else {
         Write-Host $command
     }
 }
@@ -204,12 +229,12 @@ function Write-LogIssue {
         [switch]$AsOutput)
 
     $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{
-            'type' = $Type
-            'code' = $ErrCode
-            'sourcepath' = $SourcePath
-            'linenumber' = $LineNumber
-            'columnnumber' = $ColumnNumber
-        }
+        'type'         = $Type
+        'code'         = $ErrCode
+        'sourcepath'   = $SourcePath
+        'linenumber'   = $LineNumber
+        'columnnumber' = $ColumnNumber
+    }
     if ($AsOutput) {
         return $command
     }
@@ -221,7 +246,8 @@ function Write-LogIssue {
             $foregroundColor = [System.ConsoleColor]::Red
             $backgroundColor = [System.ConsoleColor]::Black
         }
-    } else {
+    }
+    else {
         $foregroundColor = $host.PrivateData.WarningForegroundColor
         $backgroundColor = $host.PrivateData.WarningBackgroundColor
         if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) {
@@ -231,4 +257,4 @@ function Write-LogIssue {
     }
 
     Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor
-}
\ No newline at end of file
+}
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
new file mode 100644
index 0000000000000..8a68fc24b11b0
--- /dev/null
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -0,0 +1,109 @@
+Param(
+  [string] $GuardianCliLocation,
+  [string] $WorkingDirectory,
+  [string] $TargetDirectory,
+  [string] $GdnFolder,
+  # The list of Guardian tools to configure. For each object in the array:
+  # - If the item is a [hashtable], it must contain these entries:
+  #   - Name = The tool name as Guardian knows it.
+  #   - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique
+  #     among all tool entries with the same Name.
+  #   - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")'
+  # - If the item is a [string] $v, it is treated as '@{ Name="$v" }'
+  [object[]] $ToolsList,
+  [string] $GuardianLoggerLevel='Standard',
+  # Optional: Additional params to add to any tool using CredScan.
+  [string[]] $CrScanAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using PoliCheck.
+  [string[]] $PoliCheckAdditionalRunConfigParams
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  # Normalize tools list: all in [hashtable] form with defined values for each key.
+  $ToolsList = $ToolsList |
+    ForEach-Object {
+      if ($_ -is [string]) {
+        $_ = @{ Name = $_ }
+      }
+
+      if (-not ($_['Scenario'])) { $_.Scenario = "" }
+      if (-not ($_['Args'])) { $_.Args = @() }
+      $_
+    }
+  
+  Write-Host "List of tools to configure:"
+  $ToolsList | ForEach-Object { $_ | Out-String | Write-Host }
+
+  # We store config files in the r directory of .gdn
+  $gdnConfigPath = Join-Path $GdnFolder 'r'
+  $ValidPath = Test-Path $GuardianCliLocation
+
+  if ($ValidPath -eq $False)
+  {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location."
+    ExitWithExitCode 1
+  }
+
+  foreach ($tool in $ToolsList) {
+    # Put together the name and scenario to make a unique key.
+    $toolConfigName = $tool.Name
+    if ($tool.Scenario) {
+      $toolConfigName += "_" + $tool.Scenario
+    }
+
+    Write-Host "=== Configuring $toolConfigName..."
+
+    $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
+
+    # For some tools, add default and automatic args.
+    if ($tool.Name -eq 'credscan') {
+      if ($targetDirectory) {
+        $tool.Args += "`"TargetDirectory < $TargetDirectory`""
+      }
+      $tool.Args += "`"OutputType < pre`""
+      $tool.Args += $CrScanAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'policheck') {
+      if ($targetDirectory) {
+        $tool.Args += "`"Target < $TargetDirectory`""
+      }
+      $tool.Args += $PoliCheckAdditionalRunConfigParams
+    }
+
+    # Create variable pointing to the args array directly so we can use splat syntax later.
+    $toolArgs = $tool.Args
+
+    # Configure the tool. If args array is provided or the current tool has some default arguments
+    # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}",
+    # one per parameter. Doc page for "guardian configure":
+    # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure
+    Exec-BlockVerbosely {
+      & $GuardianCliLocation configure `
+        --working-directory $WorkingDirectory `
+        --tool $tool.Name `
+        --output-path $gdnConfigFile `
+        --logger-level $GuardianLoggerLevel `
+        --noninteractive `
+        --force `
+        $(if ($toolArgs) { "--args" }) @toolArgs
+      Exit-IfNZEC "Sdl"
+    }
+
+    Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile"
+  }
+}
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index 01799d63ff365..e5bef8ebd3a3b 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -1,100 +1,163 @@
 Param(
-  [string] $GuardianPackageName,                                                           # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified)
-  [string] $NugetPackageDirectory,                                                         # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified)
-  [string] $GuardianCliLocation,                                                           # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified
-  [string] $Repository=$env:BUILD_REPOSITORY_NAME,                                         # Required: the name of the repository (e.g. dotnet/arcade)
-  [string] $BranchName=$env:BUILD_SOURCEBRANCH,                                            # Optional: name of branch or version of gdn settings; defaults to master
-  [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,                                   # Required: the directory where source files are located
-  [string] $ArtifactsDirectory = (Join-Path $env:BUILD_SOURCESDIRECTORY ("artifacts")),    # Required: the directory where build artifacts are located
-  [string] $AzureDevOpsAccessToken,                                                        # Required: access token for dnceng; should be provided via KeyVault
-  [string[]] $SourceToolsList,                                                             # Optional: list of SDL tools to run on source code
-  [string[]] $ArtifactToolsList,                                                           # Optional: list of SDL tools to run on built artifacts
-  [bool] $TsaPublish=$False,                                                               # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH,                                         # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME,                                  # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs.
-  [string] $BuildNumber=$env:BUILD_BUILDNUMBER,                                            # Optional: required for TSA publish; defaults to $(Build.BuildNumber)
-  [bool] $UpdateBaseline=$False,                                                           # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed
-  [bool] $TsaOnboard=$False,                                                               # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaInstanceUrl,                                                                # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaCodebaseName,                                                               # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaProjectName,                                                                # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaNotificationEmail,                                                          # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaCodebaseAdmin,                                                              # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaBugAreaPath,                                                                # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
-  [string] $TsaIterationPath,                                                              # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
-  [string] $GuardianLoggerLevel="Standard",                                                # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
-  [string[]] $CrScanAdditionalRunConfigParams,                                             # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
-  [string[]] $PoliCheckAdditionalRunConfigParams                                           # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [string] $GuardianPackageName,                                                                 # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified)
+  [string] $NugetPackageDirectory,                                                               # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified)
+  [string] $GuardianCliLocation,                                                                 # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified
+  [string] $Repository=$env:BUILD_REPOSITORY_NAME,                                               # Required: the name of the repository (e.g. dotnet/arcade)
+  [string] $BranchName=$env:BUILD_SOURCEBRANCH,                                                  # Optional: name of branch or version of gdn settings; defaults to master
+  [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,                                         # Required: the directory where source files are located
+  [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')),  # Required: the directory where build artifacts are located
+  [string] $AzureDevOpsAccessToken,                                                              # Required: access token for dnceng; should be provided via KeyVault
+
+  # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list
+  # format.
+  [object[]] $SourceToolsList,
+  # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools
+  # list format.
+  [object[]] $ArtifactToolsList,
+  # Optional: list of SDL tools to run without automatically specifying a target directory. See
+  # 'configure-sdl-tool.ps1' for tools list format.
+  [object[]] $CustomToolsList,
+
+  [bool] $TsaPublish=$False,                                                                     # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH,                                               # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME,                                        # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs.
+  [string] $BuildNumber=$env:BUILD_BUILDNUMBER,                                                  # Optional: required for TSA publish; defaults to $(Build.BuildNumber)
+  [bool] $UpdateBaseline=$False,                                                                 # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed
+  [bool] $TsaOnboard=$False,                                                                     # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaInstanceUrl,                                                                      # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaCodebaseName,                                                                     # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaProjectName,                                                                      # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaNotificationEmail,                                                                # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaCodebaseAdmin,                                                                    # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaBugAreaPath,                                                                      # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
+  [string] $TsaIterationPath,                                                                    # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
+  [string] $GuardianLoggerLevel='Standard',                                                      # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
+  [string[]] $CrScanAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
+  [string[]] $PoliCheckAdditionalRunConfigParams,                                                # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [bool] $BreakOnFailure=$False                                                                  # Optional: Fail the build if there were errors during the run
 )
 
-$ErrorActionPreference = "Stop"
-Set-StrictMode -Version 2.0
-$LASTEXITCODE = 0
+try {
+  $ErrorActionPreference = 'Stop'
+  Set-StrictMode -Version 2.0
+  $disableConfigureToolsetImport = $true
+  $global:LASTEXITCODE = 0
 
-#Replace repo names to the format of org/repo
-if (!($Repository.contains('/'))) {
-  $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2';
-}
-else{
-  $RepoName = $Repository;
-}
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
 
-if ($GuardianPackageName) {
-  $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path "tools" "guardian.cmd"))
-} else {
-  $guardianCliLocation = $GuardianCliLocation
-}
+  #Replace repo names to the format of org/repo
+  if (!($Repository.contains('/'))) {
+    $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2';
+  }
+  else{
+    $RepoName = $Repository;
+  }
 
-$workingDirectory = (Split-Path $SourceDirectory -Parent)
-$ValidPath = Test-Path $guardianCliLocation
+  if ($GuardianPackageName) {
+    $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path 'tools' 'guardian.cmd'))
+  } else {
+    $guardianCliLocation = $GuardianCliLocation
+  }
 
-if ($ValidPath -eq $False)
-{
-  Write-Host "Invalid Guardian CLI Location."
-  exit 1
-}
+  $workingDirectory = (Split-Path $SourceDirectory -Parent)
+  $ValidPath = Test-Path $guardianCliLocation
 
-& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
-$gdnFolder = Join-Path $workingDirectory ".gdn"
+  if ($ValidPath -eq $False)
+  {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Invalid Guardian CLI Location.'
+    ExitWithExitCode 1
+  }
+
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+  }
+  $gdnFolder = Join-Path $workingDirectory '.gdn'
 
-if ($TsaOnboard) {
-  if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
-    Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-    & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
+  if ($TsaOnboard) {
+    if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+      }
+      if ($LASTEXITCODE -ne 0) {
+        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE."
+        ExitWithExitCode $LASTEXITCODE
+      }
+    } else {
+      Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not onboard to TSA -- not all required values ($TsaCodebaseName, $TsaNotificationEmail, $TsaCodebaseAdmin, $TsaBugAreaPath) were specified.'
+      ExitWithExitCode 1
     }
-  } else {
-    Write-Host "Could not onboard to TSA -- not all required values ($$TsaCodebaseName, $$TsaNotificationEmail, $$TsaCodebaseAdmin, $$TsaBugAreaPath) were specified."
-    exit 1
   }
-}
 
-if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) {
-  & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
-}
-if ($SourceToolsList -and $SourceToolsList.Count -gt 0) {
-  & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
-}
+  # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory.
+  function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) {
+    if ($tools -and $tools.Count -gt 0) {
+      Exec-BlockVerbosely {
+        & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') `
+          -GuardianCliLocation $guardianCliLocation `
+          -WorkingDirectory $workingDirectory `
+          -TargetDirectory $targetDirectory `
+          -GdnFolder $gdnFolder `
+          -ToolsList $tools `
+          -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
+          -GuardianLoggerLevel $GuardianLoggerLevel `
+          -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
+          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+        if ($BreakOnFailure) {
+          Exit-IfNZEC "Sdl"
+        }
+      }
+    }
+  }
 
-if ($UpdateBaseline) {
-  & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Update baseline"
-}
+  # Configure Artifact and Source tools with default Target directories.
+  Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory
+  Configure-ToolsList $SourceToolsList $SourceDirectory
+  # Configure custom tools with no default Target directory.
+  Configure-ToolsList $CustomToolsList $null
 
-if ($TsaPublish) {
-  if ($TsaBranchName -and $BuildNumber) {
-    if (-not $TsaRepositoryName) {
-      $TsaRepositoryName = "$($Repository)-$($BranchName)"
+  # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call.
+  # (If we used "run" multiple times, each run would overwrite data from earlier runs.)
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
+      -GuardianCliLocation $guardianCliLocation `
+      -WorkingDirectory $SourceDirectory `
+      -UpdateBaseline $UpdateBaseline `
+      -GdnFolder $gdnFolder
+  }
+
+  if ($TsaPublish) {
+    if ($TsaBranchName -and $BuildNumber) {
+      if (-not $TsaRepositoryName) {
+        $TsaRepositoryName = "$($Repository)-$($BranchName)"
+      }
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
+      }
+      if ($LASTEXITCODE -ne 0) {
+        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE."
+        ExitWithExitCode $LASTEXITCODE
+      }
+    } else {
+      Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not publish to TSA -- not all required values ($TsaBranchName, $BuildNumber) were specified.'
+      ExitWithExitCode 1
     }
-    Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-    & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
+  }
+
+  if ($BreakOnFailure) {
+    Write-Host "Failing the build in case of breaking results..."
+    Exec-BlockVerbosely {
+      & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
     }
   } else {
-    Write-Host "Could not publish to TSA -- not all required values ($$TsaBranchName, $$BuildNumber) were specified."
-    exit 1
+    Write-Host "Letting the build pass even if there were breaking results..."
   }
 }
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  exit 1
+}
diff --git a/eng/common/sdl/extract-artifact-archives.ps1 b/eng/common/sdl/extract-artifact-archives.ps1
new file mode 100644
index 0000000000000..68da4fbf25717
--- /dev/null
+++ b/eng/common/sdl/extract-artifact-archives.ps1
@@ -0,0 +1,63 @@
+# This script looks for each archive file in a directory and extracts it into the target directory.
+# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**".
+# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip.
+param(
+  # Full path to directory where archives are stored.
+  [Parameter(Mandatory=$true)][string] $InputPath,
+  # Full path to directory to extract archives into. May be the same as $InputPath.
+  [Parameter(Mandatory=$true)][string] $ExtractPath
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  Measure-Command {
+    $jobs = @()
+
+    # Find archive files for non-Windows and Windows builds.
+    $archiveFiles = @(
+      Get-ChildItem (Join-Path $InputPath "*.tar.gz")
+      Get-ChildItem (Join-Path $InputPath "*.zip")
+    )
+
+    foreach ($targzFile in $archiveFiles) {
+      $jobs += Start-Job -ScriptBlock {
+        $file = $using:targzFile
+        $fileName = [System.IO.Path]::GetFileName($file)
+        $extractDir = Join-Path $using:ExtractPath "$fileName.extracted"
+
+        New-Item $extractDir -ItemType Directory -Force | Out-Null
+
+        Write-Host "Extracting '$file' to '$extractDir'..."
+
+        # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early.
+        # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the
+        # error. Save output so it can be stored in the exception string along with context.
+        $output = tar -xf $file -C $extractDir 2>&1
+        # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we
+        # don't have access to the outer scope.
+        if ($LASTEXITCODE -ne 0) {
+          throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'"
+        }
+
+        Write-Host "Extracted to $extractDir"
+      }
+    }
+
+    Receive-Job $jobs -Wait
+  }
+}
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1
index 6e6825013bf57..7f28d9c59ec69 100644
--- a/eng/common/sdl/extract-artifact-packages.ps1
+++ b/eng/common/sdl/extract-artifact-packages.ps1
@@ -3,54 +3,12 @@ param(
   [Parameter(Mandatory=$true)][string] $ExtractPath            # Full path to directory where the packages will be extracted
 )
 
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 
-# `tools.ps1` checks $ci to perform some actions. Since the post-build
-# scripts don't necessarily execute in the same agent that run the
-# build.ps1/sh script this variable isn't automatically set.
-$ci = $true
-. $PSScriptRoot\..\tools.ps1
+$disableConfigureToolsetImport = $true
 
-$ExtractPackage = {
-  param( 
-    [string] $PackagePath                                 # Full path to a NuGet package
-  )
-  
-  if (!(Test-Path $PackagePath)) {
-    Write-PipelineTaskError "Input file does not exist: $PackagePath"
-    ExitWithExitCode 1
-  }
-  
-  $RelevantExtensions = @(".dll", ".exe", ".pdb")
-  Write-Host -NoNewLine "Extracting" ([System.IO.Path]::GetFileName($PackagePath)) "... "
-
-  $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
-  $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
-
-  Add-Type -AssemblyName System.IO.Compression.FileSystem
-
-  [System.IO.Directory]::CreateDirectory($ExtractPath);
-
-  try {
-    $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
-
-    $zip.Entries | 
-    Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} |
-      ForEach-Object {
-          $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name
-
-          [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
-        }
-  }
-  catch {
-  
-  }
-  finally {
-    $zip.Dispose() 
-  }
- }
- function ExtractArtifacts {
+function ExtractArtifacts {
   if (!(Test-Path $InputPath)) {
     Write-Host "Input Path does not exist: $InputPath"
     ExitWithExitCode 0
@@ -67,11 +25,56 @@ $ExtractPackage = {
 }
 
 try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  $ExtractPackage = {
+    param( 
+      [string] $PackagePath                                 # Full path to a NuGet package
+    )
+    
+    if (!(Test-Path $PackagePath)) {
+      Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath"
+      ExitWithExitCode 1
+    }
+    
+    $RelevantExtensions = @('.dll', '.exe', '.pdb')
+    Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...'
+  
+    $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
+    $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
+  
+    Add-Type -AssemblyName System.IO.Compression.FileSystem
+  
+    [System.IO.Directory]::CreateDirectory($ExtractPath);
+  
+    try {
+      $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
+  
+      $zip.Entries | 
+      Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} |
+        ForEach-Object {
+            $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name
+  
+            [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
+          }
+    }
+    catch {
+      Write-Host $_
+      Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+      ExitWithExitCode 1
+    }
+    finally {
+      $zip.Dispose() 
+    }
+  }
   Measure-Command { ExtractArtifacts }
 }
 catch {
   Write-Host $_
-  Write-Host $_.Exception
-  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
   ExitWithExitCode 1
 }
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index c737eb0e71c10..3ac1d92b37006 100644
--- a/eng/common/sdl/init-sdl.ps1
+++ b/eng/common/sdl/init-sdl.ps1
@@ -1,15 +1,22 @@
 Param(
   [string] $GuardianCliLocation,
   [string] $Repository,
-  [string] $BranchName="master",
+  [string] $BranchName='master',
   [string] $WorkingDirectory,
   [string] $AzureDevOpsAccessToken,
-  [string] $GuardianLoggerLevel="Standard"
+  [string] $GuardianLoggerLevel='Standard'
 )
 
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
-$LASTEXITCODE = 0
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+# `tools.ps1` checks $ci to perform some actions. Since the SDL
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+. $PSScriptRoot\..\tools.ps1
 
 # Don't display the console progress UI - it's a huge perf hit
 $ProgressPreference = 'SilentlyContinue'
@@ -17,35 +24,32 @@ $ProgressPreference = 'SilentlyContinue'
 # Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
 $encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
 $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")
-$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1"
+$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0"
 $zipFile = "$WorkingDirectory/gdn.zip"
 
 Add-Type -AssemblyName System.IO.Compression.FileSystem
-$gdnFolder = (Join-Path $WorkingDirectory ".gdn")
-Try
-{
-  # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead
-  Write-Host "Downloading gdn folder from internal config repostiory..."
-  Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile
-  if (Test-Path $gdnFolder) {
-    # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case)
-    Remove-Item -Force -Recurse $gdnFolder
-  }
-  [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory)
-  Write-Host $gdnFolder
-} Catch [System.Net.WebException] {
+$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
+
+try {
   # if the folder does not exist, we'll do a guardian init and push it to the remote repository
-  Write-Host "Initializing Guardian..."
+  Write-Host 'Initializing Guardian...'
   Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel"
   & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel
   if ($LASTEXITCODE -ne 0) {
-    Write-Error "Guardian init failed with exit code $LASTEXITCODE."
+    Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian init failed with exit code $LASTEXITCODE."
+    ExitWithExitCode $LASTEXITCODE
   }
   # We create the mainbaseline so it can be edited later
   Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline"
   & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline
   if ($LASTEXITCODE -ne 0) {
-    Write-Error "Guardian baseline failed with exit code $LASTEXITCODE."
+    Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian baseline failed with exit code $LASTEXITCODE."
+    ExitWithExitCode $LASTEXITCODE
   }
-  & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Initialize gdn folder"
-}
\ No newline at end of file
+  ExitWithExitCode 0
+}
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd721..b7bcfe38caf15 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.110.1"/>
 </packages>
diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1
index 79c707d6d8a03..43f00eae3fb50 100644
--- a/eng/common/sdl/push-gdn.ps1
+++ b/eng/common/sdl/push-gdn.ps1
@@ -8,7 +8,7 @@ Param(
 
 $ErrorActionPreference = "Stop"
 Set-StrictMode -Version 2.0
-$LASTEXITCODE = 0
+$global:LASTEXITCODE = 0
 
 # We create the temp directory where we'll store the sdl-config repository
 $sdlDir = Join-Path $env:TEMP "sdl"
@@ -36,16 +36,26 @@ git add .
 if ($LASTEXITCODE -ne 0) {
   Write-Error "Git add failed with exit code $LASTEXITCODE."
 }
-Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`""
-git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName"
+# check if there are any staged changes (0 = no changes, 1 = changes)
+# if we don't do this and there's nothing to commit `git commit` will return
+# exit code 1 and we will fail
+Write-Host "git diff --cached --exit-code"
+git diff --cached --exit-code
+Write-Host "git diff exit code: $LASTEXITCODE"
 if ($LASTEXITCODE -ne 0) {
-  Write-Error "Git commit failed with exit code $LASTEXITCODE."
+  Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`""
+  git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName"
+  if ($LASTEXITCODE -ne 0) {
+    Write-Error "Git commit failed with exit code $LASTEXITCODE."
+  }
+  Write-Host "git push"
+  git push
+  if ($LASTEXITCODE -ne 0) {
+    Write-Error "Git push failed with exit code $LASTEXITCODE."
+  }
 }
-Write-Host "git push"
-git push
-if ($LASTEXITCODE -ne 0) {
-  Write-Error "Git push failed with exit code $LASTEXITCODE."
+else {
+  Write-Host "Skipping commit and push because there is nothing to commit"
 }
-
 # Return to the original directory
 Pop-Location
\ No newline at end of file
diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1
index 9bc25314ae21d..2eac8c78f103d 100644
--- a/eng/common/sdl/run-sdl.ps1
+++ b/eng/common/sdl/run-sdl.ps1
@@ -1,59 +1,49 @@
 Param(
   [string] $GuardianCliLocation,
   [string] $WorkingDirectory,
-  [string] $TargetDirectory,
   [string] $GdnFolder,
-  [string[]] $ToolsList,
   [string] $UpdateBaseline,
-  [string] $GuardianLoggerLevel="Standard",
-  [string[]] $CrScanAdditionalRunConfigParams,
-  [string[]] $PoliCheckAdditionalRunConfigParams
+  [string] $GuardianLoggerLevel='Standard'
 )
 
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
-$LASTEXITCODE = 0
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
 
-# We store config files in the r directory of .gdn
-Write-Host $ToolsList
-$gdnConfigPath = Join-Path $GdnFolder "r"
-$ValidPath = Test-Path $GuardianCliLocation
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
 
-if ($ValidPath -eq $False)
-{
-  Write-Host "Invalid Guardian CLI Location."
-  exit 1
-}
-
-$configParam = @("--config")
+  # We store config files in the r directory of .gdn
+  $gdnConfigPath = Join-Path $GdnFolder 'r'
+  $ValidPath = Test-Path $GuardianCliLocation
 
-foreach ($tool in $ToolsList) {
-  $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig"
-  Write-Host $tool
-  # We have to manually configure tools that run on source to look at the source directory only
-  if ($tool -eq "credscan") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
-    }
-  }
-  if ($tool -eq "policheck") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
-    }
+  if ($ValidPath -eq $False)
+  {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location."
+    ExitWithExitCode 1
   }
 
-  $configParam+=$gdnConfigFile
-}
+  $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig'
+  Write-Host "Discovered Guardian config files:"
+  $gdnConfigFiles | Out-String | Write-Host
 
-Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam"
-& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam
-if ($LASTEXITCODE -ne 0) {
-  Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
-  exit $LASTEXITCODE
+  Exec-BlockVerbosely {
+    & $GuardianCliLocation run `
+      --working-directory $WorkingDirectory `
+      --baseline mainbaseline `
+      --update-baseline $UpdateBaseline `
+      --logger-level $GuardianLoggerLevel `
+      --config @gdnConfigFiles
+    Exit-IfNZEC "Sdl"
+  }
+}
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
 }
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 34ea015684c77..db9e9299fd386 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -19,7 +19,7 @@ jobs:
   variables:
     - group: DotNet-VSTS-Bot
   pool:
-    name: Hosted VS2017
+    vmImage: windows-2019
   steps:
   - checkout: self
     clean: true
@@ -65,7 +65,7 @@ jobs:
       continueOnError: ${{ parameters.sdlContinueOnError }}
   - ${{ if eq(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
+        -GuardianPackageName Microsoft.Guardian.Cli.0.110.1
         -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
         -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
         ${{ parameters.additionalParameters }}
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index ffda80a197b20..c43c779e3cac0 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -46,6 +46,9 @@ parameters:
   # Optional: enable sending telemetry
   enableTelemetry: false
 
+  # Options: Don't run CG
+  disableComponentGovernance: false
+
   # Optional: define the helix repo for telemetry (example: 'dotnet/arcade')
   helixRepo: ''
 
@@ -140,7 +143,7 @@ jobs:
 
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildSigningPlugin@2
+      - task: MicroBuildSigningPlugin@3
         displayName: Install MicroBuild plugin
         inputs:
           signType: $(_SignType)
@@ -157,6 +160,10 @@ jobs:
   - ${{ each step in parameters.steps }}:
     - ${{ step }}
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+      - task: ComponentGovernanceComponentDetection@0
+        continueOnError: true
+
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
new file mode 100644
index 0000000000000..e804cf3f38dc5
--- /dev/null
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -0,0 +1,83 @@
+parameters:
+  # Optional: dependencies of the job
+  dependsOn: ''
+
+  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
+  pool:
+    vmImage: windows-2019
+
+  CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
+  GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
+
+  SourcesDirectory: $(Build.SourcesDirectory)
+  CreatePr: true
+  AutoCompletePr: false
+  UseCheckedInLocProjectJson: false
+  LanguageSet: VS_Main_Languages
+  LclSource: lclFilesInRepo
+  LclPackageId: ''
+  RepoType: gitHub
+  condition: ''
+
+jobs:
+- job: OneLocBuild
+  
+  dependsOn: ${{ parameters.dependsOn }}
+
+  displayName: OneLocBuild
+
+  pool: ${{ parameters.pool }}
+
+  variables:
+    - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
+    - name: _GenerateLocProjectArguments
+      value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
+        -LanguageSet "${{ parameters.LanguageSet }}"
+        -CreateNeutralXlfs
+    - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
+      - name: _GenerateLocProjectArguments
+        value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
+      
+
+  steps:
+    - task: Powershell@2
+      inputs:
+        filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+        arguments: $(_GenerateLocProjectArguments)
+      displayName: Generate LocProject.json
+      condition: ${{ parameters.condition }}
+
+    - task: OneLocBuild@2
+      displayName: OneLocBuild
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      inputs:
+        locProj: Localize/LocProject.json
+        outDir: $(Build.ArtifactStagingDirectory)
+        lclSource: ${{ parameters.LclSource }}
+        lclPackageId: ${{ parameters.LclPackageId }}
+        isCreatePrSelected: ${{ parameters.CreatePr }}
+        ${{ if eq(parameters.CreatePr, true) }}:
+          isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
+        packageSourceAuth: patAuth
+        patVariable: ${{ parameters.CeapexPat }}
+        ${{ if eq(parameters.RepoType, 'gitHub') }}:
+          repoType: ${{ parameters.RepoType }}
+          gitHubPatVariable: "${{ parameters.GithubPat }}"
+      condition: ${{ parameters.condition }}
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Localization Files
+      inputs:
+        PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
+        PublishLocation: Container
+        ArtifactName: Loc
+      condition: ${{ parameters.condition }}
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish LocProject.json
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
+        PublishLocation: Container
+        ArtifactName: Loc
+      condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 6a2f98c036f61..bd9090cb0b56a 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -16,7 +16,7 @@ parameters:
 
   # Optional: Enable publishing using release pipelines
   enablePublishUsingPipelines: false
-  
+
   graphFileGeneration:
     # Optional: Enable generating the graph files at the end of the build
     enabled: false
@@ -74,7 +74,7 @@ jobs:
         - ${{ each job in parameters.jobs }}:
           - ${{ job.job }}
       pool:
-        vmImage: vs2017-win2016
+        vmImage: windows-2019
       runAsPublic: ${{ parameters.runAsPublic }}
       publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
       enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -87,4 +87,4 @@ jobs:
       dependsOn:
         - Asset_Registry_Publish
       pool:
-        vmImage: vs2017-win2016
+        vmImage: windows-2019
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index 0123cf43b1680..a87a0b2f68728 100644
--- a/eng/common/templates/phases/base.yml
+++ b/eng/common/templates/phases/base.yml
@@ -82,7 +82,7 @@ phases:
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     # Internal only resource, and Microbuild signing shouldn't be applied to PRs.
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildSigningPlugin@2
+      - task: MicroBuildSigningPlugin@3
         displayName: Install MicroBuild plugin
         inputs:
           signType: $(_SignType)
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 079375af4671c..7784d2dc9f3b1 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,6 +1,6 @@
 parameters:
   enableSourceLinkValidation: false
-  enableSigningValidation: false
+  enableSigningValidation: true
   enableSymbolValidation: false
   enableNugetValidation: true
   publishInstallersAndChecksums: false
@@ -391,6 +391,30 @@ stages:
     shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
     symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
 
+- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+  parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    stageName: 'VS16_11_Publishing'
+    channelName: 'VS 16.11'
+    channelId: 1926
+    transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+    shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+    symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+
+- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+  parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    stageName: 'VS17_0_Publishing'
+    channelName: 'VS 17.0'
+    channelId: 1853
+    transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+    shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+    symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+
 - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
   parameters:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 84651fea050ed..9d2899d526060 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -96,7 +96,47 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
-function InitializeDotNetCli([bool]$install) {
+# Take the given block, print it, print what the block probably references from the current set of
+# variables using low-effort string matching, then run the block.
+#
+# This is intended to replace the pattern of manually copy-pasting a command, wrapping it in quotes,
+# and printing it using "Write-Host". The copy-paste method is more readable in build logs, but less
+# maintainable and less reliable. It is easy to make a mistake and modify the command without
+# properly updating the "Write-Host" line, resulting in misleading build logs. The probability of
+# this mistake makes the pattern hard to trust when it shows up in build logs. Finding the bug in
+# existing source code can also be difficult, because the strings are not aligned to each other and
+# the line may be 300+ columns long.
+#
+# By removing the need to maintain two copies of the command, Exec-BlockVerbosely avoids the issues.
+#
+# In Bash (or any posix-like shell), "set -x" prints usable verbose output automatically.
+# "Set-PSDebug" appears to be similar at first glance, but unfortunately, it isn't very useful: it
+# doesn't print any info about the variables being used by the command, which is normally the
+# interesting part to diagnose.
+function Exec-BlockVerbosely([scriptblock] $block) {
+  Write-Host "--- Running script block:"
+  $blockString = $block.ToString().Trim()
+  Write-Host $blockString
+
+  Write-Host "--- List of variables that might be used:"
+  # For each variable x in the environment, check the block for a reference to x via simple "$x" or
+  # "@x" syntax. This doesn't detect other ways to reference variables ("${x}" nor "$variable:x",
+  # among others). It only catches what this function was originally written for: simple
+  # command-line commands.
+  $variableTable = Get-Variable |
+    Where-Object {
+      $blockString.Contains("`$$($_.Name)") -or $blockString.Contains("@$($_.Name)")
+    } |
+    Format-Table -AutoSize -HideTableHeaders -Wrap |
+    Out-String
+  Write-Host $variableTable.Trim()
+
+  Write-Host "--- Executing:"
+  & $block
+  Write-Host "--- Done running script block!"
+}
+
+function InitializeDotNetCli([bool]$install, [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) {
   if (Test-Path variable:global:_DotNetInstallDir) {
     return $global:_DotNetInstallDir
   }
@@ -138,7 +178,7 @@ function InitializeDotNetCli([bool]$install) {
 
     if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
       if ($install) {
-        InstallDotNetSdk $dotnetRoot $dotnetSdkVersion
+        InstallDotNetSdk -dotnetRoot $dotnetRoot -version $dotnetSdkVersion -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
       } else {
         Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'"
         ExitWithExitCode 1
@@ -207,16 +247,16 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   return $installScript
 }
 
-function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") {
-  InstallDotNet $dotnetRoot $version $architecture
+function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey ) {
+  InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
 }
 
-function InstallDotNet([string] $dotnetRoot, 
-  [string] $version, 
-  [string] $architecture = "", 
-  [string] $runtime = "", 
-  [bool] $skipNonVersionedFiles = $false, 
-  [string] $runtimeSourceFeed = "", 
+function InstallDotNet([string] $dotnetRoot,
+  [string] $version,
+  [string] $architecture = "",
+  [string] $runtime = "",
+  [bool] $skipNonVersionedFiles = $false,
+  [string] $runtimeSourceFeed = "",
   [string] $runtimeSourceFeedKey = "") {
 
   $installScript = GetDotNetInstallScript $dotnetRoot
@@ -233,10 +273,9 @@ function InstallDotNet([string] $dotnetRoot,
     & $installScript @installParameters
   }
   catch {
-    Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location."
-
-    # Only the runtime can be installed from a custom [private] location.
-    if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) {
+    # If we fail, retry from a custom (possibly private) location.
+    if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
+      Write-Host "Failed to install dotnet runtime '$runtime' version '$version' from public location; trying specified alternate feed credentials"
       if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
 
       if ($runtimeSourceFeedKey) {
@@ -253,6 +292,7 @@ function InstallDotNet([string] $dotnetRoot,
         ExitWithExitCode 1
       }
     } else {
+      Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' version '$version' from public location."
       ExitWithExitCode 1
     }
   }
@@ -323,7 +363,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
-  return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
+
+  $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
+  $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
+  if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
+  } else {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
+  }
+
+  return $global:_MSBuildExe
 }
 
 function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -439,7 +488,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   return $vsInfo[0]
 }
 
-function InitializeBuildTool() {
+function InitializeBuildTool([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) {
   if (Test-Path variable:global:_BuildTool) {
     return $global:_BuildTool
   }
@@ -451,7 +500,7 @@ function InitializeBuildTool() {
   # Initialize dotnet cli if listed in 'tools'
   $dotnetRoot = $null
   if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") {
-    $dotnetRoot = InitializeDotNetCli -install:$restore
+    $dotnetRoot = InitializeDotNetCli -install:$restore -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
   }
 
   if ($msbuildEngine -eq "dotnet") {
@@ -523,7 +572,8 @@ function InitializeNativeTools() {
   }
 }
 
-function InitializeToolset() {
+function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
+{
   if (Test-Path variable:global:_ToolsetBuildProj) {
     return $global:_ToolsetBuildProj
   }
@@ -545,7 +595,7 @@ function InitializeToolset() {
     ExitWithExitCode 1
   }
 
-  $buildTool = InitializeBuildTool
+  $buildTool = InitializeBuildTool -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
 
   $proj = Join-Path $ToolsetDir "restore.proj"
   $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }
@@ -569,6 +619,17 @@ function ExitWithExitCode([int] $exitCode) {
   exit $exitCode
 }
 
+# Check if $LASTEXITCODE is a nonzero exit code (NZEC). If so, print a Azure Pipeline error for
+# diagnostics, then exit the script with the $LASTEXITCODE.
+function Exit-IfNZEC([string] $category = "General") {
+  Write-Host "Exit code $LASTEXITCODE"
+  if ($LASTEXITCODE -ne 0) {
+    $message = "Last command failed with exit code $LASTEXITCODE."
+    Write-PipelineTelemetryError -Force -Category $category -Message $message
+    ExitWithExitCode $LASTEXITCODE
+  }
+}
+
 function Stop-Processes() {
   Write-Host "Killing running build processes..."
   foreach ($processName in $processesToStopOnExit) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index acbb0c5b3ffd7..c50849b01d0ef 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -28,6 +28,10 @@ prepare_machine=${prepare_machine:-false}
 # True to restore toolsets and dependencies.
 restore=${restore:-true}
 
+# Allows restoring .NET Core Runtimes and SDKs from alternative feeds
+runtimeSourceFeed=${runtimeSourceFeed:-""}
+runtimeSourceFeedKey=${runtimeSourceFeedKey:-""}
+
 # Adjusts msbuild verbosity level.
 verbosity=${verbosity:-'minimal'}
 
@@ -95,6 +99,12 @@ function InitializeDotNetCli {
   fi
 
   local install=$1
+  local runtimeSourceFeedArg=""
+  local runtimeSourceFeedKeyArg=""
+  if [[ $# == 3 ]]; then
+    runtimeSourceFeedArg=$2
+    runtimeSourceFeedKeyArg=$3
+  fi
 
   # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
   export DOTNET_MULTILEVEL_LOOKUP=0
@@ -140,7 +150,7 @@ function InitializeDotNetCli {
 
     if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
       if [[ "$install" == true ]]; then
-        InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version"
+        InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" "unset" $runtimeSourceFeedArg $runtimeSourceFeedKeyArg
       else
         Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'"
         ExitWithExitCode 1
@@ -171,26 +181,26 @@ function InitializeDotNetCli {
 function InstallDotNetSdk {
   local root=$1
   local version=$2
-  local architecture=""
+  local architecture="unset"
   if [[ $# == 3 ]]; then
     architecture=$3
   fi
-  InstallDotNet "$root" "$version" $architecture
+  InstallDotNet "$root" "$version" $architecture "not-a-runtime" 0 $runtimeSourceFeed $runtimeSourceFeedKey
 }
 
 function InstallDotNet {
   local root=$1
   local version=$2
- 
+
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
 
   local archArg=''
-  if [[ -n "${3:-}" ]]; then
+  if [[ -n "${3:-}" && "$3" != "unset"  ]]; then
     archArg="--architecture $3"
   fi
   local runtimeArg=''
-  if [[ -n "${4:-}" ]]; then
+  if [[ -n "${4:-}" && "$4" != "not-a-runtime" ]]; then
     runtimeArg="--runtime $4"
   fi
 
@@ -200,40 +210,61 @@ function InstallDotNet {
   fi
   bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
     local exit_code=$?
-    Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
 
-    if [[ -n "$runtimeArg" ]]; then
-      local runtimeSourceFeed=''
-      if [[ -n "${6:-}" ]]; then
-        runtimeSourceFeed="--azure-feed $6"
-      fi
+    local runtimeSourceFeed=''
+    if [[ -n "${6:-}" ]]; then
+      runtimeSourceFeed="--azure-feed $6"
+    fi
 
-      local runtimeSourceFeedKey=''
-      if [[ -n "${7:-}" ]]; then
-        # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
-        # '-d'. To work around this, do a simple detection and switch the parameter
-        # accordingly.
-        decodeArg="--decode"
-        if base64 --help 2>&1 | grep -q "BusyBox"; then
-            decodeArg="-d"
-        fi
-        decodedFeedKey=`echo $7 | base64 $decodeArg`
-        runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+    local runtimeSourceFeedKey=''
+    if [[ -n "${7:-}" ]]; then
+      # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
+      # '-d'. To work around this, do a simple detection and switch the parameter
+      # accordingly.
+      decodeArg="--decode"
+      if base64 --help 2>&1 | grep -q "BusyBox"; then
+          decodeArg="-d"
       fi
+      decodedFeedKey=`echo $7 | base64 $decodeArg`
+      runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+    else
+      Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
+    fi
 
-      if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
-        bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
-          local exit_code=$?
-          Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
-          ExitWithExitCode $exit_code
-        }
-      else
+    if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
+      bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
+        local exit_code=$?
+        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
         ExitWithExitCode $exit_code
-      fi
+      }
+    else
+      ExitWithExitCode $exit_code
     fi
   }
 }
 
+function with_retries {
+  local maxRetries=5
+  local retries=1
+  echo "Trying to run '$@' for maximum of $maxRetries attempts."
+  while [[ $((retries++)) -le $maxRetries ]]; do
+    "$@"
+
+    if [[ $? == 0 ]]; then
+      echo "Ran '$@' successfully."
+      return 0
+    fi
+
+    timeout=$((3**$retries-1))
+    echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
+    sleep $timeout
+  done
+
+  echo "Failed to execute '$@' for $maxRetries times." 1>&2
+
+  return 1
+}
+
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
@@ -246,13 +277,21 @@ function GetDotNetInstallScript {
 
     # Use curl if available, otherwise use wget
     if command -v curl > /dev/null; then
+      # first, try directly, if this fails we will retry with verbose logging
       curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
-        local exit_code=$?
-        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
-        ExitWithExitCode $exit_code
+        if command -v openssl &> /dev/null; then
+          echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
+          echo | openssl s_client -showcerts -servername dotnet.microsoft.com  -connect dotnet.microsoft.com:443
+        fi
+        echo "Will now retry the same URL with verbose logging."
+        with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
+          local exit_code=$?
+          Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
+          ExitWithExitCode $exit_code
+        }
       }
-    else 
-      wget -q -O "$install_script" "$install_script_url" || {
+    else
+      with_retries wget -v -O "$install_script" "$install_script_url" || {
         local exit_code=$?
         Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
         ExitWithExitCode $exit_code
@@ -268,7 +307,7 @@ function InitializeBuildTool {
     return
   fi
   
-  InitializeDotNetCli $restore
+  InitializeDotNetCli $restore $runtimeSourceFeed $runtimeSourceFeedKey
 
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"  
diff --git a/global.json b/global.json
index 8714b544b645a..75d74e8c793d8 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "xcopy-msbuild": "16.8.0-preview2.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22212.4",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22212.4"
   }
 }

From e469b21ca2d67631bc57b7679c0c6c3a52126364 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 09:54:41 -0700
Subject: [PATCH 134/413] Backport build yml and publishing script changes

---
 azure-pipelines-official.yml | 286 +++++++++++++++++++----------------
 eng/publish-assets.ps1       |  29 +---
 2 files changed, 164 insertions(+), 151 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 9132bab7a202c..8bc76383f5a1f 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -14,14 +14,25 @@ resources:
 - repo: self
   clean: true
 
-# Variables defined in yml cannot be overridden at queue time instead overrideable variables must be defined in the web gui.
-# Commenting out until AzDO supports something like the runtime parameters outlined here: https://github.com/Microsoft/azure-pipelines-yaml/pull/129
-#variables:
-#  SignType: real
-#  SkipTests: false
-#  SkipApplyOptimizationData: false
-#  IbcDrop: 'default'
-#  PRNumber: 'default'
+parameters:
+- name: IbcDrop
+  type: string
+  default: default
+
+- name: SignType
+  default: real
+  type: string
+  values:
+  - real
+  - test
+
+- name: SkipApplyOptimizationData
+  type: boolean
+  default: false
+
+- name: SkipTests
+  type: boolean
+  default: true
 
 # The variables `_DotNetArtifactsCategory` and `_DotNetValidationArtifactsCategory` are required for proper publishing of build artifacts. See https://github.com/dotnet/roslyn/pull/38259
 variables:
@@ -32,65 +43,50 @@ variables:
   - group: DotNet-Roslyn-SDLValidation-Params
 
   # To retrieve OptProf data we need to authenticate to the VS drop storage.
-  # If the pipeline is running in DevDiv, the account has access to the VS drop storage.
-  # Get $AccessToken-dotnet-build-bot-public-repo from DotNet-GitHub-Versions-Repo-Write
-  - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-    - group: DotNet-GitHub-Versions-Repo-Write
-    - name: _DevDivDropAccessToken
-      value: $(System.AccessToken)
-  # For publishing from devdiv pipeline to devdiv feed, the API key can 
-  # be any non-empty string as authentication is done in the pipeline. 
-    - name: _DevDivNugetFeedAccessToken
-      value: "AzureArtifacts"
-  # If the pipeline is running in dnceng:
   # Get access token with $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw from DotNet-VSTS-Infra-Access
   # Get $dotnetfeed-storage-access-key-1 from DotNet-Blob-Feed
   # Get $microsoft-symbol-server-pat and $symweb-symbol-server-pat from DotNet-Symbol-Server-Pats
   # Get $AccessToken-dotnet-build-bot-public-repo from DotNet-Versions-Publish
-  # Get $dn-bot-devdiv-packaging-rw from DotNet-DevDiv-Insertion-Workflow-Variables
-  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-    - group: DotNet-Blob-Feed
-    - group: DotNet-Symbol-Server-Pats
-    - group: DotNet-Versions-Publish
-    - group: DotNet-VSTS-Infra-Access
-    - group: DotNet-DevDiv-Insertion-Workflow-Variables
-    - name: _DevDivDropAccessToken
-      value: $(dn-bot-devdiv-drop-rw-code-rw)
-    - name: _DevDivNugetFeedAccessToken
-      value: $(dn-bot-devdiv-packaging-rw)
+  - group: DotNet-Blob-Feed
+  - group: DotNet-Symbol-Server-Pats
+  - group: DotNet-Versions-Publish
+  - group: DotNet-VSTS-Infra-Access
+  - group: DotNet-DevDiv-Insertion-Workflow-Variables
+  - name: _DevDivDropAccessToken
+    value: $(dn-bot-devdiv-drop-rw-code-rw)
+  - group: ManagedLanguageSecrets
+
+  - name: BuildConfiguration
+    value: release
+  - name: Roslyn.GitHubEmail
+    value: dotnet-build-bot@microsoft.com
+  - name: Roslyn.GitHubToken
+    value: $(AccessToken-dotnet-build-bot-public-repo)
+  - name: Roslyn.GitHubUserName
+    value: dotnet-build-bot
+
+  - name: Insertion.InsertToolset
+    value: true
+  - name: Insertion.CreateDraftPR
+    value: true
+  - name: Insertion.TitlePrefix
+    value: '[Auto Insertion]'
+  - name: Insertion.TitleSuffix
+    value: '[Skip-SymbolCheck]'
 
 stages:
 - stage: build
   displayName: Build and Test
+  pool:
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2017
 
   jobs:
   - job: OfficialBuild
     displayName: Official Build
     timeoutInMinutes: 360
-    # Conditionally set build pool so we can share this YAML when building with different pipeline (devdiv vs dnceng) 
-    pool:      
-      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-        name: VSEng-MicroBuildVS2017
-        demands: 
-        - msbuild
-        - visualstudio
-        - DotNetFramework
-      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
-
-    steps:        
-    # Make sure our two pipelines generate builds with distinct build numbers to avoid confliction.
-    # i.e. DevDiv builds will have even rev# whereas dnceng builds will be odd.
-    - task: PowerShell@2
-      displayName: Update BuildNumber
-      inputs:
-        filePath: 'eng\update-build-number.ps1'
-        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-          arguments: '-buildNumber $(Build.BuildNumber) -oddOrEven even'
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          arguments: '-buildNumber $(Build.BuildNumber) -oddOrEven odd'
 
+    steps:
     - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
       displayName: Setting SourceBranchName variable
       condition: succeeded()
@@ -100,41 +96,22 @@ stages:
       inputs:
         type: 'Build'
         tags: 'OfficialBuild'
-      condition: and(succeeded(), endsWith(variables['SourceBranchName'], '-vs-deps'), eq(variables['PRNumber'], 'default'))
-          
-    - task: tagBuildOrRelease@0
-      displayName: Tag PR validation build
-      inputs:
-        type: 'Build'
-        tags: |
-          PRValidationBuild
-          PRNumber:$(PRNumber)
-      condition: and(succeeded(), ne(variables['PRNumber'], 'default'))
-
-    - task: PowerShell@2
-      displayName: Setup branch for insertion validation
-      inputs:
-        filePath: 'eng\setup-pr-validation.ps1'
-        arguments: '-sourceBranchName $(SourceBranchName) -prNumber $(PRNumber)'
-      condition: and(succeeded(), ne(variables['PRNumber'], 'default'))
+      condition: and(succeeded(), endsWith(variables['SourceBranchName'], '-vs-deps'))
 
     - task: tagBuildOrRelease@0
-      displayName: Tag master validation build
+      displayName: Tag main validation build
       inputs:
         type: 'Build'
         tags: |
-          MasterValidationBuild
-      condition: and(succeeded(), eq(variables['SourceBranchName'], 'master'))
+          MainValidationBuild
+      condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))
 
     - task: PowerShell@2
-      displayName: Merge master-vs-deps into source branch
+      displayName: Merge main-vs-deps into source branch
       inputs:
-        filePath: 'scripts\merge-vs-deps.ps1'        
-        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-          arguments: '-userName "$(Build.RequestedFor)" -userEmail $(Build.RequestedForEmail)'
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          arguments: '-userName "$(Build.RequestedFor)" -userEmail $(Build.RequestedForEmail) -accessToken $(dn-bot-dnceng-build-rw-code-rw)'
-      condition: and(succeeded(), eq(variables['SourceBranchName'], 'master'))
+        filePath: 'scripts\merge-vs-deps.ps1'
+        arguments: '-accessToken $(dn-bot-dnceng-build-rw-code-rw)'
+      condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))
 
     - powershell: Write-Host "##vso[task.setvariable variable=VisualStudio.DropName]Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(Build.BuildNumber)"
       displayName: Setting VisualStudio.DropName variable
@@ -146,11 +123,17 @@ stages:
     # Authenticate with service connections to be able to publish packages to external nuget feeds.
     - task: NuGetAuthenticate@0
       inputs:
-        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-          nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk, devdiv/engineering
+        nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk, devdiv/engineering
 
+    # Needed because the build fails the NuGet Tools restore without it
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core sdk'
+      inputs:
+        packageType: sdk
+        useGlobalJson: true
+        workingDirectory: '$(Build.SourcesDirectory)'
+
+    # Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
     - task: NuGetCommand@2
       displayName: Restore internal tools
       inputs:
@@ -164,22 +147,20 @@ stages:
       inputs:
         signType: $(SignType)
         zipSources: false
-        # If running in dnceng, we need to use a feed different from default
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+        feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
       condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
 
     - task: PowerShell@2
       displayName: Build
       inputs:
         filePath: eng/build.ps1
-        arguments: -ci 
+        arguments: -ci
                    -restore
                    -build
                    -pack
                    -sign
                    -publish
-                   -binaryLog 
+                   -binaryLog
                    -configuration $(BuildConfiguration)
                    -officialBuildId $(Build.BuildNumber)
                    -officialSkipTests $(SkipTests)
@@ -204,8 +185,8 @@ stages:
       displayName: Publish Assets
       inputs:
         filePath: 'eng\publish-assets.ps1'
-        arguments: '-configuration $(BuildConfiguration) -branchName "$(SourceBranchName)" -gitHubUserName $(Roslyn.GitHubUserName) -gitHubToken $(AccessToken-dotnet-build-bot-public-repo) -gitHubEmail $(Roslyn.GitHubEmail) -devdivApiKey $(_DevDivNugetFeedAccessToken)'
-      condition: and(succeeded(), eq(variables['PRNumber'], 'default'))
+        arguments: '-configuration $(BuildConfiguration) -branchName "$(SourceBranchName)"'
+      condition: succeeded()
 
     # Publish OptProf configuration files
     # The env variable is required to enable cross account access using PAT (dnceng -> devdiv)
@@ -214,7 +195,7 @@ stages:
         ARTIFACTSERVICES_DROP_PAT: $(_DevDivDropAccessToken)
       inputs:
         dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
-        buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(SourceBranchName)/$(Build.BuildNumber)'
+        buildNumber: 'ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(Build.BuildNumber)'
         sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
         toLowerCase: false
         usePat: false
@@ -270,17 +251,13 @@ stages:
 
     # Publish insertion packages to CoreXT store.
     - task: NuGetCommand@2
-      displayName: Publish CoreXT Packages 
+      displayName: Publish CoreXT Packages
       inputs:
         command: push
         packagesToPush: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\DevDivPackages\**\*.nupkg'
         allowPackageConflicts: true
-        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-          feedsToUse: config
-          publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010'
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          nuGetFeedType: external
-          publishFeedCredentials: 'DevDiv - VS package feed'
+        nuGetFeedType: external
+        publishFeedCredentials: 'DevDiv - VS package feed'
       condition: succeeded()
 
     # Publish an artifact that the RoslynInsertionTool is able to find by its name.
@@ -291,7 +268,7 @@ stages:
         ArtifactName: 'VSSetup'
       condition: succeeded()
 
-    # Publish our NuPkgs as an artifact. The name of this artifact must be PackageArtifacts as the 
+    # Publish our NuPkgs as an artifact. The name of this artifact must be PackageArtifacts as the
     # arcade templates depend on the name.
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifact Packages
@@ -316,45 +293,100 @@ stages:
   - template: /eng/common/templates/job/publish-build-assets.yml
     parameters:
       publishUsingPipelines: true
-      dependsOn:	
+      dependsOn:
         - OfficialBuild
-      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-        queue:
-          name: Hosted VS2017
-      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        pool:
-          vmImage: vs2017-win2016
-
-# We need to skip post-build stages for PR validation build, but it can only be identified by 
-# the runtime variable 'PRNumber', thus this dummy stage. Also the dummy job is required
-# otherwise AzDO would just repeat jobs from previous stage.
-- stage: SetValidateDependency
-  displayName: Setup the dependency for post-build stages
-  condition: and(succeeded(), eq(variables['PRNumber'], 'default'))
+      pool:
+        vmImage: windows-2019
+
+- stage: insert
+  dependsOn:
+  - build
+  displayName: Insert to VS
+
   jobs:
-  - job: Log
-    displayName: Log
+  - job: insert
+    displayName: Insert to VS
+    pool:
+      vmImage: windows-2019
     steps:
-    - powershell: Write-Host "Setup the dependency for post-build stages."
-      displayName: Log
+    - checkout: none
+
+    - task: NuGetCommand@2
+      displayName: 'Install RIT from Azure Artifacts'
+      inputs:
+        command: custom
+        arguments: 'install RoslynTools.VisualStudioInsertionTool -PreRelease -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
+
+    - powershell: |
+        $response = Invoke-RestMethod -Headers @{Authorization = "Bearer $(System.AccessToken)"} "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
+        $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
+        $branchData = $response.branches.$branchName
+        if (!$branchData)
+        {
+          Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main'."
+          $branchData = $response.branches.main
+        }
+        if ($null -ne $branchData.insertionCreateDraftPR)
+        {
+          Write-Host "##vso[task.setvariable variable=Insertion.CreateDraftPR]$($branchData.insertionCreateDraftPR)"
+        }
+        if ($null -ne $branchData.insertionTitlePrefix)
+        {
+          Write-Host "##vso[task.setvariable variable=Insertion.TitlePrefix]$($branchData.insertionTitlePrefix)"
+        }
+        if ($null -ne $branchData.insertToolset)
+        {
+          Write-Host "##vso[task.setvariable variable=Insertion.InsertToolset]$($branchData.insertToolset)"
+        }
+        Write-Host "##vso[task.setvariable variable=Insertion.AutoComplete]$(-not $branchData.insertionCreateDraftPR)"
+        Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"
+        Write-Host "##vso[task.setvariable variable=VSBranchName]$($branchData.vsBranch)"
+      displayName: Set Insertion Variables
+    - powershell: |
+        mv RoslynTools.VisualStudioInsertionTool.* RIT
+        .\RIT\tools\net46\OneOffInsertion.ps1 `
+          -autoComplete "$(Insertion.AutoComplete)" `
+          -buildQueueName "$(Build.DefinitionName)" `
+          -cherryPick "(default)" `
+          -clientId "$(ClientId)" `
+          -clientSecret "$(ClientSecret)" `
+          -componentAzdoUri "$(System.CollectionUri)" `
+          -componentBranchName "$(ComponentBranchName)" `
+          -componentGitHubRepoName "dotnet/roslyn" `
+          -componentName "Roslyn" `
+          -componentProjectName "internal" `
+          -createDraftPR "$(Insertion.CreateDraftPR)" `
+          -defaultValueSentinel "(default)" `
+          -dropPath "(default)" `
+          -insertCore "(default)" `
+          -insertDevDiv "(default)" `
+          -insertionCount "1" `
+          -insertToolset "$(Insertion.InsertToolset)" `
+          -titlePrefix "$(Insertion.TitlePrefix)" `
+          -titleSuffix "$(Insertion.TitleSuffix)" `
+          -queueValidation "true" `
+          -requiredValueSentinel "REQUIRED" `
+          -reviewerGUID "6c25b447-1d90-4840-8fde-d8b22cb8733e" `
+          -specificBuild "$(Build.BuildNumber)" `
+          -updateAssemblyVersions "(default)" `
+          -updateCoreXTLibraries "(default)" `
+          -visualStudioBranchName "$(VSBranchName)" `
+          -writePullRequest "prid.txt" `
+      displayName: 'Run OneOffInsertion.ps1'
+    - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'
+      displayName: 'Report PR URL'
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml
     parameters:
+      publishingInfraVersion: 3
       # Symbol validation is not entirely reliable as of yet, so should be turned off until
       # https://github.com/dotnet/arcade/issues/2871 is resolved.
       enableSymbolValidation: false
       enableSourceLinkValidation: false
-      # It's important that post-build stages are depends on 'SetValidateDependency' stage instead of 'build', 
-      # since we don't want to publish validation build. 
-      validateDependsOn:
-        - SetValidateDependency
-      dependsOn:
-        - SetValidateDependency
       # Enable SDL validation, passing through values from the 'DotNet-Roslyn-SDLValidation-Params' group.
       SDLValidationParameters:
-        # Disable SDL because of https://github.com/dotnet/core-eng/issues/11902
-        enable: false
+        enable: true
         params: >-
           -SourceToolsList @("policheck","credscan")
           -TsaInstanceURL $(_TsaInstanceURL)
@@ -365,4 +397,4 @@ stages:
           -TsaIterationPath $(_TsaIterationPath)
           -TsaRepositoryName $(_TsaRepositoryName)
           -TsaCodebaseName $(_TsaCodebaseName)
-          -TsaPublish $True
+          -TsaPublish $True
\ No newline at end of file
diff --git a/eng/publish-assets.ps1 b/eng/publish-assets.ps1
index 95de84e24fd81..f75a06492318b 100644
--- a/eng/publish-assets.ps1
+++ b/eng/publish-assets.ps1
@@ -15,11 +15,7 @@ Param(
   [switch]$test,
 
   # Credentials
-  [string]$gitHubUserName = "",
-  [string]$gitHubToken = "",
-  [string]$gitHubEmail = "",
-  [string]$nugetApiKey = "",
-  [string]$devdivApiKey = ""
+  [string]$nugetApiKey = ""
 )
 Set-StrictMode -version 2.0
 $ErrorActionPreference="Stop"
@@ -29,7 +25,8 @@ function Get-PublishKey([string]$uploadUrl) {
   $url = New-Object Uri $uploadUrl
   switch ($url.Host) {
     "api.nuget.org" { return $nugetApiKey }
-    "pkgs.dev.azure.com" { return $devdivApiKey}
+    # For publishing to azure, the API key can be any non-empty string as authentication is done in the pipeline.
+    "pkgs.dev.azure.com" { return "AzureArtifacts"}
     default { throw "Cannot determine publish key for $uploadUrl" }
   }
 }
@@ -64,7 +61,7 @@ function Publish-Nuget($publishData, [string]$packageDir) {
       }
 
       # Lookup the feed name from the packages map using the package name without the version or extension.
-      $nupkgWithoutVersion = $nupkg -replace '(\.\d){3}-.*.nupkg', ''
+      $nupkgWithoutVersion = $nupkg -replace '(\.\d+){3}-.*.nupkg', ''
       if (-not (Get-Member -InputObject $packagesData -Name $nupkgWithoutVersion)) {
         throw "$nupkg has no configured feed (looked for $nupkgWithoutVersion)"
       }
@@ -95,15 +92,6 @@ function Publish-Nuget($publishData, [string]$packageDir) {
   }
 }
 
-function Publish-Channel([string]$packageDir, [string]$name) {
-  $publish = GetProjectOutputBinary "RoslynPublish.exe"
-  $args = "-nugetDir `"$packageDir`" -channel $name -gu $gitHubUserName -gt $gitHubToken -ge $githubEmail"
-  Write-Host "Publishing $packageDir to channel $name"
-  if (-not $test) {
-    Exec-Console $publish $args
-  }
-}
-
 # Do basic verification on the values provided in the publish configuration
 function Test-Entry($publishData, [switch]$isBranch) {
   if ($isBranch) {
@@ -124,13 +112,6 @@ function Publish-Entry($publishData, [switch]$isBranch) {
     Publish-NuGet $publishData (Join-Path $PackagesDir $nugetKind)
   }
 
-  # Finally get our channels uploaded to versions
-  foreach ($channel in $publishData.channels) {
-    foreach ($nugetKind in $publishData.nugetKind) {
-      Publish-Channel (Join-Path $PackagesDir $nugetKind) $channel
-    }
-  }
-
   exit 0
 }
 
@@ -177,4 +158,4 @@ catch {
   Write-Host $_.Exception
   Write-Host $_.ScriptStackTrace
   exit 1
-}
+}
\ No newline at end of file

From 07790f7b2f2a476e2b28f57f4761a734b30aa6d2 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 10:15:30 -0700
Subject: [PATCH 135/413] Add v3 publishing props

---
 eng/Publishing.props | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 eng/Publishing.props

diff --git a/eng/Publishing.props b/eng/Publishing.props
new file mode 100644
index 0000000000000..797de4ea1decd
--- /dev/null
+++ b/eng/Publishing.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+   <PropertyGroup>
+      <PublishingVersion>3</PublishingVersion>
+   </PropertyGroup>
+</Project>
\ No newline at end of file

From e5f9f5be962bf2342d78bf2a60f938958bcb7c87 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 13:24:25 -0700
Subject: [PATCH 136/413] Update MSBuild workspace test global.json

---
 src/Workspaces/MSBuildTest/Resources/global.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Workspaces/MSBuildTest/Resources/global.json b/src/Workspaces/MSBuildTest/Resources/global.json
index c3c7f97f6e2a8..1d1024a8816b9 100644
--- a/src/Workspaces/MSBuildTest/Resources/global.json
+++ b/src/Workspaces/MSBuildTest/Resources/global.json
@@ -1,4 +1,3 @@
 {
-    // this file is empty to ensure we get the "standard" behavior as if
-    // no global.json was specified in the first place
+    "comment": "this file is empty to ensure we get the 'standard' behavior as if no global.json was specified in the first place"
 }

From 3552bb96c94ff827e2f054b17a33cfec565d0543 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 14:43:49 -0700
Subject: [PATCH 137/413] Use insert.yml for vs insertions

---
 azure-pipelines-official.yml |  74 +++-----------
 eng/pipelines/insert.yml     | 185 +++++++++++++++++++++++++++++++++++
 2 files changed, 196 insertions(+), 63 deletions(-)
 create mode 100644 eng/pipelines/insert.yml

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 8bc76383f5a1f..bcaa70eec2903 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -309,72 +309,20 @@ stages:
     pool:
       vmImage: windows-2019
     steps:
-    - checkout: none
-
-    - task: NuGetCommand@2
-      displayName: 'Install RIT from Azure Artifacts'
-      inputs:
-        command: custom
-        arguments: 'install RoslynTools.VisualStudioInsertionTool -PreRelease -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-
     - powershell: |
-        $response = Invoke-RestMethod -Headers @{Authorization = "Bearer $(System.AccessToken)"} "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
         $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
-        $branchData = $response.branches.$branchName
-        if (!$branchData)
-        {
-          Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main'."
-          $branchData = $response.branches.main
-        }
-        if ($null -ne $branchData.insertionCreateDraftPR)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.CreateDraftPR]$($branchData.insertionCreateDraftPR)"
-        }
-        if ($null -ne $branchData.insertionTitlePrefix)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.TitlePrefix]$($branchData.insertionTitlePrefix)"
-        }
-        if ($null -ne $branchData.insertToolset)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.InsertToolset]$($branchData.insertToolset)"
-        }
-        Write-Host "##vso[task.setvariable variable=Insertion.AutoComplete]$(-not $branchData.insertionCreateDraftPR)"
         Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"
-        Write-Host "##vso[task.setvariable variable=VSBranchName]$($branchData.vsBranch)"
-      displayName: Set Insertion Variables
-    - powershell: |
-        mv RoslynTools.VisualStudioInsertionTool.* RIT
-        .\RIT\tools\net46\OneOffInsertion.ps1 `
-          -autoComplete "$(Insertion.AutoComplete)" `
-          -buildQueueName "$(Build.DefinitionName)" `
-          -cherryPick "(default)" `
-          -clientId "$(ClientId)" `
-          -clientSecret "$(ClientSecret)" `
-          -componentAzdoUri "$(System.CollectionUri)" `
-          -componentBranchName "$(ComponentBranchName)" `
-          -componentGitHubRepoName "dotnet/roslyn" `
-          -componentName "Roslyn" `
-          -componentProjectName "internal" `
-          -createDraftPR "$(Insertion.CreateDraftPR)" `
-          -defaultValueSentinel "(default)" `
-          -dropPath "(default)" `
-          -insertCore "(default)" `
-          -insertDevDiv "(default)" `
-          -insertionCount "1" `
-          -insertToolset "$(Insertion.InsertToolset)" `
-          -titlePrefix "$(Insertion.TitlePrefix)" `
-          -titleSuffix "$(Insertion.TitleSuffix)" `
-          -queueValidation "true" `
-          -requiredValueSentinel "REQUIRED" `
-          -reviewerGUID "6c25b447-1d90-4840-8fde-d8b22cb8733e" `
-          -specificBuild "$(Build.BuildNumber)" `
-          -updateAssemblyVersions "(default)" `
-          -updateCoreXTLibraries "(default)" `
-          -visualStudioBranchName "$(VSBranchName)" `
-          -writePullRequest "prid.txt" `
-      displayName: 'Run OneOffInsertion.ps1'
-    - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'
-      displayName: 'Report PR URL'
+      displayName: Get Branch Name
+    - template: eng/pipelines/insert.yml
+      parameters:
+        buildUserName: "dn-bot@microsoft.com"
+        buildPassword: $(dn-bot-devdiv-build-e-code-full-release-e-packaging-r)
+        componentUserName: "dn-bot@microsoft.com"
+        componentPassword: $(dn-bot-dnceng-build-e-code-full-release-e-packaging-r)
+        componentBuildProjectName: internal
+        sourceBranch: "$(ComponentBranchName)"
+        publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
+        publishDataAccessToken: "$(System.AccessToken)"
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml
diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
new file mode 100644
index 0000000000000..df80fe49a15a6
--- /dev/null
+++ b/eng/pipelines/insert.yml
@@ -0,0 +1,185 @@
+parameters:
+  # These are actually booleans but must be defined as string.
+  # Parameters are evaluated at compile time, but all variables are strings at compile time.
+  # So in order to pass a parameter that comes from a variable these must be typed as string.
+  - name: createDraftPR
+    type: string
+    default: ''
+  - name: autoComplete
+    type: string
+    default: ''
+  - name: insertToolset
+    type: string
+    default: ''
+
+  - name: buildUserName
+    type: string
+  - name: buildPassword
+    type: string
+  - name: componentUserName
+    type: string
+  - name: componentPassword
+    type: string
+  
+  - name: publishDataURI
+    type: string
+  - name: publishDataAccessToken
+    type: string
+    default: ''
+
+  - name: vsBranchName
+    type: string
+    default: ''
+  - name: componentBuildProjectName
+    type: string
+    default: ''
+  - name: titlePrefix
+    type: string
+    default: ''
+
+  - name: sourceBranch
+    type: string
+
+steps:
+  - checkout: none
+
+  - task: NuGetCommand@2
+    displayName: 'Install RIT from Azure Artifacts'
+    inputs:
+      command: custom
+      arguments: 'install RoslynTools.VisualStudioInsertionTool -PreRelease -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
+
+  - powershell: |
+      $authorization = if ("" -ne $Env:PublishDataAccessToken) { "Bearer $Env:PublishDataAccessToken" } else { "" }
+      $response = Invoke-RestMethod -Headers @{Authorization = $authorization} "${{ parameters.publishDataURI }}"
+      $branchName = "${{ parameters.sourceBranch }}"
+      $branchData = $response.branches.$branchName
+      if (!$branchData)
+      {
+        Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main'."
+        $branchData = $response.branches.main
+      }
+
+      # Set our template variables to reasonable defaults
+      Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$($true)"
+      Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$($false)"
+      Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.TitleSuffix]$('[Skip-SymbolCheck]')"
+      Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($true)"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$('')"
+
+      Write-Host "##vso[task.setvariable variable=Template.ComponentBranchName]$branchName"
+      Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$($branchData.vsBranch)"
+
+      # Overwrite the default template variables with the values from PublishData for this sourceBranch
+      if ($null -ne $branchData.insertionCreateDraftPR)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$($branchData.insertionCreateDraftPR)"
+      }
+
+      if ($null -ne $branchData.insertionCreateDraftPR)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$(-not $branchData.insertionCreateDraftPR)"
+      }
+
+      if ($null -ne $branchData.insertionTitlePrefix)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$($branchData.insertionTitlePrefix)"
+      }
+
+      if ($null -ne $branchData.insertToolset)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($branchData.insertToolset)"
+      }
+
+    displayName: Set Variables from PublishData
+    env:
+      PublishDataAccessToken: ${{ parameters.publishDataAccessToken }}
+
+  - powershell: |
+      # Overwrite template variables with values passed into this template as parameters
+      if ("" -ne $Env:CreateDraftPR)
+      {
+        Write-Host "Setting CreateDraftPR to $Env:CreateDraftPR"
+        Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$Env:CreateDraftPR"
+      }
+
+      if ("" -ne $Env:AutoComplete)
+      {
+        Write-Host "Setting AutoComplete to $Env:AutoComplete"
+        Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$Env:AutoComplete"
+      }
+
+      if ("" -ne $Env:TitlePrefix)
+      {
+        Write-Host "Setting TitlePrefix to $Env:TitlePrefix"
+        Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$Env:TitlePrefix"
+      }
+
+      if ("" -ne $Env:InsertToolset)
+      {
+        Write-Host "Setting InsertToolset to $Env:InsertToolset"
+        Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$Env:InsertToolset"
+      }
+
+      # Workaround for pipeline parameters not supporting optional empty parameters.
+      if ("" -ne $Env:VSBranchName -and "default" -ne $Env:VSBranchName)
+      {
+        Write-Host "Setting VSBranchName to $Env:VSBranchName"
+        Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$Env:VSBranchName"
+      }
+
+      if ("" -ne $Env:ComponentBuildProjectName)
+      {
+        Write-Host "Setting component Azdo parameters $('$(System.CollectionUri)') and $Env:ComponentBuildProjectName"
+        Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('$(System.CollectionUri)')"
+        Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$Env:ComponentBuildProjectName"
+      }
+
+    displayName: Set Variables from Input Parameters
+    env:
+      CreateDraftPR: ${{ parameters.createDraftPR }}
+      AutoComplete: ${{ parameters.autoComplete }}
+      TitlePrefix: ${{ parameters.titlePrefix }}
+      InsertToolset: ${{ parameters.insertToolset }}
+      VSBranchName: ${{ parameters.vsBranchName }}
+      ComponentBuildProjectName: ${{ parameters.componentBuildProjectName }}
+
+  # Now that everything is set, actually perform the insertion.
+  - powershell: |
+      mv RoslynTools.VisualStudioInsertionTool.* RIT
+      .\RIT\tools\net46\OneOffInsertion.ps1 `
+        -autoComplete "$(Template.AutoComplete)" `
+        -buildQueueName "$(Build.DefinitionName)" `
+        -cherryPick "(default)" `
+        -userName "${{ parameters.buildUserName }}" `
+        -password "${{ parameters.buildPassword }}" `
+        -componentUserName "${{ parameters.componentUserName }}" `
+        -componentPassword "${{ parameters.componentPassword }}" `
+        -componentAzdoUri "$(Template.ComponentAzdoUri)" `
+        -componentProjectName "$(Template.ComponentProjectName)" `
+        -componentName "Roslyn" `
+        -componentGitHubRepoName "dotnet/roslyn" `
+        -componentBranchName "$(Template.ComponentBranchName)" `
+        -createDraftPR "$(Template.CreateDraftPR)" `
+        -defaultValueSentinel "(default)" `
+        -dropPath "(default)" `
+        -insertCore "(default)" `
+        -insertDevDiv "(default)" `
+        -insertionCount "1" `
+        -insertToolset "$(Template.InsertToolset)" `
+        -titlePrefix "$(Template.TitlePrefix)" `
+        -titleSuffix "$(Template.TitleSuffix)" `
+        -queueValidation "true" `
+        -requiredValueSentinel "REQUIRED" `
+        -reviewerGUID "6c25b447-1d90-4840-8fde-d8b22cb8733e" `
+        -specificBuild "$(Build.BuildNumber)" `
+        -updateAssemblyVersions "(default)" `
+        -updateCoreXTLibraries "(default)" `
+        -visualStudioBranchName "$(Template.VSBranchName)" `
+        -writePullRequest "prid.txt"
+    displayName: 'Run OneOffInsertion.ps1'
+
+  - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'
+    displayName: 'Report PR URL'
\ No newline at end of file

From f40387699a08989f2a383f4e800bf156cfef1da2 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 15:00:24 -0700
Subject: [PATCH 138/413] ignore refint files

---
 src/Tools/BuildValidator/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tools/BuildValidator/Program.cs b/src/Tools/BuildValidator/Program.cs
index 7367832c32a65..9a3f08c9a8e91 100644
--- a/src/Tools/BuildValidator/Program.cs
+++ b/src/Tools/BuildValidator/Program.cs
@@ -29,6 +29,7 @@ class Program
         {
             new Regex(@"\\runtimes?\\"),
             new Regex(@"\\ref\\"),
+            new Regex(@"\\refint\\"),
             new Regex(@"\.resources?\.")
         };
 

From b07abb8220fe252773b955e9addbf76f60121808 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 15:30:08 -0700
Subject: [PATCH 139/413] Set EnableXUnitReporter for older arcade version

---
 src/Tools/Source/RunTests/TestRunner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tools/Source/RunTests/TestRunner.cs b/src/Tools/Source/RunTests/TestRunner.cs
index e3de91bc21f8d..c1cf2eed467fe 100644
--- a/src/Tools/Source/RunTests/TestRunner.cs
+++ b/src/Tools/Source/RunTests/TestRunner.cs
@@ -110,7 +110,7 @@ internal async Task<RunAllResult> RunAllOnHelixAsync(IEnumerable<AssemblyInfo> a
         <IncludeDotNetCli>true</IncludeDotNetCli>
         <DotNetCliVersion>" + globalJson.sdk.version + @"</DotNetCliVersion>
         <DotNetCliPackageType>sdk</DotNetCliPackageType>
-        <EnableAzurePipelinesReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableAzurePipelinesReporter>
+        <EnableXUnitReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableXUnitReporter>
     </PropertyGroup>
 
     <ItemGroup>

From 5635f5b1ada52d98426c8d56b2babbdd550eec4c Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 29 Apr 2022 15:32:42 -0700
Subject: [PATCH 140/413] Set EnableXUnitReporter in helix-tmp.csproj

---
 src/Tools/Source/RunTests/TestRunner.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tools/Source/RunTests/TestRunner.cs b/src/Tools/Source/RunTests/TestRunner.cs
index e3de91bc21f8d..640c2ec6d8fc0 100644
--- a/src/Tools/Source/RunTests/TestRunner.cs
+++ b/src/Tools/Source/RunTests/TestRunner.cs
@@ -111,6 +111,7 @@ internal async Task<RunAllResult> RunAllOnHelixAsync(IEnumerable<AssemblyInfo> a
         <DotNetCliVersion>" + globalJson.sdk.version + @"</DotNetCliVersion>
         <DotNetCliPackageType>sdk</DotNetCliPackageType>
         <EnableAzurePipelinesReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableAzurePipelinesReporter>
+        <EnableXUnitReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableXUnitReporter>
     </PropertyGroup>
 
     <ItemGroup>

From 073b3d631a3a8bc39126b74438430698bb367712 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 29 Apr 2022 15:38:36 -0700
Subject: [PATCH 141/413] Add dotnet7 nuget package feed.

---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index 8c879770d5df4..513b93df1e591 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,6 +7,7 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />

From fb79304432058ecddd1e28cf4d00e48e4884bc49 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 15:46:11 -0700
Subject: [PATCH 142/413] Build with VS2019

---
 azure-pipelines-official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index bcaa70eec2903..2a075a1c6eef5 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -79,7 +79,7 @@ stages:
   displayName: Build and Test
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2017
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   jobs:
   - job: OfficialBuild

From 880c3c81d38d90fcd7b9d3e5b0652144b855199b Mon Sep 17 00:00:00 2001
From: elachlan <2433737+elachlan@users.noreply.github.com>
Date: Sat, 30 Apr 2022 08:53:00 +1000
Subject: [PATCH 143/413] remove extra new line character from end of file

---
 src/Dependencies/Collections/RoslynImmutableInterlocked.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Dependencies/Collections/RoslynImmutableInterlocked.cs b/src/Dependencies/Collections/RoslynImmutableInterlocked.cs
index 094845b26bfa8..a57278c4020a2 100644
--- a/src/Dependencies/Collections/RoslynImmutableInterlocked.cs
+++ b/src/Dependencies/Collections/RoslynImmutableInterlocked.cs
@@ -486,4 +486,3 @@ public static bool TryRemove<TKey, TValue>(ref ImmutableSegmentedDictionary<TKey
         }
     }
 }
-

From ad969c562c830b7b3d1e27349d86e6f6ee0e7e15 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 29 Apr 2022 16:00:01 -0700
Subject: [PATCH 144/413] Remove ES CI leg

---
 azure-pipelines.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 401b25280dbf3..d179d2704d477 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -75,15 +75,6 @@ jobs:
     configuration: Release
     testArguments: -testDesktop -test32
 
-- template: eng/pipelines/test-windows-job.yml
-  parameters:
-    testRunName: 'Test Windows Desktop Spanish Release 32'
-    jobName: Test_Windows_Desktop_Spanish_Release_32
-    buildJobName: Build_Windows_Release
-    testArtifactName: Transport_Artifacts_Windows_Release
-    configuration: Release
-    testArguments: -testDesktop -test32 -helixQueueName Windows.10.Amd64.Server19H1.ES.Open
-
 - template: eng/pipelines/test-windows-job.yml
   parameters:
     testRunName: 'Test Windows Desktop Release 64'

From 8990eeeff0c50235829de3ccab19edbe2d926fff Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 29 Apr 2022 16:00:35 -0700
Subject: [PATCH 145/413] Remove ES CI leg

---
 azure-pipelines.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 401b25280dbf3..d179d2704d477 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -75,15 +75,6 @@ jobs:
     configuration: Release
     testArguments: -testDesktop -test32
 
-- template: eng/pipelines/test-windows-job.yml
-  parameters:
-    testRunName: 'Test Windows Desktop Spanish Release 32'
-    jobName: Test_Windows_Desktop_Spanish_Release_32
-    buildJobName: Build_Windows_Release
-    testArtifactName: Transport_Artifacts_Windows_Release
-    configuration: Release
-    testArguments: -testDesktop -test32 -helixQueueName Windows.10.Amd64.Server19H1.ES.Open
-
 - template: eng/pipelines/test-windows-job.yml
   parameters:
     testRunName: 'Test Windows Desktop Release 64'

From 193f3803d1412dcb1cd3841025eb7b018d36c976 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 09:43:08 -0700
Subject: [PATCH 146/413] Create insertion as DotNetBot

---
 azure-pipelines-official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 2a075a1c6eef5..4382e5d79c162 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -54,7 +54,7 @@ variables:
   - group: DotNet-DevDiv-Insertion-Workflow-Variables
   - name: _DevDivDropAccessToken
     value: $(dn-bot-devdiv-drop-rw-code-rw)
-  - group: ManagedLanguageSecrets
+  - group: DotNet-Roslyn-Insertion-Variables
 
   - name: BuildConfiguration
     value: release

From 00be9d6f7102c52678c92c342f32aabcca2736e6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 19:12:31 +0000
Subject: [PATCH 147/413] Update dependencies from
 https://github.com/dotnet/arcade build 20220418.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21230.2 -> To Version 6.0.0-beta.22218.4
---
 eng/Version.Details.xml                       |   8 +-
 eng/common/SetupNugetSources.ps1              |   6 +
 eng/common/SetupNugetSources.sh               |  24 +
 eng/common/build.ps1                          |   2 +
 eng/common/build.sh                           |   1 +
 eng/common/cross/arm/sources.list.trusty      |  11 -
 eng/common/cross/arm/trusty-lttng-2.4.patch   |  71 --
 eng/common/cross/arm/trusty.patch             |  97 ---
 eng/common/cross/arm64/sources.list.trusty    |  11 -
 eng/common/cross/arm64/tizen-fetch.sh         |   2 +-
 eng/common/cross/build-rootfs.sh              |  46 +-
 eng/common/cross/toolchain.cmake              |   4 +-
 eng/common/cross/x86/sources.list.trusty      |  11 -
 eng/common/dotnet-install.sh                  |   2 +-
 eng/common/generate-graph-files.ps1           |  86 ---
 eng/common/generate-sbom-prep.ps1             |  19 +
 eng/common/generate-sbom-prep.sh              |  22 +
 eng/common/init-tools-native.sh               |   2 +-
 eng/common/internal-feed-operations.ps1       |   6 +-
 eng/common/internal-feed-operations.sh        |   2 +-
 eng/common/internal/Tools.csproj              |   3 +-
 eng/common/msbuild.ps1                        |   1 +
 eng/common/native/common-library.sh           |   8 +-
 eng/common/performance/blazor_perf.proj       |  30 -
 eng/common/performance/crossgen_perf.proj     | 110 ---
 eng/common/performance/microbenchmarks.proj   | 144 ----
 eng/common/performance/performance-setup.ps1  | 139 ----
 eng/common/performance/performance-setup.sh   | 297 ---------
 eng/common/post-build/publish-using-darc.ps1  |  28 +-
 .../post-build/sourcelink-validation.ps1      |  91 ++-
 eng/common/post-build/symbols-validation.ps1  |  32 +-
 eng/common/sdk-task.ps1                       |   8 +-
 eng/common/sdl/configure-sdl-tool.ps1         | 116 ++++
 eng/common/sdl/execute-all-sdl-tools.ps1      |  75 ++-
 eng/common/sdl/extract-artifact-archives.ps1  |  63 ++
 eng/common/sdl/init-sdl.ps1                   |   2 +-
 eng/common/sdl/packages.config                |   2 +-
 eng/common/sdl/run-sdl.ps1                    |  52 +-
 eng/common/templates/job/execute-sdl.yml      |  90 ++-
 .../templates/job/generate-graph-files.yml    |  48 --
 eng/common/templates/job/job.yml              |  17 +-
 eng/common/templates/job/onelocbuild.yml      |  21 +-
 eng/common/templates/job/performance.yml      |  95 ---
 .../templates/job/publish-build-assets.yml    |  30 +-
 eng/common/templates/job/source-build.yml     |  18 +-
 .../templates/job/source-index-stage1.yml     |  29 +-
 eng/common/templates/jobs/codeql-build.yml    |  31 +
 eng/common/templates/jobs/jobs.yml            |  20 +-
 eng/common/templates/phases/base.yml          | 130 ----
 .../templates/phases/publish-build-assets.yml |  52 --
 .../channels/generic-internal-channel.yml     | 184 ------
 .../channels/generic-public-channel.yml       | 186 ------
 .../templates/post-build/common-variables.yml |  73 --
 .../templates/post-build/post-build.yml       | 624 +++++-------------
 .../post-build/setup-maestro-vars.yml         | 124 ++--
 eng/common/templates/steps/execute-codeql.yml |  32 +
 eng/common/templates/steps/execute-sdl.yml    |  68 ++
 eng/common/templates/steps/generate-sbom.yml  |  44 ++
 .../templates/steps/perf-send-to-helix.yml    |  50 --
 eng/common/templates/steps/source-build.yml   |  38 +-
 .../templates/variables/sdl-variables.yml     |   7 +
 eng/common/tools.ps1                          | 258 +++++---
 eng/common/tools.sh                           |  82 ++-
 global.json                                   |   8 +-
 64 files changed, 1290 insertions(+), 2703 deletions(-)
 delete mode 100644 eng/common/cross/arm/sources.list.trusty
 delete mode 100644 eng/common/cross/arm/trusty-lttng-2.4.patch
 delete mode 100644 eng/common/cross/arm/trusty.patch
 delete mode 100644 eng/common/cross/arm64/sources.list.trusty
 delete mode 100644 eng/common/cross/x86/sources.list.trusty
 delete mode 100644 eng/common/generate-graph-files.ps1
 create mode 100644 eng/common/generate-sbom-prep.ps1
 create mode 100644 eng/common/generate-sbom-prep.sh
 delete mode 100644 eng/common/performance/blazor_perf.proj
 delete mode 100644 eng/common/performance/crossgen_perf.proj
 delete mode 100644 eng/common/performance/microbenchmarks.proj
 delete mode 100644 eng/common/performance/performance-setup.ps1
 delete mode 100755 eng/common/performance/performance-setup.sh
 create mode 100644 eng/common/sdl/configure-sdl-tool.ps1
 create mode 100644 eng/common/sdl/extract-artifact-archives.ps1
 delete mode 100644 eng/common/templates/job/generate-graph-files.yml
 delete mode 100644 eng/common/templates/job/performance.yml
 create mode 100644 eng/common/templates/jobs/codeql-build.yml
 delete mode 100644 eng/common/templates/phases/base.yml
 delete mode 100644 eng/common/templates/phases/publish-build-assets.yml
 delete mode 100644 eng/common/templates/post-build/channels/generic-internal-channel.yml
 delete mode 100644 eng/common/templates/post-build/channels/generic-public-channel.yml
 create mode 100644 eng/common/templates/steps/execute-codeql.yml
 create mode 100644 eng/common/templates/steps/execute-sdl.yml
 create mode 100644 eng/common/templates/steps/generate-sbom.yml
 delete mode 100644 eng/common/templates/steps/perf-send-to-helix.yml
 create mode 100644 eng/common/templates/variables/sdl-variables.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 096efad97e425..b152e02e490b8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21230.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22218.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>46ad27d3cc557f2b84ce30b2c4e27438526dc91d</Sha>
+      <Sha>095ae444583627c1f0575967529107fd1e1d6913</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-3.21223.23">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>9b40ab852a3b59ce9cef33b3e97c17af13c8e694</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21230.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22218.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>46ad27d3cc557f2b84ce30b2c4e27438526dc91d</Sha>
+      <Sha>095ae444583627c1f0575967529107fd1e1d6913</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index a0b5fc37f4388..18823840b1127 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) {
     AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
 }
 
+$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
+if ($dotnet6Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+}
+
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index 2734601c13c4b..ad3fb74fd2cc8 100644
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet5-internal-transport')
 fi
 
+# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
+grep -i "<add key=\"dotnet6\"" $ConfigFile
+if [ "$?" == "0" ]; then
+    grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal')
+
+    grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal-transport to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal-transport')
+fi
+
 # I want things split line by line
 PrevIFS=$IFS
 IFS=$'\n'
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 94a91c0817e8b..8943da242f6e9 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -25,6 +25,7 @@ Param(
   [switch] $prepareMachine,
   [string] $runtimeSourceFeed = '',
   [string] $runtimeSourceFeedKey = '',
+  [switch] $excludePrereleaseVS,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -65,6 +66,7 @@ function Print-Usage() {
   Write-Host "  -prepareMachine         Prepare machine for CI run, clean up processes after build"
   Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+  Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 55b298f16ccd1..a16e18b174a75 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,6 +187,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
+
   InitializeToolset
   InitializeCustomToolset
 
diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty
deleted file mode 100644
index 07d8f88d82e87..0000000000000
--- a/eng/common/cross/arm/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm/trusty-lttng-2.4.patch b/eng/common/cross/arm/trusty-lttng-2.4.patch
deleted file mode 100644
index 8e4dd7ae7191a..0000000000000
--- a/eng/common/cross/arm/trusty-lttng-2.4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From e72c9d7ead60e3317bd6d1fade995c07021c947b Mon Sep 17 00:00:00 2001
-From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Date: Thu, 7 May 2015 13:25:04 -0400
-Subject: [PATCH] Fix: building probe providers with C++ compiler
-
-Robert Daniels wrote:
-> > I'm attempting to use lttng userspace tracing with a C++ application
-> > on an ARM platform. I'm using GCC 4.8.4 on Linux 3.14 with the 2.6
-> > release of lttng. I've compiled lttng-modules, lttng-ust, and
-> > lttng-tools and have been able to get a simple test working with C
-> > code.  When I attempt to run the hello.cxx test on my target it will
-> > segfault.
->
->
-> I spent a little time digging into this issue and finally discovered the
-> cause of my segfault with ARM C++ tracepoints.
->
-> There is a struct called 'lttng_event' in ust-events.h which contains an
-> empty union 'u'.  This was the cause of my issue.  Under C, this empty union
-> compiles to a zero byte member while under C++ it compiles to a one byte
-> member, and in my case was four-byte aligned which caused my C++ code to
-> have the 'cds_list_head node' offset incorrectly by four bytes.  This lead
-> to an incorrect linked list structure which caused my issue.
->
-> Since this union is empty, I simply removed it from the struct and everything
-> worked correctly.
->
-> I don't know the history or purpose behind this empty union so I'd like to
-> know if this is a safe fix.  If it is I can submit a patch with the union
-> removed.
-
-That's a very nice catch!
-
-We do not support building tracepoint probe provider with
-g++ yet, as stated in lttng-ust(3):
-
-"- Note for C++ support: although an application instrumented with
-   tracepoints can be compiled with g++, tracepoint probes should be
-   compiled with gcc (only tested with gcc so far)."
-
-However, if it works fine with this fix, then I'm tempted to take it,
-especially because removing the empty union does not appear to affect
-the layout of struct lttng_event as seen from liblttng-ust, which must
-be compiled with a C compiler,  and from probe providers compiled with
-a C compiler. So all we are changing is the layout of a probe provider
-compiled with a C++ compiler, which is anyway buggy at the moment,
-because it is not compatible with the layout expected by liblttng-ust
-compiled with a C compiler.
-
-Reported-by: Robert Daniels <robert.daniels@vantagecontrols.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/lttng/ust-events.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/usr/include/lttng/ust-events.h b/usr/include/lttng/ust-events.h
-index 328a875..3d7a274 100644
---- a/usr/include/lttng/ust-events.h
-+++ b/usr/include/lttng/ust-events.h
-@@ -407,8 +407,6 @@ struct lttng_event {
- 	void *_deprecated1;
- 	struct lttng_ctx *ctx;
- 	enum lttng_ust_instrumentation instrumentation;
--	union {
--	} u;
- 	struct cds_list_head node;		/* Event list in session */
- 	struct cds_list_head _deprecated2;
- 	void *_deprecated3;
--- 
-2.7.4
-
diff --git a/eng/common/cross/arm/trusty.patch b/eng/common/cross/arm/trusty.patch
deleted file mode 100644
index 2f2972f8eb590..0000000000000
--- a/eng/common/cross/arm/trusty.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
---- a/usr/include/urcu/uatomic/generic.h	2014-03-28 06:04:42.000000000 +0900
-+++ b/usr/include/urcu/uatomic/generic.h	2017-02-13 10:35:21.189927116 +0900
-@@ -65,17 +65,17 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		return __sync_val_compare_and_swap_1(addr, old, _new);
-+		return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new);
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_val_compare_and_swap_2(addr, old, _new);
-+		return __sync_val_compare_and_swap_2((uint16_t *) addr, old, _new);
- #endif
- 	case 4:
--		return __sync_val_compare_and_swap_4(addr, old, _new);
-+		return __sync_val_compare_and_swap_4((uint32_t *) addr, old, _new);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		return __sync_val_compare_and_swap_8(addr, old, _new);
-+		return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new);
- #endif
- 	}
- 	_uatomic_link_error();
-@@ -100,20 +100,20 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		__sync_and_and_fetch_1(addr, val);
-+		__sync_and_and_fetch_1((uint8_t *) addr, val);
- 		return;
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		__sync_and_and_fetch_2(addr, val);
-+		__sync_and_and_fetch_2((uint16_t *) addr, val);
- 		return;
- #endif
- 	case 4:
--		__sync_and_and_fetch_4(addr, val);
-+		__sync_and_and_fetch_4((uint32_t *) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		__sync_and_and_fetch_8(addr, val);
-+		__sync_and_and_fetch_8((uint64_t *) addr, val);
- 		return;
- #endif
- 	}
-@@ -139,20 +139,20 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		__sync_or_and_fetch_1(addr, val);
-+		__sync_or_and_fetch_1((uint8_t *) addr, val);
- 		return;
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		__sync_or_and_fetch_2(addr, val);
-+		__sync_or_and_fetch_2((uint16_t *) addr, val);
- 		return;
- #endif
- 	case 4:
--		__sync_or_and_fetch_4(addr, val);
-+		__sync_or_and_fetch_4((uint32_t *) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		__sync_or_and_fetch_8(addr, val);
-+		__sync_or_and_fetch_8((uint64_t *) addr, val);
- 		return;
- #endif
- 	}
-@@ -180,17 +180,17 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		return __sync_add_and_fetch_1(addr, val);
-+		return __sync_add_and_fetch_1((uint8_t *) addr, val);
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_add_and_fetch_2(addr, val);
-+		return __sync_add_and_fetch_2((uint16_t *) addr, val);
- #endif
- 	case 4:
--		return __sync_add_and_fetch_4(addr, val);
-+		return __sync_add_and_fetch_4((uint32_t *) addr, val);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		return __sync_add_and_fetch_8(addr, val);
-+		return __sync_add_and_fetch_8((uint64_t *) addr, val);
- #endif
- 	}
- 	_uatomic_link_error();
diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty
deleted file mode 100644
index 07d8f88d82e87..0000000000000
--- a/eng/common/cross/arm64/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh
index a48a6f51c49d0..16d1301f21e4c 100644
--- a/eng/common/cross/arm64/tizen-fetch.sh
+++ b/eng/common/cross/arm64/tizen-fetch.sh
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
 Inform "Initialize arm base"
 fetch_tizen_pkgs_init standard base
 Inform "fetch common packages"
-fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
+fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
 fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
 Inform "fetch corefx packages"
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index b26622444f5ba..5c05b39f10197 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -6,10 +6,10 @@ usage()
 {
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
-    echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
-    echo "                              for FreeBSD can be: freebsd11 or freebsd12."
+    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+    echo "                              for FreeBSD can be: freebsd11, freebsd12, freebsd13"
     echo "                              for illumos can be: illumos."
-    echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
+    echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
     echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
     exit 1
@@ -33,7 +33,6 @@ __AlpinePackages="alpine-base"
 __AlpinePackages+=" build-base"
 __AlpinePackages+=" linux-headers"
 __AlpinePackagesEdgeCommunity=" lldb-dev"
-__AlpinePackagesEdgeMain=" llvm10-libs"
 __AlpinePackagesEdgeMain+=" python3"
 __AlpinePackagesEdgeMain+=" libedit"
 
@@ -61,19 +60,25 @@ __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
 
-__FreeBSDBase="12.1-RELEASE"
+__FreeBSDBase="12.2-RELEASE"
 __FreeBSDPkg="1.12.0"
+__FreeBSDABI="12"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
 __FreeBSDPackages+=" libinotify"
 __FreeBSDPackages+=" lttng-ust"
 __FreeBSDPackages+=" krb5"
+__FreeBSDPackages+=" terminfo-db"
 
 __IllumosPackages="icu-64.2nb2"
 __IllumosPackages+=" mit-krb5-1.16.2nb4"
 __IllumosPackages+=" openssl-1.1.1e"
 __IllumosPackages+=" zlib-1.2.11"
 
+# ML.NET dependencies
+__UbuntuPackages+=" libomp5"
+__UbuntuPackages+=" libomp-dev"
+
 __UseMirror=0
 
 __UnprocessedBuildArgs=
@@ -111,6 +116,8 @@ while :; do
             __UbuntuArch=s390x
             __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
             __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
             unset __LLDB_Package
             ;;
         x86)
@@ -139,11 +146,6 @@ while :; do
         no-lldb)
             unset __LLDB_Package
             ;;
-        trusty) # Ubuntu 14.04
-            if [ "$__CodeName" != "jessie" ]; then
-                __CodeName=trusty
-            fi
-            ;;
         xenial) # Ubuntu 16.04
             if [ "$__CodeName" != "jessie" ]; then
                 __CodeName=xenial
@@ -187,6 +189,8 @@ while :; do
             __CodeName=alpine
             __UbuntuRepo=
             __AlpineVersion=3.9
+            __AlpinePackagesEdgeMain+=" llvm11-libs"
+            __AlpinePackagesEdgeMain+=" clang-libs"
             ;;
         alpine3.13)
             __CodeName=alpine
@@ -197,15 +201,24 @@ while :; do
             __AlpinePackagesEdgeCommunity=
             __AlpinePackages+=$__AlpinePackagesEdgeMain
             __AlpinePackagesEdgeMain=
+            __AlpinePackages+=" llvm10-libs"
             ;;
         freebsd11)
             __FreeBSDBase="11.3-RELEASE"
+            __FreeBSDABI="11"
             ;&
         freebsd12)
             __CodeName=freebsd
             __BuildArch=x64
             __SkipUnmount=1
             ;;
+        freebsd13)
+            __CodeName=freebsd
+            __FreeBSDBase="13.0-RELEASE"
+            __FreeBSDABI="13"
+            __BuildArch=x64
+            __SkipUnmount=1
+            ;;
         illumos)
             __CodeName=illumos
             __BuildArch=x64
@@ -283,9 +296,9 @@ if [[ "$__CodeName" == "alpine" ]]; then
     rm -r $__ApkToolsDir
 elif [[ "$__CodeName" == "freebsd" ]]; then
     mkdir -p $__RootfsDir/usr/local/etc
+    JOBS="$(getconf _NPROCESSORS_ONLN)"
     wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
-    # For now, ask for 11 ABI even on 12. This can be revisited later.
-    echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
+    echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
     echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
     mkdir -p $__RootfsDir/tmp
     # get and build package manager
@@ -293,7 +306,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
     cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
     # needed for install to succeed
     mkdir -p $__RootfsDir/host/etc
-    ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install
+    ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install
     rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
     # install packages we need.
     INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
@@ -356,13 +369,6 @@ elif [[ -n $__CodeName ]]; then
         umount $__RootfsDir/* || true
     fi
 
-    if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then
-        pushd $__RootfsDir
-        patch -p1 < $__CrossDir/$__BuildArch/trusty.patch
-        patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
-        popd
-    fi
-
     if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
         pushd $__RootfsDir
         patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index fc11001aa76c8..ec8971eb0195f 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -138,8 +138,8 @@ function(add_toolchain_linker_flag Flag)
   if (NOT Config STREQUAL "")
     set(CONFIG_SUFFIX "_${Config}")
   endif()
-  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
-  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/eng/common/cross/x86/sources.list.trusty b/eng/common/cross/x86/sources.list.trusty
deleted file mode 100644
index 9b3085436e9a9..0000000000000
--- a/eng/common/cross/x86/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index d6efeb44340ba..fdfeea66e7d43 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -70,7 +70,7 @@ case $cpuname in
     ;;
 esac
 
-dotnetRoot="$repo_root/.dotnet"
+dotnetRoot="${repo_root}.dotnet"
 if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
   dotnetRoot="$dotnetRoot/$architecture"
 fi
diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1
deleted file mode 100644
index 0728b1a8b570d..0000000000000
--- a/eng/common/generate-graph-files.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(
-  [Parameter(Mandatory=$true)][string] $barToken,       # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens
-  [Parameter(Mandatory=$true)][string] $gitHubPat,      # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
-  [Parameter(Mandatory=$true)][string] $azdoPat,        # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
-  [Parameter(Mandatory=$true)][string] $outputFolder,   # Where the graphviz.txt file will be created
-  [string] $darcVersion,                                # darc's version
-  [string] $graphvizVersion = '2.38',                   # GraphViz version
-  [switch] $includeToolset                              # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
-                                                        # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
-)
-
-function CheckExitCode ([string]$stage)
-{
-  $exitCode = $LASTEXITCODE
-  if ($exitCode  -ne 0) {
-    Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..."
-    ExitWithExitCode $exitCode
-  }
-}
-
-try {
-  $ErrorActionPreference = 'Stop'
-  . $PSScriptRoot\tools.ps1
-  
-  Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
-
-  Push-Location $PSScriptRoot
-
-  Write-Host 'Installing darc...'
-  . .\darc-init.ps1 -darcVersion $darcVersion
-  CheckExitCode 'Running darc-init'
-
-  $engCommonBaseDir = Join-Path $PSScriptRoot 'native\'
-  $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory
-  $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external'
-  $installBin = Join-Path $graphvizInstallDir 'bin'
-
-  Write-Host 'Installing dot...'
-  .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose
-
-  $darcExe = "$env:USERPROFILE\.dotnet\tools"
-  $darcExe = Resolve-Path "$darcExe\darc.exe"
-
-  Create-Directory $outputFolder
-
-  # Generate 3 graph descriptions:
-  # 1. Flat with coherency information
-  # 2. Graphviz (dot) file
-  # 3. Standard dependency graph
-  $graphVizFilePath = "$outputFolder\graphviz.txt"
-  $graphVizImageFilePath = "$outputFolder\graph.png"
-  $normalGraphFilePath = "$outputFolder\graph-full.txt"
-  $flatGraphFilePath = "$outputFolder\graph-flat.txt"
-  $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" )
-
-  if ($includeToolset) {
-    Write-Host 'Toolsets will be included in the graph...'
-    $baseOptions += @( '--include-toolset' )
-  }
-
-  Write-Host 'Generating standard dependency graph...'
-  & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath
-  CheckExitCode 'Generating normal dependency graph'
-
-  Write-Host 'Generating flat dependency graph and graphviz file...'
-  & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath
-  CheckExitCode 'Generating flat and graphviz dependency graph'
-
-  Write-Host "Generating graph image $graphVizFilePath"
-  $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe"
-  & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath"
-  CheckExitCode 'Generating graphviz image'
-
-  Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!"
-}
-catch {
-  if (!$includeToolset) {
-    Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow
-    Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow
-  }
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category 'Arcade' -Message $_
-  ExitWithExitCode 1
-} finally {
-  Pop-Location
-}
\ No newline at end of file
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
new file mode 100644
index 0000000000000..a733a8885824a
--- /dev/null
+++ b/eng/common/generate-sbom-prep.ps1
@@ -0,0 +1,19 @@
+Param(
+    [Parameter(Mandatory=$true)][string] $ManifestDirPath    # Manifest directory where sbom will be placed
+)
+
+Write-Host "Creating dir $ManifestDirPath"
+# create directory for sbom manifest to be placed
+if (!(Test-Path -path $ManifestDirPath))
+{
+  New-Item -ItemType Directory -path $ManifestDirPath
+  Write-Host "Successfully created directory $ManifestDirPath"
+}
+else{
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+}
+
+Write-Host "Updating artifact name"
+$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
+Write-Host "Artifact name $artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
new file mode 100644
index 0000000000000..f6c77453142a2
--- /dev/null
+++ b/eng/common/generate-sbom-prep.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+manifest_dir=$1
+
+if [ ! -d "$manifest_dir" ] ; then
+  mkdir -p "$manifest_dir"
+  echo "Sbom directory created." $manifest_dir
+else
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+fi
+
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+echo "Artifact name before : "$artifact_name
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+echo "Artifact name after : "$safe_artifact_name
+export ARTIFACT_NAME=$safe_artifact_name
+echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
+
+exit 0
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index 5bd205b5da3b7..3e6a8d6acf2f5 100755
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -10,7 +10,7 @@ force=false
 download_retries=5
 retry_wait_time_seconds=30
 global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
-declare -A native_assets
+declare -a native_assets
 
 . $scriptroot/pipeline-logging-functions.sh
 . $scriptroot/native/common-library.sh
diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1
index 418c09930cf16..92b77347d9904 100644
--- a/eng/common/internal-feed-operations.ps1
+++ b/eng/common/internal-feed-operations.ps1
@@ -45,11 +45,11 @@ function SetupCredProvider {
   # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable 
   # feeds successfully
 
-  $nugetConfigPath = "$RepoRoot\NuGet.config"
+  $nugetConfigPath = Join-Path $RepoRoot "NuGet.config"
 
   if (-Not (Test-Path -Path $nugetConfigPath)) {
     Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!'
-    ExitWithExitCode 1  
+    ExitWithExitCode 1
   }
   
   $endpoints = New-Object System.Collections.ArrayList
@@ -85,7 +85,7 @@ function SetupCredProvider {
 
 #Workaround for https://github.com/microsoft/msbuild/issues/4430
 function InstallDotNetSdkAndRestoreArcade {
-  $dotnetTempDir = "$RepoRoot\dotnet"
+  $dotnetTempDir = Join-Path $RepoRoot "dotnet"
   $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*)
   $dotnet = "$dotnetTempDir\dotnet.exe"
   $restoreProjPath = "$PSScriptRoot\restore.proj"
diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh
index e2233e781220f..9378223ba0955 100755
--- a/eng/common/internal-feed-operations.sh
+++ b/eng/common/internal-feed-operations.sh
@@ -39,7 +39,7 @@ function SetupCredProvider {
   # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable 
   # feeds successfully
 
-  local nugetConfigPath="$repo_root/NuGet.config"
+  local nugetConfigPath="{$repo_root}NuGet.config"
 
   if [ ! "$nugetConfigPath" ]; then
     Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!"
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index f46d5efe2e32a..beb9c4648ea19 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index c6401230002fe..eea19cd8452fd 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -5,6 +5,7 @@ Param(
   [bool] $nodeReuse = $true,
   [switch] $ci,
   [switch] $prepareMachine,
+  [switch] $excludePrereleaseVS,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs
 )
 
diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh
index bf272dcf55a53..080c2c283ae46 100755
--- a/eng/common/native/common-library.sh
+++ b/eng/common/native/common-library.sh
@@ -148,8 +148,12 @@ function NewScriptShim {
   fi
   
   if [[ ! -f $tool_file_path ]]; then
-    Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
-    return 1
+    # try to see if the path is lower cased
+    tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" 
+    if [[ ! -f $tool_file_path ]]; then
+      Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
+      return 1
+    fi
   fi
 
   local shim_contents=$'#!/usr/bin/env bash\n'
diff --git a/eng/common/performance/blazor_perf.proj b/eng/common/performance/blazor_perf.proj
deleted file mode 100644
index 3b25359c43807..0000000000000
--- a/eng/common/performance/blazor_perf.proj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
-    <Python>python3</Python>
-    <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
-      <PayloadDirectory>%(Identity)</PayloadDirectory>
-    </HelixCorrelationPayload>
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
-    <ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
-    <BlazorDirectory>$(ScenarioDirectory)blazor\</BlazorDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
-    <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
-    <BlazorDirectory>$(ScenarioDirectory)blazor/</BlazorDirectory>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HelixWorkItem Include="SOD - New Blazor Template - Publish">
-        <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-        <PreCommands>cd $(BlazorDirectory);$(Python) pre.py publish --msbuild %27/p:_TrimmerDumpDependencies=true%27 --msbuild-static AdditionalMonoLinkerOptions=%27&quot;%24(AdditionalMonoLinkerOptions) --dump-dependencies&quot;%27 --binlog %27./traces/blazor_publish.binlog%27</PreCommands>
-        <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
-        <PostCommands>$(Python) post.py</PostCommands>
-    </HelixWorkItem>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj
deleted file mode 100644
index eb8bdd9c440cd..0000000000000
--- a/eng/common/performance/crossgen_perf.proj
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
-
-  <ItemGroup>
-    <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
-      <PayloadDirectory>%(Identity)</PayloadDirectory>
-    </HelixCorrelationPayload>
-  </ItemGroup>
-
-  <!-- 
-    Crossgen and Crossgen2 Scenario WorkItems 
-  -->
-  <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
-    <Python>py -3</Python>
-    <HelixPreCommands>$(HelixPreCommands)</HelixPreCommands>
-    <CoreRoot>%HELIX_CORRELATION_PAYLOAD%\Core_Root</CoreRoot>
-    <ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
-    <CrossgenDirectory>$(ScenarioDirectory)crossgen\</CrossgenDirectory>
-    <Crossgen2Directory>$(ScenarioDirectory)crossgen2\</Crossgen2Directory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
-    <Python>python3</Python>
-    <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
-    <CoreRoot>$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot>
-    <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
-    <CrossgenDirectory>$(ScenarioDirectory)crossgen/</CrossgenDirectory>
-    <Crossgen2Directory>$(ScenarioDirectory)crossgen2/</Crossgen2Directory>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <SingleAssembly Include="System.Net.WebProxy.dll"/>                 <!-- Approx. 10 KB as of 2020/10 -->
-    <SingleAssembly Include="System.Net.Http.Json.dll"/>                <!-- Approx. 20 KB as of 2020/10 -->
-    <SingleAssembly Include="System.Drawing.Primitives.dll"/>           <!-- Approx. 50 KB as of 2020/10 -->
-    <SingleAssembly Include="System.ServiceModel.Syndication.dll"/>     <!-- Approx. 100 KB as of 2020/10 -->
-    <SingleAssembly Include="System.Net.Sockets.dll"/>                  <!-- Approx. 200 KB as of 2020/10 -->
-    <SingleAssembly Include="System.Linq.Expressions.dll"/>             <!-- Approx. 500 KB as of 2020/10 -->
-    <SingleAssembly Include="System.Data.Common.dll"/>                  <!-- Approx. 1 MB as of 2020/10 -->
-    <SingleAssembly Include="Microsoft.CodeAnalysis.dll"/>              <!-- Approx. 2 MB as of 2020/10 -->
-    <SingleAssembly Include="System.Private.Xml.dll"/>                  <!-- Approx. 3 MB as of 2020/10 -->
-    <SingleAssembly Include="Microsoft.CodeAnalysis.VisualBasic.dll"/>  <!-- Approx. 4 MB as of 2020/10 -->
-    <SingleAssembly Include="Microsoft.CodeAnalysis.CSharp.dll"/>       <!-- Approx. 4 MB as of 2020/10 -->
-    <SingleAssembly Include="System.Private.CoreLib.dll"/>              <!-- Approx. 10 MB as of 2020/10 -->
-  </ItemGroup>
-  <ItemGroup>
-    <Composite Include="framework-r2r.dll.rsp"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <CrossgenWorkItem Include="@(SingleAssembly)">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <Command>$(Python) $(CrossgenDirectory)test.py crossgen --core-root $(CoreRoot) --test-name %(Identity)</Command>
-    </CrossgenWorkItem>
-  </ItemGroup>
-
-  <ItemGroup> 
-    <Crossgen2WorkItem Include="@(SingleAssembly)">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity)</Command>
-    </Crossgen2WorkItem>
-  </ItemGroup>
-
-  <ItemGroup> 
-    <Crossgen2SingleThreadedWorkItem Include="@(SingleAssembly)">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity) --singlethreaded True</Command>
-    </Crossgen2SingleThreadedWorkItem>
-  </ItemGroup>
-
-  <ItemGroup>
-    <CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands>$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
-      <Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
-      <PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
-    </CrossgenSizeOnDiskWorkItem>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
-      <Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
-      <PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
-    </Crossgen2SizeOnDiskWorkItem>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Enable crossgen tests on Windows x64 and Windows x86 -->
-    <HelixWorkItem Include="@(CrossgenWorkItem -> 'Crossgen %(Identity)')" Condition="'$(AGENT_OS)' == 'Windows_NT'">
-      <Timeout>4:00</Timeout>
-    </HelixWorkItem>
-    <!-- Enable crossgen2 tests on Windows x64 and Linux x64 -->
-    <HelixWorkItem Include="@(Crossgen2WorkItem -> 'Crossgen2 %(Identity)')" Condition="'$(Architecture)' == 'x64'">
-      <Timeout>4:00</Timeout>
-    </HelixWorkItem>
-    <HelixWorkItem Include="@(Crossgen2SingleThreadedWorkItem -> 'Crossgen2 single-threaded %(Identity)')" Condition="'$(Architecture)' == 'x64'">
-      <Timeout>4:00</Timeout>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Crossgen2 Composite Framework R2R" Condition="'$(Architecture)' == 'x64'">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>	
-      <Command>$(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp</Command>
-      <Timeout>1:00</Timeout>  
-    </HelixWorkItem>
-    <HelixWorkItem Include="@(CrossgenSizeOnDiskWorkItem -> 'Crossgen Size on Disk %(Identity)')" Condition="'$(Architecture)' == 'x64'">
-      <Timeout>4:00</Timeout>  
-    </HelixWorkItem>
-    <HelixWorkItem Include="@(Crossgen2SizeOnDiskWorkItem -> 'Crossgen2 Size on Disk %(Identity)')" Condition="'$(Architecture)' == 'x64'">
-      <Timeout>4:00</Timeout>  
-    </HelixWorkItem>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/common/performance/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj
deleted file mode 100644
index 318ca5f1b8d4c..0000000000000
--- a/eng/common/performance/microbenchmarks.proj
+++ /dev/null
@@ -1,144 +0,0 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
-
-  <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
-    <WorkItemCommand>%HELIX_CORRELATION_PAYLOAD%\performance\scripts\benchmarks_ci.py --csproj %HELIX_CORRELATION_PAYLOAD%\performance\$(TargetCsproj)</WorkItemCommand>
-    <CliArguments>--dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP%</CliArguments>
-    <Python>py -3</Python>
-    <CoreRun>%HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe</CoreRun>
-    <BaselineCoreRun>%HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe</BaselineCoreRun>
-    
-    <HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%</HelixPreCommands>
-    <ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
-    <BaselineArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
-    <ResultsComparer>%HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj</ResultsComparer>
-    <DotnetExe>%HELIX_CORRELATION_PAYLOAD%\performance\tools\dotnet\$(Architecture)\dotnet.exe</DotnetExe>
-    <Percent>%25%25</Percent>
-    <XMLResults>%HELIX_WORKITEM_ROOT%\testResults.xml</XMLResults>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT' and '$(RunFromPerfRepo)' == 'false'">
-    <BaseDirectory>$HELIX_CORRELATION_PAYLOAD</BaseDirectory>
-    <PerformanceDirectory>$(BaseDirectory)/performance</PerformanceDirectory>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT' and '$(RunFromPerfRepo)' == 'true'">
-    <BaseDirectory>$HELIX_WORKITEM_PAYLOAD</BaseDirectory>
-    <PerformanceDirectory>$(BaseDirectory)</PerformanceDirectory>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
-    <WorkItemCommand>$(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj)</WorkItemCommand>
-    <CliArguments>--dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP</CliArguments>
-    <Python>python3</Python>
-    <CoreRun>$(BaseDirectory)/Core_Root/corerun</CoreRun>
-    <BaselineCoreRun>$(BaseDirectory)/Baseline_Core_Root/corerun</BaselineCoreRun>
-    <HelixPreCommands>$(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh</HelixPreCommands>
-    <ArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts</ArtifactsDirectory>
-    <BaselineArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
-    <ResultsComparer>$(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj</ResultsComparer>
-    <DotnetExe>$(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet</DotnetExe>
-    <Percent>%25</Percent>
-    <XMLResults>$HELIX_WORKITEM_ROOT/testResults.xml</XMLResults>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(WasmDotnet)' == 'true'">
-    <CliArguments>$(CliArguments) --wasm</CliArguments>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MonoDotnet)' == 'true' and '$(AGENT_OS)' == 'Windows_NT'">
-    <CoreRunArgument>--corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\6.0.0\corerun.exe</CoreRunArgument>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(MonoDotnet)' == 'true' and '$(AGENT_OS)' != 'Windows_NT'">
-    <CoreRunArgument>--corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/6.0.0/corerun</CoreRunArgument>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(UseCoreRun)' == 'true'">
-    <CoreRunArgument>--corerun $(CoreRun)</CoreRunArgument>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(UseBaselineCoreRun)' == 'true'">
-    <BaselineCoreRunArgument>--corerun $(BaselineCoreRun)</BaselineCoreRunArgument>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(WorkItemCommand)' != ''">
-    <WorkItemCommand>$(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments)</WorkItemCommand>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(_Framework)' != 'net461'">
-    <WorkItemCommand>$(WorkItemCommand) $(CliArguments)</WorkItemCommand>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <WorkItemTimeout>2:30</WorkItemTimeout>
-    <WorkItemTimeout Condition="'$(HelixSourcePrefix)' != 'official'">0:15</WorkItemTimeout>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
-      <PayloadDirectory>%(Identity)</PayloadDirectory>
-    </HelixCorrelationPayload>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <PartitionCount>30</PartitionCount>
-  </PropertyGroup>
-  <ItemGroup>
-    <Partition Include="$(BuildConfig).Partition0" Index="0" />
-    <Partition Include="$(BuildConfig).Partition1" Index="1" />
-    <Partition Include="$(BuildConfig).Partition2" Index="2" />
-    <Partition Include="$(BuildConfig).Partition3" Index="3" />
-    <Partition Include="$(BuildConfig).Partition4" Index="4" />
-    <Partition Include="$(BuildConfig).Partition5" Index="5" />
-    <Partition Include="$(BuildConfig).Partition6" Index="6" />
-    <Partition Include="$(BuildConfig).Partition7" Index="7" />
-    <Partition Include="$(BuildConfig).Partition8" Index="8" />
-    <Partition Include="$(BuildConfig).Partition9" Index="9" />
-    <Partition Include="$(BuildConfig).Partition10" Index="10" />
-    <Partition Include="$(BuildConfig).Partition11" Index="11" />
-    <Partition Include="$(BuildConfig).Partition12" Index="12" />
-    <Partition Include="$(BuildConfig).Partition13" Index="13" />
-    <Partition Include="$(BuildConfig).Partition14" Index="14" />
-    <Partition Include="$(BuildConfig).Partition15" Index="15" />
-    <Partition Include="$(BuildConfig).Partition16" Index="16" />
-    <Partition Include="$(BuildConfig).Partition17" Index="17" />
-    <Partition Include="$(BuildConfig).Partition18" Index="18" />
-    <Partition Include="$(BuildConfig).Partition19" Index="19" />
-    <Partition Include="$(BuildConfig).Partition20" Index="20" />
-    <Partition Include="$(BuildConfig).Partition21" Index="21" />
-    <Partition Include="$(BuildConfig).Partition22" Index="22" />
-    <Partition Include="$(BuildConfig).Partition23" Index="23" />
-    <Partition Include="$(BuildConfig).Partition24" Index="24" />
-    <Partition Include="$(BuildConfig).Partition25" Index="25" />
-    <Partition Include="$(BuildConfig).Partition26" Index="26" />
-    <Partition Include="$(BuildConfig).Partition27" Index="27" />
-    <Partition Include="$(BuildConfig).Partition28" Index="28" />
-    <Partition Include="$(BuildConfig).Partition29" Index="29" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(Compare)' == 'true'">
-    <FailOnTestFailure>false</FailOnTestFailure>
-  </PropertyGroup>
-
-  <!-- 
-    Partition the Microbenchmarks project, but nothing else
-  -->
-  <ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
-    <HelixWorkItem Include="@(Partition)">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
-      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
-      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
-      <Timeout>$(WorkItemTimeout)</Timeout>
-    </HelixWorkItem>
-  </ItemGroup>
-
-  <ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
-    <HelixWorkItem Include="$(BuildConfig).WorkItem">
-      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
-      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
-      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>
-      <Timeout>4:00</Timeout>
-    </HelixWorkItem>
-  </ItemGroup>
-</Project>
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
deleted file mode 100644
index 9a64b07e692f6..0000000000000
--- a/eng/common/performance/performance-setup.ps1
+++ /dev/null
@@ -1,139 +0,0 @@
-Param(
-    [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
-    [string] $CoreRootDirectory,
-    [string] $BaselineCoreRootDirectory,
-    [string] $Architecture="x64",
-    [string] $Framework="net5.0",
-    [string] $CompilationMode="Tiered",
-    [string] $Repository=$env:BUILD_REPOSITORY_NAME,
-    [string] $Branch=$env:BUILD_SOURCEBRANCH,
-    [string] $CommitSha=$env:BUILD_SOURCEVERSION,
-    [string] $BuildNumber=$env:BUILD_BUILDNUMBER,
-    [string] $RunCategories="Libraries Runtime",
-    [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj",
-    [string] $Kind="micro",
-    [switch] $LLVM,
-    [switch] $MonoInterpreter,
-    [switch] $MonoAOT, 
-    [switch] $Internal,
-    [switch] $Compare,
-    [string] $MonoDotnet="",
-    [string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind",
-    [string] $LogicalMachine=""
-)
-
-$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
-$UseCoreRun = ($CoreRootDirectory -ne [string]::Empty)
-$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty)
-
-$PayloadDirectory = (Join-Path $SourceDirectory "Payload")
-$PerformanceDirectory = (Join-Path $PayloadDirectory "performance")
-$WorkItemDirectory = (Join-Path $SourceDirectory "workitem")
-$ExtraBenchmarkDotNetArguments = "--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true"
-$Creator = $env:BUILD_DEFINITIONNAME
-$PerfLabArguments = ""
-$HelixSourcePrefix = "pr"
-
-$Queue = ""
-
-if ($Internal) {
-    switch ($LogicalMachine) {
-        "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf"  }
-        "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf"  }
-        "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf"  }
-        Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
-    }
-    $PerfLabArguments = "--upload-to-perflab-container"
-    $ExtraBenchmarkDotNetArguments = ""
-    $Creator = ""
-    $HelixSourcePrefix = "official"
-}
-else {
-    $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
-}
-
-if($MonoInterpreter)
-{
-    $ExtraBenchmarkDotNetArguments = "--category-exclusion-filter NoInterpreter"
-}
-
-if($MonoDotnet -ne "")
-{
-    $Configurations += " LLVM=$LLVM MonoInterpreter=$MonoInterpreter MonoAOT=$MonoAOT"
-    if($ExtraBenchmarkDotNetArguments -eq "")
-    {
-        #FIX ME: We need to block these tests as they don't run on mono for now
-        $ExtraBenchmarkDotNetArguments = "--exclusion-filter *Perf_Image* *Perf_NamedPipeStream*"
-    }
-    else
-    {
-        #FIX ME: We need to block these tests as they don't run on mono for now
-        $ExtraBenchmarkDotNetArguments += " --exclusion-filter *Perf_Image* *Perf_NamedPipeStream*"
-    }
-}
-
-# FIX ME: This is a workaround until we get this from the actual pipeline
-$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
-$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
-
-
-if ($RunFromPerformanceRepo) {
-    $SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"
-    
-    robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git
-}
-else {
-    git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory
-}
-
-if($MonoDotnet -ne "")
-{
-    $UsingMono = "true"
-    $MonoDotnetPath = (Join-Path $PayloadDirectory "dotnet-mono")
-    Move-Item -Path $MonoDotnet -Destination $MonoDotnetPath
-}
-
-if ($UseCoreRun) {
-    $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root")
-    Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot
-}
-if ($UseBaselineCoreRun) {
-    $NewBaselineCoreRoot = (Join-Path $PayloadDirectory "Baseline_Core_Root")
-    Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot
-}
-
-$DocsDir = (Join-Path $PerformanceDirectory "docs")
-robocopy $DocsDir $WorkItemDirectory
-
-# Set variables that we will need to have in future steps
-$ci = $true
-
-. "$PSScriptRoot\..\pipeline-logging-functions.ps1"
-
-# Directories
-Write-PipelineSetVariable -Name 'PayloadDirectory' -Value "$PayloadDirectory" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'PerformanceDirectory' -Value "$PerformanceDirectory" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'WorkItemDirectory' -Value "$WorkItemDirectory" -IsMultiJobVariable $false
-
-# Script Arguments
-Write-PipelineSetVariable -Name 'Python' -Value "py -3" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'ExtraBenchmarkDotNetArguments' -Value "$ExtraBenchmarkDotNetArguments" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'SetupArguments' -Value "$SetupArguments" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'PerfLabArguments' -Value "$PerfLabArguments" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'BDNCategories' -Value "$RunCategories" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'UseBaselineCoreRun' -Value "$UseBaselineCoreRun" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'Compare' -Value "$Compare" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'MonoDotnet' -Value "$UsingMono" -IsMultiJobVariable $false
-
-# Helix Arguments
-Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false
-Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false
-
-exit 0
\ No newline at end of file
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
deleted file mode 100755
index 33b60b5033742..0000000000000
--- a/eng/common/performance/performance-setup.sh
+++ /dev/null
@@ -1,297 +0,0 @@
-#!/usr/bin/env bash
-
-source_directory=$BUILD_SOURCESDIRECTORY
-core_root_directory=
-baseline_core_root_directory=
-architecture=x64
-framework=net5.0
-compilation_mode=tiered
-repository=$BUILD_REPOSITORY_NAME
-branch=$BUILD_SOURCEBRANCH
-commit_sha=$BUILD_SOURCEVERSION
-build_number=$BUILD_BUILDNUMBER
-internal=false
-compare=false
-mono_dotnet=
-kind="micro"
-llvm=false
-monointerpreter=false
-monoaot=false
-run_categories="Libraries Runtime"
-csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
-configurations="CompliationMode=$compilation_mode RunKind=$kind"
-run_from_perf_repo=false
-use_core_run=true
-use_baseline_core_run=true
-using_mono=false
-wasm_runtime_loc=
-using_wasm=false
-use_latest_dotnet=false
-logical_machine=
-
-while (($# > 0)); do
-  lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
-  case $lowerI in
-    --sourcedirectory)
-      source_directory=$2
-      shift 2
-      ;;
-    --corerootdirectory)
-      core_root_directory=$2
-      shift 2
-      ;;
-    --baselinecorerootdirectory)
-      baseline_core_root_directory=$2
-      shift 2
-      ;;
-    --architecture)
-      architecture=$2
-      shift 2
-      ;;
-    --framework)
-      framework=$2
-      shift 2
-      ;;
-    --compilationmode)
-      compilation_mode=$2
-      shift 2
-      ;;
-    --logicalmachine)
-      logical_machine=$2
-      shift 2
-      ;;
-    --repository)
-      repository=$2
-      shift 2
-      ;;
-    --branch)
-      branch=$2
-      shift 2
-      ;;
-    --commitsha)
-      commit_sha=$2
-      shift 2
-      ;;
-    --buildnumber)
-      build_number=$2
-      shift 2
-      ;;
-    --kind)
-      kind=$2
-      configurations="CompilationMode=$compilation_mode RunKind=$kind"
-      shift 2
-      ;;
-    --runcategories)
-      run_categories=$2
-      shift 2
-      ;;
-    --csproj)
-      csproj=$2
-      shift 2
-      ;;
-    --internal)
-      internal=true
-      shift 1
-      ;;
-    --alpine)
-      alpine=true
-      shift 1
-      ;;
-    --llvm)
-      llvm=true
-      shift 1
-      ;;
-    --monointerpreter)
-      monointerpreter=true
-      shift 1
-      ;;
-    --monoaot)
-      monoaot=true
-      shift 1
-      ;;
-    --monodotnet)
-      mono_dotnet=$2
-      shift 2
-      ;;
-    --wasm)
-      wasm_runtime_loc=$2
-      shift 2
-      ;;
-    --compare)
-      compare=true
-      shift 1
-      ;;
-    --configurations)
-      configurations=$2
-      shift 2
-      ;;
-    --latestdotnet)
-      use_latest_dotnet=true
-      shift 1
-      ;;
-    *)
-      echo "Common settings:"
-      echo "  --corerootdirectory <value>    Directory where Core_Root exists, if running perf testing with --corerun"
-      echo "  --architecture <value>         Architecture of the testing being run"
-      echo "  --configurations <value>       List of key=value pairs that will be passed to perf testing infrastructure."
-      echo "                                 ex: --configurations \"CompilationMode=Tiered OptimzationLevel=PGO\""
-      echo "  --help                         Print help and exit"
-      echo ""
-      echo "Advanced settings:"
-      echo "  --framework <value>            The framework to run, if not running in master"
-      echo "  --compliationmode <value>      The compilation mode if not passing --configurations"
-      echo "  --sourcedirectory <value>      The directory of the sources. Defaults to env:BUILD_SOURCESDIRECTORY"
-      echo "  --repository <value>           The name of the repository in the <owner>/<repository name> format. Defaults to env:BUILD_REPOSITORY_NAME"
-      echo "  --branch <value>               The name of the branch. Defaults to env:BUILD_SOURCEBRANCH"
-      echo "  --commitsha <value>            The commit sha1 to run against. Defaults to env:BUILD_SOURCEVERSION"
-      echo "  --buildnumber <value>          The build number currently running. Defaults to env:BUILD_BUILDNUMBER"
-      echo "  --csproj                       The relative path to the benchmark csproj whose tests should be run. Defaults to src\benchmarks\micro\MicroBenchmarks.csproj"
-      echo "  --kind <value>                 Related to csproj. The kind of benchmarks that should be run. Defaults to micro"
-      echo "  --runcategories <value>        Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\""
-      echo "  --internal                     If the benchmarks are running as an official job."
-      echo "  --monodotnet                   Pass the path to the mono dotnet for mono performance testing."
-      echo "  --wasm                         Path to the unpacked wasm runtime pack."
-      echo "  --latestdotnet                 --dotnet-versions will not be specified. --dotnet-versions defaults to LKG version in global.json "
-      echo "  --alpine                       Set for runs on Alpine"
-      echo ""
-      exit 0
-      ;;
-  esac
-done
-
-if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then
-    run_from_perf_repo=true
-fi
-
-if [ -z "$configurations" ]; then
-    configurations="CompilationMode=$compilation_mode"
-fi
-
-if [ -z "$core_root_directory" ]; then
-    use_core_run=false
-fi
-
-if [ -z "$baseline_core_root_directory" ]; then
-    use_baseline_core_run=false
-fi
-
-payload_directory=$source_directory/Payload
-performance_directory=$payload_directory/performance
-workitem_directory=$source_directory/workitem
-extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true"
-perflab_arguments=
-queue=Ubuntu.1804.Amd64.Open
-creator=$BUILD_DEFINITIONNAME
-helix_source_prefix="pr"
-
-if [[ "$internal" == true ]]; then
-    perflab_arguments="--upload-to-perflab-container"
-    helix_source_prefix="official"
-    creator=
-    extra_benchmark_dotnet_arguments=
-    
-    if [[ "$architecture" = "arm64" ]]; then
-        queue=Ubuntu.1804.Arm64.Perf
-    else
-        if [[ "$logical_machine" = "perfowl" ]]; then
-            queue=Ubuntu.1804.Amd64.Owl.Perf
-        else
-            queue=Ubuntu.1804.Amd64.Tiger.Perf
-        fi
-    fi
-
-    if [[ "$alpine" = "true" ]]; then
-        queue=alpine.amd64.tiger.perf
-    fi
-else
-    if [[ "$architecture" = "arm64" ]]; then
-        queue=ubuntu.1804.armarch.open
-    else
-        queue=Ubuntu.1804.Amd64.Open
-    fi
-
-    if [[ "$alpine" = "true" ]]; then
-        queue=alpine.amd64.tiger.perf
-    fi
-fi
-
-if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
-    configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
-    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
-fi
-
-if [[ "$wasm_runtime_loc" != "" ]]; then
-    configurations="CompilationMode=wasm RunKind=$kind"
-    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM NoMono"
-fi
-
-if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then
-    configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
-    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono"
-fi
-
-common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
-setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
-
-if [[ "$run_from_perf_repo" = true ]]; then
-    payload_directory=
-    workitem_directory=$source_directory
-    performance_directory=$workitem_directory
-    setup_arguments="--perf-hash $commit_sha $common_setup_arguments"
-else
-    git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory
-    
-    docs_directory=$performance_directory/docs
-    mv $docs_directory $workitem_directory
-fi
-
-if [[ "$wasm_runtime_loc" != "" ]]; then
-    using_wasm=true
-    wasm_dotnet_path=$payload_directory/dotnet-wasm
-    mv $wasm_runtime_loc $wasm_dotnet_path
-    extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmMainJS \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm/runtime-test.js --wasmEngine /home/helixbot/.jsvu/v8 --customRuntimePack \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm"
-fi
-
-if [[ "$mono_dotnet" != "" ]]; then
-    using_mono=true
-    mono_dotnet_path=$payload_directory/dotnet-mono
-    mv $mono_dotnet $mono_dotnet_path
-fi
-
-if [[ "$use_core_run" = true ]]; then
-    new_core_root=$payload_directory/Core_Root
-    mv $core_root_directory $new_core_root
-fi
-
-if [[ "$use_baseline_core_run" = true ]]; then
-  new_baseline_core_root=$payload_directory/Baseline_Core_Root
-  mv $baseline_core_root_directory $new_baseline_core_root
-fi
-
-ci=true
-
-_script_dir=$(pwd)/eng/common
-. "$_script_dir/pipeline-logging-functions.sh"
-
-# Make sure all of our variables are available for future steps
-Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
-Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
-Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
-Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
-Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
-Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Python" -value "python3" -is_multi_job_variable false
-Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
-Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
-Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
-Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
-Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
-Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
-Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false
-Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false
-Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_variable false
-Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 2427ca6b6aec7..8508397d77640 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,13 +5,8 @@ param(
   [Parameter(Mandatory=$true)][string] $MaestroToken,
   [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
-  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
-  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
-  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
-  [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
+  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
 )
 
 try {
@@ -35,27 +30,6 @@ try {
     $optionalParams.Add("--no-wait") | Out-Null
   }
 
-  if ("false" -ne $PublishInstallersAndChecksums) {
-    $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableNugetValidation) {
-    $optionalParams.Add("--validate-nuget") | Out-Null
-  }
-
-  if ("true" -eq $EnableSourceLinkValidation) {
-    $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableSigningValidation) {
-    $optionalParams.Add("--validate-signingchecksums") | Out-Null
-
-    if ("" -ne $SigningValidationAdditionalParameters) {
-      $optionalParams.Add("--signing-validation-parameters") | Out-Null
-      $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
-    }
-  }
-
   & $darc add-build-to-channel `
   --id $buildId `
   --publishing-infra-version $PublishingInfraVersion `
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 1c46f7b634148..e8ab29afeb333 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -14,7 +14,10 @@ param(
 $global:RepoFiles = @{}
 
 # Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
+
+$MaxRetries = 5
+$RetryWaitTimeInSeconds = 30
 
 # Wait time between check for system load
 $SecondsBetweenLoadChecks = 10
@@ -29,7 +32,10 @@ $ValidatePackage = {
   # Ensure input file exist
   if (!(Test-Path $PackagePath)) {
     Write-Host "Input file does not exist: $PackagePath"
-    return 1
+    return [pscustomobject]@{
+      result = 1
+      packagePath = $PackagePath
+    }
   }
 
   # Extensions for which we'll look for SourceLink information
@@ -59,7 +65,10 @@ $ValidatePackage = {
 
           # We ignore resource DLLs
           if ($FileName.EndsWith('.resources.dll')) {
-            return
+            return [pscustomobject]@{
+              result = 0
+              packagePath = $PackagePath
+            }
           }
 
           [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
@@ -91,36 +100,59 @@ $ValidatePackage = {
                     $Status = 200
                     $Cache = $using:RepoFiles
 
-                    if ( !($Cache.ContainsKey($FilePath)) ) {
-                      try {
-                        $Uri = $Link -as [System.URI]
-                      
-                        # Only GitHub links are valid
-                        if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
-                          $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                    $attempts = 0
+
+                    while ($attempts -lt $using:MaxRetries) {
+                      if ( !($Cache.ContainsKey($FilePath)) ) {
+                        try {
+                          $Uri = $Link -as [System.URI]
+                        
+                          if ($Link -match "submodules") {
+                            # Skip submodule links until sourcelink properly handles submodules
+                            $Status = 200
+                          }
+                          elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+                            # Only GitHub links are valid
+                            $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                          }
+                          else {
+                            # If it's not a github link, we want to break out of the loop and not retry.
+                            $Status = 0
+                            $attempts = $using:MaxRetries
+                          }
                         }
-                        else {
+                        catch {
+                          Write-Host $_
                           $Status = 0
                         }
                       }
-                      catch {
-                        write-host $_
-                        $Status = 0
-                      }
-                    }
 
-                    if ($Status -ne 200) {
-                      if ($NumFailedLinks -eq 0) {
-                        if ($FailedFiles.Value -eq 0) {
-                          Write-Host
+                      if ($Status -ne 200) {
+                        $attempts++
+                        
+                        if  ($attempts -lt $using:MaxRetries)
+                        {
+                          $attemptsLeft = $using:MaxRetries - $attempts
+                          Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
+                          Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
+                        }
+                        else {
+                          if ($NumFailedLinks -eq 0) {
+                            if ($FailedFiles.Value -eq 0) {
+                              Write-Host
+                            }
+  
+                            Write-Host "`tFile $RealPath has broken links:"
+                          }
+  
+                          Write-Host "`t`tFailed to retrieve $Link"
+  
+                          $NumFailedLinks++
                         }
-
-                        Write-Host "`tFile $RealPath has broken links:"
                       }
-
-                      Write-Host "`t`tFailed to retrieve $Link"
-
-                      $NumFailedLinks++
+                      else {
+                        break
+                      }
                     }
                   }
               }
@@ -136,7 +168,7 @@ $ValidatePackage = {
         }
   }
   catch {
-  
+    Write-Host $_
   }
   finally {
     $zip.Dispose() 
@@ -220,6 +252,7 @@ function ValidateSourceLinkLinks {
   # Process each NuGet package in parallel
   Get-ChildItem "$InputPath\*.symbols.nupkg" |
     ForEach-Object {
+      Write-Host "Starting $($_.FullName)"
       Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null
       $NumJobs = @(Get-Job -State 'Running').Count
       
@@ -267,6 +300,10 @@ function InstallSourcelinkCli {
 try {
   InstallSourcelinkCli
 
+  foreach ($Job in @(Get-Job)) {
+    Remove-Job -Id $Job.Id
+  }
+
   ValidateSourceLinkLinks 
 }
 catch {
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index e6d5d2fd05455..a5af041ba775c 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -8,7 +8,7 @@ param(
 )
 
 # Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
 
 # Max number of retries
 $MaxRetry = 5
@@ -114,6 +114,7 @@ $CountMissingSymbols = {
       $totalRetries = 0
 
       while ($totalRetries -lt $using:MaxRetry) {
+
         # Save the output and get diagnostic output
         $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
 
@@ -132,20 +133,28 @@ $CountMissingSymbols = {
         elseif (Test-Path $SymbolPath) {
           return 'Module'
         }
-        elseif ($output.Contains("503 Service Unavailable")) {
-          # If we got a 503 error, we should retry.
+        else
+        {
           $totalRetries++
         }
-        else {
-          return $null
-        }
       }
       
       return $null
     }
 
-    $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam
-    $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam
+    $FileGuid = New-Guid
+    $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
+
+    $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
+        -FullPath $FileName `
+        -TargetServerParam '--microsoft-symbol-server' `
+        -SymbolsPath "$ExpandedSymbolsPath-msdl" `
+        -WindowsPdbVerificationParam $WindowsPdbVerificationParam
+    $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
+        -FullPath $FileName `
+        -TargetServerParam '--internal-server' `
+        -SymbolsPath "$ExpandedSymbolsPath-symweb" `
+        -WindowsPdbVerificationParam $WindowsPdbVerificationParam
 
     Write-Host -NoNewLine "`t Checking file " $FileName "... "
   
@@ -208,6 +217,7 @@ function CheckSymbolsAvailable {
     Remove-Item $ExtractPath -Force  -Recurse -ErrorAction SilentlyContinue
   }
 
+  $TotalPackages = 0
   $TotalFailures = 0
   $DupedSymbols = 0
 
@@ -230,6 +240,8 @@ function CheckSymbolsAvailable {
         return
       }
 
+      $TotalPackages++
+
       Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null
 
       $NumJobs = @(Get-Job -State 'Running').Count
@@ -255,11 +267,11 @@ function CheckSymbolsAvailable {
 
   if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) {
     if ($TotalFailures -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages"
     }
 
     if ($DupedSymbols -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols packages had duplicated symbol files"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted"
     }
     
     ExitWithExitCode 1
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index f55c43c6f4786..b1bca63ab1d82 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -34,7 +34,7 @@ function Print-Usage() {
 function Build([string]$target) {
   $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
   $log = Join-Path $LogDir "$task$logSuffix.binlog"
-  $outputPath = Join-Path $ToolsetDir "$task\\"
+  $outputPath = Join-Path $ToolsetDir "$task\"
 
   MSBuild $taskProject `
     /bl:$log `
@@ -53,7 +53,7 @@ try {
   }
 
   if ($task -eq "") {
-    Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'" -ForegroundColor Red
+    Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'"
     Print-Usage
     ExitWithExitCode 1
   }
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
@@ -78,7 +78,7 @@ try {
 
   $taskProject = GetSdkTaskProject $task
   if (!(Test-Path $taskProject)) {
-    Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red
+    Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task"
     ExitWithExitCode 1
   }
 
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
new file mode 100644
index 0000000000000..adea8e8da2ab2
--- /dev/null
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -0,0 +1,116 @@
+Param(
+  [string] $GuardianCliLocation,
+  [string] $WorkingDirectory,
+  [string] $TargetDirectory,
+  [string] $GdnFolder,
+  # The list of Guardian tools to configure. For each object in the array:
+  # - If the item is a [hashtable], it must contain these entries:
+  #   - Name = The tool name as Guardian knows it.
+  #   - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique
+  #     among all tool entries with the same Name.
+  #   - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")'
+  # - If the item is a [string] $v, it is treated as '@{ Name="$v" }'
+  [object[]] $ToolsList,
+  [string] $GuardianLoggerLevel='Standard',
+  # Optional: Additional params to add to any tool using CredScan.
+  [string[]] $CrScanAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using PoliCheck.
+  [string[]] $PoliCheckAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using CodeQL/Semmle.
+  [string[]] $CodeQLAdditionalRunConfigParams
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  # Normalize tools list: all in [hashtable] form with defined values for each key.
+  $ToolsList = $ToolsList |
+    ForEach-Object {
+      if ($_ -is [string]) {
+        $_ = @{ Name = $_ }
+      }
+
+      if (-not ($_['Scenario'])) { $_.Scenario = "" }
+      if (-not ($_['Args'])) { $_.Args = @() }
+      $_
+    }
+  
+  Write-Host "List of tools to configure:"
+  $ToolsList | ForEach-Object { $_ | Out-String | Write-Host }
+
+  # We store config files in the r directory of .gdn
+  $gdnConfigPath = Join-Path $GdnFolder 'r'
+  $ValidPath = Test-Path $GuardianCliLocation
+
+  if ($ValidPath -eq $False)
+  {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location."
+    ExitWithExitCode 1
+  }
+
+  foreach ($tool in $ToolsList) {
+    # Put together the name and scenario to make a unique key.
+    $toolConfigName = $tool.Name
+    if ($tool.Scenario) {
+      $toolConfigName += "_" + $tool.Scenario
+    }
+
+    Write-Host "=== Configuring $toolConfigName..."
+
+    $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
+
+    # For some tools, add default and automatic args.
+    if ($tool.Name -eq 'credscan') {
+      if ($targetDirectory) {
+        $tool.Args += "TargetDirectory < $TargetDirectory"
+      }
+      $tool.Args += "OutputType < pre"
+      $tool.Args += $CrScanAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'policheck') {
+      if ($targetDirectory) {
+        $tool.Args += "Target < $TargetDirectory"
+      }
+      $tool.Args += $PoliCheckAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
+      if ($targetDirectory) {
+        $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
+      }
+      $tool.Args += $CodeQLAdditionalRunConfigParams
+    }
+
+    # Create variable pointing to the args array directly so we can use splat syntax later.
+    $toolArgs = $tool.Args
+
+    # Configure the tool. If args array is provided or the current tool has some default arguments
+    # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}",
+    # one per parameter. Doc page for "guardian configure":
+    # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure
+    Exec-BlockVerbosely {
+      & $GuardianCliLocation configure `
+        --working-directory $WorkingDirectory `
+        --tool $tool.Name `
+        --output-path $gdnConfigFile `
+        --logger-level $GuardianLoggerLevel `
+        --noninteractive `
+        --force `
+        $(if ($toolArgs) { "--args" }) @toolArgs
+      Exit-IfNZEC "Sdl"
+    }
+
+    Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile"
+  }
+}
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index 81b729f74a4d4..b9fe731796431 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -7,8 +7,17 @@ Param(
   [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,                                         # Required: the directory where source files are located
   [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')),  # Required: the directory where build artifacts are located
   [string] $AzureDevOpsAccessToken,                                                              # Required: access token for dnceng; should be provided via KeyVault
-  [string[]] $SourceToolsList,                                                                   # Optional: list of SDL tools to run on source code
-  [string[]] $ArtifactToolsList,                                                                 # Optional: list of SDL tools to run on built artifacts
+
+  # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list
+  # format.
+  [object[]] $SourceToolsList,
+  # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools
+  # list format.
+  [object[]] $ArtifactToolsList,
+  # Optional: list of SDL tools to run without automatically specifying a target directory. See
+  # 'configure-sdl-tool.ps1' for tools list format.
+  [object[]] $CustomToolsList,
+
   [bool] $TsaPublish=$False,                                                                     # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs.
   [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH,                                               # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs.
   [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME,                                        # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs.
@@ -25,6 +34,7 @@ Param(
   [string] $GuardianLoggerLevel='Standard',                                                      # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
   [string[]] $CrScanAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
   [string[]] $PoliCheckAdditionalRunConfigParams,                                                # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [string[]] $CodeQLAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
   [bool] $BreakOnFailure=$False                                                                  # Optional: Fail the build if there were errors during the run
 )
 
@@ -32,7 +42,7 @@ try {
   $ErrorActionPreference = 'Stop'
   Set-StrictMode -Version 2.0
   $disableConfigureToolsetImport = $true
-  $LASTEXITCODE = 0
+  $global:LASTEXITCODE = 0
 
   # `tools.ps1` checks $ci to perform some actions. Since the SDL
   # scripts don't necessarily execute in the same agent that run the
@@ -63,13 +73,16 @@ try {
     ExitWithExitCode 1
   }
 
-  & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+  }
   $gdnFolder = Join-Path $workingDirectory '.gdn'
 
   if ($TsaOnboard) {
     if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
-      Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-      & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+      }
       if ($LASTEXITCODE -ne 0) {
         Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE."
         ExitWithExitCode $LASTEXITCODE
@@ -80,11 +93,42 @@ try {
     }
   }
 
-  if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) {
-    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+  # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory.
+  function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) {
+    if ($tools -and $tools.Count -gt 0) {
+      Exec-BlockVerbosely {
+        & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') `
+          -GuardianCliLocation $guardianCliLocation `
+          -WorkingDirectory $workingDirectory `
+          -TargetDirectory $targetDirectory `
+          -GdnFolder $gdnFolder `
+          -ToolsList $tools `
+          -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
+          -GuardianLoggerLevel $GuardianLoggerLevel `
+          -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
+          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
+          -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
+        if ($BreakOnFailure) {
+          Exit-IfNZEC "Sdl"
+        }
+      }
+    }
   }
-  if ($SourceToolsList -and $SourceToolsList.Count -gt 0) {
-    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+
+  # Configure Artifact and Source tools with default Target directories.
+  Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory
+  Configure-ToolsList $SourceToolsList $SourceDirectory
+  # Configure custom tools with no default Target directory.
+  Configure-ToolsList $CustomToolsList $null
+
+  # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call.
+  # (If we used "run" multiple times, each run would overwrite data from earlier runs.)
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
+      -GuardianCliLocation $guardianCliLocation `
+      -WorkingDirectory $workingDirectory `
+      -UpdateBaseline $UpdateBaseline `
+      -GdnFolder $gdnFolder
   }
 
   if ($TsaPublish) {
@@ -92,8 +136,9 @@ try {
       if (-not $TsaRepositoryName) {
         $TsaRepositoryName = "$($Repository)-$($BranchName)"
       }
-      Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-      & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
+      }
       if ($LASTEXITCODE -ne 0) {
         Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE."
         ExitWithExitCode $LASTEXITCODE
@@ -106,7 +151,11 @@ try {
 
   if ($BreakOnFailure) {
     Write-Host "Failing the build in case of breaking results..."
-    & $guardianCliLocation break
+    Exec-BlockVerbosely {
+      & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+    }
+  } else {
+    Write-Host "Letting the build pass even if there were breaking results..."
   }
 }
 catch {
diff --git a/eng/common/sdl/extract-artifact-archives.ps1 b/eng/common/sdl/extract-artifact-archives.ps1
new file mode 100644
index 0000000000000..68da4fbf25717
--- /dev/null
+++ b/eng/common/sdl/extract-artifact-archives.ps1
@@ -0,0 +1,63 @@
+# This script looks for each archive file in a directory and extracts it into the target directory.
+# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**".
+# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip.
+param(
+  # Full path to directory where archives are stored.
+  [Parameter(Mandatory=$true)][string] $InputPath,
+  # Full path to directory to extract archives into. May be the same as $InputPath.
+  [Parameter(Mandatory=$true)][string] $ExtractPath
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  Measure-Command {
+    $jobs = @()
+
+    # Find archive files for non-Windows and Windows builds.
+    $archiveFiles = @(
+      Get-ChildItem (Join-Path $InputPath "*.tar.gz")
+      Get-ChildItem (Join-Path $InputPath "*.zip")
+    )
+
+    foreach ($targzFile in $archiveFiles) {
+      $jobs += Start-Job -ScriptBlock {
+        $file = $using:targzFile
+        $fileName = [System.IO.Path]::GetFileName($file)
+        $extractDir = Join-Path $using:ExtractPath "$fileName.extracted"
+
+        New-Item $extractDir -ItemType Directory -Force | Out-Null
+
+        Write-Host "Extracting '$file' to '$extractDir'..."
+
+        # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early.
+        # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the
+        # error. Save output so it can be stored in the exception string along with context.
+        $output = tar -xf $file -C $extractDir 2>&1
+        # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we
+        # don't have access to the outer scope.
+        if ($LASTEXITCODE -ne 0) {
+          throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'"
+        }
+
+        Write-Host "Extracted to $extractDir"
+      }
+    }
+
+    Receive-Job $jobs -Wait
+  }
+}
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index 1fe9271193cc6..3ac1d92b37006 100644
--- a/eng/common/sdl/init-sdl.ps1
+++ b/eng/common/sdl/init-sdl.ps1
@@ -10,7 +10,7 @@ Param(
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 $disableConfigureToolsetImport = $true
-$LASTEXITCODE = 0
+$global:LASTEXITCODE = 0
 
 # `tools.ps1` checks $ci to perform some actions. Since the SDL
 # scripts don't necessarily execute in the same agent that run the
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd721..b7bcfe38caf15 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.110.1"/>
 </packages>
diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1
index fe95ab35aa5d1..2eac8c78f103d 100644
--- a/eng/common/sdl/run-sdl.ps1
+++ b/eng/common/sdl/run-sdl.ps1
@@ -1,19 +1,15 @@
 Param(
   [string] $GuardianCliLocation,
   [string] $WorkingDirectory,
-  [string] $TargetDirectory,
   [string] $GdnFolder,
-  [string[]] $ToolsList,
   [string] $UpdateBaseline,
-  [string] $GuardianLoggerLevel='Standard',
-  [string[]] $CrScanAdditionalRunConfigParams,
-  [string[]] $PoliCheckAdditionalRunConfigParams
+  [string] $GuardianLoggerLevel='Standard'
 )
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 $disableConfigureToolsetImport = $true
-$LASTEXITCODE = 0
+$global:LASTEXITCODE = 0
 
 try {
   # `tools.ps1` checks $ci to perform some actions. Since the SDL
@@ -23,7 +19,6 @@ try {
   . $PSScriptRoot\..\tools.ps1
 
   # We store config files in the r directory of .gdn
-  Write-Host $ToolsList
   $gdnConfigPath = Join-Path $GdnFolder 'r'
   $ValidPath = Test-Path $GuardianCliLocation
 
@@ -33,37 +28,18 @@ try {
     ExitWithExitCode 1
   }
 
-  $configParam = @('--config')
-
-  foreach ($tool in $ToolsList) {
-    $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig"
-    Write-Host $tool
-    # We have to manually configure tools that run on source to look at the source directory only
-    if ($tool -eq 'credscan') {
-      Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
-      & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
-      if ($LASTEXITCODE -ne 0) {
-        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-        ExitWithExitCode $LASTEXITCODE
-      }
-    }
-    if ($tool -eq 'policheck') {
-      Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
-      & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
-      if ($LASTEXITCODE -ne 0) {
-        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-        ExitWithExitCode $LASTEXITCODE
-      }
-    }
-
-    $configParam+=$gdnConfigFile
-  }
-
-  Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam"
-  & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam
-  if ($LASTEXITCODE -ne 0) {
-    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
-    ExitWithExitCode $LASTEXITCODE
+  $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig'
+  Write-Host "Discovered Guardian config files:"
+  $gdnConfigFiles | Out-String | Write-Host
+
+  Exec-BlockVerbosely {
+    & $GuardianCliLocation run `
+      --working-directory $WorkingDirectory `
+      --baseline mainbaseline `
+      --update-baseline $UpdateBaseline `
+      --logger-level $GuardianLoggerLevel `
+      --config @gdnConfigFiles
+    Exit-IfNZEC "Sdl"
   }
 }
 catch {
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 4a32181fd8f93..24cec0424e5d6 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -2,17 +2,33 @@ parameters:
   enable: 'false'                                             # Whether the SDL validation job should execute or not
   overrideParameters: ''                                       # Optional: to override values for parameters.
   additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+  # diagnosis of problems with specific tool configurations.
+  publishGuardianDirectoryToPipeline: false
+  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+  # parameters rather than relying on YAML. It may be better to use a local script, because you can
+  # reproduce results locally without piecing together a command based on the YAML.
+  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
   # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
   # 'continueOnError', the parameter value is not correctly picked up.
   # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
   sdlContinueOnError: false                                    # optional: determines whether to continue the build if the step errors;
-  downloadArtifacts: true                                      # optional: determines if the artifacts should be dowloaded
+  # optional: determines if build artifacts should be downloaded.
+  downloadArtifacts: true
+  # optional: determines if this job should search the directory of downloaded artifacts for
+  # 'tar.gz' and 'zip' archive files and extract them before running SDL validation tasks.
+  extractArchiveArtifacts: false
   dependsOn: ''                                                # Optional: dependencies of the job
   artifactNames: ''                                            # Optional: patterns supplied to DownloadBuildArtifacts
                                                                # Usage:
                                                                #  artifactNames:
                                                                #    - 'BlobArtifacts'
                                                                #    - 'Artifacts_Windows_NT_Release'
+  # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
+  # not pipeline artifacts, so doesn't affect the use of this parameter.
+  pipelineArtifactNames: []
 
 jobs:
 - job: Run_SDL
@@ -22,16 +38,29 @@ jobs:
   variables:
     - group: DotNet-VSTS-Bot
     - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
+      value: ${{ parameters.AzDOProjectName }}
     - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
+      value: ${{ parameters.AzDOPipelineId }}
     - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+      value: ${{ parameters.AzDOBuildId }}
+    - template: /eng/common/templates/variables/sdl-variables.yml
+    - name: GuardianVersion
+      value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
   pool:
-    name: Hosted VS2017
+    # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+    ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+      name: VSEngSS-MicroBuild2022-1ES
+      demands: Cmd
+    # If it's not devdiv, it's dnceng
+    ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - checkout: self
     clean: true
+
+  - template: /eng/common/templates/post-build/setup-maestro-vars.yml
+
   - ${{ if ne(parameters.downloadArtifacts, 'false')}}:
     - ${{ if ne(parameters.artifactNames, '') }}:
       - ${{ each artifactName in parameters.artifactNames }}:
@@ -59,35 +88,44 @@ jobs:
           itemPattern: "**"
           downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
           checkDownloadedFiles: true
+
+  - ${{ each artifactName in parameters.pipelineArtifactNames }}:
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Pipeline Artifacts
+      inputs:
+        buildType: specific
+        buildVersionToDownload: specific
+        project: $(AzDOProjectName)
+        pipeline: $(AzDOPipelineId)
+        buildId: $(AzDOBuildId)
+        artifactName: ${{ artifactName }}
+        downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
+        checkDownloadedFiles: true
+
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
       -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
     displayName: Extract Blob Artifacts
     continueOnError: ${{ parameters.sdlContinueOnError }}
+
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
       -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
     displayName: Extract Package Artifacts
     continueOnError: ${{ parameters.sdlContinueOnError }}
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-  - task: NuGetCommand@2
-    displayName: 'Install Guardian'
-    inputs:
-      restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-      feedsToUse: config
-      nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
-      externalFeedCredentials: GuardianConnect
-      restoreDirectory: $(Build.SourcesDirectory)\.packages
-  - ${{ if ne(parameters.overrideParameters, '') }}:
-    - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  - ${{ if eq(parameters.overrideParameters, '') }}:
-    - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
-        -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-        -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
-        ${{ parameters.additionalParameters }}
-      displayName: Execute SDL
+
+  - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
+    - powershell: eng/common/sdl/extract-artifact-archives.ps1
+        -InputPath $(Build.ArtifactStagingDirectory)\artifacts
+        -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts
+      displayName: Extract Archive Artifacts
       continueOnError: ${{ parameters.sdlContinueOnError }}
+  
+  - template: /eng/common/templates/steps/execute-sdl.yml
+    parameters:
+      overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+      executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+      overrideParameters: ${{ parameters.overrideParameters }}
+      additionalParameters: ${{ parameters.additionalParameters }}
+      publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+      sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml
deleted file mode 100644
index e54ce956f9088..0000000000000
--- a/eng/common/templates/job/generate-graph-files.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool: {}
-
-  # Optional: Include toolset dependencies in the generated graph files
-  includeToolset: false
-  
-jobs:
-- job: Generate_Graph_Files
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: Generate Graph Files
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-    # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-    # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat
-    - group: Publish-Build-Assets
-    - group: DotNet-AllOrgs-Darc-Pats
-    - name: _GraphArguments
-      value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) 
-        -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) 
-        -barToken $(MaestroAccessToken) 
-        -outputFolder '$(Build.StagingDirectory)/GraphFiles/'
-    - ${{ if ne(parameters.includeToolset, 'false') }}:
-      - name: _GraphArguments
-        value: ${{ variables._GraphArguments }} -includeToolset
-
-  steps:
-    - task: PowerShell@2
-      displayName: Generate Graph Files
-      inputs:
-        filePath: eng\common\generate-graph-files.ps1 
-        arguments: $(_GraphArguments)
-      continueOnError: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Graph to Artifacts
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
-        PublishLocation: Container
-        ArtifactName: GraphFiles
-      continueOnError: true
-      condition: always()      
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 8669679348024..547d878da073a 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,12 +24,17 @@ parameters:
   enablePublishBuildAssets: false
   enablePublishTestResults: false
   enablePublishUsingPipelines: false
+  disableComponentGovernance: false
   mergeTestResults: false
   testRunTitle: ''
   testResultsFormat: ''
   name: ''
   preSteps: []
   runAsPublic: false
+# Sbom related params
+  enableSbom: true
+  PackageVersion: 6.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -103,7 +108,7 @@ jobs:
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@2
+      - task: MicroBuildSigningPlugin@3
         displayName: Install MicroBuild plugin
         inputs:
           signType: $(_SignType)
@@ -136,6 +141,10 @@ jobs:
         richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
       continueOnError: true
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+      - task: ComponentGovernanceComponentDetection@0
+        continueOnError: true
+
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
@@ -242,3 +251,9 @@ jobs:
         ArtifactName: AssetManifests
       continueOnError: ${{ parameters.continueOnError }}
       condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+    - template: /eng/common/templates/steps/generate-sbom.yml
+      parameters:
+        PackageVersion: ${{ parameters.packageVersion}}
+        BuildDropPath: ${{ parameters.buildDropPath }}
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index e8bc77d2ebbe3..9d1e3042d8a6c 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -3,15 +3,15 @@ parameters:
   dependsOn: ''
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool:
-    vmImage: vs2017-win2016
-
+  pool: ''
+    
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
   SourcesDirectory: $(Build.SourcesDirectory)
   CreatePr: true
   AutoCompletePr: false
+  ReusePr: true
   UseLfLineEndings: true
   UseCheckedInLocProjectJson: false
   LanguageSet: VS_Main_Languages
@@ -30,7 +30,18 @@ jobs:
 
   displayName: OneLocBuild
 
-  pool: ${{ parameters.pool }}
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+        name: VSEngSS-MicroBuild2022-1ES
+        demands: Cmd
+      # If it's not devdiv, it's dnceng
+      ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   variables:
     - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
@@ -64,6 +75,8 @@ jobs:
         ${{ if eq(parameters.CreatePr, true) }}:
           isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
           isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
+          ${{ if eq(parameters.RepoType, 'gitHub') }}:
+            isShouldReusePrSelected: ${{ parameters.ReusePr }}
         packageSourceAuth: patAuth
         patVariable: ${{ parameters.CeapexPat }}
         ${{ if eq(parameters.RepoType, 'gitHub') }}:
diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml
deleted file mode 100644
index f877fd7a89800..0000000000000
--- a/eng/common/templates/job/performance.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-parameters:
-  steps: []                       # optional -- any additional steps that need to happen before pulling down the performance repo and sending the performance benchmarks to helix (ie building your repo)
-  variables: []                   # optional -- list of additional variables to send to the template
-  jobName: ''                     # required -- job name
-  displayName: ''                 # optional -- display name for the job. Will use jobName if not passed
-  pool: ''                        # required -- name of the Build pool
-  container: ''                   # required -- name of the container
-  osGroup: ''                     # required -- operating system for the job
-  extraSetupParameters: ''        # optional -- extra arguments to pass to the setup script
-  frameworks: ['netcoreapp3.0']   # optional -- list of frameworks to run against
-  continueOnError: 'false'        # optional -- determines whether to continue the build if the step errors
-  dependsOn: ''                   # optional -- dependencies of the job
-  timeoutInMinutes: 320           # optional -- timeout for the job
-  enableTelemetry: false          # optional -- enable for telemetry
-
-jobs:
-- template: ../jobs/jobs.yml
-  parameters:
-    dependsOn: ${{ parameters.dependsOn }}
-    enableTelemetry: ${{ parameters.enableTelemetry }}
-    enablePublishBuildArtifacts: true
-    continueOnError: ${{ parameters.continueOnError }}
-    
-    jobs:
-      - job: '${{ parameters.jobName }}'
-
-        ${{ if ne(parameters.displayName, '') }}:
-          displayName: '${{ parameters.displayName }}'
-        ${{ if eq(parameters.displayName, '') }}:
-          displayName: '${{ parameters.jobName }}'
-
-        timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-
-        variables:
-
-        - ${{ each variable in parameters.variables }}:
-          - ${{ if ne(variable.name, '') }}:
-            - name: ${{ variable.name }}
-              value: ${{ variable.value }}
-          - ${{ if ne(variable.group, '') }}:
-            - group: ${{ variable.group }}
-
-        - IsInternal: ''
-        - HelixApiAccessToken: ''
-        - HelixPreCommand: ''
-
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-          - ${{ if eq( parameters.osGroup, 'Windows_NT') }}:
-            - HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"'
-            - IsInternal: -Internal
-          - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-            - HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"'
-            - IsInternal: --internal
-            
-          - group: DotNet-HelixApi-Access
-          - group: dotnet-benchview
-
-        workspace:
-          clean: all
-        pool:
-          ${{ parameters.pool }}
-        container: ${{ parameters.container }}
-        strategy:
-          matrix:
-            ${{ each framework in parameters.frameworks }}:
-              ${{ framework }}:
-                _Framework: ${{ framework }}
-        steps:
-        - checkout: self
-          clean: true
-        # Run all of the steps to setup repo
-        - ${{ each step in parameters.steps }}:
-          - ${{ step }}
-        - powershell: $(Build.SourcesDirectory)\eng\common\performance\performance-setup.ps1 $(IsInternal) -Framework $(_Framework) ${{ parameters.extraSetupParameters }}
-          displayName: Performance Setup (Windows)
-          condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
-          continueOnError: ${{ parameters.continueOnError }}
-        - script: $(Build.SourcesDirectory)/eng/common/performance/performance-setup.sh $(IsInternal) --framework $(_Framework) ${{ parameters.extraSetupParameters }}
-          displayName: Performance Setup (Unix)
-          condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
-          continueOnError: ${{ parameters.continueOnError }}
-        - script: $(Python) $(PerformanceDirectory)/scripts/ci_setup.py $(SetupArguments)
-          displayName: Run ci setup script
-        # Run perf testing in helix
-        - template: /eng/common/templates/steps/perf-send-to-helix.yml
-          parameters:
-            HelixSource: '$(HelixSourcePrefix)/$(Build.Repository.Name)/$(Build.SourceBranch)' # sources must start with pr/, official/, prodcon/, or agent/
-            HelixType: 'test/performance/$(Kind)/$(_Framework)/$(Architecture)'
-            HelixAccessToken: $(HelixApiAccessToken)
-            HelixTargetQueues: $(Queue)
-            HelixPreCommands: $(HelixPreCommand)
-            Creator: $(Creator)
-            WorkItemTimeout: 4:00 # 4 hours
-            WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy
-            CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions
\ No newline at end of file
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 3b9e2524ff37c..d91bf9147116f 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -38,10 +38,6 @@ jobs:
       value: ${{ parameters.configuration }}
     - group: Publish-Build-Assets
     - group: AzureDevOps-Artifact-Feeds-Pats
-    # Skip component governance and codesign validation for SDL. These jobs
-    # create no content.
-    - name: skipComponentGovernanceDetection
-      value: true
     - name: runCodesignValidationInjection
       value: false
 
@@ -94,7 +90,31 @@ jobs:
         PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
         PublishLocation: Container
         ArtifactName: ReleaseConfigs
-    
+
+    - task: powershell@2
+      displayName: Check if SymbolPublishingExclusionsFile.txt exists
+      inputs:
+        targetType: inline
+        script: |
+          $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
+          if(Test-Path -Path $symbolExclusionfile)
+          {
+            Write-Host "SymbolExclusionFile exists"
+            Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
+          }
+          else{
+           Write-Host "Symbols Exclusion file does not exists"
+           Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
+          }
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish SymbolPublishingExclusionsFile Artifact
+      condition: eq(variables['SymbolExclusionFile'], 'true') 
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+        PublishLocation: Container
+        ArtifactName: ReleaseConfigs
+        
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/templates/steps/publish-logs.yml
         parameters:
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index aad41464926c1..5cd5325d7b4e6 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -15,6 +15,9 @@ parameters:
   # nonPortable: false
   #   Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
   #   linux-x64), and compiling against distro-provided packages rather than portable ones.
+  # skipPublishValidation: false
+  #   Disables publishing validation.  By default, a check is performed to ensure no packages are
+  #   published by source-build.
   # container: ''
   #   A container to use. Runs in docker.
   # pool: {}
@@ -28,11 +31,6 @@ parameters:
   #   container and pool.
   platform: {}
 
-  # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
-  # source-build builds run in Docker, including the default managed platform.
-  defaultContainerHostPool:
-    vmImage: ubuntu-20.04
-
 jobs:
 - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
   displayName: Source-Build (${{ parameters.platform.name }})
@@ -44,7 +42,15 @@ jobs:
     container: ${{ parameters.platform.container }}
 
   ${{ if eq(parameters.platform.pool, '') }}:
-    pool: ${{ parameters.defaultContainerHostPool }}
+    # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+    # source-build builds run in Docker, including the default managed platform.
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCore1ESPool-Public
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
   ${{ if ne(parameters.platform.pool, '') }}:
     pool: ${{ parameters.platform.pool }}
 
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index a649d2b5990c0..d8990549e8097 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,15 +1,19 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210421.1
+  sourceIndexPackageVersion: 1.0.1-20210614.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
   binlogPath: artifacts/log/Debug/Build.binlog
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
+  condition: ''
+  dependsOn: ''
 
 jobs:
 - job: SourceIndexStage1
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
   variables:
   - name: SourceIndexPackageVersion
     value: ${{ parameters.sourceIndexPackageVersion }}
@@ -30,29 +34,24 @@ jobs:
     inputs:
       packageType: sdk
       version: 3.1.x
-
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk
-    inputs:
-      useGlobalJson: true
+      installationPath: $(Agent.TempDirectory)/dotnet
+      workingDirectory: $(Agent.TempDirectory)
 
   - script: |
-      dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
-      dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
-      echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools
+      $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+      $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
     displayName: Download Tools
+    # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
+    workingDirectory: $(Agent.TempDirectory)
 
   - script: ${{ parameters.sourceIndexBuildCommand }}
     displayName: Build Repository
 
-  - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
+  - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
     displayName: Process Binlog into indexable sln
-    env:
-      DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
+    - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
       displayName: Upload stage1 artifacts to source index
       env:
         BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
-        DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
new file mode 100644
index 0000000000000..54c393af440d0
--- /dev/null
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -0,0 +1,31 @@
+parameters:
+  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+  continueOnError: false
+  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  jobs: []
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    enableMicrobuild: false
+    enablePublishBuildArtifacts: false
+    enablePublishTestResults: false
+    enablePublishBuildAssets: false
+    enablePublishUsingPipelines: false
+    enableTelemetry: true
+
+    variables:
+      - group: Publish-Build-Assets
+      # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+      # sync with the packages.config file.
+      - name: DefaultGuardianVersion
+        value: 0.110.1
+      - name: GuardianPackagesConfigFile
+        value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+      - name: GuardianVersion
+        value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+  
+    jobs: ${{ parameters.jobs }}
+        
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index a1f8fce96ca81..554e71cfc436d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,17 +83,15 @@ jobs:
         - ${{ if eq(parameters.enableSourceBuild, true) }}:
           - Source_Build_Complete
         pool:
-          vmImage: vs2017-win2016
+          # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+          ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+            name: VSEngSS-MicroBuild2022-1ES
+            demands: Cmd
+          # If it's not devdiv, it's dnceng
+          ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
-
-  - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}:
-    - template: ../job/generate-graph-files.yml
-      parameters:
-        continueOnError: ${{ parameters.continueOnError }}
-        includeToolset: ${{ parameters.graphFileGeneration.includeToolset }}
-        dependsOn:
-          - Asset_Registry_Publish
-        pool:
-          vmImage: vs2017-win2016
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
deleted file mode 100644
index 0123cf43b1680..0000000000000
--- a/eng/common/templates/phases/base.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-parameters:
-  # Optional: Clean sources before building
-  clean: true
-
-  # Optional: Git fetch depth
-  fetchDepth: ''
-
-  # Optional: name of the phase (not specifying phase name may cause name collisions)
-  name: ''
-  # Optional: display name of the phase
-  displayName: ''
-
-  # Optional: condition for the job to run
-  condition: ''
-
-  # Optional: dependencies of the phase
-  dependsOn: ''
-
-  # Required: A defined YAML queue
-  queue: {}
-
-  # Required: build steps
-  steps: []
-
-  # Optional: variables
-  variables: {}
-
-  # Optional: should run as a public build even in the internal project
-  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
-  runAsPublic: false
-
-  ## Telemetry variables
-
-  # Optional: enable sending telemetry
-  #           if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
-  #             _HelixBuildConfig - differentiate between Debug, Release, other
-  #             _HelixSource - Example: build/product
-  #             _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch)
-  enableTelemetry: false
-
-  # Optional: Enable installing Microbuild plugin
-  #           if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
-  #             _TeamName - the name of your team
-  #             _SignType - 'test' or 'real'
-  enableMicrobuild: false
-
-# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
-# and some (Microbuild) should only be applied to non-PR cases for internal builds.
-
-phases:
-- phase: ${{ parameters.name }}
-
-  ${{ if ne(parameters.displayName, '') }}:
-    displayName: ${{ parameters.displayName }}
-
-  ${{ if ne(parameters.condition, '') }}:
-    condition: ${{ parameters.condition }}
-
-  ${{ if ne(parameters.dependsOn, '') }}:
-    dependsOn: ${{ parameters.dependsOn }}
-
-  queue: ${{ parameters.queue }}
-
-  ${{ if ne(parameters.variables, '') }}:
-    variables:
-      ${{ insert }}: ${{ parameters.variables }}
-
-  steps:
-  - checkout: self
-    clean: ${{ parameters.clean }}
-    ${{ if ne(parameters.fetchDepth, '') }}:
-      fetchDepth: ${{ parameters.fetchDepth }}
-
-  - ${{ if eq(parameters.enableTelemetry, 'true') }}:
-    - template: /eng/common/templates/steps/telemetry-start.yml
-      parameters:
-        buildConfig: $(_HelixBuildConfig)
-        helixSource: $(_HelixSource)
-        helixType: $(_HelixType)
-        runAsPublic: ${{ parameters.runAsPublic }}
-
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    # Internal only resource, and Microbuild signing shouldn't be applied to PRs.
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildSigningPlugin@2
-        displayName: Install MicroBuild plugin
-        inputs:
-          signType: $(_SignType)
-          zipSources: false
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-          
-        env:
-          TeamName: $(_TeamName)
-        continueOnError: false
-        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-
-  # Run provided build steps
-  - ${{ parameters.steps }}
-
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    # Internal only resources
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks  
-        condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-        env:
-          TeamName: $(_TeamName)
-
-  - ${{ if eq(parameters.enableTelemetry, 'true') }}:
-    - template: /eng/common/templates/steps/telemetry-end.yml
-      parameters:
-        helixSource: $(_HelixSource)
-        helixType: $(_HelixType)
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - task: CopyFiles@2
-      displayName: Gather Asset Manifests
-      inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
-        TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
-      continueOnError: false
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-    - task: PublishBuildArtifacts@1
-      displayName: Push Asset Manifests
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
-        PublishLocation: Container
-        ArtifactName: AssetManifests
-      continueOnError: false
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml
deleted file mode 100644
index 4e51e472e2bba..0000000000000
--- a/eng/common/templates/phases/publish-build-assets.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-parameters:
-  dependsOn: ''
-  queue: {}
-  configuration: 'Debug'
-  condition: succeeded()
-  continueOnError: false
-  runAsPublic: false
-  publishUsingPipelines: false
-phases:
-  - phase: Asset_Registry_Publish
-    displayName: Publish to Build Asset Registry
-    dependsOn: ${{ parameters.dependsOn }}
-    queue: ${{ parameters.queue }}
-    variables:
-      _BuildConfig: ${{ parameters.configuration }}
-    steps:
-      - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download artifact
-          inputs:
-            artifactName: AssetManifests
-            downloadPath: '$(Build.StagingDirectory)/Download'
-            checkDownloadedFiles: true
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: AzureKeyVault@1
-          inputs:
-            azureSubscription: 'DotNet-Engineering-Services_KeyVault'
-            KeyVaultName: EngKeyVault
-            SecretsFilter: 'MaestroAccessToken'
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: PowerShell@2
-          displayName: Publish Build Assets
-          inputs:
-            filePath: eng\common\sdk-task.ps1
-            arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
-              /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
-              /p:BuildAssetRegistryToken=$(MaestroAccessToken)
-              /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
-              /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
-              /p:Configuration=$(_BuildConfig)
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: PublishBuildArtifacts@1
-          displayName: Publish Logs to VSTS
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
-            PublishLocation: Container
-            ArtifactName: $(Agent.Os)_Asset_Registry_Publish
-          continueOnError: true
-          condition: always()
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
deleted file mode 100644
index 58fa9a35b8ca9..0000000000000
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            /p:PublishToMSDL=false
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
-            /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:PublishToMSDL=false
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
deleted file mode 100644
index b50c0b3bdb8e6..0000000000000
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-  # If the channel name is empty, no links will be generated
-  akaMSChannelName: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      - name: ArtifactsCategory
-        value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:ArtifactsCategory=$(ArtifactsCategory)
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
-            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
-            /p:AkaMSClientId=$(akams-client-id)
-            /p:AkaMSClientSecret=$(akams-client-secret)
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c99fd7503767c..1ac7f49a43ca8 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -4,54 +4,6 @@ variables:
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-MSRC-Storage
   - group: Publish-Build-Assets
-    
-  # .NET Core 3.1 Dev
-  - name: PublicDevRelease_31_Channel_Id
-    value: 128
-
-  # .NET 5 Dev
-  - name: Net_5_Dev_Channel_Id
-    value: 131
-
-  # .NET Eng - Validation
-  - name: Net_Eng_Validation_Channel_Id
-    value: 9
-
-  # .NET Eng - Latest
-  - name: Net_Eng_Latest_Channel_Id
-    value: 2
-
-  # .NET 3 Eng - Validation
-  - name: NET_3_Eng_Validation_Channel_Id
-    value: 390
-
-  # .NET 3 Eng
-  - name: NetCore_3_Tools_Channel_Id
-    value: 344
-
-  # .NET Core 3.0 Internal Servicing
-  - name: InternalServicing_30_Channel_Id
-    value: 184
-
-  # .NET Core 3.0 Release
-  - name: PublicRelease_30_Channel_Id
-    value: 19
-
-  # .NET Core 3.1 Release
-  - name: PublicRelease_31_Channel_Id
-    value: 129
-
-  # General Testing
-  - name: GeneralTesting_Channel_Id
-    value: 529
-
-  # .NET Core 3.1 Blazor Features
-  - name: NetCore_31_Blazor_Features_Channel_Id
-    value: 531
-
-  # .NET Core Experimental
-  - name: NetCore_Experimental_Channel_Id
-    value: 562
 
   # Whether the build is internal or not
   - name: IsInternalBuild
@@ -70,30 +22,5 @@ variables:
   - name: SymbolToolVersion
     value: 1.0.1
 
-  # Feed Configurations
-  # These should include the suffix "/index.json"
-
-  # Default locations for Installers and checksums
-  # Public Locations
-  - name: ChecksumsBlobFeedUrl
-    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
-  - name: InstallersBlobFeedUrl
-    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
-
-  # Private Locations
-  - name: InternalChecksumsBlobFeedUrl
-    value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalChecksumsBlobFeedKey
-    value: $(dotnetclichecksumsmsrc-storage-key)
-
-  - name: InternalInstallersBlobFeedUrl
-    value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalInstallersBlobFeedKey
-    value: $(dotnetclimsrc-access-key)
-
-  # Skip component governance and codesign validation for SDL. These jobs
-  # create no content.
-  - name: skipComponentGovernanceDetection
-    value: true
   - name: runCodesignValidationInjection
     value: false
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 4f79cf0f33703..24e92a275a4fb 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,113 +1,114 @@
 parameters:
- # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
-  # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
-  # Publishing V3 DOES NOT accept inlining the publishing stages.
-  publishingInfraVersion: 2
-  # When set to true the publishing templates from the repo will be used
-  # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
-  inline: true
-
-  # Only used if inline==false. When set to true will stall the current build until
-  # the Promotion Pipeline build finishes. Otherwise, the current build will continue 
-  # execution concurrently with the promotion build.
-  waitPublishingFinish: true
-
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-  enableSourceLinkValidation: false
-  enableSigningValidation: true
-  enableSymbolValidation: false
-  enableNugetValidation: true
-  publishInstallersAndChecksums: true
-  SDLValidationParameters:
-    enable: false
-    continueOnError: false
-    params: ''
-    artifactNames: ''
-    downloadArtifacts: true
+  # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+  # Publishing V1 is no longer supported
+  # Publishing V2 is no longer supported
+  # Publishing V3 is the default
+  - name: publishingInfraVersion
+    displayName: Which version of publishing should be used to promote the build definition?
+    type: number
+    default: 3
+    values:
+    - 3
+
+  - name: BARBuildId
+    displayName: BAR Build Id
+    type: number
+    default: 0
+
+  - name: PromoteToChannelIds
+    displayName: Channel to promote BARBuildId to
+    type: string
+    default: ''
+
+  - name: enableSourceLinkValidation
+    displayName: Enable SourceLink validation
+    type: boolean
+    default: false
+
+  - name: enableSigningValidation
+    displayName: Enable signing validation
+    type: boolean
+    default: true
+
+  - name: enableSymbolValidation
+    displayName: Enable symbol validation
+    type: boolean
+    default: false
+
+  - name: enableNugetValidation
+    displayName: Enable NuGet validation
+    type: boolean
+    default: true
+    
+  - name: publishInstallersAndChecksums
+    displayName: Publish installers and checksums
+    type: boolean
+    default: true
+
+  - name: SDLValidationParameters
+    type: object
+    default:
+      enable: false
+      continueOnError: false
+      params: ''
+      artifactNames: ''
+      downloadArtifacts: true
 
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
-  symbolPublishingAdditionalParameters: ''
-  artifactsPublishingAdditionalParameters: ''
-  signingValidationAdditionalParameters: ''
+  - name: symbolPublishingAdditionalParameters
+    displayName: Symbol publishing additional parameters
+    type: string
+    default: ''
+
+  - name: artifactsPublishingAdditionalParameters
+    displayName: Artifact publishing additional parameters
+    type: string
+    default: ''
+
+  - name: signingValidationAdditionalParameters
+    displayName: Signing validation additional parameters
+    type: string
+    default: ''
 
   # Which stages should finish execution before post-build stages start
-  validateDependsOn:
-  - build
-  publishDependsOn: 
-  - Validate
+  - name: validateDependsOn
+    type: object
+    default:
+    - build
 
-  # Channel ID's instantiated in this file.
-  # When adding a new channel implementation the call to `check-channel-consistency.ps1` 
-  # needs to be updated with the new channel ID
-  NetEngLatestChannelId: 2
-  NetEngValidationChannelId: 9
-  NetDev5ChannelId: 131
-  NetDev6ChannelId: 1296
-  GeneralTestingChannelId: 529
-  NETCoreToolingDevChannelId: 548
-  NETCoreToolingReleaseChannelId: 549
-  NETInternalToolingChannelId: 551
-  NETCoreExperimentalChannelId: 562
-  NetEngServicesIntChannelId: 678
-  NetEngServicesProdChannelId: 679
-  NetCoreSDK313xxChannelId: 759
-  NetCoreSDK313xxInternalChannelId: 760
-  NetCoreSDK314xxChannelId: 921
-  NetCoreSDK314xxInternalChannelId: 922
-  VS166ChannelId: 1010
-  VS167ChannelId: 1011
-  VS168ChannelId: 1154
-  VSMasterChannelId: 1012
-  VS169ChannelId: 1473
-  VS1610ChannelId: 1692
+  - name: publishDependsOn
+    type: object
+    default:
+    - Validate
 
 stages:
-- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
   - stage: Validate
     dependsOn: ${{ parameters.validateDependsOn }}
     displayName: Validate Build Assets
     variables:
       - template: common-variables.yml
     jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-      - job:
-        displayName: Post-build Checks
-        dependsOn: setupMaestroVars
-        variables:
-          - name: TargetChannels
-            value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
-        pool:
-          vmImage: 'windows-2019'
-        steps:
-          - task: PowerShell@2
-            displayName: Maestro Channels Consistency
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
-              arguments: -PromoteToChannels "$(TargetChannels)"
-                -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
-
     - job:
       displayName: NuGet Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
       pool:
-        vmImage: 'windows-2019'
-      variables:
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -128,19 +129,22 @@ stages:
 
     - job:
       displayName: Signing Validation
-      dependsOn: setupMaestroVars
       condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -185,19 +189,22 @@ stages:
 
     - job:
       displayName: SourceLink Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Blob Artifacts
           inputs:
@@ -223,367 +230,46 @@ stages:
     - template: /eng/common/templates/job/execute-sdl.yml
       parameters:
         enable: ${{ parameters.SDLValidationParameters.enable }}
-        dependsOn: setupMaestroVars
         additionalParameters: ${{ parameters.SDLValidationParameters.params }}
         continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
         artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
         downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
 
-- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
-  - stage: publish_using_darc
-    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.publishDependsOn }}
-    ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Publish using Darc
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - job:
-      displayName: Publish Using Darc
-      dependsOn: setupMaestroVars
-      timeoutInMinutes: 120
-      variables:
-        - name: BARBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: PowerShell@2
-          displayName: Publish Using Darc
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId) 
-              -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
-              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-              -MaestroToken '$(MaestroApiAccessToken)'
-              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
-              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-
-- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev5_Publish'
-      channelName: '.NET 5 Dev'
-      akaMSChannelName: 'net5/dev'
-      channelId: ${{ parameters.NetDev5ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev6_Publish'
-      channelName: '.NET 6 Dev'
-      akaMSChannelName: 'net6/dev'
-      channelId: ${{ parameters.NetDev6ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Latest_Publish'
-      channelName: '.NET Eng - Latest'
-      akaMSChannelName: 'eng/daily'
-      channelId: ${{ parameters.NetEngLatestChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Validation_Publish'
-      channelName: '.NET Eng - Validation'
-      akaMSChannelName: 'eng/validation'
-      channelId: ${{ parameters.NetEngValidationChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'General_Testing_Publish'
-      channelName: 'General Testing'
-      akaMSChannelName: 'generaltesting'
-      channelId: ${{ parameters.GeneralTestingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Dev_Publishing'
-      channelName: '.NET Core Tooling Dev'
-      channelId: ${{ parameters.NETCoreToolingDevChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Release_Publishing'
-      channelName: '.NET Core Tooling Release'
-      channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NET_Internal_Tooling_Publishing'
-      channelName: '.NET Internal Tooling'
-      channelId: ${{ parameters.NETInternalToolingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Experimental_Publishing'
-      channelName: '.NET Core Experimental'
-      channelId: ${{ parameters.NETCoreExperimentalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Int_Publish'
-      channelName: '.NET Eng Services - Int'
-      channelId: ${{ parameters.NetEngServicesIntChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Prod_Publish'
-      channelName: '.NET Eng Services - Prod'
-      channelId: ${{ parameters.NetEngServicesProdChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx'
-      channelId: ${{ parameters.NetCoreSDK314xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx Internal'
-      channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx'
-      channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx Internal'
-      channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_6_Publishing'
-      channelName: 'VS 16.6'
-      channelId: ${{ parameters.VS166ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_7_Publishing'
-      channelName: 'VS 16.7'
-      channelId: ${{ parameters.VS167ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-      
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_8_Publishing'
-      channelName: 'VS 16.8'
-      channelId: ${{ parameters.VS168ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_Master_Publishing'
-      channelName: 'VS Master'
-      channelId: ${{ parameters.VSMasterChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_9_Publishing'
-      channelName: 'VS 16.9'
-      channelId: ${{ parameters.VS169ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_10_Publishing'
-      channelName: 'VS 16.10'
-      channelId: ${{ parameters.VS1610ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+- stage: publish_using_darc
+  ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.publishDependsOn }}
+  ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.validateDependsOn }}
+  displayName: Publish using Darc
+  variables:
+    - template: common-variables.yml
+  jobs:
+  - job:
+    displayName: Publish Using Darc
+    timeoutInMinutes: 120
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    steps:
+      - template: setup-maestro-vars.yml
+        parameters:
+          BARBuildId: ${{ parameters.BARBuildId }}
+          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+      - task: PowerShell@2
+        displayName: Publish Using Darc
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          arguments: -BuildId $(BARBuildId) 
+            -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+            -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+            -MaestroToken '$(MaestroApiAccessToken)'
+            -WaitPublishingFinish true
+            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 4a22b2e6f6de7..0c87f149a4ad7 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -2,77 +2,69 @@ parameters:
   BARBuildId: ''
   PromoteToChannelIds: ''
 
-jobs:
-- job: setupMaestroVars
-  displayName: Setup Maestro Vars
-  variables:
-    - template: common-variables.yml
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - checkout: none
-
-    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Release Configs
-        inputs:
-          buildType: current
-          artifactName: ReleaseConfigs
-          checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      name: setReleaseVars
-      displayName: Set Release Configs Vars
+steps:
+  - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Release Configs
       inputs:
-        targetType: inline
-        script: |
-          try {
-            if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
-              $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
+        buildType: current
+        artifactName: ReleaseConfigs
+        checkDownloadedFiles: true
 
-              $BarId = $Content | Select -Index 0
-              $Channels = $Content | Select -Index 1             
-              $IsStableBuild = $Content | Select -Index 2
+  - task: PowerShell@2
+    name: setReleaseVars
+    displayName: Set Release Configs Vars
+    inputs:
+      targetType: inline
+      pwsh: true
+      script: |
+        try {
+          if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
+            $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
 
-              $AzureDevOpsProject = $Env:System_TeamProject
-              $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
-              $AzureDevOpsBuildId = $Env:Build_BuildId
-            }
-            else {
-              $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
+            $BarId = $Content | Select -Index 0
+            $Channels = $Content | Select -Index 1             
+            $IsStableBuild = $Content | Select -Index 2
 
-              $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-              $apiHeaders.Add('Accept', 'application/json')
-              $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-              $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-             
-              $BarId = $Env:BARBuildId
-              $Channels = $Env:PromoteToMaestroChannels -split ","
-              $Channels = $Channels -join "]["
-              $Channels = "[$Channels]"
+            $AzureDevOpsProject = $Env:System_TeamProject
+            $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
+            $AzureDevOpsBuildId = $Env:Build_BuildId
+          }
+          else {
+            $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
 
-              $IsStableBuild = $buildInfo.stable
-              $AzureDevOpsProject = $buildInfo.azureDevOpsProject
-              $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
-              $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
-            }
+            $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
+            $apiHeaders.Add('Accept', 'application/json')
+            $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
 
-            Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
-            Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
-            Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
+            $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
+            
+            $BarId = $Env:BARBuildId
+            $Channels = $Env:PromoteToMaestroChannels -split ","
+            $Channels = $Channels -join "]["
+            $Channels = "[$Channels]"
 
-            Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
-            Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
-            Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
+            $IsStableBuild = $buildInfo.stable
+            $AzureDevOpsProject = $buildInfo.azureDevOpsProject
+            $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
+            $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
           }
-          catch {
-            Write-Host $_
-            Write-Host $_.Exception
-            Write-Host $_.ScriptStackTrace
-            exit 1
-          }
-      env:
-        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
+
+          Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId"
+          Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels"
+          Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild"
+
+          Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject"
+          Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId"
+          Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId"
+        }
+        catch {
+          Write-Host $_
+          Write-Host $_.Exception
+          Write-Host $_.ScriptStackTrace
+          exit 1
+        }
+    env:
+      MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml
new file mode 100644
index 0000000000000..3930b1630214b
--- /dev/null
+++ b/eng/common/templates/steps/execute-codeql.yml
@@ -0,0 +1,32 @@
+parameters:
+  # Language that should be analyzed. Defaults to csharp
+  language: csharp
+  # Build Commands
+  buildCommands: ''
+  overrideParameters: ''                                       # Optional: to override values for parameters.
+  additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+  # diagnosis of problems with specific tool configurations.
+  publishGuardianDirectoryToPipeline: false
+  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+  # parameters rather than relying on YAML. It may be better to use a local script, because you can
+  # reproduce results locally without piecing together a command based on the YAML.
+  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+  # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
+  # 'continueOnError', the parameter value is not correctly picked up.
+  # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
+  # optional: determines whether to continue the build if the step errors;
+  sdlContinueOnError: false
+
+steps:
+- template: /eng/common/templates/steps/execute-sdl.yml
+  parameters:
+    overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+    executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+    overrideParameters: ${{ parameters.overrideParameters }}
+    additionalParameters: '${{ parameters.additionalParameters }}
+      -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")'
+    publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+    sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml
new file mode 100644
index 0000000000000..7b8ee18a28d7e
--- /dev/null
+++ b/eng/common/templates/steps/execute-sdl.yml
@@ -0,0 +1,68 @@
+parameters:
+  overrideGuardianVersion: ''
+  executeAllSdlToolsScript: ''
+  overrideParameters: ''
+  additionalParameters: ''
+  publishGuardianDirectoryToPipeline: false
+  sdlContinueOnError: false
+  condition: ''
+
+steps:
+- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
+  - powershell: |
+      $content = Get-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content was:`n$content"
+
+      $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
+      $content | Set-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content updated to:`n$content"
+    displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
+
+- task: NuGetToolInstaller@1
+  displayName: 'Install NuGet.exe'
+  
+- task: NuGetCommand@2
+  displayName: 'Install Guardian'
+  inputs:
+    restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+    feedsToUse: config
+    nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
+    externalFeedCredentials: GuardianConnect
+    restoreDirectory: $(Build.SourcesDirectory)\.packages
+
+- ${{ if ne(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if eq(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }}
+      -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
+      -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
+      -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
+      ${{ parameters.additionalParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
+  # We want to publish the Guardian results and configuration for easy diagnosis. However, the
+  # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
+  # tooling files. Some of these files are large and aren't useful during an investigation, so
+  # exclude them by simply deleting them before publishing. (As of writing, there is no documented
+  # way to selectively exclude a dir from the pipeline artifact publish task.)
+  - task: DeleteFiles@1
+    displayName: Delete Guardian dependencies to avoid uploading
+    inputs:
+      SourceFolder: $(Agent.BuildDirectory)/.gdn
+      Contents: |
+        c
+        i
+    condition: succeededOrFailed()
+  - publish: $(Agent.BuildDirectory)/.gdn
+    artifact: GuardianConfiguration
+    displayName: Publish GuardianConfiguration
+    condition: succeededOrFailed()
\ No newline at end of file
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
new file mode 100644
index 0000000000000..f4d7937f3798c
--- /dev/null
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -0,0 +1,44 @@
+# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
+# PackageName - The name of the package this SBOM represents.
+# PackageVersion - The version of the package this SBOM represents. 
+# ManifestDirPath - The path of the directory where the generated manifest files will be placed
+
+parameters:
+  PackageVersion: 6.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  PackageName: '.NET'
+  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
+  sbomContinueOnError: true
+
+steps:
+- task: PowerShell@2 
+  displayName: Prep for SBOM generation in (Non-linux)
+  condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
+  inputs: 
+    filePath: ./eng/common/generate-sbom-prep.ps1
+    arguments: ${{parameters.manifestDirPath}}
+
+# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
+- script: |
+    chmod +x ./eng/common/generate-sbom-prep.sh
+    ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
+  displayName: Prep for SBOM generation in (Linux)
+  condition: eq(variables['Agent.Os'], 'Linux')
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+  displayName: 'Generate SBOM manifest'
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+  inputs:
+      PackageName: ${{ parameters.packageName }}
+      BuildDropPath: ${{ parameters.buildDropPath }}
+      PackageVersion: ${{ parameters.packageVersion }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}
+
+- task: PublishPipelineArtifact@1
+  displayName: Publish SBOM manifest
+  continueOnError: ${{parameters.sbomContinueOnError}}
+  inputs:
+    targetPath: '${{parameters.manifestDirPath}}'
+    artifactName: $(ARTIFACT_NAME)
+
diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml
deleted file mode 100644
index 0fb786fabf7e3..0000000000000
--- a/eng/common/templates/steps/perf-send-to-helix.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Please remember to update the documentation if you make changes to these parameters!
-parameters:
-  ProjectFile: ''                        # required -- project file that specifies the helix workitems
-  HelixSource: 'pr/default'              # required -- sources must start with pr/, official/, prodcon/, or agent/
-  HelixType: 'tests/default/'            # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
-  HelixBuild: $(Build.BuildNumber)       # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
-  HelixTargetQueues: ''                  # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
-  HelixAccessToken: ''                   # required -- access token to make Helix API requests; should be provided by the appropriate variable group
-  HelixPreCommands: ''                   # optional -- commands to run before Helix work item execution
-  HelixPostCommands: ''                  # optional -- commands to run after Helix work item execution
-  WorkItemDirectory: ''                  # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
-  CorrelationPayloadDirectory: ''        # optional -- a directory to zip up and send to Helix as a correlation payload
-  IncludeDotNetCli: false                # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
-  DotNetCliPackageType: ''               # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
-  DotNetCliVersion: ''                   # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
-  EnableXUnitReporter: false             # optional -- true enables XUnit result reporting to Mission Control
-  WaitForWorkItemCompletion: true        # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
-  Creator: ''                            # optional -- if the build is external, use this to specify who is sending the job
-  DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO 
-  condition: succeeded()                 # optional -- condition for step to execute; defaults to succeeded()
-  continueOnError: false                 # optional -- determines whether to continue the build if the step errors; defaults to false
-  osGroup: ''                            # required -- operating system for the job
-            
-
-steps:
-- template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
-  parameters:
-    osGroup: ${{ parameters.osGroup }}
-    sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
-    displayName: ${{ parameters.DisplayNamePrefix }}
-    condition: ${{ parameters.condition }}
-    shouldContinueOnError: ${{ parameters.continueOnError }}
-    environment:
-      BuildConfig: $(_BuildConfig)
-      HelixSource: ${{ parameters.HelixSource }}
-      HelixType: ${{ parameters.HelixType }}
-      HelixBuild: ${{ parameters.HelixBuild }}
-      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
-      HelixAccessToken: ${{ parameters.HelixAccessToken }}
-      HelixPreCommands: ${{ parameters.HelixPreCommands }}
-      HelixPostCommands: ${{ parameters.HelixPostCommands }}
-      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
-      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
-      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
-      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
-      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
-      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
-      Creator: ${{ parameters.Creator }}
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 8e336b7d16b34..abb1b2bcda42b 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -18,6 +18,35 @@ steps:
     set -x
     df -h
 
+    # If building on the internal project, the artifact feeds variable may be available (usually only if needed)
+    # In that case, call the feed setup script to add internal feeds corresponding to public ones.
+    # In addition, add an msbuild argument to copy the WIP from the repo to the target build location.
+    # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those
+    # changes.
+    $internalRestoreArgs=
+    if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then
+      # Temporarily work around https://github.com/dotnet/arcade/issues/7709
+      chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+      $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw)
+      internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
+
+      # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
+      # This only works if there is a username/email configured, which won't be the case in most CI runs.
+      git config --get user.email
+      if [ $? -ne 0 ]; then
+        git config user.email dn-bot@microsoft.com
+        git config user.name dn-bot
+      fi
+    fi
+
+    # If building on the internal project, the internal storage variable may be available (usually only if needed)
+    # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
+    # in the default public locations.
+    internalRuntimeDownloadArgs=
+    if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
+    fi
+
     buildConfig=Release
     # Check if AzDO substitutes in a build config from a variable, and use it if so.
     if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then
@@ -34,10 +63,17 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
+    publishArgs=
+    if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
+      publishArgs='--publish'
+    fi
+
     ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
       --configuration $buildConfig \
-      --restore --build --pack --publish \
+      --restore --build --pack $publishArgs -bl \
       $officialBuildArgs \
+      $internalRuntimeDownloadArgs \
+      $internalRestoreArgs \
       $targetRidArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml
new file mode 100644
index 0000000000000..1a860bd040647
--- /dev/null
+++ b/eng/common/templates/variables/sdl-variables.yml
@@ -0,0 +1,7 @@
+variables:
+# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+# sync with the packages.config file.
+- name: DefaultGuardianVersion
+  value: 0.110.1
+- name: GuardianPackagesConfigFile
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index d52467eea11d2..f1e1cb53953bc 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,12 +42,15 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dot.net/v1/dotnet-install.ps1
+#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
 [bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci }
 
+# True to exclude prerelease versions Visual Studio during build
+[bool]$excludePrereleaseVS = if (Test-Path variable:excludePrereleaseVS) { $excludePrereleaseVS } else { $false }
+
 # An array of names of processes to stop on script exit if prepareMachine is true.
 $processesToStopOnExit = if (Test-Path variable:processesToStopOnExit) { $processesToStopOnExit } else { @('msbuild', 'dotnet', 'vbcscompiler') }
 
@@ -103,6 +106,46 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
+# Take the given block, print it, print what the block probably references from the current set of
+# variables using low-effort string matching, then run the block.
+#
+# This is intended to replace the pattern of manually copy-pasting a command, wrapping it in quotes,
+# and printing it using "Write-Host". The copy-paste method is more readable in build logs, but less
+# maintainable and less reliable. It is easy to make a mistake and modify the command without
+# properly updating the "Write-Host" line, resulting in misleading build logs. The probability of
+# this mistake makes the pattern hard to trust when it shows up in build logs. Finding the bug in
+# existing source code can also be difficult, because the strings are not aligned to each other and
+# the line may be 300+ columns long.
+#
+# By removing the need to maintain two copies of the command, Exec-BlockVerbosely avoids the issues.
+#
+# In Bash (or any posix-like shell), "set -x" prints usable verbose output automatically.
+# "Set-PSDebug" appears to be similar at first glance, but unfortunately, it isn't very useful: it
+# doesn't print any info about the variables being used by the command, which is normally the
+# interesting part to diagnose.
+function Exec-BlockVerbosely([scriptblock] $block) {
+  Write-Host "--- Running script block:"
+  $blockString = $block.ToString().Trim()
+  Write-Host $blockString
+
+  Write-Host "--- List of variables that might be used:"
+  # For each variable x in the environment, check the block for a reference to x via simple "$x" or
+  # "@x" syntax. This doesn't detect other ways to reference variables ("${x}" nor "$variable:x",
+  # among others). It only catches what this function was originally written for: simple
+  # command-line commands.
+  $variableTable = Get-Variable |
+    Where-Object {
+      $blockString.Contains("`$$($_.Name)") -or $blockString.Contains("@$($_.Name)")
+    } |
+    Format-Table -AutoSize -HideTableHeaders -Wrap |
+    Out-String
+  Write-Host $variableTable.Trim()
+
+  Write-Host "--- Executing:"
+  & $block
+  Write-Host "--- Done running script block!"
+}
+
 # createSdkLocationFile parameter enables a file being generated under the toolset directory
 # which writes the sdk's location into. This is only necessary for cmd --> powershell invocations
 # as dot sourcing isn't possible.
@@ -190,38 +233,42 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   return $global:_DotNetInstallDir = $dotnetRoot
 }
 
+function Retry($downloadBlock, $maxRetries = 5) {
+  $retries = 1
+
+  while($true) {
+    try {
+      & $downloadBlock
+      break
+    }
+    catch {
+      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
+    }
+
+    if (++$retries -le $maxRetries) {
+      $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
+      Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
+      Start-Sleep -Seconds $delayInSeconds
+    }
+    else {
+      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
+      break
+    }
+
+  }
+}
+
 function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
+    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
-    $maxRetries = 5
-    $retries = 1
-
-    $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
-
-    while($true) {
-      try {
-        Write-Host "GET $uri"
-        Invoke-WebRequest $uri -OutFile $installScript
-        break
-      }
-      catch {
-        Write-Host "Failed to download '$uri'"
-        Write-Error $_.Exception.Message -ErrorAction Continue
-      }
-
-      if (++$retries -le $maxRetries) {
-        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
-        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
-        Start-Sleep -Seconds $delayInSeconds
-      }
-      else {
-        throw "Unable to download file in $maxRetries attempts."
-      }
-
-    }
+    Retry({
+      Write-Host "GET $uri"
+      Invoke-WebRequest $uri -OutFile $installScript
+    })
   }
 
   return $installScript
@@ -251,32 +298,45 @@ function InstallDotNet([string] $dotnetRoot,
   if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
   if ($noPath) { $installParameters.NoPath = $True }
 
-  try {
-    & $installScript @installParameters
-  }
-  catch {
-    if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
-      Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
-      if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
+  $variations = @()
+  $variations += @($installParameters)
 
-      if ($runtimeSourceFeedKey) {
-        $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
-        $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
-        $installParameters.FeedCredential = $decodedString
-      }
+  $dotnetBuilds = $installParameters.Clone()
+  $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
+  $variations += @($dotnetBuilds)
 
-      try {
-        & $installScript @installParameters
-      }
-      catch {
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
-        ExitWithExitCode 1
-      }
+  if ($runtimeSourceFeed) {
+    $runtimeSource = $installParameters.Clone()
+    $runtimeSource.AzureFeed = $runtimeSourceFeed
+    if ($runtimeSourceFeedKey) {
+      $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
+      $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
+      $runtimeSource.FeedCredential = $decodedString
+    }
+    $variations += @($runtimeSource)
+  }
+
+  $installSuccess = $false
+  foreach ($variation in $variations) {
+    if ($variation | Get-Member AzureFeed) {
+      $location = $variation.AzureFeed
     } else {
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
-      ExitWithExitCode 1
+      $location = "public location";
+    }
+    Write-Host "Attempting to install dotnet from $location."
+    try {
+      & $installScript @variation
+      $installSuccess = $true
+      break
+    }
+    catch {
+      Write-Host "Failed to install dotnet from $location."
     }
   }
+  if (-not $installSuccess) {
+    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
+    ExitWithExitCode 1
+  }
 }
 
 #
@@ -305,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview
-  $defaultXCopyMSBuildVersion = '16.8.0-preview3'
+  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview
+  $defaultXCopyMSBuildVersion = '16.10.0-preview2'
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
   $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
@@ -371,7 +431,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
-  return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
+
+  $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
+  $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
+  if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
+  } else {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
+  }
+
+  return $global:_MSBuildExe
 }
 
 function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -400,9 +469,13 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
     }
 
     Create-Directory $packageDir
+
     Write-Host "Downloading $packageName $packageVersion"
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+    Retry({
+      Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+    })
+
     Unzip $packagePath $packageDir
   }
 
@@ -439,31 +512,17 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   if (!(Test-Path $vsWhereExe)) {
     Create-Directory $vsWhereDir
     Write-Host 'Downloading vswhere'
-    $maxRetries = 5
-    $retries = 1
-
-    while($true) {
-      try {
-        Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
-        break
-      }
-      catch{
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
-      }
-
-      if (++$retries -le $maxRetries) {
-        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
-        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
-        Start-Sleep -Seconds $delayInSeconds
-      }
-      else {
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
-      }
-    }
+    Retry({
+      Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+    })
   }
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
-  $args = @('-latest', '-prerelease', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
+  $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
+
+  if (!$excludePrereleaseVS) {
+    $args += '-prerelease'
+  }
 
   if (Get-Member -InputObject $vsRequirements -Name 'version') {
     $args += '-version'
@@ -489,7 +548,13 @@ function LocateVisualStudio([object]$vsRequirements = $null){
 
 function InitializeBuildTool() {
   if (Test-Path variable:global:_BuildTool) {
-    return $global:_BuildTool
+    # If the requested msbuild parameters do not match, clear the cached variables.
+    if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) {
+      Remove-Item variable:global:_BuildTool
+      Remove-Item variable:global:_MSBuildExe
+    } else {
+      return $global:_BuildTool
+    }
   }
 
   if (-not $msbuildEngine) {
@@ -517,7 +582,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
 
-    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" }
+    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
   } else {
     Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
     ExitWithExitCode 1
@@ -542,7 +607,7 @@ function GetDefaultMSBuildEngine() {
 
 function GetNuGetPackageCachePath() {
   if ($env:NUGET_PACKAGES -eq $null) {
-    # Use local cache on CI to ensure deterministic build. 
+    # Use local cache on CI to ensure deterministic build.
     # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116
     # use global cache in dev builds to avoid cost of downloading packages.
     # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968
@@ -620,6 +685,17 @@ function ExitWithExitCode([int] $exitCode) {
   exit $exitCode
 }
 
+# Check if $LASTEXITCODE is a nonzero exit code (NZEC). If so, print a Azure Pipeline error for
+# diagnostics, then exit the script with the $LASTEXITCODE.
+function Exit-IfNZEC([string] $category = "General") {
+  Write-Host "Exit code $LASTEXITCODE"
+  if ($LASTEXITCODE -ne 0) {
+    $message = "Last command failed with exit code $LASTEXITCODE."
+    Write-PipelineTelemetryError -Force -Category $category -Message $message
+    ExitWithExitCode $LASTEXITCODE
+  }
+}
+
 function Stop-Processes() {
   Write-Host 'Killing running build processes...'
   foreach ($processName in $processesToStopOnExit) {
@@ -643,6 +719,8 @@ function MSBuild() {
       Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
     }
 
+    Enable-Nuget-EnhancedRetry
+
     $toolsetBuildProject = InitializeToolset
     $basePath = Split-Path -parent $toolsetBuildProject
     $possiblePaths = @(
@@ -651,6 +729,8 @@ function MSBuild() {
       (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
+      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
     )
     $selectedPath = $null
     foreach ($path in $possiblePaths) {
@@ -687,6 +767,8 @@ function MSBuild-Core() {
     }
   }
 
+  Enable-Nuget-EnhancedRetry
+
   $buildTool = InitializeBuildTool
 
   $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
@@ -699,7 +781,10 @@ function MSBuild-Core() {
   }
 
   foreach ($arg in $args) {
-    if ($arg -ne $null -and $arg.Trim() -ne "") {
+    if ($null -ne $arg -and $arg.Trim() -ne "") {
+      if ($arg.EndsWith('\')) {
+        $arg = $arg + "\"
+      }
       $cmdArgs += " `"$arg`""
     }
   }
@@ -771,7 +856,7 @@ function Get-Darc($version) {
 
 . $PSScriptRoot\pipeline-logging-functions.ps1
 
-$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')
+$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..\')
 $EngRoot = Resolve-Path (Join-Path $PSScriptRoot '..')
 $ArtifactsDir = Join-Path $RepoRoot 'artifacts'
 $ToolsetDir = Join-Path $ArtifactsDir 'toolset'
@@ -806,3 +891,18 @@ if (!$disableConfigureToolsetImport) {
     }
   }
 }
+
+#
+# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
+#
+function Enable-Nuget-EnhancedRetry() {
+    if ($ci) {
+      Write-Host "Setting NUGET enhanced retry environment variables"
+      $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
+      $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
+      $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
+      Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
+      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
+      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
+    }
+}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 5fad1846e5a53..e555c34269f6e 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dot.net/v1/dotnet-install.sh
+#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -188,28 +188,29 @@ function InstallDotNet {
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
 
-  local archArg=''
+  local installParameters=(--version $version --install-dir "$root")
+
   if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then
-    archArg="--architecture $3"
+    installParameters+=(--architecture $3)
   fi
-  local runtimeArg=''
   if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
-    runtimeArg="--runtime $4"
+    installParameters+=(--runtime $4)
   fi
-  local skipNonVersionedFilesArg=""
   if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then
-    skipNonVersionedFilesArg="--skip-non-versioned-files"
+    installParameters+=(--skip-non-versioned-files)
   fi
-  bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
-    local exit_code=$?
-    echo "Failed to install dotnet SDK from public location (exit code '$exit_code')."
 
-    local runtimeSourceFeed=''
-    if [[ -n "${6:-}" ]]; then
-      runtimeSourceFeed="--azure-feed $6"
-    fi
+  local variations=() # list of variable names with parameter arrays in them
+
+  local public_location=("${installParameters[@]}")
+  variations+=(public_location)
 
-    local runtimeSourceFeedKey=''
+  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
+  variations+=(dotnetbuilds)
+
+  if [[ -n "${6:-}" ]]; then
+    variations+=(private_feed)
+    local private_feed=("${installParameters[@]}" --azure-feed $6)
     if [[ -n "${7:-}" ]]; then
       # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
       # '-d'. To work around this, do a simple detection and switch the parameter
@@ -219,22 +220,27 @@ function InstallDotNet {
           decodeArg="-d"
       fi
       decodedFeedKey=`echo $7 | base64 $decodeArg`
-      runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+      private_feed+=(--feed-credential $decodedFeedKey)
     fi
+  fi
 
-    if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
-      bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
-        local exit_code=$?
-        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
-        ExitWithExitCode $exit_code
-      }
-    else
-      if [[ $exit_code != 0 ]]; then
-        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
-      fi
-      ExitWithExitCode $exit_code
+  local installSuccess=0
+  for variationName in "${variations[@]}"; do
+    local name="$variationName[@]"
+    local variation=("${!name}")
+    echo "Attempting to install dotnet from $variationName."
+    bash "$install_script" "${variation[@]}" && installSuccess=1
+    if [[ "$installSuccess" -eq 1 ]]; then
+      break
     fi
-  }
+
+    echo "Failed to install dotnet from $variationName."
+  done
+
+  if [[ "$installSuccess" -eq 0 ]]; then
+    Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
+    ExitWithExitCode 1
+  fi
 }
 
 function with_retries {
@@ -262,7 +268,7 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
 
   if [[ ! -a "$install_script" ]]; then
     mkdir -p "$root"
@@ -410,6 +416,13 @@ function MSBuild {
       export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
       Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
       Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
+
+      export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
+      export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
+      export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
+      Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
+      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
+      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
     fi
 
     local toolset_dir="${_InitializeToolset%/*}"
@@ -420,6 +433,8 @@ function MSBuild {
     possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
+    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
     for path in "${possiblePaths[@]}"; do
       if [[ -f $path ]]; then
         selectedPath=$path
@@ -485,13 +500,14 @@ _script_dir=`dirname "$_ResolvePath"`
 
 eng_root=`cd -P "$_script_dir/.." && pwd`
 repo_root=`cd -P "$_script_dir/../.." && pwd`
-artifacts_dir="$repo_root/artifacts"
+repo_root="${repo_root}/"
+artifacts_dir="${repo_root}artifacts"
 toolset_dir="$artifacts_dir/toolset"
-tools_dir="$repo_root/.tools"
+tools_dir="${repo_root}.tools"
 log_dir="$artifacts_dir/log/$configuration"
 temp_dir="$artifacts_dir/tmp/$configuration"
 
-global_json_file="$repo_root/global.json"
+global_json_file="${repo_root}global.json"
 # determine if global.json contains a "runtimes" entry
 global_json_has_runtimes=false
 if command -v jq &> /dev/null; then
@@ -504,7 +520,7 @@ fi
 
 # HOME may not be defined in some scenarios, but it is required by NuGet
 if [[ -z $HOME ]]; then
-  export HOME="$repo_root/artifacts/.home/"
+  export HOME="${repo_root}artifacts/.home/"
   mkdir -p "$HOME"
 fi
 
diff --git a/global.json b/global.json
index d7b31f0fb8bc3..d8e8647a644dc 100644
--- a/global.json
+++ b/global.json
@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.3.21202.5",
+    "version": "6.0.104",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.3.21202.5",
+    "dotnet": "6.0.104",
     "vs": {
       "version": "16.8"
     },
     "xcopy-msbuild": "16.8.0-preview2.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21230.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22218.4",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22218.4"
   }
 }

From 354603460bca9fb404ed43f6262869e07d64ed3c Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 12:20:26 -0700
Subject: [PATCH 148/413] In progress

---
 ...pNetCoreRouteEmbeddedLanguageClassifier.cs | 65 +++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
index 8f7bcefc4dc4a..4def6525001c6 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
@@ -3,10 +3,15 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Composition;
+using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
 {
@@ -14,17 +19,67 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLang
         nameof(AspNetCoreRouteEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false, "Route"), Shared]
     internal class AspNetCoreRouteEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
     {
-        private readonly IAspNetCoreRouteEmbeddedLanguageClassifier? _classifier;
+        // Following CWTs are used to cache the  providers from projects' references,
+        // so we can avoid the slow path unless there's any change to the references.
+        private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, IAspNetCoreRouteEmbeddedLanguageClassifier> _analyzerReferencesToClassifierMap = new();
+        private readonly ConditionalWeakTable<AnalyzerReference, IAspNetCoreRouteEmbeddedLanguageClassifier> _analyzerReferenceToClassifierMap = new();
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public AspNetCoreRouteEmbeddedLanguageClassifier(
-            [Import(AllowDefault = true)] IAspNetCoreRouteEmbeddedLanguageClassifier? classifier)
+        public AspNetCoreRouteEmbeddedLanguageClassifier()
         {
-            _classifier = classifier;
         }
 
         public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
-            => _classifier?.RegisterClassifications(new AspNetCoreEmbeddedLanguageClassificationContext(context));
+        {
+        }
+
+        private IAspNetCoreRouteEmbeddedLanguageClassifier? GetClassifier(Project? project)
+        {
+            if (project is null)
+                return null;
+
+            if (_analyzerReferencesToClassifierMap.TryGetValue(project.AnalyzerReferences, out var classifier))
+                return classifier;
+
+            return GetClassifierSlow(project);
+
+            IAspNetCoreRouteEmbeddedLanguageClassifier? GetClassifierSlow(Project project)
+                => _analyzerReferencesToClassifierMap.GetValue(project.AnalyzerReferences, _ => ComputeClassifier(project));
+
+            IAspNetCoreRouteEmbeddedLanguageClassifier? ComputeClassifier(Project project)
+            {
+                foreach (var reference in project.AnalyzerReferences)
+                {
+                    var classifier = _analyzerReferenceToClassifierMap.GetValue(reference, r => GetClassifier(r));
+                    if (classifier != null)
+                        return classifier;
+                }
+
+                return null;
+            }
+        }
+
+        private sealed class ClassifierExtensionProvider
+            : AbstractProjectExtensionProvider<IAspNetCoreRouteEmbeddedLanguageClassifier, ExportCompletionProviderAttribute>
+        {
+            public ClassifierExtensionProvider(AnalyzerReference reference)
+                : base(reference)
+            {
+            }
+
+            protected override bool SupportsLanguage(ExportCompletionProviderAttribute exportAttribute, string language)
+            {
+                return exportAttribute.Language == null
+                    || exportAttribute.Language.Length == 0
+                    || exportAttribute.Language.Contains(language);
+            }
+
+            protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<CompletionProvider> extensions)
+            {
+                extensions = default;
+                return false;
+            }
+        }
     }
 }

From 971d47b090ce5f7d850f89bfe97708c0507ad977 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 12:32:17 -0700
Subject: [PATCH 149/413] Backport test fixes from #60523

---
 .../CSharp/Test/CommandLine/CommandLineTests.cs    | 14 +++++++++++---
 .../CSharp/Test/Symbol/Symbols/Source/EnumTests.cs |  7 ++++---
 .../Analyzers/AnalyzerFileReferenceTests.cs        |  2 +-
 .../Core/CodeAnalysisTest/CorLibTypesTests.cs      | 10 ++++++++--
 .../DefaultAnalyzerAssemblyLoaderTests.cs          |  2 +-
 .../ShadowCopyAnalyzerAssemblyLoaderTests.cs       |  2 +-
 src/Compilers/Test/Core/ModuleInitializer.cs       |  2 ++
 .../Test/Symbol/SymbolsTests/Source/EnumTests.vb   |  8 +++++---
 8 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
index 96c9ee0369c5d..563d268bdf011 100644
--- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
+++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
@@ -5804,7 +5804,8 @@ class A                                                               \
         [Fact]
         public void CscCompile_WithSourceCodeRedirectedViaStandardInput_ProducesLibrary()
         {
-            var name = Guid.NewGuid().ToString() + ".dll";
+            var nameGuid = Guid.NewGuid().ToString();
+            var name = nameGuid + ".dll";
             string tempDir = Temp.CreateDirectory().Path;
             ProcessResult result = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
                 ProcessUtilities.Run("cmd", $@"/C echo  ^
@@ -5828,8 +5829,15 @@ class A                                                               \
             Assert.False(result.ContainsErrors, $"Compilation error(s) occurred: {result.Output} {result.Errors}");
 
             var assemblyName = AssemblyName.GetAssemblyName(Path.Combine(tempDir, name));
-            Assert.Equal(name.Replace(".dll", ", Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"),
-                assemblyName.ToString());
+
+            Assert.Equal(nameGuid, assemblyName.Name);
+            Assert.Equal("0.0.0.0", assemblyName.Version.ToString());
+            Assert.Equal(string.Empty, assemblyName.CultureName);
+#if NETCOREAPP
+            Assert.Null(assemblyName.GetPublicKeyToken());
+#else
+            Assert.Equal(Array.Empty<byte>(), assemblyName.GetPublicKeyToken());
+#endif
         }
 
         [Fact(Skip = "https://github.com/dotnet/roslyn/issues/55727")]
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EnumTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EnumTests.cs
index 047f543429c4a..fbf8f77bbbff5 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EnumTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EnumTests.cs
@@ -341,7 +341,8 @@ public enum Suits
     static void Main(string[] args)
     {
         Suits S = (Suits)Enum.ToObject(typeof(Suits), 2);
-        Console.WriteLine(S.ToString()); // ValueE
+        Console.WriteLine(S == Suits.ValueB);
+        Console.WriteLine(S == Suits.ValueE);
         Suits S1 = (Suits)Enum.ToObject(typeof(Suits), -1);
         Console.WriteLine(S1.ToString()); // -1
     }
@@ -349,8 +350,8 @@ static void Main(string[] args)
 ";
             VerifyEnumsValue(source, "c1.Suits", 1, 2, 4, 2, 2);
 
-            CompileAndVerify(source, expectedOutput: @"
-ValueE
+            CompileAndVerify(source, expectedOutput: @"True
+True
 -1
 ");
         }
diff --git a/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceTests.cs b/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceTests.cs
index ea200e0d58402..f28f09892b3c6 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceTests.cs
@@ -321,7 +321,7 @@ public void TestLoadVisualBasicGenerators()
         }
 
         // can't load a coreclr targeting generator on net framework / mono
-        [ConditionalFact(typeof(CoreClrOnly))]
+        [ConditionalFact(typeof(CoreClrOnly), AlwaysSkip = "https://github.com/dotnet/roslyn/issues/60762")]
         public void TestGeneratorsCantTargetNetFramework()
         {
             var directory = Temp.CreateDirectory();
diff --git a/src/Compilers/Core/CodeAnalysisTest/CorLibTypesTests.cs b/src/Compilers/Core/CodeAnalysisTest/CorLibTypesTests.cs
index ecf897cf5c360..37ff9a1074120 100644
--- a/src/Compilers/Core/CodeAnalysisTest/CorLibTypesTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/CorLibTypesTests.cs
@@ -191,11 +191,17 @@ public void ConstantValueGetHashCodeTest02()
         [Fact]
         public void ConstantValueToStringTest01()
         {
+            var value = "Null";
+#if NETCOREAPP
+            value = "Nothing";
+#endif
+
             var cv = ConstantValue.Create(null, ConstantValueTypeDiscriminator.Null);
-            Assert.Equal("ConstantValueNull(null: Null)", cv.ToString());
+            Assert.Equal($"ConstantValueNull(null: {value})", cv.ToString());
 
             cv = ConstantValue.Create(null, ConstantValueTypeDiscriminator.String);
-            Assert.Equal("ConstantValueNull(null: Null)", cv.ToString());
+            Assert.Equal($"ConstantValueNull(null: {value})", cv.ToString());
+
             // Never hit "ConstantValueString(null: Null)"
 
             var strVal = "QC";
diff --git a/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs b/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs
index 723a496a22974..5c705da54745f 100644
--- a/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs
@@ -326,7 +326,7 @@ public void AssemblyLoading_MultipleVersions_MultipleEqualMatches()
             }
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/60763")]
         public void AssemblyLoading_MultipleVersions_ExactAndGreaterMatch()
         {
             StringBuilder sb = new StringBuilder();
diff --git a/src/Compilers/Core/CodeAnalysisTest/ShadowCopyAnalyzerAssemblyLoaderTests.cs b/src/Compilers/Core/CodeAnalysisTest/ShadowCopyAnalyzerAssemblyLoaderTests.cs
index 02525eb8c552d..7102c7654bce3 100644
--- a/src/Compilers/Core/CodeAnalysisTest/ShadowCopyAnalyzerAssemblyLoaderTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/ShadowCopyAnalyzerAssemblyLoaderTests.cs
@@ -139,7 +139,7 @@ public void AssemblyLoading_DependencyInDifferentDirectory_Delete()
             File.Delete(gammaFile.Path);
 
             var actual = sb.ToString();
-            Assert.Equal(@"Delta: Gamma: Test G
+            Assert.Equal(@"Delta.2: Gamma: Test G
 ", actual);
         }
     }
diff --git a/src/Compilers/Test/Core/ModuleInitializer.cs b/src/Compilers/Test/Core/ModuleInitializer.cs
index ec521237e9d79..91a23203447dd 100644
--- a/src/Compilers/Test/Core/ModuleInitializer.cs
+++ b/src/Compilers/Test/Core/ModuleInitializer.cs
@@ -12,7 +12,9 @@ namespace Roslyn.Test.Utilities
 {
     internal static class ModuleInitializer
     {
+#pragma warning disable CA2255
         [ModuleInitializer]
+#pragma warning restore CA2255
         internal static void Initialize()
         {
             Trace.Listeners.Clear();
diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EnumTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EnumTests.vb
index a911e8734f554..ea5db281bd504 100644
--- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EnumTests.vb
+++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EnumTests.vb
@@ -496,7 +496,8 @@ BC30396: 'NotInheritable' is not valid on an Enum declaration.
             End Enum
             Shared Sub Main()
                 Dim S As Suits = CType(2, Suits)
-                Console.WriteLine(S.ToString())     ' ValueE
+                Console.WriteLine(S = Suits.ValueB)
+                Console.WriteLine(S = Suits.ValueE)
                 Dim S1 As Suits = CType(-1, Suits)
                 Console.WriteLine(S1.ToString())        ' 255
             End Sub
@@ -505,8 +506,9 @@ BC30396: 'NotInheritable' is not valid on an Enum declaration.
 </compilation>
 
             VerifyEnumsValue(text, "c1.Suits", 1, 2, 4, 2, 2)
-            Dim expectedOutput = <![CDATA[
-ValueE
+
+            Dim expectedOutput = <![CDATA[True
+True
 -1
 ]]>
             Dim comp = CreateCompilationWithMscorlib40AndVBRuntime(text, TestOptions.ReleaseExe)

From 18a2f6b1a584f675ce477a997f58b101788bc6b9 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 12:33:26 -0700
Subject: [PATCH 150/413] Move 'Identifiers' out of metadata about an embedded
 lang classifier

---
 .../CSharpJsonEmbeddedLanguageClassifier.cs    |  2 +-
 .../CSharpRegexEmbeddedLanguageClassifier.cs   |  2 +-
 .../AbstractJsonEmbeddedLanguageClassifier.cs  |  3 +++
 .../AbstractRegexEmbeddedLanguageClassifier.cs |  3 +++
 ...isualBasicJsonEmbeddedLanguageClassifier.vb |  2 +-
 ...sualBasicRegexEmbeddedLanguageClassifier.vb |  2 +-
 ...actEmbeddedLanguageClassificationService.cs | 18 +++++++++---------
 ...stractFallbackEmbeddedLanguageClassifier.cs |  2 ++
 .../ExportEmbeddedLanguageClassifier.cs        | 17 +++--------------
 .../IEmbeddedLanguageClassifier.cs             | 11 +++++++++++
 .../EmbeddedLanguageMetadata.cs                |  9 +--------
 11 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
index f17b7ebf38c61..659676a717f6f 100644
--- a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
+++ b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.CodeAnalysis.CSharp.Features.EmbeddedLanguages
 {
     [ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.CSharp, supportsUnannotatedAPIs: true, "Json"), Shared]
+        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.CSharp, supportsUnannotatedAPIs: true), Shared]
     internal class CSharpJsonEmbeddedLanguageClassifier : AbstractJsonEmbeddedLanguageClassifier
     {
         [ImportingConstructor]
diff --git a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
index 929b2af473c16..625f38f80f7e7 100644
--- a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
+++ b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.CSharp.Features.EmbeddedLanguages
     // want that to happen for APIs that are certain to be another language like Regex.
     [ExtensionOrder(Before = PredefinedEmbeddedLanguageClassifierNames.Json)]
     [ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.CSharp, supportsUnannotatedAPIs: true, "Regex", "Regexp"), Shared]
+        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.CSharp, supportsUnannotatedAPIs: true), Shared]
     internal class CSharpRegexEmbeddedLanguageClassifier : AbstractRegexEmbeddedLanguageClassifier
     {
         [ImportingConstructor]
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs b/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
index 514a909bae8b0..3dfd2fa92b3d3 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
@@ -2,6 +2,7 @@
 // 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.Classification;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
@@ -22,6 +23,8 @@ internal abstract class AbstractJsonEmbeddedLanguageClassifier : IEmbeddedLangua
         private static readonly ObjectPool<Visitor> s_visitorPool = new(() => new Visitor());
         private readonly EmbeddedLanguageInfo _info;
 
+        public ImmutableArray<string> Identifiers { get; } = ImmutableArray.Create("Json");
+
         public AbstractJsonEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
index 1a66b8761ce6b..d730374c723b9 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
@@ -2,6 +2,7 @@
 // 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.Classification;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
@@ -24,6 +25,8 @@ internal abstract class AbstractRegexEmbeddedLanguageClassifier : IEmbeddedLangu
 
         private readonly EmbeddedLanguageInfo _info;
 
+        public ImmutableArray<string> Identifiers { get; } = ImmutableArray.Create("Regex", "Regexp");
+
         protected AbstractRegexEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
index 88566a89e9ccb..e1b2ffbaa21b2 100644
--- a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
+++ b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
@@ -10,7 +10,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.EmbeddedLanguages.LanguageServices
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Features.EmbeddedLanguages
     <ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.VisualBasic, True, "Json"), [Shared]>
+        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.VisualBasic, True), [Shared]>
     Friend Class VisualBasicJsonEmbeddedLanguageClassifier
         Inherits AbstractJsonEmbeddedLanguageClassifier
 
diff --git a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
index 847389b65f68e..61721f227f387 100644
--- a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
+++ b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
@@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Features.EmbeddedLanguages
     ' want that to happen for APIs that are certain to be another language Like Regex.
     <ExtensionOrder(Before:=PredefinedEmbeddedLanguageClassifierNames.Json)>
     <ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.VisualBasic, True, "Regex", "Regexp"), [Shared]>
+        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.VisualBasic, True), [Shared]>
     Friend Class VisualBasicRegexEmbeddedLanguageClassifier
         Inherits AbstractRegexEmbeddedLanguageClassifier
 
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index 83ca6b0ea8e64..cf9efceb85c31 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -28,7 +28,7 @@ internal abstract class AbstractEmbeddedLanguageClassificationService : IEmbedde
         /// <summary>
         /// Classifiers that can annotated older APIs not updated to use the [StringSyntax] attribute.
         /// </summary>
-        private readonly ImmutableArray<Lazy<IEmbeddedLanguageClassifier, EmbeddedLanguageMetadata>> _legacyClassifiers;
+        private readonly ImmutableArray<IEmbeddedLanguageClassifier> _legacyClassifiers;
 
         /// <summary>
         /// Finally classifier to run if there is no embedded language in a string.  It will just classify escape sequences.
@@ -40,7 +40,7 @@ internal abstract class AbstractEmbeddedLanguageClassificationService : IEmbedde
         /// This allows for multiple classifiers to be available.  The first classifier though that returns
         /// classifications for a string will 'win' and no other classifiers will contribute.
         /// </summary>
-        private readonly Dictionary<string, ArrayBuilder<Lazy<IEmbeddedLanguageClassifier, EmbeddedLanguageMetadata>>> _identifierToClassifiers = new(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, ArrayBuilder<IEmbeddedLanguageClassifier>> _identifierToClassifiers = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Helper to look at string literals and determine what language they are annotated to take.
@@ -60,12 +60,12 @@ protected AbstractEmbeddedLanguageClassificationService(
             var orderedClassifiers = ExtensionOrderer.Order(allClassifiers).Where(c => c.Metadata.Language == languageName).ToImmutableArray();
 
             // Grab out the classifiers that handle unannotated literals and APIs.
-            _legacyClassifiers = orderedClassifiers.WhereAsArray(c => c.Metadata.SupportsUnannotatedAPIs);
+            _legacyClassifiers = orderedClassifiers.SelectAsArray(c => c.Metadata.SupportsUnannotatedAPIs, c => c.Value);
 
             foreach (var classifier in orderedClassifiers)
             {
-                foreach (var identifier in classifier.Metadata.Identifiers)
-                    _identifierToClassifiers.MultiAdd(identifier, classifier);
+                foreach (var identifier in classifier.Value.Identifiers)
+                    _identifierToClassifiers.MultiAdd(identifier, classifier.Value);
             }
 
             foreach (var (_, classifiers) in _identifierToClassifiers)
@@ -172,10 +172,10 @@ private void ClassifyToken(SyntaxToken token)
                         foreach (var classifier in classifiers)
                         {
                             // keep track of what classifiers we've run so we don't call into them multiple times.
-                            _classifierBuffer.Add(classifier.Value);
+                            _classifierBuffer.Add(classifier);
 
                             // If this classifier added values then need to check the other ones.
-                            if (TryClassify(classifier.Value, context))
+                            if (TryClassify(classifier, context))
                                 return;
                         }
                     }
@@ -185,11 +185,11 @@ private void ClassifyToken(SyntaxToken token)
                     foreach (var legacyClassifier in _service._legacyClassifiers)
                     {
                         // don't bother trying to classify again if we already tried above.
-                        if (_classifierBuffer.Contains(legacyClassifier.Value))
+                        if (_classifierBuffer.Contains(legacyClassifier))
                             continue;
 
                         // If this classifier added values then need to check the other ones.
-                        if (TryClassify(legacyClassifier.Value, context))
+                        if (TryClassify(legacyClassifier, context))
                             return;
                     }
 
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
index 6721a8d5d495f..0bd14341c33f3 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
@@ -12,6 +12,8 @@ internal abstract class AbstractFallbackEmbeddedLanguageClassifier : IEmbeddedLa
         private readonly EmbeddedLanguageInfo _info;
         private readonly ImmutableArray<int> _supportedKinds;
 
+        public ImmutableArray<string> Identifiers => ImmutableArray<string>.Empty;
+
         protected AbstractFallbackEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
index 9962078c392ac..0f050b8552dc6 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
@@ -26,23 +26,12 @@ internal class ExportEmbeddedLanguageClassifierAttribute : ExportAttribute
         /// </summary>
         public string Language { get; }
 
-        /// <summary>
-        /// Identifiers in code (or StringSyntaxAttribute) used to identify an embedded language string. For example
-        /// <c>Regex</c> or <c>Json</c>.
-        /// </summary>
-        /// <remarks>This can be used to find usages of an embedded language using a comment marker like <c>//
-        /// lang=regex</c> or passed to a symbol annotated with <c>[StringSyntaxAttribyte("Regex")]</c>.  The identifier
-        /// is case sensitive for the StringSyntaxAttribute, and case insensitive for the comment.
-        /// </remarks>
-        public string[] Identifiers { get; }
-
         public ExportEmbeddedLanguageClassifierAttribute(
-            string name, string language, params string[] identifiers)
+            string name, string language)
             : base(typeof(IEmbeddedLanguageClassifier))
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
             Language = language ?? throw new ArgumentNullException(nameof(language));
-            Identifiers = identifiers ?? throw new ArgumentNullException(nameof(identifiers));
         }
     }
 
@@ -59,8 +48,8 @@ internal sealed class ExportEmbeddedLanguageClassifierInternalAttribute : Export
         public bool SupportsUnannotatedAPIs { get; }
 
         public ExportEmbeddedLanguageClassifierInternalAttribute(
-            string name, string language, bool supportsUnannotatedAPIs, params string[] identifiers)
-            : base(name, language, identifiers)
+            string name, string language, bool supportsUnannotatedAPIs)
+            : base(name, language)
         {
             SupportsUnannotatedAPIs = supportsUnannotatedAPIs;
         }
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
index fea4b4960db1a..7b4ef3af402fc 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
@@ -3,12 +3,23 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Immutable;
 using System.Composition;
 
 namespace Microsoft.CodeAnalysis.Classification
 {
     internal interface IEmbeddedLanguageClassifier
     {
+        /// <summary>
+        /// Identifiers in code (or StringSyntaxAttribute) used to identify an embedded language string. For example
+        /// <c>Regex</c> or <c>Json</c>.
+        /// </summary>
+        /// <remarks>This can be used to find usages of an embedded language using a comment marker like <c>//
+        /// lang=regex</c> or passed to a symbol annotated with <c>[StringSyntaxAttribyte("Regex")]</c>.  The identifier
+        /// is case sensitive for the StringSyntaxAttribute, and case insensitive for the comment.
+        /// </remarks>
+        ImmutableArray<string> Identifiers { get; }
+
         /// <summary>
         /// This method will be called for all string and character tokens in a file to determine if there are special
         /// embedded language strings to classify.
diff --git a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
index a5c38cd15caee..9d16b201a417b 100644
--- a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
+++ b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
@@ -10,11 +10,6 @@ namespace Microsoft.CodeAnalysis.EmbeddedLanguages
 {
     internal class EmbeddedLanguageMetadata : OrderableLanguageMetadata
     {
-        /// <summary>
-        /// The particular language-IDs this language supports (for example 'regex/regexp/etc.').
-        /// </summary>
-        public IEnumerable<string> Identifiers { get; }
-
         /// <summary>
         /// If this language supports strings being passed to APIs that do not have a <c>// lang=...</c> comment or a
         /// <c>[StringSyntax]</c> attribute on them.  This is not exposed publicly as all modern language plugins should
@@ -26,15 +21,13 @@ internal class EmbeddedLanguageMetadata : OrderableLanguageMetadata
         public EmbeddedLanguageMetadata(IDictionary<string, object> data)
             : base(data)
         {
-            this.Identifiers = ((IReadOnlyDictionary<string, object>)data).GetEnumerableMetadata<string>(nameof(Identifiers)).WhereNotNull();
             this.SupportsUnannotatedAPIs = data.GetValueOrDefault(nameof(SupportsUnannotatedAPIs)) is bool b ? b : false;
         }
 
         public EmbeddedLanguageMetadata(
-            string name, string language, IEnumerable<string> after, IEnumerable<string> before, IEnumerable<string> identifiers, bool supportsUnannotatedAPIs)
+            string name, string language, IEnumerable<string> after, IEnumerable<string> before, bool supportsUnannotatedAPIs)
             : base(name, language, after, before)
         {
-            this.Identifiers = identifiers;
             SupportsUnannotatedAPIs = supportsUnannotatedAPIs;
         }
     }

From 078fe0f661d1f81d9518f82fe8cb54c215c42469 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 12:37:26 -0700
Subject: [PATCH 151/413] Update SDK version in getting started instructions

---
 docs/contributing/Building, Debugging, and Testing on Unix.md   | 2 +-
 .../contributing/Building, Debugging, and Testing on Windows.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/Building, Debugging, and Testing on Unix.md b/docs/contributing/Building, Debugging, and Testing on Unix.md
index 0c254cc298f9c..f668aff6770f4 100644
--- a/docs/contributing/Building, Debugging, and Testing on Unix.md	
+++ b/docs/contributing/Building, Debugging, and Testing on Unix.md	
@@ -12,7 +12,7 @@ Particularly for developers who aren't experienced with .NET Core development on
 1. Install [VS Code](https://code.visualstudio.com/Download)
     - After you install VS Code, install the [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
     - Important tip: You can look up editor commands by name by hitting *Ctrl+Shift+P*, or by hitting *Ctrl+P* and typing a `>` character. This will help you get familiar with editor commands mentioned below. On a Mac, use *⌘* instead of *Ctrl*.
-2. Install the [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0).
+2. Install the latest [.NET 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0).
 3. You can build from VS Code by running the *Run Build Task* command, then selecting an appropriate task such as *build* or *build current project* (the latter builds the containing project for the current file you're viewing in the editor).
 4. You can run tests from VS Code by opening a test class in the editor, then using the *Run Tests in Context* and *Debug Tests in Context* editor commands. You may want to bind these commands to keyboard shortcuts that match their Visual Studio equivalents (**Ctrl+R, T** for *Run Tests in Context* and **Ctrl+R, Ctrl+T** for *Debug Tests in Context*).
 
diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md
index 25003217ea1a8..c01d756b2f301 100644
--- a/docs/contributing/Building, Debugging, and Testing on Windows.md	
+++ b/docs/contributing/Building, Debugging, and Testing on Windows.md	
@@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2.
     - Ensure Visual Studio is on Version "17.0" or greater
     - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
     - Restart Visual Studio
-1. [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-windows-x64-installer)
+1. Install the latest [.NET 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0).
 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
 1. Run Restore.cmd
 1. Open Roslyn.sln

From ac227054d0e4628b63d3cd7d1e9a4003230fd68a Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 12:39:45 -0700
Subject: [PATCH 152/413] Update getting started instructions

---
 docs/contributing/Building, Debugging, and Testing on Unix.md   | 2 +-
 .../contributing/Building, Debugging, and Testing on Windows.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/Building, Debugging, and Testing on Unix.md b/docs/contributing/Building, Debugging, and Testing on Unix.md
index c5aa407b43044..99b7a8625cd8e 100644
--- a/docs/contributing/Building, Debugging, and Testing on Unix.md	
+++ b/docs/contributing/Building, Debugging, and Testing on Unix.md	
@@ -12,7 +12,7 @@ Particularly for developers who aren't experienced with .NET Core development on
 1. Install [VS Code](https://code.visualstudio.com/Download)
     - After you install VS Code, install the [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
     - Important tip: You can look up editor commands by name by hitting *Ctrl+Shift+P*, or by hitting *Ctrl+P* and typing a `>` character. This will help you get familiar with editor commands mentioned below. On a Mac, use *⌘* instead of *Ctrl*.
-2. Install a recent preview [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core). At time of writing, Roslyn uses .NET 5 preview 8. The exact version in use is recorded in our [global.json](https://github.com/dotnet/roslyn/blob/main/global.json) file.
+2. Install the latest [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0).
 3. You can build from VS Code by running the *Run Build Task* command, then selecting an appropriate task such as *build* or *build current project* (the latter builds the containing project for the current file you're viewing in the editor).
 4. You can run tests from VS Code by opening a test class in the editor, then using the *Run Tests in Context* and *Debug Tests in Context* editor commands. You may want to bind these commands to keyboard shortcuts that match their Visual Studio equivalents (**Ctrl+R, T** for *Run Tests in Context* and **Ctrl+R, Ctrl+T** for *Debug Tests in Context*).
 
diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md
index f3c08c93ae68d..832f164b85f95 100644
--- a/docs/contributing/Building, Debugging, and Testing on Windows.md	
+++ b/docs/contributing/Building, Debugging, and Testing on Windows.md	
@@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2.
     - Ensure Visual Studio is on Version "16.8" or greater
     - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
     - Restart Visual Studio
-1. [.NET 6.0 Preview 1 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-preview.1-windows-x64-installer)
+1. Install the latest [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0).
 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
 1. Run Restore.cmd
 1. Open Roslyn.sln

From a4ebcb90a9ca64c45ac442c63e7cad11887c8c7e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 12:48:08 -0700
Subject: [PATCH 153/413] In progress

---
 ...ionServiceWithProviders.ProviderManager.cs |   5 +-
 ...CoreEmbeddedLanguageClassifierAttribute.cs |  35 ++++++
 ... IAspNetCoreEmbeddedLanguageClassifier.cs} |   8 +-
 .../AspNetCoreEmbeddedLanguageClassifier.cs   | 100 ++++++++++++++++++
 ...pNetCoreRouteEmbeddedLanguageClassifier.cs |  85 ---------------
 5 files changed, 137 insertions(+), 96 deletions(-)
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
 rename src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/{IAspNetCoreRouteEmbeddedLanguageClassifier.cs => IAspNetCoreEmbeddedLanguageClassifier.cs} (68%)
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
 delete mode 100644 src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs

diff --git a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
index 4dec07fc1d5b6..90016b89869eb 100644
--- a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
+++ b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
@@ -32,9 +32,6 @@ private sealed class ProviderManager : IEqualityComparer<ImmutableHashSet<string
             private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, StrongBox<ImmutableArray<CompletionProvider>>> _projectCompletionProvidersMap = new();
             private readonly ConditionalWeakTable<AnalyzerReference, ProjectCompletionProvider> _analyzerReferenceToCompletionProvidersMap = new();
 
-            private readonly ConditionalWeakTable<AnalyzerReference, ProjectCompletionProvider>.CreateValueCallback _createProjectCompletionProvidersProvider
-                = new(r => new ProjectCompletionProvider(r));
-
             private readonly Func<ImmutableHashSet<string>, ImmutableArray<CompletionProvider>> _createRoleProviders;
             private readonly Func<string, CompletionProvider?> _getProviderByName;
 
@@ -142,7 +139,7 @@ ImmutableArray<CompletionProvider> ComputeProjectCompletionProviders(Project pro
                     using var _ = ArrayBuilder<CompletionProvider>.GetInstance(out var builder);
                     foreach (var reference in project.AnalyzerReferences)
                     {
-                        var projectCompletionProvider = _analyzerReferenceToCompletionProvidersMap.GetValue(reference, _createProjectCompletionProvidersProvider);
+                        var projectCompletionProvider = _analyzerReferenceToCompletionProvidersMap.GetValue(reference, static r => new ProjectCompletionProvider(r));
                         foreach (var completionProvider in projectCompletionProvider.GetExtensions(project.Language))
                         {
                             builder.Add(completionProvider);
diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
new file mode 100644
index 0000000000000..b2fdb7d7b3c33
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
@@ -0,0 +1,35 @@
+// 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.ExternalAccess.AspNetCore.EmbeddedLanguages
+{
+    /// <summary>
+    /// Use this attribute to export a <see cref="IAspNetCoreEmbeddedLanguageClassifier"/>.
+    /// </summary>
+    [MetadataAttribute]
+    [AttributeUsage(AttributeTargets.Class)]
+    internal class ExportAspNetCoreEmbeddedLanguageClassifierAttribute : ExportAttribute
+    {
+        /// <summary>
+        /// Name of the classifier.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Name of the containing language hosting the embedded language.  e.g. C# or VB.
+        /// </summary>
+        public string Language { get; }
+
+        public ExportAspNetCoreEmbeddedLanguageClassifierAttribute(
+            string name, string language)
+            : base(typeof(IAspNetCoreEmbeddedLanguageClassifier))
+        {
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            Language = language ?? throw new ArgumentNullException(nameof(language));
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
similarity index 68%
rename from src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
rename to src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
index bb55e48b1b632..f24b66269e96a 100644
--- a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreRouteEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
@@ -2,15 +2,9 @@
 // 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.Tasks;
-
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
 {
-    internal interface IAspNetCoreRouteEmbeddedLanguageClassifier
+    internal interface IAspNetCoreEmbeddedLanguageClassifier
     {
         void RegisterClassifications(AspNetCoreEmbeddedLanguageClassificationContext context);
     }
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
new file mode 100644
index 0000000000000..1cb5b681c438e
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
@@ -0,0 +1,100 @@
+// 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.Composition;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
+{
+    [ExportEmbeddedLanguageClassifierInternal(
+        nameof(AspNetCoreEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false), Shared]
+    internal class AspNetCoreEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
+    {
+        // Following CWTs are used to cache the  providers from projects' references,
+        // so we can avoid the slow path unless there's any change to the references.
+        private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, StrongBox<ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier>>> _analyzerReferencesToClassifiersMap = new();
+        private readonly ConditionalWeakTable<AnalyzerReference, ClassifierExtensionProvider> _analyzerReferenceToProviderMap = new();
+
+        private readonly ImmutableArray<string> _identifiers;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public AspNetCoreEmbeddedLanguageClassifier()
+        {
+        }
+
+        public ImmutableArray<string> Identifiers
+        {
+            get
+            {
+                if (_identifiers.IsDefault)
+                {
+                    var classifiers = 
+                }
+            }
+        }
+
+        public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
+        {
+        }
+
+        private ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiers(Project? project)
+        {
+            if (project is null)
+                return ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier>.Empty;
+
+            if (_analyzerReferencesToClassifiersMap.TryGetValue(project.AnalyzerReferences, out var classifiers))
+                return classifiers.Value;
+
+            return GetClassifiersSlow(project);
+
+            ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiersSlow(Project project)
+                => _analyzerReferencesToClassifiersMap.GetValue(project.AnalyzerReferences, _ => new(ComputeClassifiers(project))).Value;
+
+            ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> ComputeClassifiers(Project project)
+            {
+                using var _ = ArrayBuilder<IAspNetCoreEmbeddedLanguageClassifier>.GetInstance(out var result);
+
+                foreach (var reference in project.AnalyzerReferences)
+                {
+                    var provider = _analyzerReferenceToProviderMap.GetValue(reference, static r => new ClassifierExtensionProvider(r));
+                    result.AddRange(provider.GetExtensions(project.Language));
+                }
+
+                return result.ToImmutable();
+            }
+        }
+
+        private sealed class ClassifierExtensionProvider
+            : AbstractProjectExtensionProvider<IAspNetCoreEmbeddedLanguageClassifier, ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
+        {
+            public ClassifierExtensionProvider(AnalyzerReference reference)
+                : base(reference)
+            {
+            }
+
+            protected override bool SupportsLanguage(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute, string language)
+            {
+                return exportAttribute.Language == null
+                    || exportAttribute.Language.Length == 0
+                    || exportAttribute.Language.Contains(language);
+            }
+
+            protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> extensions)
+            {
+                extensions = default;
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
deleted file mode 100644
index 4def6525001c6..0000000000000
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreRouteEmbeddedLanguageClassifier.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 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.Composition;
-using System.Runtime.CompilerServices;
-using Microsoft.CodeAnalysis.Classification;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.PooledObjects;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
-{
-    [ExportEmbeddedLanguageClassifierInternal(
-        nameof(AspNetCoreRouteEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false, "Route"), Shared]
-    internal class AspNetCoreRouteEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
-    {
-        // Following CWTs are used to cache the  providers from projects' references,
-        // so we can avoid the slow path unless there's any change to the references.
-        private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, IAspNetCoreRouteEmbeddedLanguageClassifier> _analyzerReferencesToClassifierMap = new();
-        private readonly ConditionalWeakTable<AnalyzerReference, IAspNetCoreRouteEmbeddedLanguageClassifier> _analyzerReferenceToClassifierMap = new();
-
-        [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public AspNetCoreRouteEmbeddedLanguageClassifier()
-        {
-        }
-
-        public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
-        {
-        }
-
-        private IAspNetCoreRouteEmbeddedLanguageClassifier? GetClassifier(Project? project)
-        {
-            if (project is null)
-                return null;
-
-            if (_analyzerReferencesToClassifierMap.TryGetValue(project.AnalyzerReferences, out var classifier))
-                return classifier;
-
-            return GetClassifierSlow(project);
-
-            IAspNetCoreRouteEmbeddedLanguageClassifier? GetClassifierSlow(Project project)
-                => _analyzerReferencesToClassifierMap.GetValue(project.AnalyzerReferences, _ => ComputeClassifier(project));
-
-            IAspNetCoreRouteEmbeddedLanguageClassifier? ComputeClassifier(Project project)
-            {
-                foreach (var reference in project.AnalyzerReferences)
-                {
-                    var classifier = _analyzerReferenceToClassifierMap.GetValue(reference, r => GetClassifier(r));
-                    if (classifier != null)
-                        return classifier;
-                }
-
-                return null;
-            }
-        }
-
-        private sealed class ClassifierExtensionProvider
-            : AbstractProjectExtensionProvider<IAspNetCoreRouteEmbeddedLanguageClassifier, ExportCompletionProviderAttribute>
-        {
-            public ClassifierExtensionProvider(AnalyzerReference reference)
-                : base(reference)
-            {
-            }
-
-            protected override bool SupportsLanguage(ExportCompletionProviderAttribute exportAttribute, string language)
-            {
-                return exportAttribute.Language == null
-                    || exportAttribute.Language.Length == 0
-                    || exportAttribute.Language.Contains(language);
-            }
-
-            protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<CompletionProvider> extensions)
-            {
-                extensions = default;
-                return false;
-            }
-        }
-    }
-}

From 746c91944a40a50ce72d9aec9b31a7c63531d6f8 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 12:51:17 -0700
Subject: [PATCH 154/413] Remove unneeded helix project property

---
 src/Tools/Source/RunTests/TestRunner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tools/Source/RunTests/TestRunner.cs b/src/Tools/Source/RunTests/TestRunner.cs
index f15a270974e00..cab5d85735c12 100644
--- a/src/Tools/Source/RunTests/TestRunner.cs
+++ b/src/Tools/Source/RunTests/TestRunner.cs
@@ -111,7 +111,6 @@ internal async Task<RunAllResult> RunAllOnHelixAsync(IEnumerable<AssemblyInfo> a
         <DotNetCliVersion>" + globalJson.sdk.version + @"</DotNetCliVersion>
         <DotNetCliPackageType>sdk</DotNetCliPackageType>
         <EnableAzurePipelinesReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableAzurePipelinesReporter>
-        <EnableXUnitReporter>" + (isAzureDevOpsRun ? "true" : "false") + @"</EnableXUnitReporter>
     </PropertyGroup>
 
     <ItemGroup>

From e9bb1bd8d5243e7cbad93ebaeac647f9b2d4bf91 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 12:58:30 -0700
Subject: [PATCH 155/413] Revert "Merge branch 'classifierIdentifier' into
 aspEA"

This reverts commit 7273e7ee34736078b0d18eeff27678ab5d35cef8, reversing
changes made to 354603460bca9fb404ed43f6262869e07d64ed3c.
---
 .../CSharpJsonEmbeddedLanguageClassifier.cs    |  2 +-
 .../CSharpRegexEmbeddedLanguageClassifier.cs   |  2 +-
 .../AbstractJsonEmbeddedLanguageClassifier.cs  |  3 ---
 .../AbstractRegexEmbeddedLanguageClassifier.cs |  3 ---
 ...isualBasicJsonEmbeddedLanguageClassifier.vb |  2 +-
 ...sualBasicRegexEmbeddedLanguageClassifier.vb |  2 +-
 ...actEmbeddedLanguageClassificationService.cs | 18 +++++++++---------
 ...stractFallbackEmbeddedLanguageClassifier.cs |  2 --
 .../ExportEmbeddedLanguageClassifier.cs        | 17 ++++++++++++++---
 .../IEmbeddedLanguageClassifier.cs             | 11 -----------
 .../EmbeddedLanguageMetadata.cs                |  9 ++++++++-
 11 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
index 659676a717f6f..f17b7ebf38c61 100644
--- a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
+++ b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpJsonEmbeddedLanguageClassifier.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.CodeAnalysis.CSharp.Features.EmbeddedLanguages
 {
     [ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.CSharp, supportsUnannotatedAPIs: true), Shared]
+        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.CSharp, supportsUnannotatedAPIs: true, "Json"), Shared]
     internal class CSharpJsonEmbeddedLanguageClassifier : AbstractJsonEmbeddedLanguageClassifier
     {
         [ImportingConstructor]
diff --git a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
index 625f38f80f7e7..929b2af473c16 100644
--- a/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
+++ b/src/Features/CSharp/Portable/EmbeddedLanguages/CSharpRegexEmbeddedLanguageClassifier.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.CSharp.Features.EmbeddedLanguages
     // want that to happen for APIs that are certain to be another language like Regex.
     [ExtensionOrder(Before = PredefinedEmbeddedLanguageClassifierNames.Json)]
     [ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.CSharp, supportsUnannotatedAPIs: true), Shared]
+        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.CSharp, supportsUnannotatedAPIs: true, "Regex", "Regexp"), Shared]
     internal class CSharpRegexEmbeddedLanguageClassifier : AbstractRegexEmbeddedLanguageClassifier
     {
         [ImportingConstructor]
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs b/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
index 3dfd2fa92b3d3..514a909bae8b0 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/Json/LanguageServices/AbstractJsonEmbeddedLanguageClassifier.cs
@@ -2,7 +2,6 @@
 // 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.Classification;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
@@ -23,8 +22,6 @@ internal abstract class AbstractJsonEmbeddedLanguageClassifier : IEmbeddedLangua
         private static readonly ObjectPool<Visitor> s_visitorPool = new(() => new Visitor());
         private readonly EmbeddedLanguageInfo _info;
 
-        public ImmutableArray<string> Identifiers { get; } = ImmutableArray.Create("Json");
-
         public AbstractJsonEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
index d730374c723b9..1a66b8761ce6b 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/LanguageServices/AbstractRegexEmbeddedLanguageClassifier.cs
@@ -2,7 +2,6 @@
 // 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.Classification;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
@@ -25,8 +24,6 @@ internal abstract class AbstractRegexEmbeddedLanguageClassifier : IEmbeddedLangu
 
         private readonly EmbeddedLanguageInfo _info;
 
-        public ImmutableArray<string> Identifiers { get; } = ImmutableArray.Create("Regex", "Regexp");
-
         protected AbstractRegexEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
index e1b2ffbaa21b2..88566a89e9ccb 100644
--- a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
+++ b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicJsonEmbeddedLanguageClassifier.vb
@@ -10,7 +10,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.EmbeddedLanguages.LanguageServices
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Features.EmbeddedLanguages
     <ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.VisualBasic, True), [Shared]>
+        PredefinedEmbeddedLanguageClassifierNames.Json, LanguageNames.VisualBasic, True, "Json"), [Shared]>
     Friend Class VisualBasicJsonEmbeddedLanguageClassifier
         Inherits AbstractJsonEmbeddedLanguageClassifier
 
diff --git a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
index 61721f227f387..847389b65f68e 100644
--- a/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
+++ b/src/Features/VisualBasic/Portable/EmbeddedLanguages/VisualBasicRegexEmbeddedLanguageClassifier.vb
@@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Features.EmbeddedLanguages
     ' want that to happen for APIs that are certain to be another language Like Regex.
     <ExtensionOrder(Before:=PredefinedEmbeddedLanguageClassifierNames.Json)>
     <ExportEmbeddedLanguageClassifierInternal(
-        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.VisualBasic, True), [Shared]>
+        PredefinedEmbeddedLanguageClassifierNames.Regex, LanguageNames.VisualBasic, True, "Regex", "Regexp"), [Shared]>
     Friend Class VisualBasicRegexEmbeddedLanguageClassifier
         Inherits AbstractRegexEmbeddedLanguageClassifier
 
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index cf9efceb85c31..83ca6b0ea8e64 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -28,7 +28,7 @@ internal abstract class AbstractEmbeddedLanguageClassificationService : IEmbedde
         /// <summary>
         /// Classifiers that can annotated older APIs not updated to use the [StringSyntax] attribute.
         /// </summary>
-        private readonly ImmutableArray<IEmbeddedLanguageClassifier> _legacyClassifiers;
+        private readonly ImmutableArray<Lazy<IEmbeddedLanguageClassifier, EmbeddedLanguageMetadata>> _legacyClassifiers;
 
         /// <summary>
         /// Finally classifier to run if there is no embedded language in a string.  It will just classify escape sequences.
@@ -40,7 +40,7 @@ internal abstract class AbstractEmbeddedLanguageClassificationService : IEmbedde
         /// This allows for multiple classifiers to be available.  The first classifier though that returns
         /// classifications for a string will 'win' and no other classifiers will contribute.
         /// </summary>
-        private readonly Dictionary<string, ArrayBuilder<IEmbeddedLanguageClassifier>> _identifierToClassifiers = new(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, ArrayBuilder<Lazy<IEmbeddedLanguageClassifier, EmbeddedLanguageMetadata>>> _identifierToClassifiers = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Helper to look at string literals and determine what language they are annotated to take.
@@ -60,12 +60,12 @@ protected AbstractEmbeddedLanguageClassificationService(
             var orderedClassifiers = ExtensionOrderer.Order(allClassifiers).Where(c => c.Metadata.Language == languageName).ToImmutableArray();
 
             // Grab out the classifiers that handle unannotated literals and APIs.
-            _legacyClassifiers = orderedClassifiers.SelectAsArray(c => c.Metadata.SupportsUnannotatedAPIs, c => c.Value);
+            _legacyClassifiers = orderedClassifiers.WhereAsArray(c => c.Metadata.SupportsUnannotatedAPIs);
 
             foreach (var classifier in orderedClassifiers)
             {
-                foreach (var identifier in classifier.Value.Identifiers)
-                    _identifierToClassifiers.MultiAdd(identifier, classifier.Value);
+                foreach (var identifier in classifier.Metadata.Identifiers)
+                    _identifierToClassifiers.MultiAdd(identifier, classifier);
             }
 
             foreach (var (_, classifiers) in _identifierToClassifiers)
@@ -172,10 +172,10 @@ private void ClassifyToken(SyntaxToken token)
                         foreach (var classifier in classifiers)
                         {
                             // keep track of what classifiers we've run so we don't call into them multiple times.
-                            _classifierBuffer.Add(classifier);
+                            _classifierBuffer.Add(classifier.Value);
 
                             // If this classifier added values then need to check the other ones.
-                            if (TryClassify(classifier, context))
+                            if (TryClassify(classifier.Value, context))
                                 return;
                         }
                     }
@@ -185,11 +185,11 @@ private void ClassifyToken(SyntaxToken token)
                     foreach (var legacyClassifier in _service._legacyClassifiers)
                     {
                         // don't bother trying to classify again if we already tried above.
-                        if (_classifierBuffer.Contains(legacyClassifier))
+                        if (_classifierBuffer.Contains(legacyClassifier.Value))
                             continue;
 
                         // If this classifier added values then need to check the other ones.
-                        if (TryClassify(legacyClassifier, context))
+                        if (TryClassify(legacyClassifier.Value, context))
                             return;
                     }
 
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
index 0bd14341c33f3..6721a8d5d495f 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
@@ -12,8 +12,6 @@ internal abstract class AbstractFallbackEmbeddedLanguageClassifier : IEmbeddedLa
         private readonly EmbeddedLanguageInfo _info;
         private readonly ImmutableArray<int> _supportedKinds;
 
-        public ImmutableArray<string> Identifiers => ImmutableArray<string>.Empty;
-
         protected AbstractFallbackEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
index 0f050b8552dc6..9962078c392ac 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/ExportEmbeddedLanguageClassifier.cs
@@ -26,12 +26,23 @@ internal class ExportEmbeddedLanguageClassifierAttribute : ExportAttribute
         /// </summary>
         public string Language { get; }
 
+        /// <summary>
+        /// Identifiers in code (or StringSyntaxAttribute) used to identify an embedded language string. For example
+        /// <c>Regex</c> or <c>Json</c>.
+        /// </summary>
+        /// <remarks>This can be used to find usages of an embedded language using a comment marker like <c>//
+        /// lang=regex</c> or passed to a symbol annotated with <c>[StringSyntaxAttribyte("Regex")]</c>.  The identifier
+        /// is case sensitive for the StringSyntaxAttribute, and case insensitive for the comment.
+        /// </remarks>
+        public string[] Identifiers { get; }
+
         public ExportEmbeddedLanguageClassifierAttribute(
-            string name, string language)
+            string name, string language, params string[] identifiers)
             : base(typeof(IEmbeddedLanguageClassifier))
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
             Language = language ?? throw new ArgumentNullException(nameof(language));
+            Identifiers = identifiers ?? throw new ArgumentNullException(nameof(identifiers));
         }
     }
 
@@ -48,8 +59,8 @@ internal sealed class ExportEmbeddedLanguageClassifierInternalAttribute : Export
         public bool SupportsUnannotatedAPIs { get; }
 
         public ExportEmbeddedLanguageClassifierInternalAttribute(
-            string name, string language, bool supportsUnannotatedAPIs)
-            : base(name, language)
+            string name, string language, bool supportsUnannotatedAPIs, params string[] identifiers)
+            : base(name, language, identifiers)
         {
             SupportsUnannotatedAPIs = supportsUnannotatedAPIs;
         }
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
index 7b4ef3af402fc..fea4b4960db1a 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassifier.cs
@@ -3,23 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Immutable;
 using System.Composition;
 
 namespace Microsoft.CodeAnalysis.Classification
 {
     internal interface IEmbeddedLanguageClassifier
     {
-        /// <summary>
-        /// Identifiers in code (or StringSyntaxAttribute) used to identify an embedded language string. For example
-        /// <c>Regex</c> or <c>Json</c>.
-        /// </summary>
-        /// <remarks>This can be used to find usages of an embedded language using a comment marker like <c>//
-        /// lang=regex</c> or passed to a symbol annotated with <c>[StringSyntaxAttribyte("Regex")]</c>.  The identifier
-        /// is case sensitive for the StringSyntaxAttribute, and case insensitive for the comment.
-        /// </remarks>
-        ImmutableArray<string> Identifiers { get; }
-
         /// <summary>
         /// This method will be called for all string and character tokens in a file to determine if there are special
         /// embedded language strings to classify.
diff --git a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
index 9d16b201a417b..a5c38cd15caee 100644
--- a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
+++ b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageMetadata.cs
@@ -10,6 +10,11 @@ namespace Microsoft.CodeAnalysis.EmbeddedLanguages
 {
     internal class EmbeddedLanguageMetadata : OrderableLanguageMetadata
     {
+        /// <summary>
+        /// The particular language-IDs this language supports (for example 'regex/regexp/etc.').
+        /// </summary>
+        public IEnumerable<string> Identifiers { get; }
+
         /// <summary>
         /// If this language supports strings being passed to APIs that do not have a <c>// lang=...</c> comment or a
         /// <c>[StringSyntax]</c> attribute on them.  This is not exposed publicly as all modern language plugins should
@@ -21,13 +26,15 @@ internal class EmbeddedLanguageMetadata : OrderableLanguageMetadata
         public EmbeddedLanguageMetadata(IDictionary<string, object> data)
             : base(data)
         {
+            this.Identifiers = ((IReadOnlyDictionary<string, object>)data).GetEnumerableMetadata<string>(nameof(Identifiers)).WhereNotNull();
             this.SupportsUnannotatedAPIs = data.GetValueOrDefault(nameof(SupportsUnannotatedAPIs)) is bool b ? b : false;
         }
 
         public EmbeddedLanguageMetadata(
-            string name, string language, IEnumerable<string> after, IEnumerable<string> before, bool supportsUnannotatedAPIs)
+            string name, string language, IEnumerable<string> after, IEnumerable<string> before, IEnumerable<string> identifiers, bool supportsUnannotatedAPIs)
             : base(name, language, after, before)
         {
+            this.Identifiers = identifiers;
             SupportsUnannotatedAPIs = supportsUnannotatedAPIs;
         }
     }

From 0b4898a30e440daaee923d9032578ab62bf01ad4 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 13:27:30 -0700
Subject: [PATCH 156/413] Build with VS 16.10 or higher

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 0120d695a6195..6a5f72bb91179 100644
--- a/global.json
+++ b/global.json
@@ -7,9 +7,9 @@
   "tools": {
     "dotnet": "6.0.104",
     "vs": {
-      "version": "16.8"
+      "version": "16.10"
     },
-    "xcopy-msbuild": "16.8.0-preview2.1"
+    "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22218.4",

From 09f08675abce147be7dc92db85c481228c39c8ad Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 13:55:36 -0700
Subject: [PATCH 157/413] Update arcade files

---
 eng/common/build.ps1                          | 12 +++----
 eng/common/build.sh                           |  3 --
 eng/common/generate-locproject.ps1            | 10 +++---
 eng/common/sdl/configure-sdl-tool.ps1         |  2 +-
 eng/common/templates/job/execute-sdl.yml      |  2 +-
 eng/common/templates/job/job.yml              | 12 +++----
 eng/common/templates/job/onelocbuild.yml      |  8 ++---
 eng/common/templates/jobs/jobs.yml            |  6 ++--
 .../templates/post-build/post-build.yml       | 16 ++++-----
 eng/common/tools.ps1                          |  9 +++--
 eng/common/tools.sh                           | 34 +------------------
 global.json                                   |  2 +-
 12 files changed, 39 insertions(+), 77 deletions(-)

diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 90d089780dcac..8943da242f6e9 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -27,15 +27,13 @@ Param(
   [string] $runtimeSourceFeedKey = '',
   [switch] $excludePrereleaseVS,
   [switch] $help,
-  [string] $runtimeSourceFeed = "",
-  [string] $runtimeSourceFeedKey = "",
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
 # Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file
 # some computer has this env var defined (e.g. Some HP)
 if($env:Platform) {
-  $env:Platform=""
+  $env:Platform=""  
 }
 function Print-Usage() {
   Write-Host "Common settings:"
@@ -90,7 +88,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
-  $toolsetBuildProj = InitializeToolset -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
+  $toolsetBuildProj = InitializeToolset
   InitializeCustomToolset
 
   $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
@@ -100,10 +98,10 @@ function Build {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
     # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
     [string[]] $msbuildArgs = $properties
-
-    # Resolve relative project paths into full paths
+    
+    # Resolve relative project paths into full paths 
     $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
-
+    
     $msbuildArgs += "/p:Projects=$projects"
     $properties = $msbuildArgs
   }
diff --git a/eng/common/build.sh b/eng/common/build.sh
index a5c91b58f7a93..a16e18b174a75 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -79,9 +79,6 @@ verbosity='minimal'
 runtime_source_feed=''
 runtime_source_feed_key=''
 
-runtimeSourceFeed=''
-runtimeSourceFeedKey=''
-
 properties=''
 while [[ $# > 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 55e51ac996fd9..25e97ac00772d 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -28,7 +28,7 @@ $jsonFiles = @()
 $jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
 $jsonTemplateFiles | ForEach-Object {
     $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
-
+    
     $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
     $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
@@ -46,7 +46,7 @@ if ($allXlfFiles) {
 }
 $langXlfFiles | ForEach-Object {
     $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
-
+    
     $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
     $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
@@ -59,7 +59,7 @@ $locJson = @{
             LanguageSet = $LanguageSet
             LocItems = @(
                 $locFiles | ForEach-Object {
-                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
+                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
                     $continue = $true
                     foreach ($exclusion in $exclusions.Exclusions) {
                         if ($outputPath.Contains($exclusion))
@@ -108,10 +108,10 @@ else {
 
     if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
         Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
-
+        
         exit 1
     }
     else {
         Write-Host "Generated LocProject.json and current LocProject.json are identical."
     }
-}
+}
\ No newline at end of file
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index de901aa32bb3b..adea8e8da2ab2 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -43,7 +43,7 @@ try {
       if (-not ($_['Args'])) { $_.Args = @() }
       $_
     }
-
+  
   Write-Host "List of tools to configure:"
   $ToolsList | ForEach-Object { $_ | Out-String | Write-Host }
 
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 47d454534f260..24cec0424e5d6 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -120,7 +120,7 @@ jobs:
         -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts
       displayName: Extract Archive Artifacts
       continueOnError: ${{ parameters.sdlContinueOnError }}
-
+  
   - template: /eng/common/templates/steps/execute-sdl.yml
     parameters:
       overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index d3f251c4613c1..547d878da073a 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -81,7 +81,7 @@ jobs:
     - ${{ if ne(variable.name, '') }}:
       - name: ${{ variable.name }}
         value: ${{ variable.value }}
-
+    
     # handle variable groups
     - ${{ if ne(variable.group, '') }}:
       - group: ${{ variable.group }}
@@ -148,7 +148,7 @@ jobs:
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks
+        displayName: Execute Microbuild cleanup tasks  
         condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
         continueOnError: ${{ parameters.continueOnError }}
         env:
@@ -183,7 +183,7 @@ jobs:
         continueOnError: true
         condition: always()
     - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
-      - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:    
         - task: CopyFiles@2
           displayName: Gather Asset Manifests
           inputs:
@@ -216,7 +216,7 @@ jobs:
       displayName: Publish XUnit Test Results
       inputs:
         testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml'
+        testResultsFiles: '*.xml' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
         mergeTestResults: ${{ parameters.mergeTestResults }}
@@ -227,13 +227,13 @@ jobs:
       displayName: Publish TRX Test Results
       inputs:
         testResultsFormat: 'VSTest'
-        testResultsFiles: '*.trx'
+        testResultsFiles: '*.trx' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
       condition: always()
-
+    
   - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - task: CopyFiles@2
       displayName: Gather Asset Manifests
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index d6262c9a7bea3..9d1e3042d8a6c 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,7 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool: ''
-
+    
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
@@ -25,7 +25,7 @@ parameters:
 
 jobs:
 - job: OneLocBuild
-
+  
   dependsOn: ${{ parameters.dependsOn }}
 
   displayName: OneLocBuild
@@ -52,7 +52,7 @@ jobs:
     - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
       - name: _GenerateLocProjectArguments
         value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
-
+      
 
   steps:
     - task: Powershell@2
@@ -103,4 +103,4 @@ jobs:
         PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
         PublishLocation: Container
         ArtifactName: Loc
-      condition: ${{ parameters.condition }}
+      condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 82635234f93b7..554e71cfc436d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -20,7 +20,7 @@ parameters:
     enabled: false
     # Optional: Include toolset dependencies in the generated graph files
     includeToolset: false
-
+    
   # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
   jobs: []
 
@@ -40,7 +40,7 @@ parameters:
 jobs:
 - ${{ each job in parameters.jobs }}:
   - template: ../job/job.yml
-    parameters:
+    parameters: 
       # pass along parameters
       ${{ each parameter in parameters }}:
         ${{ if ne(parameter.key, 'jobs') }}:
@@ -68,7 +68,7 @@ jobs:
         ${{ parameter.key }}: ${{ parameter.value }}
 
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-
+  
   - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
     - template: ../job/publish-build-assets.yml
       parameters:
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index e33ffe82c5b65..24e92a275a4fb 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -39,7 +39,7 @@ parameters:
     displayName: Enable NuGet validation
     type: boolean
     default: true
-
+    
   - name: publishInstallersAndChecksums
     displayName: Publish installers and checksums
     type: boolean
@@ -124,8 +124,8 @@ stages:
           displayName: Validate
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
-            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
-              -ToolDestinationPath $(Agent.BuildDirectory)/Extract/
+            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ 
+              -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ 
 
     - job:
       displayName: Signing Validation
@@ -220,9 +220,9 @@ stages:
           displayName: Validate
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
-            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
-              -ExtractPath $(Agent.BuildDirectory)/Extract/
-              -GHRepoName $(Build.Repository.Name)
+            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
+              -ExtractPath $(Agent.BuildDirectory)/Extract/ 
+              -GHRepoName $(Build.Repository.Name) 
               -GHCommit $(Build.SourceVersion)
               -SourcelinkCliVersion $(SourceLinkCLIVersion)
           continueOnError: true
@@ -266,10 +266,10 @@ stages:
         displayName: Publish Using Darc
         inputs:
           filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-          arguments: -BuildId $(BARBuildId)
+          arguments: -BuildId $(BARBuildId) 
             -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
             -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
             -MaestroToken '$(MaestroApiAccessToken)'
             -WaitPublishingFinish true
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 011ef5d3ecbd5..f1e1cb53953bc 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -191,7 +191,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
 
     if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
       if ($install) {
-        InstallDotNetSdk -dotnetRoot $dotnetRoot -version $dotnetSdkVersion -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
+        InstallDotNetSdk $dotnetRoot $dotnetSdkVersion
       } else {
         Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'"
         ExitWithExitCode 1
@@ -546,7 +546,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   return $vsInfo[0]
 }
 
-function InitializeBuildTool([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) {
+function InitializeBuildTool() {
   if (Test-Path variable:global:_BuildTool) {
     # If the requested msbuild parameters do not match, clear the cached variables.
     if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) {
@@ -639,8 +639,7 @@ function InitializeNativeTools() {
   }
 }
 
-function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
-{
+function InitializeToolset() {
   if (Test-Path variable:global:_ToolsetBuildProj) {
     return $global:_ToolsetBuildProj
   }
@@ -662,7 +661,7 @@ function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceF
     ExitWithExitCode 1
   }
 
-  $buildTool = InitializeBuildTool -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
+  $buildTool = InitializeBuildTool
 
   $proj = Join-Path $ToolsetDir 'restore.proj'
   $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'ToolsetRestore.binlog') } else { '' }
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 1faf5bb267773..e555c34269f6e 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -36,10 +36,6 @@ prepare_machine=${prepare_machine:-false}
 # True to restore toolsets and dependencies.
 restore=${restore:-true}
 
-# Allows restoring .NET Core Runtimes and SDKs from alternative feeds
-runtimeSourceFeed=${runtimeSourceFeed:-""}
-runtimeSourceFeedKey=${runtimeSourceFeedKey:-""}
-
 # Adjusts msbuild verbosity level.
 verbosity=${verbosity:-'minimal'}
 
@@ -111,12 +107,6 @@ function InitializeDotNetCli {
   fi
 
   local install=$1
-  local runtimeSourceFeedArg=""
-  local runtimeSourceFeedKeyArg=""
-  if [[ $# == 3 ]]; then
-    runtimeSourceFeedArg=$2
-    runtimeSourceFeedKeyArg=$3
-  fi
 
   # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
   export DOTNET_MULTILEVEL_LOOKUP=0
@@ -162,7 +152,7 @@ function InitializeDotNetCli {
 
     if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
       if [[ "$install" == true ]]; then
-        InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" "unset" $runtimeSourceFeedArg $runtimeSourceFeedKeyArg
+        InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version"
       else
         Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'"
         ExitWithExitCode 1
@@ -275,28 +265,6 @@ function with_retries {
   return 1
 }
 
-function with_retries {
-  local maxRetries=5
-  local retries=1
-  echo "Trying to run '$@' for maximum of $maxRetries attempts."
-  while [[ $((retries++)) -le $maxRetries ]]; do
-    "$@"
-
-    if [[ $? == 0 ]]; then
-      echo "Ran '$@' successfully."
-      return 0
-    fi
-
-    timeout=$((3**$retries-1))
-    echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
-    sleep $timeout
-  done
-
-  echo "Failed to execute '$@' for $maxRetries times." 1>&2
-
-  return 1
-}
-
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
diff --git a/global.json b/global.json
index 6a5f72bb91179..26d508216871f 100644
--- a/global.json
+++ b/global.json
@@ -15,4 +15,4 @@
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22218.4",
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22218.4"
   }
-}
\ No newline at end of file
+}

From f8733b9903f62055facdee13b29aeddcec985d7a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 14:21:17 -0700
Subject: [PATCH 158/413] In progress

---
 .../AspNetCoreEmbeddedLanguageClassifier.cs   | 49 ++++---------------
 .../ClassifierExtensionProvider.cs            | 32 ++++++++++++
 .../Razor/RazorClassifierAccessor.cs          |  3 +-
 .../Portable/Classification/Classifier.cs     | 10 ++--
 ...ctEmbeddedLanguageClassificationService.cs | 11 +++--
 .../EmbeddedLanguageClassifierContext.cs      |  4 ++
 .../IEmbeddedLanguageClassificationService.cs |  1 +
 7 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs

diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
index 1cb5b681c438e..9efe68af9c17d 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
@@ -17,7 +17,7 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
 {
     [ExportEmbeddedLanguageClassifierInternal(
-        nameof(AspNetCoreEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false), Shared]
+        nameof(AspNetCoreEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false, "Route"), Shared]
     internal class AspNetCoreEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
     {
         // Following CWTs are used to cache the  providers from projects' references,
@@ -25,34 +25,25 @@ internal class AspNetCoreEmbeddedLanguageClassifier : IEmbeddedLanguageClassifie
         private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, StrongBox<ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier>>> _analyzerReferencesToClassifiersMap = new();
         private readonly ConditionalWeakTable<AnalyzerReference, ClassifierExtensionProvider> _analyzerReferenceToProviderMap = new();
 
-        private readonly ImmutableArray<string> _identifiers;
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public AspNetCoreEmbeddedLanguageClassifier()
         {
         }
 
-        public ImmutableArray<string> Identifiers
-        {
-            get
-            {
-                if (_identifiers.IsDefault)
-                {
-                    var classifiers = 
-                }
-            }
-        }
-
         public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
         {
+            if (context.Project is null)
+                return;
+
+            var classifiers = GetClassifiers(context.Project);
+            var aspContext = new AspNetCoreEmbeddedLanguageClassificationContext(context);
+            foreach (var classifier in classifiers)
+                classifier.RegisterClassifications(aspContext);
         }
 
-        private ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiers(Project? project)
+        private ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiers(Project project)
         {
-            if (project is null)
-                return ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier>.Empty;
-
             if (_analyzerReferencesToClassifiersMap.TryGetValue(project.AnalyzerReferences, out var classifiers))
                 return classifiers.Value;
 
@@ -74,27 +65,5 @@ ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> ComputeClassifiers(Project
                 return result.ToImmutable();
             }
         }
-
-        private sealed class ClassifierExtensionProvider
-            : AbstractProjectExtensionProvider<IAspNetCoreEmbeddedLanguageClassifier, ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
-        {
-            public ClassifierExtensionProvider(AnalyzerReference reference)
-                : base(reference)
-            {
-            }
-
-            protected override bool SupportsLanguage(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute, string language)
-            {
-                return exportAttribute.Language == null
-                    || exportAttribute.Language.Length == 0
-                    || exportAttribute.Language.Contains(language);
-            }
-
-            protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> extensions)
-            {
-                extensions = default;
-                return false;
-            }
-        }
     }
 }
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
new file mode 100644
index 0000000000000..77824597ad772
--- /dev/null
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
@@ -0,0 +1,32 @@
+// 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.Diagnostics;
+using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
+using System.Collections.Immutable;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
+{
+    internal sealed class ClassifierExtensionProvider
+        : AbstractProjectExtensionProvider<IAspNetCoreEmbeddedLanguageClassifier, ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
+    {
+        public ClassifierExtensionProvider(AnalyzerReference reference)
+            : base(reference)
+        {
+        }
+
+        protected override bool SupportsLanguage(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute, string language)
+        {
+            return exportAttribute.Language == null
+                || exportAttribute.Language.Length == 0
+                || exportAttribute.Language.Contains(language);
+        }
+
+        protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> extensions)
+        {
+            extensions = default;
+            return false;
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/Razor/RazorClassifierAccessor.cs b/src/Tools/ExternalAccess/Razor/RazorClassifierAccessor.cs
index 2a3633e40084d..9f62f2d73a878 100644
--- a/src/Tools/ExternalAccess/Razor/RazorClassifierAccessor.cs
+++ b/src/Tools/ExternalAccess/Razor/RazorClassifierAccessor.cs
@@ -16,7 +16,8 @@ internal static class RazorClassifierAccessor
         public static async Task<IEnumerable<ClassifiedSpan>> GetClassifiedSpansAsync(Document document, TextSpan textSpan, RazorClassificationOptionsWrapper options, CancellationToken cancellationToken)
         {
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            return Classifier.GetClassifiedSpans(document.Project.Solution.Workspace.Services, semanticModel, textSpan, options.UnderlyingObject, cancellationToken);
+            return Classifier.GetClassifiedSpans(
+                document.Project.Solution.Workspace.Services, document.Project, semanticModel, textSpan, options.UnderlyingObject, cancellationToken);
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Classification/Classifier.cs b/src/Workspaces/Core/Portable/Classification/Classifier.cs
index dc72199e92c87..bc7fb4fb2957f 100644
--- a/src/Workspaces/Core/Portable/Classification/Classifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/Classifier.cs
@@ -28,7 +28,7 @@ public static async Task<IEnumerable<ClassifiedSpan>> GetClassifiedSpansAsync(
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
 
             // public options do not affect classification:
-            return GetClassifiedSpans(document.Project.Solution.Workspace.Services, semanticModel, textSpan, ClassificationOptions.Default, cancellationToken);
+            return GetClassifiedSpans(document.Project.Solution.Workspace.Services, document.Project, semanticModel, textSpan, ClassificationOptions.Default, cancellationToken);
         }
 
         /// <summary>
@@ -47,11 +47,12 @@ public static IEnumerable<ClassifiedSpan> GetClassifiedSpans(
             CancellationToken cancellationToken = default)
         {
             // public options do not affect classification:
-            return GetClassifiedSpans(workspace.Services, semanticModel, textSpan, ClassificationOptions.Default, cancellationToken);
+            return GetClassifiedSpans(workspace.Services, project: null, semanticModel, textSpan, ClassificationOptions.Default, cancellationToken);
         }
 
         internal static IEnumerable<ClassifiedSpan> GetClassifiedSpans(
             HostWorkspaceServices workspaceServices,
+            Project? project,
             SemanticModel semanticModel,
             TextSpan textSpan,
             ClassificationOptions options,
@@ -76,7 +77,8 @@ internal static IEnumerable<ClassifiedSpan> GetClassifiedSpans(
             classsificationService.AddSemanticClassifications(semanticModel, textSpan, getNodeClassifiers, getTokenClassifiers, semanticClassifications, options, cancellationToken);
 
             // intentionally adding to the semanticClassifications array here.
-            embeddedLanguageService.AddEmbeddedLanguageClassifications(semanticModel, textSpan, options, semanticClassifications, cancellationToken);
+            if (project != null)
+                embeddedLanguageService.AddEmbeddedLanguageClassifications(project, semanticModel, textSpan, options, semanticClassifications, cancellationToken);
 
             var allClassifications = new List<ClassifiedSpan>(semanticClassifications.Where(s => s.TextSpan.OverlapsWith(textSpan)));
             var semanticSet = semanticClassifications.Select(s => s.TextSpan).ToSet();
@@ -92,7 +94,7 @@ internal static async Task<ImmutableArray<SymbolDisplayPart>> GetClassifiedSymbo
             HostWorkspaceServices workspaceServices, SemanticModel semanticModel, TextSpan textSpan, ClassificationOptions options,
             CancellationToken cancellationToken = default)
         {
-            var classifiedSpans = GetClassifiedSpans(workspaceServices, semanticModel, textSpan, options, cancellationToken);
+            var classifiedSpans = GetClassifiedSpans(workspaceServices, project: null, semanticModel, textSpan, options, cancellationToken);
             var sourceText = await semanticModel.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);
 
             return ConvertClassificationsToParts(sourceText, textSpan.Start, classifiedSpans);
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index 83ca6b0ea8e64..2e09365f521f1 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -88,21 +88,22 @@ public async Task AddEmbeddedLanguageClassificationsAsync(
             Document document, TextSpan textSpan, ClassificationOptions options, ArrayBuilder<ClassifiedSpan> result, CancellationToken cancellationToken)
         {
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            AddEmbeddedLanguageClassifications(semanticModel, textSpan, options, result, cancellationToken);
+            AddEmbeddedLanguageClassifications(document.Project, semanticModel, textSpan, options, result, cancellationToken);
         }
 
         public void AddEmbeddedLanguageClassifications(
-            SemanticModel semanticModel, TextSpan textSpan, ClassificationOptions options, ArrayBuilder<ClassifiedSpan> result, CancellationToken cancellationToken)
+            Project project, SemanticModel semanticModel, TextSpan textSpan, ClassificationOptions options, ArrayBuilder<ClassifiedSpan> result, CancellationToken cancellationToken)
         {
             using var _ = ArrayBuilder<IEmbeddedLanguageClassifier>.GetInstance(out var classifierBuffer);
             var root = semanticModel.SyntaxTree.GetRoot(cancellationToken);
-            var worker = new Worker(this, semanticModel, textSpan, options, result, classifierBuffer, cancellationToken);
+            var worker = new Worker(this, project, semanticModel, textSpan, options, result, classifierBuffer, cancellationToken);
             worker.Recurse(root);
         }
 
         private ref struct Worker
         {
             private readonly AbstractEmbeddedLanguageClassificationService _service;
+            private readonly Project _project;
             private readonly SemanticModel _semanticModel;
             private readonly TextSpan _textSpan;
             private readonly ClassificationOptions _options;
@@ -112,6 +113,7 @@ private ref struct Worker
 
             public Worker(
                 AbstractEmbeddedLanguageClassificationService service,
+                Project project,
                 SemanticModel semanticModel,
                 TextSpan textSpan,
                 ClassificationOptions options,
@@ -120,6 +122,7 @@ public Worker(
                 CancellationToken cancellationToken)
             {
                 _service = service;
+                _project = project;
                 _semanticModel = semanticModel;
                 _textSpan = textSpan;
                 _options = options;
@@ -162,7 +165,7 @@ private void ClassifyToken(SyntaxToken token)
                     _classifierBuffer.Clear();
 
                     var context = new EmbeddedLanguageClassificationContext(
-                        _semanticModel, token, _options, _result, _cancellationToken);
+                        _project, _semanticModel, token, _options, _result, _cancellationToken);
 
                     // First, see if this is a string annotated with either a comment or [StringSyntax] attribute. If
                     // so, delegate to the first classifier we have registered for whatever language ID we find.
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
index f7b5ae45c535e..ff72c08701480 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
@@ -14,6 +14,8 @@ internal struct EmbeddedLanguageClassificationContext
         internal readonly ClassificationOptions Options;
         private readonly ArrayBuilder<ClassifiedSpan> _result;
 
+        public Project Project { get; }
+
         /// <summary>
         /// The string or character token to classify.
         /// </summary>
@@ -27,12 +29,14 @@ internal struct EmbeddedLanguageClassificationContext
         public CancellationToken CancellationToken { get; }
 
         internal EmbeddedLanguageClassificationContext(
+            Project project,
             SemanticModel semanticModel,
             SyntaxToken syntaxToken,
             ClassificationOptions options,
             ArrayBuilder<ClassifiedSpan> result,
             CancellationToken cancellationToken)
         {
+            Project = project;
             SemanticModel = semanticModel;
             SyntaxToken = syntaxToken;
             Options = options;
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
index 365212ade57c6..f349c664a3724 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
@@ -20,6 +20,7 @@ Task AddEmbeddedLanguageClassificationsAsync(
             CancellationToken cancellationToken);
 
         void AddEmbeddedLanguageClassifications(
+            Project project,
             SemanticModel semanticModel,
             TextSpan textSpan,
             ClassificationOptions options,

From 697b37ee08fa0bf704c6900b6b4c719765ec1268 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:05:14 -0700
Subject: [PATCH 159/413] Publishing

---
 .../VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj      | 1 +
 .../Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj | 1 -
 src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj     | 6 ++++++
 src/VisualStudio/Setup/source.extension.vsixmanifest        | 1 +
 .../Remote/ServiceHub/Host/RemoteWorkspaceManager.cs        | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
index 6667c0e5259b3..cf33cab1405ce 100644
--- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -38,6 +38,7 @@
     <ProjectReference Include="..\..\Scripting\CSharp\Microsoft.CodeAnalysis.CSharp.Scripting.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Apex\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Debugger\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\VisualStudio\LiveShare\Impl\Microsoft.VisualStudio.LanguageServices.LiveShare.csproj" PrivateAssets="all" />
diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
index 328da7b83d89a..da1cdbfe1a238 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -30,7 +30,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
     <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
-    <ProjectReference Include="..\..\..\Features\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
index 97bc48a097d1f..69d5081621396 100644
--- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
+++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -59,6 +59,12 @@
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj">
+      <Name>Microsoft.CodeAnalysis.ExternalAccess.AspNetCore</Name>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
+      <PkgDefEntry>BindingRedirect</PkgDefEntry>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tools\ExternalAccess\FSharp\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.FSharp</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
diff --git a/src/VisualStudio/Setup/source.extension.vsixmanifest b/src/VisualStudio/Setup/source.extension.vsixmanifest
index f6da1017eed39..76f80471a53d0 100644
--- a/src/VisualStudio/Setup/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup/source.extension.vsixmanifest
@@ -65,6 +65,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" />
+    <Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServices.LiveShare.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" />
     <!-- ServiceHub assets are added by msbuild target -->
diff --git a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspaceManager.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspaceManager.cs
index 947e5cad0035b..72787c52bca6f 100644
--- a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspaceManager.cs
+++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspaceManager.cs
@@ -7,6 +7,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.ServiceHub.Framework;
 using Microsoft.VisualStudio.Composition;
@@ -29,6 +30,7 @@ internal class RemoteWorkspaceManager
 
         internal static readonly ImmutableArray<Assembly> RemoteHostAssemblies =
             MefHostServices.DefaultAssemblies
+                .Add(typeof(AspNetCoreEmbeddedLanguageClassifier).Assembly)
                 .Add(typeof(BrokeredServiceBase).Assembly)
                 .Add(typeof(RemoteWorkspacesResources).Assembly);
 

From 7f854218f0325e5d1f4e1e4d440dcbae3f31e559 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:08:44 -0700
Subject: [PATCH 160/413] Use restricted IVT

---
 .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
index 80ff821edb8ef..a239a4edf3d7e 100644
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -113,7 +113,7 @@
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor" Partner="Razor" Key="$(RazorKey)" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor.Test" Partner="Razor" Key="$(RazorKey)" />
     <InternalsVisibleTo Include="IdeCoreBenchmarks" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
+    <RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Partner="AspNetCore"  Key="$(AspNetCoreKey)"/>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
   </ItemGroup>

From 940163c6a36b80a8ae80844bf1c8083005fcb99d Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Date: Mon, 2 May 2022 15:13:04 -0700
Subject: [PATCH 161/413] Update
 src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj

Co-authored-by: James Newton-King <james@newtonking.com>
---
 .../Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
index da1cdbfe1a238..8224b2ed9654a 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -24,6 +24,8 @@
     <!--
       ⚠ ONLY ASP.NET CORE ASSEMBLIES MAY BE ADDED HERE ⚠
     -->
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Analyzers" />
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.App.Analyzers" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.UnitTests" />
   </ItemGroup>
 

From d4872225b92bf47a7ebe662a1afdf482414932b8 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:13:34 -0700
Subject: [PATCH 162/413] Use EA

---
 .../Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
index 36bad4d099180..48834110d9605 100644
--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
+++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
@@ -28,7 +28,7 @@
     <!-- BEGIN External Access -->
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
+    <RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Partner="AspNetCore"  Key="$(AspNetCoreKey)"/>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <!-- END External Access -->
     <!-- BEGIN MONODEVELOP

From b367814bc979272ffe1b07962f02eac39f97934b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:15:16 -0700
Subject: [PATCH 163/413] Make optional

---
 .../AbstractEmbeddedLanguageClassificationService.cs          | 4 ++--
 .../EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index 2e09365f521f1..8cf50ce00b728 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -92,7 +92,7 @@ public async Task AddEmbeddedLanguageClassificationsAsync(
         }
 
         public void AddEmbeddedLanguageClassifications(
-            Project project, SemanticModel semanticModel, TextSpan textSpan, ClassificationOptions options, ArrayBuilder<ClassifiedSpan> result, CancellationToken cancellationToken)
+            Project? project, SemanticModel semanticModel, TextSpan textSpan, ClassificationOptions options, ArrayBuilder<ClassifiedSpan> result, CancellationToken cancellationToken)
         {
             using var _ = ArrayBuilder<IEmbeddedLanguageClassifier>.GetInstance(out var classifierBuffer);
             var root = semanticModel.SyntaxTree.GetRoot(cancellationToken);
@@ -103,7 +103,7 @@ public void AddEmbeddedLanguageClassifications(
         private ref struct Worker
         {
             private readonly AbstractEmbeddedLanguageClassificationService _service;
-            private readonly Project _project;
+            private readonly Project? _project;
             private readonly SemanticModel _semanticModel;
             private readonly TextSpan _textSpan;
             private readonly ClassificationOptions _options;
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
index ff72c08701480..866d202fc068b 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/EmbeddedLanguageClassifierContext.cs
@@ -14,7 +14,7 @@ internal struct EmbeddedLanguageClassificationContext
         internal readonly ClassificationOptions Options;
         private readonly ArrayBuilder<ClassifiedSpan> _result;
 
-        public Project Project { get; }
+        public Project? Project { get; }
 
         /// <summary>
         /// The string or character token to classify.
@@ -29,7 +29,7 @@ internal struct EmbeddedLanguageClassificationContext
         public CancellationToken CancellationToken { get; }
 
         internal EmbeddedLanguageClassificationContext(
-            Project project,
+            Project? project,
             SemanticModel semanticModel,
             SyntaxToken syntaxToken,
             ClassificationOptions options,

From a724dc76735b05747dc1f6e7faea6e9195d34393 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:15:41 -0700
Subject: [PATCH 164/413] Simplify

---
 src/Workspaces/Core/Portable/Classification/Classifier.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Workspaces/Core/Portable/Classification/Classifier.cs b/src/Workspaces/Core/Portable/Classification/Classifier.cs
index bc7fb4fb2957f..e4980d791b9cc 100644
--- a/src/Workspaces/Core/Portable/Classification/Classifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/Classifier.cs
@@ -77,8 +77,7 @@ internal static IEnumerable<ClassifiedSpan> GetClassifiedSpans(
             classsificationService.AddSemanticClassifications(semanticModel, textSpan, getNodeClassifiers, getTokenClassifiers, semanticClassifications, options, cancellationToken);
 
             // intentionally adding to the semanticClassifications array here.
-            if (project != null)
-                embeddedLanguageService.AddEmbeddedLanguageClassifications(project, semanticModel, textSpan, options, semanticClassifications, cancellationToken);
+            embeddedLanguageService.AddEmbeddedLanguageClassifications(project, semanticModel, textSpan, options, semanticClassifications, cancellationToken);
 
             var allClassifications = new List<ClassifiedSpan>(semanticClassifications.Where(s => s.TextSpan.OverlapsWith(textSpan)));
             var semanticSet = semanticClassifications.Select(s => s.TextSpan).ToSet();

From 854deeff1f242aeed8b4981c20ec56bd0cb0c00d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:20:09 -0700
Subject: [PATCH 165/413] Make normal EA ivt

---
 .../Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj      | 2 +-
 .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj        | 2 +-
 .../AbstractEmbeddedLanguageClassificationService.cs            | 2 +-
 .../EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
index 48834110d9605..36bad4d099180 100644
--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
+++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
@@ -28,7 +28,7 @@
     <!-- BEGIN External Access -->
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests" />
-    <RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Partner="AspNetCore"  Key="$(AspNetCoreKey)"/>
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <!-- END External Access -->
     <!-- BEGIN MONODEVELOP
diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
index a239a4edf3d7e..80ff821edb8ef 100644
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -113,7 +113,7 @@
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor" Partner="Razor" Key="$(RazorKey)" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServerClient.Razor.Test" Partner="Razor" Key="$(RazorKey)" />
     <InternalsVisibleTo Include="IdeCoreBenchmarks" />
-    <RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Partner="AspNetCore"  Key="$(AspNetCoreKey)"/>
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
   </ItemGroup>
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index 8cf50ce00b728..b703957b43a3c 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -113,7 +113,7 @@ private ref struct Worker
 
             public Worker(
                 AbstractEmbeddedLanguageClassificationService service,
-                Project project,
+                Project? project,
                 SemanticModel semanticModel,
                 TextSpan textSpan,
                 ClassificationOptions options,
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
index f349c664a3724..8283310cad01a 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/IEmbeddedLanguageClassificationService.cs
@@ -20,7 +20,7 @@ Task AddEmbeddedLanguageClassificationsAsync(
             CancellationToken cancellationToken);
 
         void AddEmbeddedLanguageClassifications(
-            Project project,
+            Project? project,
             SemanticModel semanticModel,
             TextSpan textSpan,
             ClassificationOptions options,

From d5b10a69a3832bdd0261d5847b53780ba61ced32 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 15:21:53 -0700
Subject: [PATCH 166/413] Backport correctness fixes from #54997

---
 eng/Versions.props             |  2 +-
 eng/test-build-correctness.ps1 | 12 ++++++------
 eng/test-determinism.ps1       | 35 +++++++++++++++++-----------------
 eng/test-rebuild.ps1           |  4 ++--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d70b7a7410275..f8ba36453004d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -91,7 +91,7 @@
     <MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta2-20115-01</MicrosoftDiaSymReaderConverterXmlVersion>
     <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.5.0</MicrosoftDiaSymReaderPortablePdbVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21230.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22218.4</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
diff --git a/eng/test-build-correctness.ps1 b/eng/test-build-correctness.ps1
index a8e9ecb67ebfe..11c1097b9efc6 100644
--- a/eng/test-build-correctness.ps1
+++ b/eng/test-build-correctness.ps1
@@ -44,10 +44,10 @@ try {
 
   # Verify no PROTOTYPE marker left in main
   if ($env:SYSTEM_PULLREQUEST_TARGETBRANCH -eq "main") {
-    Write-Host "Checking no PROTOTYPE markers in compiler source"
-    $prototypes = Get-ChildItem -Path src/Compilers/*.cs, src/Compilers/*.vb,src/Compilers/*.xml -Recurse | Select-String -Pattern 'PROTOTYPE' -CaseSensitive -SimpleMatch
+    Write-Host "Checking no PROTOTYPE markers in source"
+    $prototypes = Get-ChildItem -Path src, eng, scripts -Exclude *.dll,*.exe,*.pdb,*.xlf,test-build-correctness.ps1 -Recurse | Select-String -Pattern 'PROTOTYPE' -CaseSensitive -SimpleMatch
     if ($prototypes) {
-      Write-Host "Found PROTOTYPE markers in compiler source:"
+      Write-Host "Found PROTOTYPE markers in source:"
       Write-Host $prototypes
       throw "PROTOTYPE markers disallowed in compiler source"
     }
@@ -59,15 +59,15 @@ try {
   # Verify the state of our various build artifacts
   Write-Host "Running BuildBoss"
   $buildBossPath = GetProjectOutputBinary "BuildBoss.exe"
-  Exec-Console $buildBossPath "-r `"$RepoRoot`" -c $configuration" -p Roslyn.sln
+  Exec-Console $buildBossPath "-r `"$RepoRoot/`" -c $configuration" -p Roslyn.sln
   Write-Host ""
 
   # Verify the state of our generated syntax files
   Write-Host "Checking generated compiler files"
   Exec-Block { & (Join-Path $PSScriptRoot "generate-compiler-code.ps1") -test -configuration:$configuration }
   Exec-Console dotnet "format . --include-generated --include src/Compilers/CSharp/Portable/Generated/ src/Compilers/VisualBasic/Portable/Generated/ src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Generated/ --check -f"
-  Write-Host ""  
-  
+  Write-Host ""
+
   exit 0
 }
 catch [exception] {
diff --git a/eng/test-determinism.ps1 b/eng/test-determinism.ps1
index fa5d1001bd27c..ab6148fb2fc5a 100644
--- a/eng/test-determinism.ps1
+++ b/eng/test-determinism.ps1
@@ -21,7 +21,7 @@ if ($help) {
 }
 
 # List of binary names that should be skipped because they have a known issue that
-# makes them non-deterministic.  
+# makes them non-deterministic.
 $script:skipList = @(
   # Added to work around https://github.com/dotnet/roslyn/issues/48417
   "Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.dll"
@@ -67,11 +67,11 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
   Stop-Processes
 }
 
-function Get-ObjDir([string]$rootDir) { 
+function Get-ObjDir([string]$rootDir) {
   return Join-Path $rootDir "artifacts\obj"
 }
 
-function Get-BinDir([string]$rootDir) { 
+function Get-BinDir([string]$rootDir) {
   return Join-Path $rootDir "artifacts\bin"
 }
 
@@ -80,7 +80,7 @@ function Get-BinDir([string]$rootDir) {
 function Get-FilesToProcess([string]$rootDir) {
   $objDir = Get-ObjDir $rootDir
   foreach ($item in Get-ChildItem -re -in *.dll,*.exe,*.pdb,*.sourcelink.json $objDir) {
-    $filePath = $item.FullName 
+    $filePath = $item.FullName
     $fileName = Split-Path -leaf $filePath
     $relativeDirectory = Split-Path -parent $filePath
     $relativeDirectory = $relativeDirectory.Substring($objDir.Length)
@@ -103,7 +103,7 @@ function Get-FilesToProcess([string]$rootDir) {
 
     $keyFilePath = $filePath + ".key"
     $keyFileName = Split-Path -leaf $keyFilePath
-    if (Test-Path $keyFilePath) { 
+    if (Test-Path $keyFilePath) {
       $data.KeyFileName = $keyFileName
       $data.KeyFilePath = $keyFilePath
       $data.KeyFileContent = [IO.File]::ReadAllBytes($keyFilePath)
@@ -124,7 +124,7 @@ function Record-Binaries([string]$rootDir) {
   Write-Host "Recording file hashes"
 
   $map = @{ }
-  foreach ($fileData in Get-FilesToProcess $rootDir) { 
+  foreach ($fileData in Get-FilesToProcess $rootDir) {
     Write-Host "`t$($fileData.FileId) = $($fileData.Hash)"
     $map[$fileData.FileId] = $fileData
   }
@@ -134,9 +134,9 @@ function Record-Binaries([string]$rootDir) {
 }
 
 # This is a sanity check to ensure that we're actually putting the right entries into
-# the core data map. Essentially to ensure things like if we change our directory layout 
-# that this test fails beacuse we didn't record the binaries we intended to record. 
-function Test-MapContents($dataMap) { 
+# the core data map. Essentially to ensure things like if we change our directory layout
+# that this test fails beacuse we didn't record the binaries we intended to record.
+function Test-MapContents($dataMap) {
 
   # Sanity check to ensure we didn't return a false positive because we failed
   # to examine any binaries.
@@ -151,16 +151,16 @@ function Test-MapContents($dataMap) {
     "Microsoft.CodeAnalysis.Workspaces.dll",
     "Microsoft.VisualStudio.LanguageServices.Implementation.dll")
 
-  foreach ($fileName in $list) { 
+  foreach ($fileName in $list) {
     $found = $false
-    foreach ($value in $dataMap.Values) { 
-      if ($value.FileName -eq $fileName) { 
+    foreach ($value in $dataMap.Values) {
+      if ($value.FileName -eq $fileName) {
         $found = $true
         break;
       }
     }
 
-    if (-not $found) { 
+    if (-not $found) {
       throw "Did not find the expected binary $fileName"
     }
   }
@@ -187,7 +187,7 @@ function Test-Build([string]$rootDir, $dataMap, [string]$logFileName) {
     }
 
     $oldfileData = $datamap[$fileId]
-    if ($fileData.Hash -ne $oldFileData.Hash) { 
+    if ($fileData.Hash -ne $oldFileData.Hash) {
       Write-Host "`tERROR! $relativeDir\$fileName contents don't match"
       $allGood = $false
       $errorList += $fileName
@@ -242,13 +242,13 @@ function Run-Test() {
   # Run a test against the source in the same directory location
   Test-Build -rootDir $RepoRoot -dataMap $dataMap -logFileName "test1"
 
-  # Run another build in a different source location and verify that path mapping 
-  # allows the build to be identical.  To do this we'll copy the entire source 
+  # Run another build in a different source location and verify that path mapping
+  # allows the build to be identical.  To do this we'll copy the entire source
   # tree under the artifacts\q directory and run a build from there.
   Write-Host "Building in a different directory"
   Exec-Command "subst" "$altRootDrive $(Split-Path -parent $RepoRoot)"
   try {
-    $altRootDir = Join-Path "$($altRootDrive)\" (Split-Path -leaf $RepoRoot)
+    $altRootDir = Join-Path (Join-Path "$($altRootDrive)\" (Split-Path -leaf $RepoRoot)) "\"
     Test-Build -rootDir $altRootDir -dataMap $dataMap -logFileName "test2"
   }
   finally {
@@ -292,4 +292,3 @@ finally {
   Get-Process VBCSCompiler -ErrorAction SilentlyContinue | Stop-Process
   Write-Host "Stopped VBCSCompiler"
 }
-
diff --git a/eng/test-rebuild.ps1 b/eng/test-rebuild.ps1
index b2b0f3914e525..8cd2f7adc0731 100644
--- a/eng/test-rebuild.ps1
+++ b/eng/test-rebuild.ps1
@@ -1,5 +1,5 @@
 <#
-  This script tests that Roslyn artifacts are rebuildable--i.e. that the source code and resources can be identified 
+  This script tests that Roslyn artifacts are rebuildable--i.e. that the source code and resources can be identified
 #>
 
 [CmdletBinding(PositionalBinding=$false)]
@@ -63,7 +63,7 @@ try {
   " --exclude net472\Zip\tools\vsixexpinstaller\VSIXExpInstaller.exe" +
 
   " --debugPath `"$ArtifactsDir/BuildValidator`"" +
-  " --sourcePath `"$RepoRoot`"" +
+  " --sourcePath `"$RepoRoot/`"" +
   " --referencesPath `"$ArtifactsDir/bin`"" +
   " --referencesPath `"$dotnetInstallDir/packs`"")
   Exec-Console "$ArtifactsDir/bin/BuildValidator/$configuration/net472/BuildValidator.exe" $rebuildArgs

From 6c3966cfdcd6d5829b63381574d078f3f0d6f13e Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 15:23:07 -0700
Subject: [PATCH 167/413] Backport dependency version changes from #54997

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index f8ba36453004d..1737bccdb71d1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -189,7 +189,7 @@
     <MicrosoftVisualStudioWorkspaceVSIntegrationVersion>16.3.43</MicrosoftVisualStudioWorkspaceVSIntegrationVersion>
     <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
-    <MSBuildStructuredLoggerVersion>2.1.133</MSBuildStructuredLoggerVersion>
+    <MSBuildStructuredLoggerVersion>2.1.500</MSBuildStructuredLoggerVersion>
     <MDbgVersion>0.1.0</MDbgVersion>
     <MonoOptionsVersion>6.6.0.161</MonoOptionsVersion>
     <MoqVersion>4.10.1</MoqVersion>

From 171255c94f3652ab78171173374cb7717901bb97 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:37:51 -0700
Subject: [PATCH 168/413] Add docs

---
 .../IAspNetCoreEmbeddedLanguageClassifier.cs                  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
index f24b66269e96a..dd3f55f3c4c16 100644
--- a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/IAspNetCoreEmbeddedLanguageClassifier.cs
@@ -2,10 +2,14 @@
 // 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.Classification;
+
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
 {
+    /// <inheritdoc cref="IEmbeddedLanguageClassifier"/>
     internal interface IAspNetCoreEmbeddedLanguageClassifier
     {
+        /// <inheritdoc cref="IEmbeddedLanguageClassifier.RegisterClassifications"/>
         void RegisterClassifications(AspNetCoreEmbeddedLanguageClassificationContext context);
     }
 }

From 28fce58bb9f2a52ca893a094a148a00e2bebeadc Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 2 May 2022 15:39:30 -0700
Subject: [PATCH 169/413] Add docs

---
 .../EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
index 9efe68af9c17d..a5c8580ed06d0 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
@@ -17,7 +17,9 @@
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
 {
     [ExportEmbeddedLanguageClassifierInternal(
-        nameof(AspNetCoreEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false, "Route"), Shared]
+        nameof(AspNetCoreEmbeddedLanguageClassifier), LanguageNames.CSharp, supportsUnannotatedAPIs: false,
+        // Add more syntax names here in the future if there are additional cases ASP.Net would like to light up on.
+        identifiers: new[] { "Route" }), Shared]
     internal class AspNetCoreEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
     {
         // Following CWTs are used to cache the  providers from projects' references,

From 8e4d730f1873915fb9f337273bfb9023c0a72cf6 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 16:08:44 -0700
Subject: [PATCH 170/413] Backport test fixes from #57426

---
 .../Semantic/Semantics/InitOnlyMemberTests.vb | 86 +++++++++++++------
 1 file changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
index effd45a1354f0..5e8dad1754f88 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
+++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
@@ -3030,7 +3030,8 @@ BC30937: Member 'CL1.P' that matches this signature cannot be implemented becaus
             Assert.NotEmpty(p.ExplicitInterfaceImplementations.Single().TypeCustomModifiers)
         End Sub
 
-        <Fact>
+        <ConditionalFact(GetType(CoreClrOnly))>
+        <WorkItem(56665, "https://github.com/dotnet/roslyn/issues/56665")>
         Public Sub LateBound_01()
 
             Dim csSource =
@@ -3057,13 +3058,37 @@ Public Class Test
         Dim x = new C()
         Dim ox As Object = x
 
-        ox.P0 = -40
+        Try
+            ox.P0 = -40
+        Catch ex As System.MissingMemberException
+            System.Console.Write(x.P0)
+            System.Console.Write(" ")
+        End Try
+
         b.Init(ox.P1, -41)
         ob.Init(x.P2, -42)
         ob.Init(ox.P3, -43)
 
-        ox(0) = 40
-        ox.Item(1) = 41
+        System.Console.Write(x.P1)
+        System.Console.Write(" ")
+        System.Console.Write(x.P2)
+        System.Console.Write(" ")
+        System.Console.Write(x.P3)
+
+        Try
+            ox(0) = 40
+        Catch ex As System.MissingMemberException
+            System.Console.Write(" ")
+            System.Console.Write(x(0))
+        End Try
+
+        Try
+            ox.Item(1) = 41
+        Catch ex As System.MissingMemberException
+            System.Console.Write(" ")
+            System.Console.Write(x(1))
+        End Try
+
         b.Init(ox(2), 42)
         ob.Init(x(3), 43)
         b.Init(ox.Item(4), 44)
@@ -3071,15 +3096,7 @@ Public Class Test
         ob.Init(ox(6), 46)
         ob.Init(ox.Item(7), 47)
 
-        System.Console.Write(x.P0)
-        System.Console.Write(" ")
-        System.Console.Write(x.P1)
-        System.Console.Write(" ")
-        System.Console.Write(x.P2)
-        System.Console.Write(" ")
-        System.Console.Write(x.P3)
-
-        For i as Integer = 0 To 7
+        For i as Integer = 2 To 7
             System.Console.Write(" ")
             System.Console.Write(x(i))
         Next
@@ -3094,7 +3111,7 @@ End Class
 ]]></file>
 </compilation>
 
-            Dim expectedOutput As String = "-40 -41 0 -43 40 41 42 0 44 0 46 47"
+            Dim expectedOutput As String = "0 0 0 0 0 0 0 0 0 0 0 0"
             Dim comp1 = CreateCompilation(source1, parseOptions:=TestOptions.RegularLatest, options:=TestOptions.DebugExe, references:={csCompilation})
             CompileAndVerify(comp1, expectedOutput:=expectedOutput).VerifyDiagnostics()
 
@@ -3102,7 +3119,8 @@ End Class
             CompileAndVerify(comp2, expectedOutput:=expectedOutput).VerifyDiagnostics()
         End Sub
 
-        <Fact>
+        <ConditionalFact(GetType(CoreClrOnly))>
+        <WorkItem(56665, "https://github.com/dotnet/roslyn/issues/56665")>
         Public Sub LateBound_02()
 
             Dim csSource =
@@ -3126,10 +3144,32 @@ Public Class Test
         Dim x = new C()
         Dim ox As Object = x
 
-        ox(0) = 40
-        ox.Item(1) = 41
-        x(CObj(2)) = 42
-        x.Item(CObj(3)) = 43
+        Try
+            ox(0) = 40
+        Catch ex As System.MissingMemberException
+            System.Console.Write(x(0))
+        End Try
+
+        Try
+            ox.Item(1) = 41
+        Catch ex As System.MissingMemberException
+            System.Console.Write(" ")
+            System.Console.Write(x(1))
+        End Try
+
+        Try
+            x(CObj(2)) = 42
+        Catch ex As System.MissingMemberException
+            System.Console.Write(" ")
+            System.Console.Write(x(2))
+        End Try
+
+        Try
+            x.Item(CObj(3)) = 43
+        Catch ex As System.MissingMemberException
+            System.Console.Write(" ")
+            System.Console.Write(x(3))
+        End Try
 
         b.Init(ox(4), 44)
         ob.Init(ox(5), 45)
@@ -3140,9 +3180,7 @@ Public Class Test
         b.Init(x.Item(CObj(10)), 50)
         ob.Init(x.Item(CObj(11)), 51)
 
-        System.Console.Write(x(0))
-
-        For i as Integer = 1 To 11
+        For i as Integer = 4 To 11
             System.Console.Write(" ")
             System.Console.Write(x(i))
         Next
@@ -3157,7 +3195,7 @@ End Class
 ]]></file>
 </compilation>
 
-            Dim expectedOutput As String = "40 41 42 43 44 45 46 47 48 49 50 51"
+            Dim expectedOutput As String = "0 0 0 0 0 0 0 0 0 0 0 0"
             Dim comp1 = CreateCompilation(source1, parseOptions:=TestOptions.RegularLatest, options:=TestOptions.DebugExe, references:={csCompilation})
             CompileAndVerify(comp1, expectedOutput:=expectedOutput).VerifyDiagnostics()
 
@@ -5734,4 +5772,4 @@ BC37311: Init-only property 'P1' can only be assigned by an object member initia
         End Sub
 
     End Class
-End Namespace
+End Namespace
\ No newline at end of file

From caf645da1314e67e67d1d82a7fb19d784bc6033e Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 22:14:29 -0700
Subject: [PATCH 171/413] Fix format command invocation

---
 eng/test-build-correctness.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/test-build-correctness.ps1 b/eng/test-build-correctness.ps1
index 11c1097b9efc6..62de113e3fe25 100644
--- a/eng/test-build-correctness.ps1
+++ b/eng/test-build-correctness.ps1
@@ -65,7 +65,7 @@ try {
   # Verify the state of our generated syntax files
   Write-Host "Checking generated compiler files"
   Exec-Block { & (Join-Path $PSScriptRoot "generate-compiler-code.ps1") -test -configuration:$configuration }
-  Exec-Console dotnet "format . --include-generated --include src/Compilers/CSharp/Portable/Generated/ src/Compilers/VisualBasic/Portable/Generated/ src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Generated/ --check -f"
+  Exec-Console dotnet "tool run dotnet-format whitespace . --folder --include-generated --include src/Compilers/CSharp/Portable/Generated/ src/Compilers/VisualBasic/Portable/Generated/ src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Generated/ --verify-no-changes"
   Write-Host ""
 
   exit 0

From 3c225e59db39e25542097b9c0a1ae68053cd1cb5 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 22:45:51 -0700
Subject: [PATCH 172/413] Pass dropPath to insert.yml

---
 azure-pipelines-official.yml | 3 +++
 eng/pipelines/insert.yml     | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 4382e5d79c162..54d0e91c1e223 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -309,6 +309,8 @@ stages:
     pool:
       vmImage: windows-2019
     steps:
+    - download: current
+      artifact: VSSetup
     - powershell: |
         $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
         Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"
@@ -323,6 +325,7 @@ stages:
         sourceBranch: "$(ComponentBranchName)"
         publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
         publishDataAccessToken: "$(System.AccessToken)"
+        dropPath: "$(Pipeline.Workspace)\VSSetup"
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml
diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
index df80fe49a15a6..2fedf5a619f55 100644
--- a/eng/pipelines/insert.yml
+++ b/eng/pipelines/insert.yml
@@ -40,6 +40,10 @@ parameters:
   - name: sourceBranch
     type: string
 
+  - name: dropPath
+    type: string
+    default: '(default)'
+
 steps:
   - checkout: none
 
@@ -164,7 +168,7 @@ steps:
         -componentBranchName "$(Template.ComponentBranchName)" `
         -createDraftPR "$(Template.CreateDraftPR)" `
         -defaultValueSentinel "(default)" `
-        -dropPath "(default)" `
+        -dropPath "${{ parameters.dropPath }}" `
         -insertCore "(default)" `
         -insertDevDiv "(default)" `
         -insertionCount "1" `

From 3c953153f3b8105b0193f465aac6a3be336e0678 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 2 May 2022 22:48:42 -0700
Subject: [PATCH 173/413] Fix yml

---
 azure-pipelines-official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 54d0e91c1e223..87030e9aee08a 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -325,7 +325,7 @@ stages:
         sourceBranch: "$(ComponentBranchName)"
         publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
         publishDataAccessToken: "$(System.AccessToken)"
-        dropPath: "$(Pipeline.Workspace)\VSSetup"
+        dropPath: '$(Pipeline.Workspace)\VSSetup'
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml

From a007ee61f8d036b53ea34dcf51b90243a95f60ec Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 3 May 2022 04:36:49 -0700
Subject: [PATCH 174/413] Add FixAll support for "Convert to raw string"
 refactoring

---
 ...ularStringToRawStringString_FixAllTests.cs | 690 ++++++++++++++++++
 .../CodeActions/AbstractCodeActionTest.cs     |   7 +-
 ...tringToRawStringCodeRefactoringProvider.cs | 168 ++++-
 .../CodeRefactorings/CodeRefactoring.cs       |   6 +-
 .../CodeRefactoringService.cs                 |   2 +-
 ...nvertConditionalCodeRefactoringProvider.cs |   8 +-
 .../UnifiedSuggestedActionsSource.cs          |   8 +-
 .../CSharp/CSharpCodeActions.cs               | 108 +--
 .../FixAllOccurrences/FixAllState.cs          |   4 +-
 .../CommonFixAllState.cs                      |   4 +
 .../CodeFixesAndRefactorings/IFixAllState.cs  |   3 +
 .../FixAllOccurences/FixAllState.cs           |  12 +-
 ...yntaxEditorBasedCodeRefactoringProvider.cs |  35 +-
 13 files changed, 946 insertions(+), 109 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/ConvertToRawString/ConvertToRegularStringToRawStringString_FixAllTests.cs

diff --git a/src/EditorFeatures/CSharpTest/ConvertToRawString/ConvertToRegularStringToRawStringString_FixAllTests.cs b/src/EditorFeatures/CSharpTest/ConvertToRawString/ConvertToRegularStringToRawStringString_FixAllTests.cs
new file mode 100644
index 0000000000000..b646b5ddd9f77
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/ConvertToRawString/ConvertToRegularStringToRawStringString_FixAllTests.cs
@@ -0,0 +1,690 @@
+// 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.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp.ConvertToRawString;
+using Microsoft.CodeAnalysis.CSharp.Shared.Extensions;
+using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
+using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ConvertToRawString
+{
+    public class ConvertToRegularStringToRawStringString_FixAllTests : AbstractCSharpCodeActionTest
+    {
+        protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
+            => new ConvertRegularStringToRawStringCodeRefactoringProvider();
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInDocument_SingleLine()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = {|FixAllInDocument:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+}",
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInDocument_MultiLine()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = {|FixAllInDocument:|}""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+}",
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = """"""
+            goo
+            bar
+            """""";
+        var multiLine2 = """"""
+            goo
+            bar
+            """""";
+
+        var multiLineWithoutLeadingWhitespace1 = """"""
+
+            from x in y
+            where x > 0
+            select x
+            """""";
+        var multiLineWithoutLeadingWhitespace2 = """"""
+
+            from x2 in y2
+            where x2 > 0
+            select x2
+            """""";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = """"""
+            goo
+            bar
+            """""";
+        var multiLine2 = """"""
+            goo
+            bar
+            """""";
+
+        var multiLineWithoutLeadingWhitespace1 = """"""
+
+            from x in y
+            where x > 0
+            select x
+            """""";
+        var multiLineWithoutLeadingWhitespace2 = """"""
+
+            from x2 in y2
+            where x2 > 0
+            select x2
+            """""";
+    }
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInDocument_MultiLineWithoutLeadingWhitespace()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = {|FixAllInDocument:|}@""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = @""
+from x in y
+where x > 0
+select x"";
+        var multiLineWithoutLeadingWhitespace2 = @""
+from x2 in y2
+where x2 > 0
+select x2"";
+    }
+}",
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = """"""
+            from x in y
+            where x > 0
+            select x
+            """""";
+        var multiLineWithoutLeadingWhitespace2 = """"""
+            from x2 in y2
+            where x2 > 0
+            select x2
+            """""";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+
+        var multiLine1 = ""goo\r\nbar"";
+        var multiLine2 = @""goo
+bar"";
+
+        var multiLineWithoutLeadingWhitespace1 = """"""
+            from x in y
+            where x > 0
+            select x
+            """""";
+        var multiLineWithoutLeadingWhitespace2 = """"""
+            from x2 in y2
+            where x2 > 0
+            select x2
+            """""";
+    }
+}", index: 1);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInProject()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class Program1
+{
+    void M1()
+    {
+        var singleLine1 = {|FixAllInProject:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+        <Document>
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class Program1
+{
+    void M1()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+        <Document>
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInSolution()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class Program1
+{
+    void M1()
+    {
+        var singleLine1 = {|FixAllInSolution:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+        <Document>
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+class Program1
+{
+    void M1()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+        <Document>
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInContainingMember()
+        {
+            await TestInRegularAndScriptAsync(
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = {|FixAllInContainingMember:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+class C2
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}",
+@"class C
+{
+    void M()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+class C2
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInContainingType()
+        {
+            await TestInRegularAndScriptAsync(
+@"partial class C
+{
+    void M()
+    {
+        var singleLine1 = {|FixAllInContainingType:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+class C2
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+partial class C
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}",
+@"partial class C
+{
+    void M()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+
+    void M2()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+
+class C2
+{
+    void M()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+partial class C
+{
+    void M3()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInContainingType_AcrossFiles()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+partial class Program1
+{
+    void M1()
+    {
+        var singleLine1 = {|FixAllInContainingType:|}""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+        <Document>
+partial class Program1
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>
+partial class Program1
+{
+    void M1()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+
+    void M2()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+        </Document>
+        <Document>
+partial class Program1
+{
+    void M3()
+    {
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
+    }
+}
+
+class Program2
+{
+    void M2()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+    void M3()
+    {
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
+    }
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+    }
+}
diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
index 6c881dc7e2d13..c11936ae57c0c 100644
--- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
+++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
@@ -65,13 +65,14 @@ protected abstract CodeRefactoringProvider CreateCodeRefactoringProvider(
                 return (actions, actionToInvoke);
 
             var fixAllCodeAction = await GetFixAllFixAsync(actionToInvoke,
-                refactoring.Provider, document, span, fixAllScope.Value).ConfigureAwait(false);
+                refactoring.Provider, refactoring.CodeActionOptionsProvider, document, span, fixAllScope.Value).ConfigureAwait(false);
             return (ImmutableArray.Create(fixAllCodeAction), fixAllCodeAction);
         }
 
         private static async Task<CodeAction> GetFixAllFixAsync(
             CodeAction originalCodeAction,
             CodeRefactoringProvider provider,
+            CodeActionOptionsProvider optionsProvider,
             Document document,
             TextSpan selectionSpan,
             FixAllScope scope)
@@ -79,7 +80,7 @@ private static async Task<CodeAction> GetFixAllFixAsync(
             var fixAllProvider = provider.GetFixAllProvider();
             Assert.NotNull(fixAllProvider);
 
-            var fixAllState = new FixAllState(fixAllProvider, document, selectionSpan, provider, scope, originalCodeAction);
+            var fixAllState = new FixAllState(fixAllProvider, document, selectionSpan, provider, optionsProvider, scope, originalCodeAction);
             var fixAllContext = new FixAllContext(fixAllState, new ProgressTracker(), CancellationToken.None);
             return await fixAllProvider.GetFixAsync(fixAllContext).ConfigureAwait(false);
         }
@@ -110,7 +111,7 @@ internal async Task<CodeRefactoring> GetCodeRefactoringAsync(
 
             var context = new CodeRefactoringContext(document, selectedOrAnnotatedSpan, (a, t) => actions.Add((a, t)), codeActionOptionsProvider, CancellationToken.None);
             await provider.ComputeRefactoringsAsync(context);
-            var result = actions.Count > 0 ? new CodeRefactoring(provider, actions.ToImmutable(), FixAllProviderInfo.Create(provider)) : null;
+            var result = actions.Count > 0 ? new CodeRefactoring(provider, actions.ToImmutable(), FixAllProviderInfo.Create(provider), codeActionOptionsProvider) : null;
             actions.Free();
             return result;
         }
diff --git a/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
index cb7f451956a34..9321004619cd3 100644
--- a/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
@@ -5,15 +5,19 @@
 using System;
 using System.Collections.Immutable;
 using System.Composition;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Collections;
 using Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -28,7 +32,7 @@ namespace Microsoft.CodeAnalysis.CSharp.ConvertToRawString
     using static ConvertToRawStringHelpers;
 
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.ConvertToRawString), Shared]
-    internal class ConvertRegularStringToRawStringCodeRefactoringProvider : CodeRefactoringProvider
+    internal class ConvertRegularStringToRawStringCodeRefactoringProvider : SyntaxEditorBasedCodeRefactoringProvider
     {
         private enum ConvertToRawKind
         {
@@ -37,12 +41,25 @@ private enum ConvertToRawKind
             MultiLineWithoutLeadingWhitespace,
         }
 
+        private static readonly BidirectionalMap<ConvertToRawKind, string> s_kindToEquivalenceKeyMap =
+            new(new[]
+            {
+                KeyValuePairUtil.Create(ConvertToRawKind.SingleLine,
+                                        nameof(CSharpFeaturesResources.Convert_to_raw_string) + "-" + ConvertToRawKind.SingleLine),
+                KeyValuePairUtil.Create(ConvertToRawKind.MultiLineIndented,
+                                        nameof(CSharpFeaturesResources.Convert_to_raw_string)),
+                KeyValuePairUtil.Create(ConvertToRawKind.MultiLineWithoutLeadingWhitespace,
+                                        nameof(CSharpFeaturesResources.without_leading_whitespace_may_change_semantics)),
+            });
+
         [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        [SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
         public ConvertRegularStringToRawStringCodeRefactoringProvider()
         {
         }
 
+        protected override ImmutableArray<FixAllScope> SupportedFixAllScopes => AllFixAllScopes;
+
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
             var (document, span, cancellationToken) = context;
@@ -55,38 +72,24 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
             if (token.Kind() != SyntaxKind.StringLiteralToken)
                 return;
 
-            // Can't convert a string literal in a directive to a raw string.
-            if (IsInDirective(token.Parent))
-                return;
-
-            var characters = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(token);
-
-            // TODO(cyrusn): Should we offer this on empty strings... seems undesirable as you'd end with a gigantic 
-            // three line alternative over just ""
-            if (characters.IsDefaultOrEmpty)
-                return;
-
-            // Ensure that all characters in the string are those we can convert.
-            if (!characters.All(static ch => CanConvert(ch)))
+            if (!CanConvertStringLiteral(token, out var convertParams))
                 return;
 
             // If we have escaped quotes in the string, then this is a good option to bubble up as something to convert
             // to a raw string.  Otherwise, still offer this refactoring, but at low priority as the user may be
             // invoking this on lots of strings that they have no interest in converting.
-            var priority = AllEscapesAreQuotes(characters) ? CodeActionPriority.Medium : CodeActionPriority.Low;
-
-            var canBeSingleLine = CanBeSingleLine(characters);
+            var priority = AllEscapesAreQuotes(convertParams.Characters) ? CodeActionPriority.Medium : CodeActionPriority.Low;
 
-            var formattingOptions = await document.GetSyntaxFormattingOptionsAsync(context.Options, cancellationToken).ConfigureAwait(false);
+            var options = context.Options;
 
-            if (canBeSingleLine)
+            if (convertParams.CanBeSingleLine)
             {
                 context.RegisterRefactoring(
                     CodeAction.CreateWithPriority(
                         priority,
                         CSharpFeaturesResources.Convert_to_raw_string,
-                        c => UpdateDocumentAsync(document, span, ConvertToRawKind.SingleLine, formattingOptions, c),
-                        nameof(CSharpFeaturesResources.Convert_to_raw_string) + "-" + ConvertToRawKind.SingleLine),
+                        c => UpdateDocumentAsync(document, span, ConvertToRawKind.SingleLine, options, c),
+                        s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.SingleLine)!),
                     token.Span);
             }
             else
@@ -95,10 +98,48 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                     CodeAction.CreateWithPriority(
                         priority,
                         CSharpFeaturesResources.Convert_to_raw_string,
-                        c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineIndented, formattingOptions, c),
-                        nameof(CSharpFeaturesResources.Convert_to_raw_string)),
+                        c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineIndented, options, c),
+                        s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.MultiLineIndented)!),
                     token.Span);
 
+                if (convertParams.CanBeMultiLineWithoutLeadingWhiteSpaces)
+                {
+                    context.RegisterRefactoring(
+                        CodeAction.CreateWithPriority(
+                            priority,
+                            CSharpFeaturesResources.without_leading_whitespace_may_change_semantics,
+                            c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineWithoutLeadingWhitespace, options, c),
+                            s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.MultiLineWithoutLeadingWhitespace)!),
+                        token.Span);
+                }
+            }
+        }
+
+        private static bool CanConvertStringLiteral(SyntaxToken token, out CanConvertParams convertParams)
+        {
+            Debug.Assert(token.Kind() == SyntaxKind.StringLiteralToken);
+
+            convertParams = default;
+
+            // Can't convert a string literal in a directive to a raw string.
+            if (IsInDirective(token.Parent))
+                return false;
+
+            var characters = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(token);
+
+            // TODO(cyrusn): Should we offer this on empty strings... seems undesirable as you'd end with a gigantic 
+            // three line alternative over just ""
+            if (characters.IsDefaultOrEmpty)
+                return false;
+
+            // Ensure that all characters in the string are those we can convert.
+            if (!characters.All(static ch => CanConvert(ch)))
+                return false;
+
+            var canBeSingleLine = CanBeSingleLine(characters);
+            var canBeMultiLineWithoutLeadingWhiteSpaces = false;
+            if (!canBeSingleLine)
+            {
                 // Users sometimes write verbatim string literals with a extra starting newline (or indentation) purely
                 // for aesthetic reasons.  For example:
                 //
@@ -123,19 +164,27 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                 //
                 // This changes the contents of the literal, but that can be fine for the domain the user is working in.
                 // Offer this, but let the user know that this will change runtime semantics.
-                if (token.IsVerbatimStringLiteral() &&
+                canBeMultiLineWithoutLeadingWhiteSpaces = token.IsVerbatimStringLiteral() &&
                     HasLeadingWhitespace(characters) &&
-                    CleanupWhitespace(characters).Length > 0)
-                {
-                    context.RegisterRefactoring(
-                        CodeAction.CreateWithPriority(
-                            priority,
-                            CSharpFeaturesResources.without_leading_whitespace_may_change_semantics,
-                            c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineWithoutLeadingWhitespace, formattingOptions, c),
-                            nameof(CSharpFeaturesResources.without_leading_whitespace_may_change_semantics)),
-                        token.Span);
-                }
+                    CleanupWhitespace(characters).Length > 0;
             }
+
+            convertParams = new CanConvertParams(characters, canBeSingleLine, canBeMultiLineWithoutLeadingWhiteSpaces);
+            return true;
+        }
+
+        private readonly struct CanConvertParams
+        {
+            public CanConvertParams(VirtualCharSequence characters, bool canBeSingleLine, bool canBeMultiLineWithoutLeadingWhiteSpaces)
+            {
+                Characters = characters;
+                CanBeSingleLine = canBeSingleLine;
+                CanBeMultiLineWithoutLeadingWhiteSpaces = canBeMultiLineWithoutLeadingWhiteSpaces;
+            }
+
+            public VirtualCharSequence Characters { get; }
+            public bool CanBeSingleLine { get; }
+            public bool CanBeMultiLineWithoutLeadingWhiteSpaces { get; }
         }
 
         private static bool HasLeadingWhitespace(VirtualCharSequence characters)
@@ -148,8 +197,9 @@ private static bool HasLeadingWhitespace(VirtualCharSequence characters)
         }
 
         private static async Task<Document> UpdateDocumentAsync(
-            Document document, TextSpan span, ConvertToRawKind kind, SyntaxFormattingOptions options, CancellationToken cancellationToken)
+            Document document, TextSpan span, ConvertToRawKind kind, CodeActionOptionsProvider optionsProvider, CancellationToken cancellationToken)
         {
+            var options = await document.GetSyntaxFormattingOptionsAsync(optionsProvider, cancellationToken).ConfigureAwait(false);
             var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var token = root.FindToken(span.Start);
             Contract.ThrowIfFalse(span.IntersectsWith(token.Span));
@@ -159,6 +209,52 @@ private static async Task<Document> UpdateDocumentAsync(
             return document.WithSyntaxRoot(root.ReplaceToken(token, replacement));
         }
 
+        protected override async Task FixAllAsync(
+            Document document,
+            ImmutableArray<TextSpan> fixAllSpans,
+            SyntaxEditor editor,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken)
+        {
+            Debug.Assert(equivalenceKey != null);
+
+            var options = await document.GetSyntaxFormattingOptionsAsync(optionsProvider, cancellationToken).ConfigureAwait(false);
+            using var _ = PooledDictionary<SyntaxToken, SyntaxToken>.GetInstance(out var tokenReplacementMap);
+
+            foreach (var fixSpan in fixAllSpans)
+            {
+                var node = editor.OriginalRoot.FindNode(fixSpan);
+                foreach (var stringLiteral in node.DescendantTokens(descendIntoTrivia: true).Where(token => token.Kind() == SyntaxKind.StringLiteralToken))
+                {
+                    // Ensure we can convert the string literal
+                    if (!CanConvertStringLiteral(stringLiteral, out var canConvertParams))
+                        continue;
+
+                    // Get the kind to be fixed from the equivalenceKey for the FixAll operation
+                    var kind = s_kindToEquivalenceKeyMap.GetKeyOrDefault(equivalenceKey);
+
+                    // Ensure we have a matching kind to fix for this literal
+                    var hasMatchingKind = kind switch
+                    {
+                        ConvertToRawKind.SingleLine => canConvertParams.CanBeSingleLine,
+                        ConvertToRawKind.MultiLineIndented => !canConvertParams.CanBeSingleLine,
+                        ConvertToRawKind.MultiLineWithoutLeadingWhitespace => canConvertParams.CanBeMultiLineWithoutLeadingWhiteSpaces,
+                        _ => throw ExceptionUtilities.UnexpectedValue(kind),
+                    };
+
+                    if (!hasMatchingKind)
+                        continue;
+
+                    var replacement = GetReplacementToken(document, stringLiteral, kind, options, cancellationToken);
+                    tokenReplacementMap.Add(stringLiteral, replacement);
+                }
+            }
+
+            var newRoot = editor.OriginalRoot.ReplaceTokens(tokenReplacementMap.Keys, (token, _) => tokenReplacementMap[token]);
+            editor.ReplaceNode(editor.OriginalRoot, newRoot);
+        }
+
         private static SyntaxToken GetReplacementToken(
             Document document,
             SyntaxToken token,
diff --git a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs
index 3938a5780a37d..17216a5ff5d45 100644
--- a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs
@@ -28,14 +28,18 @@ internal class CodeRefactoring
 
         public FixAllProviderInfo? FixAllProviderInfo { get; }
 
+        public CodeActionOptionsProvider CodeActionOptionsProvider { get; }
+
         public CodeRefactoring(
             CodeRefactoringProvider provider,
             ImmutableArray<(CodeAction, TextSpan?)> actions,
-            FixAllProviderInfo? fixAllProviderInfo)
+            FixAllProviderInfo? fixAllProviderInfo,
+            CodeActionOptionsProvider codeActionOptionsProvider)
         {
             Provider = provider;
             CodeActions = actions.NullToEmpty();
             FixAllProviderInfo = fixAllProviderInfo;
+            CodeActionOptionsProvider = codeActionOptionsProvider;
 
             if (CodeActions.IsEmpty)
             {
diff --git a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
index 7d4ca940a02bb..ffce769f3b2e0 100644
--- a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
@@ -191,7 +191,7 @@ public async Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(
 
                 var fixAllProviderInfo = extensionManager.PerformFunction(
                     provider, () => ImmutableInterlocked.GetOrAdd(ref _fixAllProviderMap, provider, FixAllProviderInfo.Create), defaultValue: null);
-                return new CodeRefactoring(provider, actions.ToImmutable(), fixAllProviderInfo);
+                return new CodeRefactoring(provider, actions.ToImmutable(), fixAllProviderInfo, options);
             }
             catch (OperationCanceledException)
             {
diff --git a/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs b/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
index f076a466a50dc..699fba088a529 100644
--- a/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
+++ b/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
@@ -45,7 +45,13 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
             Document document, TextSpan span, CancellationToken cancellationToken)
             => await document.TryGetRelevantNodeAsync<TConditionalExpressionSyntax>(span, cancellationToken).ConfigureAwait(false);
 
-        protected override async Task FixAllAsync(Document document, ImmutableArray<TextSpan> fixAllSpans, SyntaxEditor editor, CancellationToken cancellationToken)
+        protected override async Task FixAllAsync(
+            Document document,
+            ImmutableArray<TextSpan> fixAllSpans,
+            SyntaxEditor editor,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken)
         {
             var originalRoot = editor.OriginalRoot;
 
diff --git a/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs b/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
index 141a25762da1c..d12434e1363b2 100644
--- a/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
+++ b/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
@@ -454,7 +454,7 @@ private static ImmutableArray<CodeRefactoring> FilterOnAnyThread(
                 ? null
                 : actions.Length == refactoring.CodeActions.Length
                     ? refactoring
-                    : new CodeRefactoring(refactoring.Provider, actions, refactoring.FixAllProviderInfo);
+                    : new CodeRefactoring(refactoring.Provider, actions, refactoring.FixAllProviderInfo, refactoring.CodeActionOptionsProvider);
 
             bool IsActionAndSpanApplicable((CodeAction action, TextSpan? applicableSpan) actionAndSpan)
             {
@@ -538,7 +538,8 @@ async Task<IUnifiedSuggestedAction> GetUnifiedSuggestedActionSetAsync(CodeAction
                 {
                     var fixAllSuggestedActionSet = await GetUnifiedFixAllSuggestedActionSetAsync(codeAction,
                         refactoring.CodeActions.Length, document, selection, refactoring.Provider,
-                        refactoring.FixAllProviderInfo, workspace, cancellationToken).ConfigureAwait(false);
+                        refactoring.FixAllProviderInfo, refactoring.CodeActionOptionsProvider,
+                        workspace, cancellationToken).ConfigureAwait(false);
 
                     return new UnifiedCodeRefactoringSuggestedAction(
                             workspace, codeAction, codeAction.Priority, refactoring.Provider, fixAllSuggestedActionSet);
@@ -556,6 +557,7 @@ async Task<IUnifiedSuggestedAction> GetUnifiedSuggestedActionSetAsync(CodeAction
             TextSpan selection,
             CodeRefactoringProvider provider,
             FixAllProviderInfo? fixAllProviderInfo,
+            CodeActionOptionsProvider optionsProvider,
             Workspace workspace,
             CancellationToken cancellationToken)
         {
@@ -577,7 +579,7 @@ async Task<IUnifiedSuggestedAction> GetUnifiedSuggestedActionSetAsync(CodeAction
             {
                 var fixAllState = new CodeRefactorings.FixAllState(
                     (CodeRefactorings.FixAllProvider)fixAllProviderInfo.FixAllProvider,
-                    document, selection, provider, scope, action);
+                    document, selection, provider, optionsProvider, scope, action);
 
                 if (scope is FixAllScope.ContainingMember or FixAllScope.ContainingType)
                 {
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs
index e3c2f57d3252a..c64168dfe7d69 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs
@@ -1171,45 +1171,49 @@ public async Task TestFixAllOccurrences_CodeRefactoring_ContainingMember()
             var markup = @"
 class C1
 {
-    void M(bool x, int a, int b)
+    void M()
     {
-        var c = $$x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = $$""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 
-    void M2(bool x, int a, int b)
+    void M2()
     {
-        var c = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 class C2
 {
-    void M3(bool x, int a, int b)
+    void M3()
     {
-        var c = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }";
             var expectedText = @"
 class C1
 {
-    void M(bool x, int a, int b)
+    void M()
     {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
     }
 
-    void M2(bool x, int a, int b)
+    void M2()
     {
-        var c = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 class C2
 {
-    void M3(bool x, int a, int b)
+    void M3()
     {
-        var c = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }";
 
@@ -1230,7 +1234,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
             await TestServices.Editor.InvokeCodeActionListAsync(HangMitigatingCancellationToken);
 
             await TestServices.EditorVerifier.CodeActionAsync(
-                "Invert conditional",
+                "Convert to raw string",
                 applyFix: true,
                 fixAllScope: FixAllScope.ContainingMember,
                 cancellationToken: HangMitigatingCancellationToken);
@@ -1245,104 +1249,104 @@ public async Task TestFixAllOccurrences_CodeRefactoring_ContainingType()
             var markup1 = @"
 partial class C1
 {
-    void M(bool x, int a, int b)
+    void M()
     {
-        var c = $$x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = $$""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 
-    void M2(bool x, int a, int b)
+    void M2()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 class C2
 {
-    void M3(bool x, int a, int b)
+    void M3()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 partial class C1
 {
-    void M4(bool x, int a, int b)
+    void M4()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }";
             var expectedText1 = @"
 partial class C1
 {
-    void M(bool x, int a, int b)
+    void M()
     {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
     }
 
-    void M2(bool x, int a, int b)
+    void M2()
     {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
     }
 }
 
 class C2
 {
-    void M3(bool x, int a, int b)
+    void M3()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 partial class C1
 {
-    void M4(bool x, int a, int b)
+    void M4()
     {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
     }
 }";
 
             var markup2 = @"
 partial class C1
 {
-    void M5(bool x, int a, int b)
+    void M5()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }
 
 class C2
 {
-    void M6(bool x, int a, int b)
+    void M6()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }";
             var expectedText2 = @"
 partial class C1
 {
-    void M5(bool x, int a, int b)
+    void M5()
     {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
+        var singleLine1 = """"""a"""""";
+        var singleLine2 = """"""goo""bar"""""";
     }
 }
 
 class C2
 {
-    void M6(bool x, int a, int b)
+    void M6()
     {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
+        var singleLine1 = ""a"";
+        var singleLine2 = @""goo""""bar"";
     }
 }";
 
@@ -1364,7 +1368,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
             await TestServices.Editor.InvokeCodeActionListAsync(HangMitigatingCancellationToken);
 
             await TestServices.EditorVerifier.CodeActionAsync(
-                "Invert conditional",
+                "Convert to raw string",
                 applyFix: true,
                 fixAllScope: FixAllScope.ContainingType,
                 cancellationToken: HangMitigatingCancellationToken);
diff --git a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllState.cs b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllState.cs
index 7ff5acf91fd54..f0c7139efcae7 100644
--- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllState.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllState.cs
@@ -20,7 +20,6 @@ internal sealed partial class FixAllState : CommonFixAllState<CodeFixProvider, F
         public FixAllContext.DiagnosticProvider DiagnosticProvider { get; }
 
         public ImmutableHashSet<string> DiagnosticIds { get; }
-        public CodeActionOptionsProvider CodeActionOptionsProvider { get; }
 
         // Note: DiagnosticSpan can be null from the back-compat public constructor of FixAllContext.
         public TextSpan? DiagnosticSpan { get; }
@@ -36,7 +35,7 @@ internal FixAllState(
             IEnumerable<string> diagnosticIds,
             FixAllContext.DiagnosticProvider fixAllDiagnosticProvider,
             CodeActionOptionsProvider codeActionOptionsProvider)
-            : base(fixAllProvider, document, project, codeFixProvider, scope, codeActionEquivalenceKey)
+            : base(fixAllProvider, document, project, codeFixProvider, codeActionOptionsProvider, scope, codeActionEquivalenceKey)
         {
             // We need the trigger diagnostic span for span based fix all scopes, i.e. FixAllScope.ContainingMember and FixAllScope.ContainingType
             Debug.Assert(diagnosticSpan.HasValue || scope is not FixAllScope.ContainingMember or FixAllScope.ContainingType);
@@ -44,7 +43,6 @@ internal FixAllState(
             DiagnosticSpan = diagnosticSpan;
             DiagnosticIds = ImmutableHashSet.CreateRange(diagnosticIds);
             DiagnosticProvider = fixAllDiagnosticProvider;
-            CodeActionOptionsProvider = codeActionOptionsProvider;
         }
 
         internal bool IsFixMultiple => DiagnosticProvider is FixMultipleDiagnosticProvider;
diff --git a/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/CommonFixAllState.cs b/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/CommonFixAllState.cs
index d8f2595c7191e..9f051c30b102e 100644
--- a/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/CommonFixAllState.cs
+++ b/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/CommonFixAllState.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
+using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.Internal.Log;
 using FixAllScope = Microsoft.CodeAnalysis.CodeFixes.FixAllScope;
 
@@ -21,12 +22,14 @@ internal abstract partial class CommonFixAllState<TProvider, TFixAllProvider, TF
         public Solution Solution => Project.Solution;
         public FixAllScope Scope { get; }
         public abstract FixAllKind FixAllKind { get; }
+        public CodeActionOptionsProvider CodeActionOptionsProvider { get; }
 
         protected CommonFixAllState(
             TFixAllProvider fixAllProvider,
             Document? document,
             Project project,
             TProvider provider,
+            CodeActionOptionsProvider optionsProvider,
             FixAllScope scope,
             string? codeActionEquivalenceKey)
         {
@@ -36,6 +39,7 @@ protected CommonFixAllState(
             Document = document;
             Project = project;
             Provider = provider;
+            CodeActionOptionsProvider = optionsProvider;
             Scope = scope;
             CodeActionEquivalenceKey = codeActionEquivalenceKey;
         }
diff --git a/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/IFixAllState.cs b/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/IFixAllState.cs
index 78123d794608c..17f98b6848001 100644
--- a/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/IFixAllState.cs
+++ b/src/Workspaces/Core/Portable/CodeFixesAndRefactorings/IFixAllState.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
+using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.Internal.Log;
 using FixAllScope = Microsoft.CodeAnalysis.CodeFixes.FixAllScope;
 
@@ -27,6 +28,8 @@ internal interface IFixAllState
         /// </summary>
         object Provider { get; }
 
+        CodeActionOptionsProvider CodeActionOptionsProvider { get; }
+
         IFixAllState With(
             Optional<(Document? document, Project project)> documentAndProject = default,
             Optional<FixAllScope> scope = default,
diff --git a/src/Workspaces/Core/Portable/CodeRefactorings/FixAllOccurences/FixAllState.cs b/src/Workspaces/Core/Portable/CodeRefactorings/FixAllOccurences/FixAllState.cs
index e8e286c2fe5c3..7899ecd79b5b5 100644
--- a/src/Workspaces/Core/Portable/CodeRefactorings/FixAllOccurences/FixAllState.cs
+++ b/src/Workspaces/Core/Portable/CodeRefactorings/FixAllOccurences/FixAllState.cs
@@ -36,9 +36,11 @@ public FixAllState(
             Document document!!,
             TextSpan selectionSpan,
             CodeRefactoringProvider codeRefactoringProvider,
+            CodeActionOptionsProvider optionsProvider,
             FixAllScope fixAllScope,
             CodeAction codeAction)
-            : this(fixAllProvider, document, document.Project, selectionSpan, codeRefactoringProvider, fixAllScope, codeAction.Title, codeAction.EquivalenceKey)
+            : this(fixAllProvider, document, document.Project, selectionSpan, codeRefactoringProvider,
+                   optionsProvider, fixAllScope, codeAction.Title, codeAction.EquivalenceKey)
         {
         }
 
@@ -47,9 +49,11 @@ public FixAllState(
             Project project!!,
             TextSpan selectionSpan,
             CodeRefactoringProvider codeRefactoringProvider,
+            CodeActionOptionsProvider optionsProvider,
             FixAllScope fixAllScope,
             CodeAction codeAction)
-            : this(fixAllProvider, document: null, project, selectionSpan, codeRefactoringProvider, fixAllScope, codeAction.Title, codeAction.EquivalenceKey)
+            : this(fixAllProvider, document: null, project, selectionSpan, codeRefactoringProvider,
+                   optionsProvider, fixAllScope, codeAction.Title, codeAction.EquivalenceKey)
         {
         }
 
@@ -59,10 +63,11 @@ private FixAllState(
             Project project,
             TextSpan selectionSpan,
             CodeRefactoringProvider codeRefactoringProvider,
+            CodeActionOptionsProvider optionsProvider,
             FixAllScope fixAllScope,
             string codeActionTitle,
             string? codeActionEquivalenceKey)
-            : base(fixAllProvider, document, project, codeRefactoringProvider, fixAllScope, codeActionEquivalenceKey)
+            : base(fixAllProvider, document, project, codeRefactoringProvider, optionsProvider, fixAllScope, codeActionEquivalenceKey)
         {
             _selectionSpan = selectionSpan;
             this.CodeActionTitle = codeActionTitle;
@@ -76,6 +81,7 @@ protected override FixAllState With(Document? document, Project project, FixAllS
                 project,
                 _selectionSpan,
                 this.Provider,
+                this.CodeActionOptionsProvider,
                 scope,
                 this.CodeActionTitle,
                 codeActionEquivalenceKey);
diff --git a/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs b/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
index cb0f2b8073be0..797b4ac7a3385 100644
--- a/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
+++ b/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
@@ -21,6 +21,10 @@ internal abstract partial class SyntaxEditorBasedCodeRefactoringProvider : CodeR
         protected static readonly ImmutableArray<FixAllScope> AllFixAllScopes = ImmutableArray.Create(FixAllScope.Document,
             FixAllScope.Project, FixAllScope.Solution, FixAllScope.ContainingType, FixAllScope.ContainingMember);
 
+#if CODE_STYLE
+        private static readonly CodeActionOptionsProvider s_codeStyleOptionsProvider = new(_ => default);
+#endif
+
         protected abstract ImmutableArray<FixAllScope> SupportedFixAllScopes { get; }
 
         internal sealed override FixAllProvider? GetFixAllProvider()
@@ -31,21 +35,35 @@ internal abstract partial class SyntaxEditorBasedCodeRefactoringProvider : CodeR
             return FixAllProvider.Create(
                 async (fixAllContext, document, fixAllSpans) =>
                 {
-                    return await this.FixAllAsync(document, fixAllSpans, fixAllContext.CancellationToken).ConfigureAwait(false);
+#if CODE_STYLE
+                    var optionsProvider = s_codeStyleOptionsProvider;
+#else
+                    var optionsProvider = fixAllContext.State.CodeActionOptionsProvider;
+#endif
+
+                    return await this.FixAllAsync(document, fixAllSpans, optionsProvider, fixAllContext.CodeActionEquivalenceKey, fixAllContext.CancellationToken).ConfigureAwait(false);
                 },
                 SupportedFixAllScopes);
         }
 
         protected Task<Document> FixAsync(
-            Document document, TextSpan fixAllSpan, CancellationToken cancellationToken)
+            Document document,
+            TextSpan fixAllSpan,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken)
         {
             return FixAllWithEditorAsync(document,
-                editor => FixAllAsync(document, ImmutableArray.Create(fixAllSpan), editor, cancellationToken),
+                editor => FixAllAsync(document, ImmutableArray.Create(fixAllSpan), editor, optionsProvider, equivalenceKey, cancellationToken),
                 cancellationToken);
         }
 
         protected Task<Document> FixAllAsync(
-            Document document, Optional<ImmutableArray<TextSpan>> fixAllSpans, CancellationToken cancellationToken)
+            Document document,
+            Optional<ImmutableArray<TextSpan>> fixAllSpans,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken)
         {
             return FixAllWithEditorAsync(document, FixAllAsync, cancellationToken);
 
@@ -54,7 +72,7 @@ Task FixAllAsync(SyntaxEditor editor)
             {
                 // Fix the entire document if there are no sub-spans to fix.
                 var spans = fixAllSpans.HasValue ? fixAllSpans.Value : ImmutableArray.Create(editor.OriginalRoot.FullSpan);
-                return this.FixAllAsync(document, spans, editor, cancellationToken);
+                return this.FixAllAsync(document, spans, editor, optionsProvider, equivalenceKey, cancellationToken);
             }
         }
 
@@ -73,6 +91,11 @@ internal static async Task<Document> FixAllWithEditorAsync(
         }
 
         protected abstract Task FixAllAsync(
-            Document document, ImmutableArray<TextSpan> fixAllSpans, SyntaxEditor editor, CancellationToken cancellationToken);
+            Document document,
+            ImmutableArray<TextSpan> fixAllSpans,
+            SyntaxEditor editor,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken);
     }
 }

From 87ed50cae015766d184ee58e7c21c5ab1ef3316e Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 3 May 2022 05:12:22 -0700
Subject: [PATCH 175/413] Use helper

---
 .../SyntaxEditorBasedCodeRefactoringProvider.cs      | 12 +-----------
 .../Workspace/Core/CodeFixes/CodeActionOptions.cs    |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs b/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
index 797b4ac7a3385..df38ea5e63b36 100644
--- a/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
+++ b/src/Workspaces/Core/Portable/CodeRefactorings/SyntaxEditorBasedCodeRefactoringProvider.cs
@@ -21,10 +21,6 @@ internal abstract partial class SyntaxEditorBasedCodeRefactoringProvider : CodeR
         protected static readonly ImmutableArray<FixAllScope> AllFixAllScopes = ImmutableArray.Create(FixAllScope.Document,
             FixAllScope.Project, FixAllScope.Solution, FixAllScope.ContainingType, FixAllScope.ContainingMember);
 
-#if CODE_STYLE
-        private static readonly CodeActionOptionsProvider s_codeStyleOptionsProvider = new(_ => default);
-#endif
-
         protected abstract ImmutableArray<FixAllScope> SupportedFixAllScopes { get; }
 
         internal sealed override FixAllProvider? GetFixAllProvider()
@@ -35,13 +31,7 @@ internal abstract partial class SyntaxEditorBasedCodeRefactoringProvider : CodeR
             return FixAllProvider.Create(
                 async (fixAllContext, document, fixAllSpans) =>
                 {
-#if CODE_STYLE
-                    var optionsProvider = s_codeStyleOptionsProvider;
-#else
-                    var optionsProvider = fixAllContext.State.CodeActionOptionsProvider;
-#endif
-
-                    return await this.FixAllAsync(document, fixAllSpans, optionsProvider, fixAllContext.CodeActionEquivalenceKey, fixAllContext.CancellationToken).ConfigureAwait(false);
+                    return await this.FixAllAsync(document, fixAllSpans, fixAllContext.GetOptionsProvider(), fixAllContext.CodeActionEquivalenceKey, fixAllContext.CancellationToken).ConfigureAwait(false);
                 },
                 SupportedFixAllScopes);
         }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
index 3bff9a335dd30..e05b87d782cb6 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.AddImport;
 using Microsoft.CodeAnalysis.CodeCleanup;
 using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CodeFixesAndRefactorings;
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.ExtractMethod;
@@ -155,7 +156,7 @@ internal static CodeActionOptionsProvider GetOptionsProvider(this CodeFixContext
             => context.Options;
 #endif
 
-        internal static CodeActionOptionsProvider GetOptionsProvider(this FixAllContext context)
+        internal static CodeActionOptionsProvider GetOptionsProvider(this IFixAllContext context)
 #if CODE_STYLE
             => CodeActionOptions.DefaultProvider;
 #else

From cd03af1aaeebacd0791b271ed487162f2dee4acb Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 3 May 2022 07:32:09 -0700
Subject: [PATCH 176/413] Fix build

---
 .../Workspace/Core/CodeFixes/CodeActionOptions.cs              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
index e05b87d782cb6..f36efbf9e4893 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -156,10 +156,11 @@ internal static CodeActionOptionsProvider GetOptionsProvider(this CodeFixContext
             => context.Options;
 #endif
 
-        internal static CodeActionOptionsProvider GetOptionsProvider(this IFixAllContext context)
 #if CODE_STYLE
+        internal static CodeActionOptionsProvider GetOptionsProvider(this FixAllContext context)
             => CodeActionOptions.DefaultProvider;
 #else
+        internal static CodeActionOptionsProvider GetOptionsProvider(this IFixAllContext context)
             => context.State.CodeActionOptionsProvider;
 #endif
 

From 5f7cc41f57a30dbec90003f44941f892f119d801 Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Date: Tue, 3 May 2022 08:55:58 -0700
Subject: [PATCH 177/413] Update
 src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs

Co-authored-by: James Newton-King <james@newtonking.com>
---
 .../AspNetCoreEmbeddedLanguageClassificationContext.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
index a34de788d48fb..802a51bc8805c 100644
--- a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassificationContext.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
 {
-    internal struct AspNetCoreEmbeddedLanguageClassificationContext
+    internal readonly struct AspNetCoreEmbeddedLanguageClassificationContext
     {
         private readonly EmbeddedLanguageClassificationContext _context;
 

From db21235775932d4509b335abf79671da007b16dd Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 3 May 2022 09:34:00 -0700
Subject: [PATCH 178/413] Update insert.yml

---
 eng/pipelines/insert.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
index 2fedf5a619f55..560dfc63e4866 100644
--- a/eng/pipelines/insert.yml
+++ b/eng/pipelines/insert.yml
@@ -143,12 +143,17 @@ steps:
 
     displayName: Set Variables from Input Parameters
     env:
+      BuildUserName: ${{ parameters.buildUserName }}
+      BuildPassword: ${{ parameters.buildPassword }}
+      ComponentUserName: ${{ parameters.componentUserName }}
+      ComponentPassword: ${{ parameters.componentPassword }}
       CreateDraftPR: ${{ parameters.createDraftPR }}
       AutoComplete: ${{ parameters.autoComplete }}
       TitlePrefix: ${{ parameters.titlePrefix }}
       InsertToolset: ${{ parameters.insertToolset }}
       VSBranchName: ${{ parameters.vsBranchName }}
       ComponentBuildProjectName: ${{ parameters.componentBuildProjectName }}
+      DropPath: ${{ parameters.dropPath }}
 
   # Now that everything is set, actually perform the insertion.
   - powershell: |
@@ -157,10 +162,10 @@ steps:
         -autoComplete "$(Template.AutoComplete)" `
         -buildQueueName "$(Build.DefinitionName)" `
         -cherryPick "(default)" `
-        -userName "${{ parameters.buildUserName }}" `
-        -password "${{ parameters.buildPassword }}" `
-        -componentUserName "${{ parameters.componentUserName }}" `
-        -componentPassword "${{ parameters.componentPassword }}" `
+        -userName "$(Template.BuildUserName)" `
+        -password "$(Template.BuildPassword)" `
+        -componentUserName "$(Template.ComponentUserName)" `
+        -componentPassword "$(Template.ComponentPassword)" `
         -componentAzdoUri "$(Template.ComponentAzdoUri)" `
         -componentProjectName "$(Template.ComponentProjectName)" `
         -componentName "Roslyn" `
@@ -168,7 +173,7 @@ steps:
         -componentBranchName "$(Template.ComponentBranchName)" `
         -createDraftPR "$(Template.CreateDraftPR)" `
         -defaultValueSentinel "(default)" `
-        -dropPath "${{ parameters.dropPath }}" `
+        -dropPath "$(Template.DropPath)" `
         -insertCore "(default)" `
         -insertDevDiv "(default)" `
         -insertionCount "1" `

From 62468e70f87dec9d9cd28bc379dbacf5b4e58773 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 3 May 2022 11:46:14 -0700
Subject: [PATCH 179/413] Simplify

---
 .../AspNetCoreEmbeddedLanguageClassifier.cs   | 37 +------------------
 .../ClassifierExtensionProvider.cs            | 12 +++---
 2 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
index a5c8580ed06d0..32f254ede03df 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/AspNetCoreEmbeddedLanguageClassifier.cs
@@ -3,16 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Composition;
-using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.Classification;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.PooledObjects;
-using Microsoft.CodeAnalysis;
-using System.Collections.Immutable;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
 {
@@ -22,11 +16,6 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLang
         identifiers: new[] { "Route" }), Shared]
     internal class AspNetCoreEmbeddedLanguageClassifier : IEmbeddedLanguageClassifier
     {
-        // Following CWTs are used to cache the  providers from projects' references,
-        // so we can avoid the slow path unless there's any change to the references.
-        private readonly ConditionalWeakTable<IReadOnlyList<AnalyzerReference>, StrongBox<ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier>>> _analyzerReferencesToClassifiersMap = new();
-        private readonly ConditionalWeakTable<AnalyzerReference, ClassifierExtensionProvider> _analyzerReferenceToProviderMap = new();
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public AspNetCoreEmbeddedLanguageClassifier()
@@ -38,34 +27,10 @@ public void RegisterClassifications(EmbeddedLanguageClassificationContext contex
             if (context.Project is null)
                 return;
 
-            var classifiers = GetClassifiers(context.Project);
+            var classifiers = AspNetCoreClassifierExtensionProvider.GetExtensions(context.Project);
             var aspContext = new AspNetCoreEmbeddedLanguageClassificationContext(context);
             foreach (var classifier in classifiers)
                 classifier.RegisterClassifications(aspContext);
         }
-
-        private ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiers(Project project)
-        {
-            if (_analyzerReferencesToClassifiersMap.TryGetValue(project.AnalyzerReferences, out var classifiers))
-                return classifiers.Value;
-
-            return GetClassifiersSlow(project);
-
-            ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> GetClassifiersSlow(Project project)
-                => _analyzerReferencesToClassifiersMap.GetValue(project.AnalyzerReferences, _ => new(ComputeClassifiers(project))).Value;
-
-            ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> ComputeClassifiers(Project project)
-            {
-                using var _ = ArrayBuilder<IAspNetCoreEmbeddedLanguageClassifier>.GetInstance(out var result);
-
-                foreach (var reference in project.AnalyzerReferences)
-                {
-                    var provider = _analyzerReferenceToProviderMap.GetValue(reference, static r => new ClassifierExtensionProvider(r));
-                    result.AddRange(provider.GetExtensions(project.Language));
-                }
-
-                return result.ToImmutable();
-            }
-        }
     }
 }
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
index 77824597ad772..0b802a0fe884d 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
@@ -8,14 +8,12 @@
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.Internal.EmbeddedLanguages
 {
-    internal sealed class ClassifierExtensionProvider
-        : AbstractProjectExtensionProvider<IAspNetCoreEmbeddedLanguageClassifier, ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
+    internal sealed class AspNetCoreClassifierExtensionProvider
+        : AbstractProjectExtensionProvider<
+            AspNetCoreClassifierExtensionProvider,
+            IAspNetCoreEmbeddedLanguageClassifier,
+            ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
     {
-        public ClassifierExtensionProvider(AnalyzerReference reference)
-            : base(reference)
-        {
-        }
-
         protected override bool SupportsLanguage(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute, string language)
         {
             return exportAttribute.Language == null

From e63c46d2bdc1775877d17d2a4f44593f5842b962 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 3 May 2022 11:53:45 -0700
Subject: [PATCH 180/413] Simplify

---
 .../Portable/CodeRefactorings/CodeRefactoringService.cs  | 8 ++------
 .../Portable/Common/AbstractProjectExtensionProvider.cs  | 9 ++++++---
 .../CompletionServiceWithProviders.ProviderManager.cs    | 8 ++------
 .../CodeFixes/CodeFixService.ProjectCodeFixProvider.cs   | 8 ++------
 .../EmbeddedLanguages/ClassifierExtensionProvider.cs     | 8 ++------
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
index c4c076031f14e..5b83e8bc2ed9b 100644
--- a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
@@ -217,12 +217,8 @@ private static ImmutableArray<CodeRefactoringProvider> GetProjectRefactorings(Pr
         private class ProjectCodeRefactoringProvider
             : AbstractProjectExtensionProvider<ProjectCodeRefactoringProvider, CodeRefactoringProvider, ExportCodeRefactoringProviderAttribute>
         {
-            protected override bool SupportsLanguage(ExportCodeRefactoringProviderAttribute exportAttribute, string language)
-            {
-                return exportAttribute.Languages == null
-                    || exportAttribute.Languages.Length == 0
-                    || exportAttribute.Languages.Contains(language);
-            }
+            protected override ImmutableArray<string> GetLanguages(ExportCodeRefactoringProviderAttribute exportAttribute)
+                => exportAttribute.Languages.ToImmutableArray();
 
             protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<CodeRefactoringProvider> extensions)
             {
diff --git a/src/Features/Core/Portable/Common/AbstractProjectExtensionProvider.cs b/src/Features/Core/Portable/Common/AbstractProjectExtensionProvider.cs
index 627c767262460..5e98d44666709 100644
--- a/src/Features/Core/Portable/Common/AbstractProjectExtensionProvider.cs
+++ b/src/Features/Core/Portable/Common/AbstractProjectExtensionProvider.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.PooledObjects;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis
 {
@@ -25,7 +26,7 @@ internal abstract class AbstractProjectExtensionProvider<TProvider, TExtension,
         private AnalyzerReference Reference { get; init; } = null!;
         private ImmutableDictionary<string, ImmutableArray<TExtension>> _extensionsPerLanguage = ImmutableDictionary<string, ImmutableArray<TExtension>>.Empty;
 
-        protected abstract bool SupportsLanguage(TExportAttribute exportAttribute, string language);
+        protected abstract ImmutableArray<string> GetLanguages(TExportAttribute exportAttribute);
         protected abstract bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<TExtension> extensions);
 
         public static ImmutableArray<TExtension> GetExtensions(Project? project)
@@ -83,9 +84,11 @@ private ImmutableArray<TExtension> CreateExtensions(string language)
                         try
                         {
                             var attribute = typeInfo.GetCustomAttribute<TExportAttribute>();
-                            if (attribute is not null && SupportsLanguage(attribute, language))
+                            if (attribute is not null)
                             {
-                                builder.AddIfNotNull((TExtension?)Activator.CreateInstance(typeInfo.AsType()));
+                                var languages = GetLanguages(attribute);
+                                if (languages.Contains(language))
+                                    builder.AddIfNotNull((TExtension?)Activator.CreateInstance(typeInfo.AsType()));
                             }
                         }
                         catch
diff --git a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
index bc428492d56e4..d9564f4c4a2ff 100644
--- a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
+++ b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.ProviderManager.cs
@@ -217,12 +217,8 @@ int IEqualityComparer<ImmutableHashSet<string>>.GetHashCode([DisallowNull] Immut
             private sealed class ProjectCompletionProvider
                 : AbstractProjectExtensionProvider<ProjectCompletionProvider, CompletionProvider, ExportCompletionProviderAttribute>
             {
-                protected override bool SupportsLanguage(ExportCompletionProviderAttribute exportAttribute, string language)
-                {
-                    return exportAttribute.Language == null
-                        || exportAttribute.Language.Length == 0
-                        || exportAttribute.Language.Contains(language);
-                }
+                protected override ImmutableArray<string> GetLanguages(ExportCompletionProviderAttribute exportAttribute)
+                    => ImmutableArray.Create(exportAttribute.Language);
 
                 protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<CompletionProvider> extensions)
                 {
diff --git a/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs b/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs
index feffd3529350b..f30b9ac390f0d 100644
--- a/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs
+++ b/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs
@@ -14,12 +14,8 @@ internal partial class CodeFixService
         private class ProjectCodeFixProvider
             : AbstractProjectExtensionProvider<ProjectCodeFixProvider, CodeFixProvider, ExportCodeFixProviderAttribute>
         {
-            protected override bool SupportsLanguage(ExportCodeFixProviderAttribute exportAttribute, string language)
-            {
-                return exportAttribute.Languages == null
-                    || exportAttribute.Languages.Length == 0
-                    || exportAttribute.Languages.Contains(language);
-            }
+            protected override ImmutableArray<string> GetLanguages(ExportCodeFixProviderAttribute exportAttribute)
+                => exportAttribute.Languages.ToImmutableArray();
 
             protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<CodeFixProvider> extensions)
             {
diff --git a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
index 0b802a0fe884d..fc75d9bbfd7c8 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/Internal/EmbeddedLanguages/ClassifierExtensionProvider.cs
@@ -14,12 +14,8 @@ internal sealed class AspNetCoreClassifierExtensionProvider
             IAspNetCoreEmbeddedLanguageClassifier,
             ExportAspNetCoreEmbeddedLanguageClassifierAttribute>
     {
-        protected override bool SupportsLanguage(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute, string language)
-        {
-            return exportAttribute.Language == null
-                || exportAttribute.Language.Length == 0
-                || exportAttribute.Language.Contains(language);
-        }
+        protected override ImmutableArray<string> GetLanguages(ExportAspNetCoreEmbeddedLanguageClassifierAttribute exportAttribute)
+            => ImmutableArray.Create(exportAttribute.Language);
 
         protected override bool TryGetExtensionsFromReference(AnalyzerReference reference, out ImmutableArray<IAspNetCoreEmbeddedLanguageClassifier> extensions)
         {

From 5aa8fb0f9c2e44d7d3206138efc52c22e2494a1e Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 3 May 2022 13:21:14 -0700
Subject: [PATCH 181/413] Set template variables in insert.yml

---
 eng/pipelines/insert.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
index 560dfc63e4866..ccdd55da6a6a9 100644
--- a/eng/pipelines/insert.yml
+++ b/eng/pipelines/insert.yml
@@ -42,7 +42,7 @@ parameters:
 
   - name: dropPath
     type: string
-    default: '(default)'
+    default: ''
 
 steps:
   - checkout: none
@@ -72,6 +72,7 @@ steps:
       Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($true)"
       Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('')"
       Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.DropPath]$('(default)')"
 
       Write-Host "##vso[task.setvariable variable=Template.ComponentBranchName]$branchName"
       Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$($branchData.vsBranch)"
@@ -102,6 +103,15 @@ steps:
       PublishDataAccessToken: ${{ parameters.publishDataAccessToken }}
 
   - powershell: |
+      # Set AzDO authorization template variables
+      Write-Host "Setting BuildUserName to $Env:BuildUserName"
+      Write-Host "##vso[task.setvariable variable=Template.BuildUserName]$Env:BuildUserName"
+      Write-Host "##vso[task.setvariable variable=Template.BuildPassword]$Env:BuildPassword"
+
+      Write-Host "Setting ComponentUserName to $Env:ComponentUserName"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentUserName]$Env:ComponentUserName"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentPassword]$Env:ComponentPassword"
+
       # Overwrite template variables with values passed into this template as parameters
       if ("" -ne $Env:CreateDraftPR)
       {
@@ -141,6 +151,12 @@ steps:
         Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$Env:ComponentBuildProjectName"
       }
 
+      if ("" -ne $Env:DropPath)
+      {
+        Write-Host "Setting DropPath to $Env:DropPath"
+        Write-Host "##vso[task.setvariable variable=Template.DropPath]$Env:DropPath"
+      }
+
     displayName: Set Variables from Input Parameters
     env:
       BuildUserName: ${{ parameters.buildUserName }}

From ab790eb22f7b4b7cc8e1678a8900ad7ad3fccd7a Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 3 May 2022 13:51:13 -0700
Subject: [PATCH 182/413] Update format command

---
 eng/test-build-correctness.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/test-build-correctness.ps1 b/eng/test-build-correctness.ps1
index 62de113e3fe25..13e627f12bdcb 100644
--- a/eng/test-build-correctness.ps1
+++ b/eng/test-build-correctness.ps1
@@ -65,7 +65,7 @@ try {
   # Verify the state of our generated syntax files
   Write-Host "Checking generated compiler files"
   Exec-Block { & (Join-Path $PSScriptRoot "generate-compiler-code.ps1") -test -configuration:$configuration }
-  Exec-Console dotnet "tool run dotnet-format whitespace . --folder --include-generated --include src/Compilers/CSharp/Portable/Generated/ src/Compilers/VisualBasic/Portable/Generated/ src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Generated/ --verify-no-changes"
+  Exec-Console dotnet "tool run dotnet-format . --include-generated --include src/Compilers/CSharp/Portable/Generated/ src/Compilers/VisualBasic/Portable/Generated/ src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Generated/ --check -f"
   Write-Host ""
 
   exit 0

From bd91a8c3480d7aa00f7d8232518dba9a35ca2c88 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 3 May 2022 14:14:56 -0700
Subject: [PATCH 183/413] Fix

---
 .../StringCopyPasteCommandHandlerTests.cs     | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 2c663c9dba869..ce042a7a44758 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -2,21 +2,13 @@
 // 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;
-<<<<<<< HEAD
-using System.Composition;
-using System.Data.SqlTypes;
-=======
->>>>>>> stringCopyPaste
 using System.Linq;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste;
-using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
-using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
@@ -71,7 +63,6 @@ public StringCopyPasteTestState(XElement workspaceElement, bool unknownCopy)
             public static StringCopyPasteTestState CreateTestState(string? copyFileMarkup, string pasteFileMarkup)
                 => new(GetWorkspaceXml(copyFileMarkup, pasteFileMarkup), unknownCopy: copyFileMarkup == null);
 
-<<<<<<< HEAD
             public static XElement GetWorkspaceXml(string? copyFileMarkup, string pasteFileMarkup)
                 => XElement.Parse(($@"
 <Workspace>
@@ -83,17 +74,6 @@ public static XElement GetWorkspaceXml(string? copyFileMarkup, string pasteFileM
         <Document Markup=""SpansOnly"">{copyFileMarkup}</Document>
     </Project>")}
 </Workspace>"));
-=======
-            public static XElement GetWorkspaceXml(string markup)
-                => markup.Contains("<Workspace>")
-                    ? XElement.Parse(markup)
-                    : XElement.Parse($@"
-<Workspace>
-    <Project Language=""C#"" CommonReferences=""true"">
-        <Document Markup=""SpansOnly"">{markup}</Document>
-    </Project>
-</Workspace>");
->>>>>>> stringCopyPaste
 
             internal void AssertCodeIs(string expectedCode)
             {

From fc3ffd582e1e06863ac7d943b6d090c8ffa295ac Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 3 May 2022 14:21:17 -0700
Subject: [PATCH 184/413] Silly

---
 .../CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 3753b41a8dae7..8031cbba47ea9 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -92,13 +92,13 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
 
+            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotBeforePaste)
+                return;
+
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
-            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotBeforePaste)
-                return;
-
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;

From 0ee3e0c2a48740cbfde9049da2925450a35682e6 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 3 May 2022 14:34:34 -0700
Subject: [PATCH 185/413] Fixes

---
 .../StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs   | 3 ++-
 .../PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs     | 1 +
 .../Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs      | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index cad235d9a18a6..347f7b19d6d5c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -34,10 +34,11 @@ public void ExecuteCommand(CopyCommandArgs args, Action nextCommandHandler, Comm
         private void ExecuteCommand(ITextView textView, ITextBuffer subjectBuffer, Action nextCommandHandler)
         {
             Contract.ThrowIfFalse(_threadingContext.HasMainThread);
-            CaptureCutCopyInformation(textView, subjectBuffer);
 
             // Ensure that the copy always goes through all other handlers.
             nextCommandHandler();
+
+            CaptureCutCopyInformation(textView, subjectBuffer);
         }
 
         private void CaptureCutCopyInformation(ITextView textView, ITextBuffer subjectBuffer)
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
index 5860a0e5a1e3a..1b64ed31d47c9 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -153,6 +153,7 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent()
 var dest =
     $@""\""[||]"";");
         }
+
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index f84f73062da93..d14265b112955 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -154,7 +154,6 @@ public void SetData(string format, object data, bool autoConvert)
                     _roslynSequenceNumber = data is int v ? v : FailureValue;
                 else
                     _dataObject.SetData(format, data, autoConvert);
-
             }
         }
     }

From 702230154fed8b826674f7db7ba4a5bde15a9534 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Mon, 4 Apr 2022 17:13:29 +0200
Subject: [PATCH 186/413] Update Roslyn.Diagnostics.Analyzers and remove RS0005
 suppressions

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index e1055826f3ac4..5cdb71f57d900 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Versions used by several individual references below -->
-    <RoslynDiagnosticsNugetPackageVersion>3.3.4-beta1.22160.2</RoslynDiagnosticsNugetPackageVersion>
+    <RoslynDiagnosticsNugetPackageVersion>3.3.4-beta1.22204.1</RoslynDiagnosticsNugetPackageVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22218.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22122.4</MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.132-beta</MicrosoftVisualStudioExtensibilityTestingVersion>

From 4b3a833d5dbb4f28a932ad4a93a970d5ec0284a0 Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 3 May 2022 18:51:14 -0700
Subject: [PATCH 187/413] Remove unused method

---
 .../Workspace/Core/CodeFixes/CodeActionOptions.cs            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
index f36efbf9e4893..8327d76cabed0 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -156,10 +156,7 @@ internal static CodeActionOptionsProvider GetOptionsProvider(this CodeFixContext
             => context.Options;
 #endif
 
-#if CODE_STYLE
-        internal static CodeActionOptionsProvider GetOptionsProvider(this FixAllContext context)
-            => CodeActionOptions.DefaultProvider;
-#else
+#if !CODE_STYLE
         internal static CodeActionOptionsProvider GetOptionsProvider(this IFixAllContext context)
             => context.State.CodeActionOptionsProvider;
 #endif

From 31a76e0ef9db0bcc2b686add10bbd947c9c6edac Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 3 May 2022 22:20:46 -0700
Subject: [PATCH 188/413] Fix build

---
 .../Workspace/Core/CodeFixes/CodeActionOptions.cs            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
index 8327d76cabed0..039b270c0a60d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -156,7 +156,10 @@ internal static CodeActionOptionsProvider GetOptionsProvider(this CodeFixContext
             => context.Options;
 #endif
 
-#if !CODE_STYLE
+#if CODE_STYLE
+        internal static CodeActionOptionsProvider GetOptionsProvider(this FixAllContext _)
+            => CodeActionOptions.DefaultProvider;
+#else
         internal static CodeActionOptionsProvider GetOptionsProvider(this IFixAllContext context)
             => context.State.CodeActionOptionsProvider;
 #endif

From dd76d77c7245d51c0746e14703924b4480f29dba Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Wed, 4 May 2022 19:15:46 +0300
Subject: [PATCH 189/413] C#

---
 .../GenerateVariable/GenerateVariableTests.cs | 81 +++++++++++++++++++
 ...ableService.GenerateParameterCodeAction.cs |  6 +-
 .../AbstractGenerateVariableService.cs        | 23 ++++--
 .../Core/Extensions/ICompilationExtensions.cs |  4 +
 4 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index 2c398c21e05e5..9236f898abcdc 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9724,5 +9724,86 @@ void Main()
         var x = [|{keyword}|];
     }}");
         }
+
+        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterInAsycMethodBeforeCancellationToken_OneParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(System.TimeSpan time, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
+
+        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterInAsycMethodBeforeCancellationToken_SeveralParameters()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(string someParameter, CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(string someParameter, System.TimeSpan time, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
+
+        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterNotBeforeCancellationTokenIfMethodIsNotAsync()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public Task M(CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public Task M(CancellationToken cancellationToken, System.TimeSpan time)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
     }
 }
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
index e3d9320f51a86..c45e264588c97 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
@@ -17,12 +17,14 @@ private class GenerateParameterCodeAction : CodeAction
             private readonly Document _document;
             private readonly State _state;
             private readonly bool _includeOverridesAndImplementations;
+            private readonly int? _parameterIndex;
 
-            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations)
+            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations, int? parameterIndex)
             {
                 _document = document;
                 _state = state;
                 _includeOverridesAndImplementations = includeOverridesAndImplementations;
+                _parameterIndex = parameterIndex;
             }
 
             public override string Title
@@ -47,7 +49,7 @@ public override string Title
                     _state.LocalType,
                     RefKind.None,
                     _state.IdentifierToken.ValueText,
-                    newParameterIndex: null,
+                    _parameterIndex,
                     _includeOverridesAndImplementations,
                     cancellationToken).AsNullable();
             }
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index e91748bacbc38..e4524ba67ceb0 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -74,7 +74,7 @@ public async Task<ImmutableArray<CodeAction>> GenerateVariableAsync(
                 }
 
                 await AddLocalCodeActionsAsync(actions, document, state, fallbackOptions, cancellationToken).ConfigureAwait(false);
-                await AddParameterCodeActionsAsync(actions, document, state, cancellationToken).ConfigureAwait(false);
+                await AddParameterCodeActionsAsync(actions, semanticDocument, state, cancellationToken).ConfigureAwait(false);
 
                 if (actions.Count > 1)
                 {
@@ -199,21 +199,34 @@ private async Task AddLocalCodeActionsAsync(
         }
 
         private static async Task AddParameterCodeActionsAsync(
-            ArrayBuilder<CodeAction> result, Document document, State state, CancellationToken cancellationToken)
+            ArrayBuilder<CodeAction> result, SemanticDocument document, State state, CancellationToken cancellationToken)
         {
             if (state.CanGenerateParameter())
             {
                 // Don't generate parameters with a `_` prefix unless that's what the user really wants as their naming style.
                 if (await NameIsHighlyUnlikelyToWarrantSymbolAsync(
-                        document, state, SymbolKind.Parameter, Accessibility.NotApplicable, cancellationToken).ConfigureAwait(false))
+                        document.Document, state, SymbolKind.Parameter, Accessibility.NotApplicable, cancellationToken).ConfigureAwait(false))
                 {
                     return;
                 }
 
-                result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false));
+                int? parameterIndex = null;
+                var containigMethod = state.ContainingMethod;
+
+                if (containigMethod.IsAsync && containigMethod.Parameters.Length > 0)
+                {
+                    var lastParameterIsCancellationToken = containigMethod.Parameters.LastOrDefault()!.Type.Equals(document.SemanticModel.Compilation.CancellationTokenType());
+
+                    if (lastParameterIsCancellationToken)
+                    {
+                        parameterIndex = containigMethod.Parameters.Length - 1;
+                    }
+                }
+
+                result.Add(new GenerateParameterCodeAction(document.Document, state, includeOverridesAndImplementations: false, parameterIndex));
 
                 if (AddParameterService.HasCascadingDeclarations(state.ContainingMethod))
-                    result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: true));
+                    result.Add(new GenerateParameterCodeAction(document.Document, state, includeOverridesAndImplementations: true, parameterIndex));
             }
         }
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs
index a19748810a5db..cdac5d2c17e7c 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs
@@ -12,6 +12,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.PooledObjects;
 
@@ -220,5 +221,8 @@ public static ImmutableArray<IAssemblySymbol> GetReferencedAssemblySymbols(this
 
         public static INamedTypeSymbol? DataContractAttribute(this Compilation compilation)
             => compilation.GetTypeByMetadataName(typeof(DataContractAttribute).FullName!);
+
+        public static INamedTypeSymbol? CancellationTokenType(this Compilation compilation)
+            => compilation.GetTypeByMetadataName(typeof(CancellationToken).FullName!);
     }
 }

From 369fe28a20275ad01b2549c1f9aba5c26efc9389 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Wed, 4 May 2022 19:42:37 +0300
Subject: [PATCH 190/413] VB tests

---
 .../GenerateVariable/GenerateVariableTests.vb | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
index 0e3774d352114..6462b0de62c00 100644
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -2990,5 +2990,71 @@ count:=5)
     End Sub
 End Namespace")
         End Function
+
+        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterInAsycFunctionBeforeCancellationToken_OneParameter() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(time As System.TimeSpan, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
+
+        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterInAsycFunctionBeforeCancellationToken_SeveralParameters() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(someParameter As String, token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(someParameter As String, time As System.TimeSpan, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
+
+        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterNotBeforeCancellationTokenIfFunctionIsNotAsync() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Function Test(token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Function Test(token As CancellationToken, time As System.TimeSpan) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
     End Class
 End Namespace

From 6e8ebd57dc6e095c30d8b4bc2d11d3b6e82f52a2 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 10:13:49 -0700
Subject: [PATCH 191/413] Fix

---
 src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
index cf33cab1405ce..6f509c21b56ff 100644
--- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -76,6 +76,7 @@
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Apex\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Debugger\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" TargetDir="" />
+      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.AspNetCore\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.FSharp\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Features.dll" TargetDir="" />

From 57ab1f72a3824dbc3e17a492fee24222e26ddbca Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Wed, 4 May 2022 20:34:04 +0300
Subject: [PATCH 192/413] Typo

Co-authored-by: Ankita Khera <40616383+akhera99@users.noreply.github.com>
---
 .../GenerateVariable/AbstractGenerateVariableService.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index e4524ba67ceb0..c48cdd8d91c58 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -211,7 +211,7 @@ private static async Task AddParameterCodeActionsAsync(
                 }
 
                 int? parameterIndex = null;
-                var containigMethod = state.ContainingMethod;
+                var containingMethod = state.ContainingMethod;
 
                 if (containigMethod.IsAsync && containigMethod.Parameters.Length > 0)
                 {

From 6fb834046ce815cdc12615995b230bbf646b3dcb Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 4 May 2022 10:48:25 -0700
Subject: [PATCH 193/413] Backport fix from
 f14601eb159f429fee712524e6cd4831654e4db0

---
 src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
index 2c59e7cc97d26..86ade7802c086 100644
--- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
+++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
@@ -9445,7 +9445,7 @@ public void WRN_InvalidSearchPathDir()
         }
 
         [WorkItem(650083, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/650083")]
-        [ConditionalFact(typeof(WindowsOnly))]
+        [ConditionalFact(typeof(WindowsDesktopOnly), Reason = "https://github.com/dotnet/roslyn/issues/55730")]
         public void ReservedDeviceNameAsFileName()
         {
             var parsedArgs = DefaultParse(new[] { "com9.cs", "/t:library " }, WorkingDirectory);

From 141462c0f18e7ad1db55b45036d6549ecf4290c1 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Wed, 4 May 2022 20:49:20 +0300
Subject: [PATCH 194/413] PR feedback

---
 .../GenerateVariable/GenerateVariableTests.cs | 31 ++-----------------
 .../GenerateVariable/GenerateVariableTests.vb | 26 ++--------------
 .../AbstractGenerateVariableService.cs        | 17 +++++-----
 3 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index 9236f898abcdc..a790a105189fc 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9727,7 +9727,7 @@ void Main()
 
         [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
-        public async Task TestGenerateParameterInAsycMethodBeforeCancellationToken_OneParameter()
+        public async Task TestGenerateParameterBeforeCancellationToken_OneParameter()
         {
             await TestInRegularAndScriptAsync(
 @"using System.Threading;
@@ -9754,7 +9754,7 @@ public async Task M(System.TimeSpan time, CancellationToken cancellationToken)
 
         [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
-        public async Task TestGenerateParameterInAsycMethodBeforeCancellationToken_SeveralParameters()
+        public async Task TestGenerateParameterBeforeCancellationToken_SeveralParameters()
         {
             await TestInRegularAndScriptAsync(
 @"using System.Threading;
@@ -9776,33 +9776,6 @@ public async Task M(string someParameter, System.TimeSpan time, CancellationToke
     {
         await Task.Delay(time);
     }
-}", index: 4);
-        }
-
-        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
-        public async Task TestGenerateParameterNotBeforeCancellationTokenIfMethodIsNotAsync()
-        {
-            await TestInRegularAndScriptAsync(
-@"using System.Threading;
-using System.Threading.Tasks;
-
-class C
-{
-    public Task M(CancellationToken cancellationToken)
-    {
-        await Task.Delay([|time|]);
-    }
-}",
-@"using System.Threading;
-using System.Threading.Tasks;
-
-class C
-{
-    public Task M(CancellationToken cancellationToken, System.TimeSpan time)
-    {
-        await Task.Delay(time);
-    }
 }", index: 4);
         }
     }
diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
index 6462b0de62c00..f17b8ee7dfcd3 100644
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -2993,7 +2993,7 @@ End Namespace")
 
         <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
-        Public Async Function TestGenerateParameterInAsycFunctionBeforeCancellationToken_OneParameter() As Task
+        Public Async Function TestGenerateParameterBeforeCancellationToken_OneParameter() As Task
             Await TestInRegularAndScriptAsync(
 "Imports System.Threading
 Imports System.Threading.Tasks
@@ -3015,7 +3015,7 @@ End Class", index:=4)
 
         <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
-        Public Async Function TestGenerateParameterInAsycFunctionBeforeCancellationToken_SeveralParameters() As Task
+        Public Async Function TestGenerateParameterBeforeCancellationToken_SeveralParameters() As Task
             Await TestInRegularAndScriptAsync(
 "Imports System.Threading
 Imports System.Threading.Tasks
@@ -3032,28 +3032,6 @@ Class Test
     Private Async Function Test(someParameter As String, time As System.TimeSpan, token As CancellationToken) As Task
         Await Task.Delay(time)
     End Function
-End Class", index:=4)
-        End Function
-
-        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
-        Public Async Function TestGenerateParameterNotBeforeCancellationTokenIfFunctionIsNotAsync() As Task
-            Await TestInRegularAndScriptAsync(
-"Imports System.Threading
-Imports System.Threading.Tasks
-
-Class Test
-    Private Function Test(token As CancellationToken) As Task
-        Await Task.Delay([|time|])
-    End Function
-End Class",
-"Imports System.Threading
-Imports System.Threading.Tasks
-
-Class Test
-    Private Function Test(token As CancellationToken, time As System.TimeSpan) As Task
-        Await Task.Delay(time)
-    End Function
 End Class", index:=4)
         End Function
     End Class
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index c48cdd8d91c58..20bfbf7542b99 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -74,7 +74,7 @@ public async Task<ImmutableArray<CodeAction>> GenerateVariableAsync(
                 }
 
                 await AddLocalCodeActionsAsync(actions, document, state, fallbackOptions, cancellationToken).ConfigureAwait(false);
-                await AddParameterCodeActionsAsync(actions, semanticDocument, state, cancellationToken).ConfigureAwait(false);
+                await AddParameterCodeActionsAsync(actions, document, state, cancellationToken).ConfigureAwait(false);
 
                 if (actions.Count > 1)
                 {
@@ -199,13 +199,13 @@ private async Task AddLocalCodeActionsAsync(
         }
 
         private static async Task AddParameterCodeActionsAsync(
-            ArrayBuilder<CodeAction> result, SemanticDocument document, State state, CancellationToken cancellationToken)
+            ArrayBuilder<CodeAction> result, Document document, State state, CancellationToken cancellationToken)
         {
             if (state.CanGenerateParameter())
             {
                 // Don't generate parameters with a `_` prefix unless that's what the user really wants as their naming style.
                 if (await NameIsHighlyUnlikelyToWarrantSymbolAsync(
-                        document.Document, state, SymbolKind.Parameter, Accessibility.NotApplicable, cancellationToken).ConfigureAwait(false))
+                        document, state, SymbolKind.Parameter, Accessibility.NotApplicable, cancellationToken).ConfigureAwait(false))
                 {
                     return;
                 }
@@ -213,20 +213,21 @@ private static async Task AddParameterCodeActionsAsync(
                 int? parameterIndex = null;
                 var containingMethod = state.ContainingMethod;
 
-                if (containigMethod.IsAsync && containigMethod.Parameters.Length > 0)
+                if (containingMethod.Parameters.Length > 0)
                 {
-                    var lastParameterIsCancellationToken = containigMethod.Parameters.LastOrDefault()!.Type.Equals(document.SemanticModel.Compilation.CancellationTokenType());
+                    var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+                    var lastParameterIsCancellationToken = containingMethod.Parameters.Last().Type.Equals(semanticModel.Compilation.CancellationTokenType());
 
                     if (lastParameterIsCancellationToken)
                     {
-                        parameterIndex = containigMethod.Parameters.Length - 1;
+                        parameterIndex = containingMethod.Parameters.Length - 1;
                     }
                 }
 
-                result.Add(new GenerateParameterCodeAction(document.Document, state, includeOverridesAndImplementations: false, parameterIndex));
+                result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false, parameterIndex));
 
                 if (AddParameterService.HasCascadingDeclarations(state.ContainingMethod))
-                    result.Add(new GenerateParameterCodeAction(document.Document, state, includeOverridesAndImplementations: true, parameterIndex));
+                    result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: true, parameterIndex));
             }
         }
 

From 04af1091b335d817f3d95e10848edf7cfdac8268 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 10:51:23 -0700
Subject: [PATCH 195/413] Fix

---
 src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
index 6f509c21b56ff..9d86097111d35 100644
--- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -76,7 +76,7 @@
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Apex\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Debugger\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" TargetDir="" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.AspNetCore\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" TargetDir="" />
+      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.AspNetCore\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.FSharp\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Features.dll" TargetDir="" />

From 9919d7e7bd753404a5d2328e5e3fb2de635169f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Wed, 4 May 2022 10:55:18 -0700
Subject: [PATCH 196/413] Fix F# smart indentation (#61115)

---
 .../Core/SmartIndent/SmartIndentProvider.cs   |   9 +-
 .../Editor/FSharpSmartIndentProvider.cs       | 106 ++++++++++++++++++
 .../FSharpSynchronousIndentationService.cs    |  65 -----------
 3 files changed, 110 insertions(+), 70 deletions(-)
 create mode 100644 src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSmartIndentProvider.cs
 delete mode 100644 src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSynchronousIndentationService.cs

diff --git a/src/EditorFeatures/Core/SmartIndent/SmartIndentProvider.cs b/src/EditorFeatures/Core/SmartIndent/SmartIndentProvider.cs
index e8f1a12a740c8..52bab7b222477 100644
--- a/src/EditorFeatures/Core/SmartIndent/SmartIndentProvider.cs
+++ b/src/EditorFeatures/Core/SmartIndent/SmartIndentProvider.cs
@@ -2,8 +2,6 @@
 // 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.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
@@ -16,8 +14,9 @@
 namespace Microsoft.CodeAnalysis.Editor.Implementation.SmartIndent
 {
     [Export(typeof(ISmartIndentProvider))]
-    [ContentType(ContentTypeNames.RoslynContentType)]
-    internal class SmartIndentProvider : ISmartIndentProvider
+    [ContentType(ContentTypeNames.CSharpContentType)]
+    [ContentType(ContentTypeNames.VisualBasicContentType)]
+    internal sealed class SmartIndentProvider : ISmartIndentProvider
     {
         private readonly IGlobalOptionService _globalOptions;
 
@@ -28,7 +27,7 @@ public SmartIndentProvider(IGlobalOptionService globalOptions)
             _globalOptions = globalOptions;
         }
 
-        public ISmartIndent CreateSmartIndent(ITextView textView)
+        public ISmartIndent? CreateSmartIndent(ITextView textView)
         {
             if (textView == null)
             {
diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSmartIndentProvider.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSmartIndentProvider.cs
new file mode 100644
index 0000000000000..28eb38a433ca1
--- /dev/null
+++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSmartIndentProvider.cs
@@ -0,0 +1,106 @@
+// 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 Microsoft.CodeAnalysis.Editor;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.Editor.Shared.Options;
+using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Indentation;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Utilities;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor
+{
+    [Export(typeof(ISmartIndentProvider))]
+    [ContentType(ContentTypeNames.FSharpContentType)]
+    internal sealed class FSharpSmartIndentProvider : ISmartIndentProvider
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        private readonly IFSharpSynchronousIndentationService? _legacyService;
+#pragma warning restore
+        private readonly IFSharpIndentationService? _service;
+
+        private readonly IGlobalOptionService _globalOptions;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public FSharpSmartIndentProvider(
+            [Import(AllowDefault = true)] IFSharpSynchronousIndentationService? legacyService,
+            [Import(AllowDefault = true)] IFSharpIndentationService? service,
+            IGlobalOptionService globalOptions)
+        {
+            Contract.ThrowIfTrue(service == null && legacyService == null);
+
+            _legacyService = legacyService;
+            _service = service;
+            _globalOptions = globalOptions;
+        }
+
+        public ISmartIndent? CreateSmartIndent(ITextView textView)
+            => _globalOptions.GetOption(InternalFeatureOnOffOptions.SmartIndenter) ? new SmartIndent(textView, this) : null;
+
+        private sealed class SmartIndent : ISmartIndent
+        {
+            private readonly ITextView _textView;
+            private readonly FSharpSmartIndentProvider _provider;
+
+            public SmartIndent(ITextView textView, FSharpSmartIndentProvider provider)
+            {
+                _textView = textView;
+                _provider = provider;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public int? GetDesiredIndentation(ITextSnapshotLine line)
+                => GetDesiredIndentation(line, CancellationToken.None);
+
+            private int? GetDesiredIndentation(ITextSnapshotLine line, CancellationToken cancellationToken)
+            {
+                using (Logger.LogBlock(FunctionId.SmartIndentation_Start, cancellationToken))
+                {
+                    var document = line.Snapshot.GetOpenDocumentInCurrentContextWithChanges();
+
+                    // all F# documents should have a file path
+                    if (document?.FilePath == null)
+                        return null;
+
+                    FSharpIndentationResult? result;
+                    if (_provider._service != null)
+                    {
+                        var text = document.GetTextSynchronously(cancellationToken);
+
+                        var indentStyle = _provider._globalOptions.GetOption(IndentationOptionsStorage.SmartIndent, document.Project.Language);
+
+                        var fsharpOptions = new FSharpIndentationOptions(
+                            TabSize: _textView.Options.GetOptionValue(DefaultOptions.TabSizeOptionId),
+                            IndentStyle: (FormattingOptions.IndentStyle)indentStyle);
+
+                        result = _provider._service.GetDesiredIndentation(document.Project.LanguageServices, text, document.Id, document.FilePath, line.LineNumber, fsharpOptions);
+                    }
+                    else
+                    {
+                        Contract.ThrowIfNull(_provider._legacyService);
+                        result = _provider._legacyService.GetDesiredIndentation(document, line.LineNumber, cancellationToken);
+                    }
+
+                    return result.HasValue ? new IndentationResult(result.Value.BasePosition, result.Value.Offset).GetIndentation(_textView, line) : null;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSynchronousIndentationService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSynchronousIndentationService.cs
deleted file mode 100644
index f4b5e03c70901..0000000000000
--- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpSynchronousIndentationService.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.ExternalAccess.FSharp.Editor;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Indentation;
-using Roslyn.Utilities;
-
-namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor
-{
-    [Shared]
-    [ExportLanguageService(typeof(IIndentationService), LanguageNames.FSharp)]
-    internal class FSharpSynchronousIndentationService : IIndentationService
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        private readonly IFSharpSynchronousIndentationService? _legacyService;
-#pragma warning restore
-        private readonly IFSharpIndentationService? _service;
-
-        [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public FSharpSynchronousIndentationService(
-            [Import(AllowDefault = true)] IFSharpSynchronousIndentationService? legacyService,
-            [Import(AllowDefault = true)] IFSharpIndentationService? service)
-        {
-            Contract.ThrowIfTrue(service == null && legacyService == null);
-
-            _legacyService = legacyService;
-            _service = service;
-        }
-
-        public IndentationResult GetIndentation(Document document, int lineNumber, IndentationOptions options, CancellationToken cancellationToken)
-        {
-            // all F# documents should have a file path
-            if (document.FilePath == null)
-            {
-                return default;
-            }
-
-            FSharpIndentationResult? result;
-            if (_service != null)
-            {
-                var text = document.GetTextSynchronously(cancellationToken);
-
-                var fsharpOptions = new FSharpIndentationOptions(
-                    TabSize: options.FormattingOptions.TabSize,
-                    IndentStyle: (FormattingOptions.IndentStyle)options.IndentStyle);
-
-                result = _service.GetDesiredIndentation(document.Project.LanguageServices, text, document.Id, document.FilePath, lineNumber, fsharpOptions);
-            }
-            else
-            {
-                Contract.ThrowIfNull(_legacyService);
-                result = _legacyService.GetDesiredIndentation(document, lineNumber, cancellationToken);
-            }
-
-            return result.HasValue ? new IndentationResult(result.Value.BasePosition, result.Value.Offset) : default;
-        }
-    }
-}

From 55dd730b337eb6cfa540b7d22768c907188f6ecd Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:22:34 -0700
Subject: [PATCH 197/413] Disable

---
 .../StringCopyPaste/KnownSourcePasteProcessor.cs    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 6f722b88c1413..d202bd8287e2a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -51,9 +51,12 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             // For pastes into non-raw strings, we can just determine how the change should be escaped in-line at that
             // same location the paste originally happened at.  For raw-strings things get more complex as we have to
             // deal with things like indentation and potentially adding newlines to make things legal.
-            return IsAnyRawStringExpression(StringExpressionBeforePaste)
-                ? GetEditsForRawString(cancellationToken)
-                : GetEditsForNonRawString();
+
+            // Smart Pasting into raw string not supported yet.  
+            if (IsAnyRawStringExpression(StringExpressionBeforePaste))
+                return default;
+
+            return GetEditsForNonRawString();
         }
 
         private ImmutableArray<TextChange> GetEditsForNonRawString()
@@ -237,6 +240,8 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
 
+#if false
+
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
             // Determine the basic updates to the pasted pieces we need to make to properly unescape the pieces for a
@@ -293,5 +298,7 @@ private ImmutableArray<TextChange> GetRawStringContentChanges(CancellationToken
         {
             throw new NotImplementedException();
         }
+
+#endif
     }
 }

From 54b7a384bdd5586846bf38117c32b2cbf649bdf1 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:23:22 -0700
Subject: [PATCH 198/413] Simplify

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs      | 5 +----
 .../CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index d202bd8287e2a..4c92e14877e9b 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -24,7 +24,6 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
-        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
         private readonly ExpressionSyntax _stringExpressionCopiedFrom;
         private readonly ITextSnapshot _snapshotCopiedFrom;
 
@@ -37,13 +36,11 @@ public KnownSourcePasteProcessor(
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             ExpressionSyntax stringExpressionCopiedFrom,
-            ITextSnapshot snapshotCopiedFrom,
-            ITextBufferFactoryService3 textBufferFactoryService)
+            ITextSnapshot snapshotCopiedFrom)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
             _snapshotCopiedFrom = snapshotCopiedFrom;
-            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 8031cbba47ea9..258d6c2fcc181 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -230,7 +230,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(IndentationOptions ind
                                 snapshotBeforePaste, snapshotAfterPaste,
                                 documentBeforePaste, documentAfterPaste,
                                 stringExpressionBeforePaste, stringExpressionCopiedFrom,
-                                _lastSelectedSpans[0].Snapshot, _textBufferFactoryService);
+                                _lastSelectedSpans[0].Snapshot);
                             return knownProcessor.GetEdits(cancellationToken);
                         }
                     }

From 3ae1c97a92f12822ae5b7ed63a4b5182610d1b2f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:23:56 -0700
Subject: [PATCH 199/413] Simplify

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index f2a8392a790c9..bdedd9ca3e74f 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -100,8 +100,8 @@ internal abstract class AbstractPasteProcessor
         protected readonly int DelimiterDollarCount;
 
         /// <summary>
-        /// The set of <see cref="ITextChange"/>'s that produced <see cref="AbstractPasteProcessor.SnapshotAfterPaste"/>
-        /// from <see cref="AbstractPasteProcessor.SnapshotBeforePaste"/>.
+        /// The set of <see cref="ITextChange"/>'s that produced <see cref="SnapshotAfterPaste"/> from <see
+        /// cref="SnapshotBeforePaste"/>.
         /// </summary>
         protected INormalizedTextChangeCollection Changes => SnapshotBeforePaste.Version.Changes;
 

From 8679faf253c009b52c67fcd147be3f8379c3bdfd Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:25:45 -0700
Subject: [PATCH 200/413] Fix

---
 .../StringCopyPaste/StringCopyPasteCommandHandler.cs       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 258d6c2fcc181..210f0a4925b7e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -91,14 +91,15 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var subjectBuffer = args.SubjectBuffer;
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-
-            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotBeforePaste)
-                return;
+            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
 
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
+            if (snapshotBeforePaste is null)
+                return;
+
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;

From 8da8af21a3a160af7e5c95edd6b0a4fa40d276c8 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:28:26 -0700
Subject: [PATCH 201/413] Add docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 4c92e14877e9b..b0e29d7a52cbf 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -24,7 +24,14 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
+        /// <summary>
+        /// The original string expression in some document that we were cut/copying text from.
+        /// </summary>
         private readonly ExpressionSyntax _stringExpressionCopiedFrom;
+
+        /// <summary>
+        /// The text snapshot of the document the original text was cut/copied from.
+        /// </summary>
         private readonly ITextSnapshot _snapshotCopiedFrom;
 
         public KnownSourcePasteProcessor(

From 207f850f1eaf9c8efc0f5e6479d5190578b8e712 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:29:23 -0700
Subject: [PATCH 202/413] Add docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index b0e29d7a52cbf..4adbd675dc3ee 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -22,6 +22,12 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     using static StringCopyPasteHelpers;
     using static SyntaxFactory;
 
+    /// <summary>
+    /// Implementation of <see cref="AbstractPasteProcessor"/> used when we know the original string literal expression
+    /// we were copying text out of.  Because we know the original literal expression, we can determine what the
+    /// characters being pasted meant in the original context and we can attempt to preserve that as closely as
+    /// possible.
+    /// </summary>
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
         /// <summary>

From 69a9041de474df9ff1c46a1f5e9c675a456062ef Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:30:29 -0700
Subject: [PATCH 203/413] Add docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 4adbd675dc3ee..88167189804a1 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -96,10 +96,6 @@ string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
                 // Interpolated string
                 // Verbatim string
                 // Verbatim interpolated string
-                // Raw single line string
-                // Raw multi line string
-                // Raw interpolated line string
-                // Raw interpolated multi-line string.
                 var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
 
                 return (parsedChange, StringExpressionBeforePaste) switch

From ca13f18947ca4c8cd089d22a9f471bdae08113ad Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:34:52 -0700
Subject: [PATCH 204/413] Simplify

---
 .../StringCopyPasteCommandHandler.cs           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 210f0a4925b7e..7d9a7ad35e815 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -98,7 +98,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             nextCommandHandler();
 
             if (snapshotBeforePaste is null)
-                return;
+                return; KnownSourcePasteProcessor
 
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
@@ -140,7 +140,10 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var pasteWasSuccessful = PasteWasSuccessful(
                 snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
 
-            var textChanges = GetEdits(cancellationToken);
+            var newLine = textView.Options.GetNewLineCharacter();
+            var indentationOptions = documentBeforePaste.GetIndentationOptionsAsync(_globalOptions, cancellationToken).WaitAndGetResult(cancellationToken);
+
+            var textChanges = GetEdits(newLine, indentationOptions, cancellationToken);
 
             // If we didn't get any viable changes back, don't do anything.
             if (textChanges.IsDefaultOrEmpty)
@@ -188,13 +191,10 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             transaction.Complete();
             return;
 
-            ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+            ImmutableArray<TextChange> GetEdits(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
             {
-                var newLine = textView.Options.GetNewLineCharacter();
-                var indentationOptions = documentBeforePaste.GetIndentationOptionsAsync(_globalOptions, cancellationToken).WaitAndGetResult(cancellationToken);
-
                 // See if this is a paste of the last copy that we heard about.
-                var edits = TryGetEditsFromKnownCopySource(indentationOptions, cancellationToken);
+                var edits = TryGetEditsFromKnownCopySource(newLine, indentationOptions, cancellationToken);
                 if (!edits.IsDefaultOrEmpty)
                     return edits;
 
@@ -207,7 +207,7 @@ ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
                 return unknownPasteProcessor.GetEdits(cancellationToken);
             }
 
-            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(IndentationOptions indentationOptions, CancellationToken cancellationToken)
+            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
             {
                 var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
                 if (service != null &&
@@ -224,8 +224,6 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(IndentationOptions ind
                             lastSelectedDocument, _lastSelectedSpans, cancellationToken);
                         if (stringExpressionCopiedFrom != null)
                         {
-                            var newLine = textView.Options.GetNewLineCharacter();
-
                             var knownProcessor = new KnownSourcePasteProcessor(
                                 newLine, indentationOptions,
                                 snapshotBeforePaste, snapshotAfterPaste,

From 690687d75472ad55f18e4d9e8813241edfd47371 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:35:55 -0700
Subject: [PATCH 205/413] Delete

---
 .../StringCopyPasteCommandHandler.cs          | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 7d9a7ad35e815..173b618126983 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -341,38 +341,5 @@ static int FindIndex(TextSpan span, int position)
                 return 1;
             }
         }
-
-        private bool PastedTextEqualsLastCopiedText(INormalizedTextChangeCollection pastedChanges)
-        {
-            // If we have no history of any copied text, then there's nothing in the past we can compare to.
-            if (_lastSelectedSpans == null)
-                return false;
-
-            var copiedSpans = _lastSelectedSpans;
-
-            // If we don't have any actual changes to compare, we can't consider these the same.
-            if (copiedSpans.Count == 0 || pastedChanges.Count == 0)
-                return false;
-
-            // Both the copied and pasted data is normalized.  So we should be able to compare counts to see
-            // if they look the same.
-            if (copiedSpans.Count != pastedChanges.Count)
-                return false;
-
-            // Validate each copied span from the source matches what was pasted into the destination.
-            for (int i = 0, n = copiedSpans.Count; i < n; i++)
-            {
-                var copiedSpan = copiedSpans[i];
-                var pastedChange = pastedChanges[i];
-
-                if (copiedSpan.Length != pastedChange.NewLength)
-                    return false;
-
-                if (copiedSpan.GetText() != pastedChange.NewText)
-                    return false;
-            }
-
-            return true;
-        }
     }
 }

From ca4f07b3affa50f6cf74bd499f55035d73b0d9eb Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:37:36 -0700
Subject: [PATCH 206/413] Add docs

---
 .../CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 173b618126983..6de60fe672d74 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -98,7 +98,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             nextCommandHandler();
 
             if (snapshotBeforePaste is null)
-                return; KnownSourcePasteProcessor
+                return;
 
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
@@ -209,6 +209,7 @@ ImmutableArray<TextChange> GetEdits(string newLine, IndentationOptions indentati
 
             ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
             {
+                // See if we can determine the information about the code the user copied from.
                 var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
                 if (service != null &&
                     _lastSelectedSpans?.Count > 0 &&

From 2b618063febb092c40f11ed515969b110b910919 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Wed, 4 May 2022 21:39:53 +0300
Subject: [PATCH 207/413] PR feedback 2

---
 ...erateVariableService.GenerateParameterCodeAction.cs |  4 ++--
 .../AbstractGenerateVariableService.cs                 | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
index c45e264588c97..fd36d52d3e9cf 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
@@ -17,9 +17,9 @@ private class GenerateParameterCodeAction : CodeAction
             private readonly Document _document;
             private readonly State _state;
             private readonly bool _includeOverridesAndImplementations;
-            private readonly int? _parameterIndex;
+            private readonly int _parameterIndex;
 
-            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations, int? parameterIndex)
+            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations, int parameterIndex)
             {
                 _document = document;
                 _state = state;
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 20bfbf7542b99..52db3de9416d1 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -210,18 +210,16 @@ private static async Task AddParameterCodeActionsAsync(
                     return;
                 }
 
-                int? parameterIndex = null;
                 var containingMethod = state.ContainingMethod;
+                var parameterIndex = containingMethod.Parameters.Length;
 
                 if (containingMethod.Parameters.Length > 0)
                 {
-                    var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-                    var lastParameterIsCancellationToken = containingMethod.Parameters.Last().Type.Equals(semanticModel.Compilation.CancellationTokenType());
+                    var compilation = await document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
+                    var lastParameterIsCancellationToken = Equals(containingMethod.Parameters.Last().Type, compilation.CancellationTokenType());
 
                     if (lastParameterIsCancellationToken)
-                    {
-                        parameterIndex = containingMethod.Parameters.Length - 1;
-                    }
+                        parameterIndex--;
                 }
 
                 result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false, parameterIndex));

From 2183950181eee96a1287ea53678b6e2b69d484aa Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:45:58 -0700
Subject: [PATCH 208/413] Delete

---
 .../StringCopyPasteCommandHandlerTests.cs       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index ce042a7a44758..7638a5e2cfd67 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -27,23 +27,6 @@ public abstract class StringCopyPasteCommandHandlerTests
     {
         internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
         {
-            //[ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
-            //[PartNotDiscoverable]
-            //private class MockStringCopyPasteService : IStringCopyPasteService
-            //{
-            //    [ImportingConstructor]
-            //    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-            //    public MockStringCopyPasteService()
-            //    {
-            //    }
-
-            //    public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
-            //    {
-            //        sequenceNumber = 0;
-            //        return true;
-            //    }
-            //}
-
             private static readonly TestComposition s_compositionWithUnknownCopy =
                 EditorTestCompositions.EditorFeaturesWpf
                     .AddParts(typeof(StringCopyPasteCommandHandler));

From a7cb3d40f5858d99ea72e21426ff5efa1ce84f97 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:47:08 -0700
Subject: [PATCH 209/413] Add try/catch

---
 .../WpfStringCopyPasteService.cs              | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index d14265b112955..78dabdd4fa60f 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -26,20 +26,26 @@ public WpfStringCopyPasteService()
 
         public bool TrySetClipboardSequenceNumber(int sequenceNumber)
         {
-            var dataObject = Clipboard.GetDataObject();
-            if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
+            try
             {
-                var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
-                           dataObject.GetData(DataFormats.Text) as string;
-                if (data != null)
+                var dataObject = Clipboard.GetDataObject();
+                if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
                 {
-                    // Ok, there's viable text on the clipboard.  Try to create a new dataobject, copy everything from
-                    // the current data object to it, and add roslyn's data.
-                    var copy = new DataObjectWrapper(dataObject, sequenceNumber);
-                    Clipboard.SetDataObject(copy);
-                    return true;
+                    var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
+                               dataObject.GetData(DataFormats.Text) as string;
+                    if (data != null)
+                    {
+                        // Ok, there's viable text on the clipboard.  Try to create a new dataobject, copy everything from
+                        // the current data object to it, and add roslyn's data.
+                        var copy = new DataObjectWrapper(dataObject, sequenceNumber);
+                        Clipboard.SetDataObject(copy);
+                        return true;
+                    }
                 }
             }
+            catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
+            {
+            }
 
             return false;
         }

From 7df4e3b6674111a9839558231fbb7219eb2b7a32 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 11:49:02 -0700
Subject: [PATCH 210/413] Remove

---
 .../Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index 78dabdd4fa60f..2eb97a79b7f58 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -73,9 +73,10 @@ public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
             return false;
         }
 
-        [DllImport("user32.dll")]
-        private static extern uint GetClipboardSequenceNumber();
-
+        /// <summary>
+        /// Wraps an underlying <see cref="IDataObject"/>, forwarding all calls to it unless the request is about our
+        /// special <see cref="RoslynCopyPasteSequenceNumber"/> data that we've added ourselves.
+        /// </summary>
         private class DataObjectWrapper : IDataObject
         {
             private readonly IDataObject _dataObject;

From 23b93ad081dbcb73b26e88e1ddec7a7272da8732 Mon Sep 17 00:00:00 2001
From: "gel@microsoft.com" <gel@microsoft.com>
Date: Tue, 3 May 2022 18:39:46 -0700
Subject: [PATCH 211/413] Hard select item from default source when filter text
 is empty

---
 .../AsyncCompletion/ItemManager.CompletionListUpdater.cs   | 7 ++++++-
 .../CSharpCompletionCommandHandlerTests_DefaultsSource.vb  | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/Core/IntelliSense/AsyncCompletion/ItemManager.CompletionListUpdater.cs b/src/EditorFeatures/Core/IntelliSense/AsyncCompletion/ItemManager.CompletionListUpdater.cs
index 5bcbf0c447000..4784858c4a760 100644
--- a/src/EditorFeatures/Core/IntelliSense/AsyncCompletion/ItemManager.CompletionListUpdater.cs
+++ b/src/EditorFeatures/Core/IntelliSense/AsyncCompletion/ItemManager.CompletionListUpdater.cs
@@ -729,7 +729,12 @@ private ItemSelection GetDefaultsMatch(IReadOnlyList<MatchResult<VSCompletionIte
                     for (var i = 0; i < inferiorItemIndex; ++i)
                     {
                         if (items[i].RoslynCompletionItem.DisplayText == defaultText)
-                            return intialSelection with { SelectedItemIndex = i };
+                        {
+                            // If user hasn't typed anything, we'd like to hard select the default item.
+                            // This way, they can easily commit the default item which matches what WLC shows.
+                            var selectionHint = _filterText.Length == 0 ? UpdateSelectionHint.Selected : intialSelection.SelectionHint;
+                            return intialSelection with { SelectedItemIndex = i, SelectionHint = selectionHint };
+                        }
                     }
                 }
 
diff --git a/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_DefaultsSource.vb b/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_DefaultsSource.vb
index ec3f7745919b0..5b97fcaede5b9 100644
--- a/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_DefaultsSource.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_DefaultsSource.vb
@@ -43,6 +43,7 @@ class C
 
         <WpfFact, CombinatorialData>
         <Trait(Traits.Feature, Traits.Features.Completion)>
+        <WorkItem(61120, "https://github.com/dotnet/roslyn/issues/61120")>
         Public Async Function SelectFirstMatchingDefaultIfNoFilterText() As Task
             Using state = CreateTestStateWithAdditionalDocument(
                               <Document>
@@ -57,7 +58,7 @@ class C
                               </Document>)
 
                 state.SendInvokeCompletionList()
-                Await state.AssertSelectedCompletionItem("MyAB", isHardSelected:=False) ' Not hard-selected since filter text is empty
+                Await state.AssertSelectedCompletionItem("MyAB", isHardSelected:=True) ' hard-selected since filter text is empty
             End Using
         End Function
 

From 145d70bd637f51bb10a8503a8055841cd05f6a2b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 12:24:32 -0700
Subject: [PATCH 212/413] In progress

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  12 +-
 .../KnownSourcePasteProcessor.cs              | 104 ++++++++++++++++--
 .../UnknownSourcePasteProcessor.cs            |  36 +++---
 3 files changed, 121 insertions(+), 31 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index bdedd9ca3e74f..d3d676ae9435c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -149,11 +149,19 @@ protected TextSpan MapSpanForward(TextSpan span)
             return trackingSpan.GetSpan(SnapshotAfterPaste).Span.ToTextSpan();
         }
 
+        /// <inheritdoc cref="GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        protected string? GetQuotesToAddToRawString()
+            => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
+
+        /// <inheritdoc cref="GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        protected string? GetDollarSignsToAddToRawString()
+            => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
+
         /// <summary>
         /// Given an initial raw string literal, and the changes made to it by the paste, determines how many quotes to
         /// add to the start and end to keep things parsing properly.
         /// </summary>
-        protected string? GetQuotesToAddToRawString(
+        private string? GetQuotesToAddToRawString(
             SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
         {
             Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
@@ -168,7 +176,7 @@ protected TextSpan MapSpanForward(TextSpan span)
         /// Given an initial raw string literal, and the changes made to it by the paste, determines how many dollar
         /// signs to add to the start to keep things parsing properly.
         /// </summary>
-        protected string? GetDollarSignsToAddToRawString(
+        private string? GetDollarSignsToAddToRawString(
             SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
         {
             Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 88167189804a1..228a72cd63528 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -64,7 +64,8 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
 
             // Smart Pasting into raw string not supported yet.  
             if (IsAnyRawStringExpression(StringExpressionBeforePaste))
-                return default;
+                // return default;
+                return GetEditsForRawString();
 
             return GetEditsForNonRawString();
         }
@@ -205,7 +206,7 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             // was pasted this normally is not an issue.  However, it can be a problem in the following case:
             //
             //      var source = """
-            //              exiting text
+            //              existing text
             //              [|copy
             //              this|]
             //              existing text
@@ -246,6 +247,100 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
 
+        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
+        {
+            // Can't really figure anything out if the raw string is in error.
+            if (NodeOrTokenContainsError(StringExpressionBeforePaste))
+                return default;
+
+            // If all we're going to do is insert whitespace, then don't make any adjustments to the text. We don't want
+            // to end up inserting nothing and having the user very confused why their paste did nothing.
+            if (AllWhitespace(SnapshotBeforePaste.Version.Changes))
+                return default;
+
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
+
+            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
+            // quotes in it now).  Update the delimiters to make the content legal if necessary. if the content we're
+            // going to add itself contains quotes, then figure out how many start/end quotes the final string literal
+            // will need (which also gives us the number of quotes to add to the start/end).
+            var quotesToAdd = GetQuotesToAddToRawString();
+            var dollarSignsToAdd = GetDollarSignsToAddToRawString();
+
+            // First, add any extra dollar signs needed.
+            if (dollarSignsToAdd != null)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
+
+            // Then any quotes to your starting delimiter
+            if (quotesToAdd != null)
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+
+            if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
+                AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(edits);
+            else
+                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits, cancellationToken);
+
+            // Then add any extra end quotes needed.
+            if (quotesToAdd != null)
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+
+            foreach (var change in Changes)
+            {
+                var wrappedChange = WrapChangeWithOriginalQuotes(change.NewText);
+                var parsedChange = ParseExpression(wrappedChange);
+
+                // If for some reason we can't actually successfully parse this copied text, then bail out.
+                if (ContainsError(parsedChange))
+                    return default;
+
+                var modifiedText = TransformValueToDestinationKind(parsedChange);
+                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), modifiedText));
+            }
+
+
+            if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
+            {
+
+            }
+            else
+            {
+                // If we pasted into a single-line raw literal we may have to make it multiline if it starts/ends with a
+                // quote, or contains a newline.
+
+            }
+
+
+            return edits.ToImmutable();
+        }
+
+        private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(ArrayBuilder<TextChange> edits, CancellationToken cancellationToken)
+        {
+            // When pasting into a single-line raw literal we will keep it a single line if we can.  If the content
+            // we're pasting starts/ends with a quote, or contains a newline, then we have to convert to a multiline.
+            //
+            // Pasting any other content into a single-line raw literal is always legal and needs no extra work on our
+            // part.
+
+            var mustBeMultiLine = RawContentMustBeMultiLine(TextAfterPaste, TextContentsSpansAfterPaste);
+            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
+
+            // A newline and the indentation to start with.
+            if (mustBeMultiLine)
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), NewLine + indentationWhitespace));
+
+
+
+            // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
+            // final newline-space at the end because we will have already done that.
+            if (mustBeMultiLine && !LastPastedLineAddedNewLine())
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), NewLine + indentationWhitespace));
+        }
+
+        private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(ArrayBuilder<TextChange> edits)
+        {
+            throw new NotImplementedException();
+        }
+
 #if false
 
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
@@ -295,11 +390,6 @@ private string GetDollarSignsToAddToRawString()
             throw new NotImplementedException();
         }
 
-        private string GetQuotesToAddToRawString()
-        {
-            throw new NotImplementedException();
-        }
-
         private ImmutableArray<TextChange> GetRawStringContentChanges(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 73f5a7bdd4d88..0547db3bbc3bf 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -101,14 +101,6 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             return textChanges.ToImmutableAndClear();
         }
 
-        /// <inheritdoc cref="AbstractPasteProcessor.GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
-        private string? GetQuotesToAddToRawString()
-            => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
-
-        /// <inheritdoc cref="AbstractPasteProcessor.GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
-        private string? GetDollarSignsToAddToRawString()
-            => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
-
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
             // Can't really figure anything out if the raw string is in error.
@@ -128,34 +120,34 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             var quotesToAdd = _pasteWasSuccessful ? null : GetQuotesToAddToRawString();
             var dollarSignsToAdd = _pasteWasSuccessful ? null : GetDollarSignsToAddToRawString();
 
-            using var _ = ArrayBuilder<TextChange>.GetInstance(out var editsToMake);
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
 
             // First, add any extra dollar signs needed.
             if (dollarSignsToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
 
             // Then any quotes to your starting delimiter
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
 
             // Then add the actual changes in the content.
 
             if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
-                AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(editsToMake);
+                AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(edits);
             else
-                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(editsToMake, cancellationToken);
+                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits, cancellationToken);
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
 
-            return editsToMake.ToImmutable();
+            return edits.ToImmutable();
         }
 
         // Pasting with single line case.
 
         private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
-            ArrayBuilder<TextChange> editsToMake,
+            ArrayBuilder<TextChange> edits,
             CancellationToken cancellationToken)
         {
             // When pasting into a single-line raw literal we will keep it a single line if we can.  If the content
@@ -170,9 +162,9 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
 
             using var _ = PooledStringBuilder.GetInstance(out var buffer);
 
-            // Then a newline and the indentation to start with.
+            // A newline and the indentation to start with.
             if (mustBeMultiLine)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), NewLine + indentationWhitespace));
 
             SourceText? textOfCurrentChange = null;
             var commonIndentationPrefix = GetCommonIndentationPrefix(Changes) ?? "";
@@ -210,13 +202,13 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
                         buffer.Append(indentationWhitespace);
                 }
 
-                editsToMake.Add(new TextChange(change.OldSpan.ToTextSpan(), buffer.ToString()));
+                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), buffer.ToString()));
             }
 
             // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
             // final newline-space at the end because we will have already done that.
             if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), NewLine + indentationWhitespace));
 
             return;
 
@@ -231,7 +223,7 @@ bool LastPastedLineAddedNewLine()
         // Pasting into multi line case.
 
         private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(
-            ArrayBuilder<TextChange> editsToMake)
+            ArrayBuilder<TextChange> edits)
         {
             var endLine = TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.Span.End);
 
@@ -334,7 +326,7 @@ private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(
                     }
                 }
 
-                editsToMake.Add(new TextChange(change.OldSpan.ToTextSpan(), buffer.ToString()));
+                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), buffer.ToString()));
             }
         }
     }

From e5571e0cbc05fe3776c71728c102e0a26eebab16 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 4 May 2022 15:00:23 -0700
Subject: [PATCH 213/413] Fix CI source-build

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7976191cdb495..611d64926684c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -197,7 +197,7 @@ jobs:
   steps:
     - template: eng/pipelines/checkout-unix-task.yml
 
-    - script: ./eng/cibuild.sh --configuration Debug --prepareMachine --binaryLog --sourceBuild
+    - script: ./eng/cibuild.sh --configuration Debug --prepareMachine --binaryLog --sourceBuild /p:ArcadeBuildFromSource=true
       displayName: Build
 
     - template: eng/pipelines/publish-logs.yml

From 57196df20b5deba345b496ef5c69aa42e472a4e9 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 15:04:02 -0700
Subject: [PATCH 214/413] Simplify

---
 .../WpfStringCopyPasteService.cs              | 113 ++----------------
 1 file changed, 9 insertions(+), 104 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index 2eb97a79b7f58..eb8438a664aba 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -4,8 +4,6 @@
 
 using System;
 using System.Composition;
-using System.Linq;
-using System.Runtime.InteropServices;
 using System.Windows;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -29,19 +27,17 @@ public bool TrySetClipboardSequenceNumber(int sequenceNumber)
             try
             {
                 var dataObject = Clipboard.GetDataObject();
-                if (dataObject != null && dataObject.GetDataPresent(typeof(string)))
+
+                var copy = new DataObject(RoslynCopyPasteSequenceNumber, sequenceNumber);
+
+                foreach (var format in dataObject.GetFormats())
                 {
-                    var data = dataObject.GetData(DataFormats.UnicodeText) as string ??
-                               dataObject.GetData(DataFormats.Text) as string;
-                    if (data != null)
-                    {
-                        // Ok, there's viable text on the clipboard.  Try to create a new dataobject, copy everything from
-                        // the current data object to it, and add roslyn's data.
-                        var copy = new DataObjectWrapper(dataObject, sequenceNumber);
-                        Clipboard.SetDataObject(copy);
-                        return true;
-                    }
+                    if (dataObject.GetDataPresent(format))
+                        copy.SetData(format, dataObject.GetData(format));
                 }
+
+                Clipboard.SetDataObject(copy);
+                return true;
             }
             catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
             {
@@ -72,96 +68,5 @@ public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
             sequenceNumber = 0;
             return false;
         }
-
-        /// <summary>
-        /// Wraps an underlying <see cref="IDataObject"/>, forwarding all calls to it unless the request is about our
-        /// special <see cref="RoslynCopyPasteSequenceNumber"/> data that we've added ourselves.
-        /// </summary>
-        private class DataObjectWrapper : IDataObject
-        {
-            private readonly IDataObject _dataObject;
-            private int _roslynSequenceNumber;
-
-            public DataObjectWrapper(IDataObject dataObject, int roslynSequenceNumber)
-            {
-                _dataObject = dataObject;
-                _roslynSequenceNumber = roslynSequenceNumber;
-            }
-
-            public object GetData(string format)
-            {
-                return format == RoslynCopyPasteSequenceNumber
-                    ? _roslynSequenceNumber
-                    : _dataObject.GetData(format);
-            }
-
-            public object GetData(Type format)
-            {
-                return _dataObject.GetData(format);
-            }
-
-            public object GetData(string format, bool autoConvert)
-            {
-                return format == RoslynCopyPasteSequenceNumber
-                    ? _roslynSequenceNumber
-                    : _dataObject.GetData(format, autoConvert);
-            }
-
-            public bool GetDataPresent(string format)
-            {
-                return format == RoslynCopyPasteSequenceNumber || _dataObject.GetDataPresent(format);
-            }
-
-            public bool GetDataPresent(Type format)
-            {
-                return _dataObject.GetDataPresent(format);
-            }
-
-            public bool GetDataPresent(string format, bool autoConvert)
-            {
-                return format == RoslynCopyPasteSequenceNumber || _dataObject.GetDataPresent(format, autoConvert);
-            }
-
-            public string[] GetFormats()
-            {
-                var result = _dataObject.GetFormats().ToList();
-                result.Add(RoslynCopyPasteSequenceNumber);
-                return result.ToArray();
-            }
-
-            public string[] GetFormats(bool autoConvert)
-            {
-                var result = _dataObject.GetFormats(autoConvert).ToList();
-                result.Add(RoslynCopyPasteSequenceNumber);
-                return result.ToArray();
-
-            }
-
-            public void SetData(object data)
-            {
-                _dataObject.SetData(data);
-            }
-
-            public void SetData(string format, object data)
-            {
-                if (format == RoslynCopyPasteSequenceNumber)
-                    _roslynSequenceNumber = data is int v ? v : FailureValue;
-                else
-                    _dataObject.SetData(format, data);
-            }
-
-            public void SetData(Type format, object data)
-            {
-                _dataObject.SetData(format, data);
-            }
-
-            public void SetData(string format, object data, bool autoConvert)
-            {
-                if (format == RoslynCopyPasteSequenceNumber)
-                    _roslynSequenceNumber = data is int v ? v : FailureValue;
-                else
-                    _dataObject.SetData(format, data, autoConvert);
-            }
-        }
     }
 }

From dd0a1dcd726f1deaa1de06f4b1d409d13584b534 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 4 May 2022 15:46:04 -0700
Subject: [PATCH 215/413] Add source-build configuration

---
 azure-pipelines.yml                 |  4 ++--
 eng/SourceBuild.props               | 18 ++++++++++++++++++
 eng/SourceBuildPrebuiltBaseline.xml |  5 +++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 eng/SourceBuild.props
 create mode 100644 eng/SourceBuildPrebuiltBaseline.xml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 611d64926684c..6758d313d93d3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -144,7 +144,7 @@ jobs:
 - job: Correctness_Determinism
   pool:
     name: NetCore1ESPool-Svc-Public
-    demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017.Open
+    demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open
   timeoutInMinutes: 90
   steps:
     - template: eng/pipelines/checkout-windows-task.yml
@@ -160,7 +160,7 @@ jobs:
 - job: Correctness_Build
   pool:
     name: NetCore1ESPool-Svc-Public
-    demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017.Open
+    demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open
   timeoutInMinutes: 90
   steps:
     - template: eng/pipelines/checkout-windows-task.yml
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
new file mode 100644
index 0000000000000..182f8a9cdb12b
--- /dev/null
+++ b/eng/SourceBuild.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <PropertyGroup>
+    <GitHubRepositoryName>roslyn</GitHubRepositoryName>
+    <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
+  </PropertyGroup>
+
+  <!--
+    The build script passes in the full path of the sln to build.  This must be overridden in order to build
+    the cloned source in the inner build.
+  -->
+  <Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
+    <PropertyGroup>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln"</InnerBuildArgs>
+    </PropertyGroup>
+  </Target>
+
+</Project>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
new file mode 100644
index 0000000000000..c1b6dfbf05381
--- /dev/null
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -0,0 +1,5 @@
+<UsageData>
+  <IgnorePatterns>
+    <UsagePattern IdentityGlob="*/*" />
+  </IgnorePatterns>
+</UsageData>

From f871d50bca57a0324b96628d8896b11644c55290 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 15:46:15 -0700
Subject: [PATCH 216/413] Simplify

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  51 ++-----
 .../KnownSourcePasteProcessor.cs              |   9 +-
 .../StringCopyPasteCommandHandler.cs          |   5 +-
 .../StringCopyPaste/StringCopyPasteHelpers.cs | 134 ++++++++++--------
 .../CSharp/StringCopyPaste/StringInfo.cs      |  66 +++++++++
 .../UnknownSourcePasteProcessor.cs            |  10 +-
 ...knownSourceIntoSingleLineRawStringTests.cs |   4 +-
 7 files changed, 170 insertions(+), 109 deletions(-)
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index bdedd9ca3e74f..195f0b5c83aa8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -63,41 +63,24 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly ExpressionSyntax StringExpressionBeforePaste;
 
-        /// <summary>
-        /// User's desired new-line sequence if we need to add newlines to our text changes.
-        /// </summary>
-        protected readonly string NewLine;
+        protected readonly StringInfo StringExpressionBeforePasteInfo;
 
         /// <summary>
-        /// Spans of text-content within <see cref="StringExpressionBeforePaste"/>.  These represent the spans where
-        /// text can go within a string literal/interpolation.  Note that these spans may be empty.  For example, this
-        /// happens for cases like the empty string <c>""</c>, or between interpolation holes like <c>$"x{a}{b}y"</c>.
-        /// These spans can be examined to determine if pasted content is only impacting the content portion of a
-        /// string, and not the delimiters or interpolation-holes.
-        /// </summary>
-        protected readonly ImmutableArray<TextSpan> TextContentsSpansBeforePaste;
-
-        /// <summary>
-        /// All the spans of <see cref="TextContentsSpansBeforePaste"/> mapped forward (<see
-        /// cref="MapSpanForward(TextSpan)"/>) to <see cref="TextContentsSpansAfterPaste"/> in an inclusive manner. This
-        /// can be used to determine what content exists post paste, and if that content requires the literal to revised
-        /// to be legal.  For example, if the text content in a raw-literal contains a longer sequence of quotes after
-        /// pasting, then the delimiters of the raw literal may need to be increased accordingly.
+        /// All the spans of <see cref="StringExpressionBeforePasteInfo"/>'s <see cref="StringInfo.ContentSpans"/>
+        /// mapped forward (<see cref="MapSpanForward(TextSpan)"/>) to <see cref="SnapshotAfterPaste"/> in an inclusive
+        /// manner. This can be used to determine what content exists post paste, and if that content requires the
+        /// literal to revised to be legal.  For example, if the text content in a raw-literal contains a longer
+        /// sequence of quotes after pasting, then the delimiters of the raw literal may need to be increased
+        /// accordingly.
         /// </summary>
         protected readonly ImmutableArray<TextSpan> TextContentsSpansAfterPaste;
 
-        protected readonly IndentationOptions IndentationOptions;
-
         /// <summary>
-        /// Number of quotes in the delimiter of the string being pasted into.  Given that the string should have no
-        /// errors in it, this quote count should be the same for the start and end delimiter.
+        /// User's desired new-line sequence if we need to add newlines to our text changes.
         /// </summary>
-        protected readonly int DelimiterQuoteCount;
+        protected readonly string NewLine;
 
-        /// <summary>
-        /// Number of dollar signs (<c>$</c>) in the starting delimiter of the string being pasted into.
-        /// </summary>
-        protected readonly int DelimiterDollarCount;
+        protected readonly IndentationOptions IndentationOptions;
 
         /// <summary>
         /// The set of <see cref="ITextChange"/>'s that produced <see cref="SnapshotAfterPaste"/> from <see
@@ -127,14 +110,10 @@ protected AbstractPasteProcessor(
             DocumentAfterPaste = documentAfterPaste;
 
             StringExpressionBeforePaste = stringExpressionBeforePaste;
+            StringExpressionBeforePasteInfo = GetStringInfo(TextBeforePaste, stringExpressionBeforePaste);
+            TextContentsSpansAfterPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(MapSpanForward);
 
-            TextContentsSpansBeforePaste = GetTextContentSpans(
-                TextBeforePaste, stringExpressionBeforePaste,
-                out DelimiterQuoteCount, out DelimiterDollarCount,
-                out _, out _);
-            TextContentsSpansAfterPaste = TextContentsSpansBeforePaste.SelectAsArray(MapSpanForward);
-
-            Contract.ThrowIfTrue(TextContentsSpansBeforePaste.IsEmpty);
+            Contract.ThrowIfTrue(StringExpressionBeforePasteInfo.ContentSpans.IsEmpty);
         }
 
         public abstract ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken);
@@ -160,7 +139,7 @@ protected TextSpan MapSpanForward(TextSpan span)
 
             var longestQuoteSequence = textContentSpansAfterChange.Max(ts => GetLongestQuoteSequence(textAfterChange, ts));
 
-            var quotesToAddCount = (longestQuoteSequence - DelimiterQuoteCount) + 1;
+            var quotesToAddCount = (longestQuoteSequence - StringExpressionBeforePasteInfo.DelimiterQuoteCount) + 1;
             return quotesToAddCount <= 0 ? null : new string('"', quotesToAddCount);
         }
 
@@ -182,7 +161,7 @@ protected TextSpan MapSpanForward(TextSpan span)
                     GetLongestOpenBraceSequence(textAfterChange, ts),
                     GetLongestCloseBraceSequence(textAfterChange, ts)));
 
-            var dollarsToAddCount = (longestBraceSequence - DelimiterDollarCount) + 1;
+            var dollarsToAddCount = (longestBraceSequence - StringExpressionBeforePasteInfo.DelimiterDollarCount) + 1;
             return dollarsToAddCount <= 0 ? null : new string('$', dollarsToAddCount);
         }
     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 88167189804a1..7b037c602c6b2 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -191,12 +191,11 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
         private string WrapChangeWithOriginalQuotes(string pastedText)
         {
             var textCopiedFrom = _snapshotCopiedFrom.AsText();
-            GetTextContentSpans(
-                textCopiedFrom, _stringExpressionCopiedFrom, out _, out _,
-                out var startQuoteSpan, out var endQuoteSpan);
+            var stringExpressionCopiedFromInfo = GetStringInfo(textCopiedFrom, _stringExpressionCopiedFrom);
+
+            var startQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.StartDelimiterSpan);
+            var endQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.EndDelimiterSpan);
 
-            var startQuote = textCopiedFrom.ToString(startQuoteSpan);
-            var endQuote = textCopiedFrom.ToString(endQuoteSpan);
             if (!IsAnyMultiLineRawStringExpression(_stringExpressionCopiedFrom))
                 return $"{startQuote}{pastedText}{endQuote}";
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 6de60fe672d74..c89208d267a94 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -316,10 +316,7 @@ private static bool ContentsAreSame(
             // Now, given that string expression, find the inside 'text' spans of the expression.  These are the parts
             // of the literal between the quotes.  It does not include the interpolation holes in an interpolated
             // string.  These spans may be empty (for an empty string, or empty text gap between interpolations).
-            var contentSpans = GetTextContentSpans(
-                snapshot.AsText(), stringExpression,
-                out _, out _, out _, out _);
-
+            var contentSpans = GetStringInfo(snapshot.AsText(), stringExpression).ContentSpans;
             foreach (var snapshotSpan in spans)
             {
                 var startIndex = contentSpans.BinarySearch(snapshotSpan.Span.Start, FindIndex);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index e237a219fade1..177fc47ec6abb 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -169,37 +169,13 @@ public static bool IsRawStringLiteral(InterpolatedStringExpressionSyntax interpo
         public static bool IsRawStringLiteral(LiteralExpressionSyntax literal)
             => literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.MultiLineRawStringLiteralToken;
 
-        /// <summary>
-        /// Given a string literal or interpolated string, returns the subspans of those expressions that are actual
-        /// text content spans.  For a string literal, this is the span between the quotes.  For an interpolated string
-        /// this is the text regions between the holes.  Note that for interpolated strings the content spans may be
-        /// empty (for example, between two adjacent holes).  We still want to know about those empty spans so that if a
-        /// paste happens into that empty region that we still escape properly.
-        /// </summary>
-        public static ImmutableArray<TextSpan> GetTextContentSpans(
-            SourceText text, ExpressionSyntax stringExpression,
-            out int delimiterQuoteCount, out int delimiterDollarCount,
-            out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
-        {
-            if (stringExpression is LiteralExpressionSyntax literal)
+        public static StringInfo GetStringInfo(SourceText text, ExpressionSyntax stringExpression)
+            => stringExpression switch
             {
-                delimiterDollarCount = 0;
-                return ImmutableArray.Create(GetStringLiteralTextContentSpan(
-                    text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan));
-            }
-            else if (stringExpression is InterpolatedStringExpressionSyntax interpolatedString)
-            {
-                startQuoteSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
-                endQuoteSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
-
-                return GetInterpolatedStringTextContentSpans(
-                    text, interpolatedString, out delimiterQuoteCount, out delimiterDollarCount);
-            }
-            else
-            {
-                throw ExceptionUtilities.UnexpectedValue(stringExpression);
-            }
-        }
+                LiteralExpressionSyntax literal => GetStringLiteralInfo(text, literal),
+                InterpolatedStringExpressionSyntax interpolatedString => GetInterpolatedStringInfo(text, interpolatedString),
+                _ => throw ExceptionUtilities.UnexpectedValue(stringExpression)
+            };
 
         private static int SkipU8Suffix(SourceText text, int end)
         {
@@ -210,9 +186,8 @@ private static int SkipU8Suffix(SourceText text, int end)
             return end;
         }
 
-        private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
-            SourceText text, InterpolatedStringExpressionSyntax interpolatedString,
-            out int delimiterQuoteCount, out int delimiterDollarCount)
+        private static StringInfo GetInterpolatedStringInfo(
+            SourceText text, InterpolatedStringExpressionSyntax interpolatedString)
         {
             // Interpolated string.  Normal, verbatim, or raw.
             //
@@ -220,12 +195,12 @@ private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
             var start = interpolatedString.SpanStart;
             while (SafeCharAt(text, start) is '@' or '$')
                 start++;
-            delimiterDollarCount = start - interpolatedString.SpanStart;
+            var delimiterDollarCount = start - interpolatedString.SpanStart;
 
             var position = start;
             while (start < interpolatedString.StringStartToken.Span.End && text[start] == '"')
                 start++;
-            delimiterQuoteCount = start - position;
+            var delimiterQuoteCount = start - position;
 
             var end = interpolatedString.Span.End;
 
@@ -245,17 +220,20 @@ private static ImmutableArray<TextSpan> GetInterpolatedStringTextContentSpans(
                 }
             }
 
+            var startDelimiterSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
+            var endDelimiterSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
+
             // Then, once through the body, add a final span from the end of the last interpolation to the end delimiter.
             result.Add(TextSpan.FromBounds(currentPosition, end));
-            return result.ToImmutableAndClear();
+            var contentSpans = result.ToImmutableAndClear();
+
+            // todo: implement withoutIndentationSpans properly
+            var withoutIndentationSpans = contentSpans;
+
+            return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, contentSpans, withoutIndentationSpans);
         }
 
-        private static TextSpan GetStringLiteralTextContentSpan(
-            SourceText text,
-            LiteralExpressionSyntax literal,
-            out int delimiterQuoteCount,
-            out TextSpan startQuoteSpan,
-            out TextSpan endQuoteSpan)
+        private static StringInfo GetStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
         {
             // simple string literal (normal, verbatim or raw).
             //
@@ -265,16 +243,16 @@ private static TextSpan GetStringLiteralTextContentSpan(
             // '@', there's also the issue that normal strings just have a single starting/ending quote, where as
             // raw-strings can have an unbounded number of them.
             return IsRawStringLiteral(literal)
-                ? GetRawStringLiteralTextContentSpan(text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan)
-                : GetNormalStringLiteralTextContentSpan(text, literal, out delimiterQuoteCount, out startQuoteSpan, out endQuoteSpan);
+                ? GetRawStringLiteralInfo(text, literal)
+                : GetNormalStringLiteralStringInfo(text, literal);
         }
 
-        private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, LiteralExpressionSyntax literal, out int delimiterQuoteCount, out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
+        private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
         {
             var start = literal.SpanStart;
             while (SafeCharAt(text, start) == '"')
                 start++;
-            delimiterQuoteCount = start - literal.SpanStart;
+            var delimiterQuoteCount = start - literal.SpanStart;
 
             var end = literal.Span.End;
 
@@ -284,8 +262,16 @@ private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, Lite
 
             if (literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
             {
-                startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, start);
-                endQuoteSpan = TextSpan.FromBounds(end, literal.Span.End);
+                var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
+
+                // A single line raw literal doesn't have any indentation processing.  So we use the same spans for both
+                // sets of content.
+                return new StringInfo(
+                    delimiterQuoteCount, delimiterDollarCount: 0,
+                    startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
+                    endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+                    contentSpans,
+                    withoutIndentationContentSpans: contentSpans);
             }
             else if (literal.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
             {
@@ -310,6 +296,8 @@ private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, Lite
                 while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawEnd - 1)))
                     rawEnd--;
 
+                var indentationLength = end - rawEnd;
+
                 if (SafeCharAt(text, rawEnd - 2) == '\r' && SafeCharAt(text, rawEnd - 1) == '\n')
                 {
                     rawEnd -= 2;
@@ -320,18 +308,45 @@ private static TextSpan GetRawStringLiteralTextContentSpan(SourceText text, Lite
                     rawEnd--;
                 }
 
-                startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, rawStart);
-                endQuoteSpan = TextSpan.FromBounds(rawEnd, literal.Span.End);
+                using var _ = ArrayBuilder<TextSpan>.GetInstance(out var withoutIndentationBuilder);
+
+                var contentLineStart = text.Lines.GetLineFromPosition(rawStart).LineNumber;
+                var contentLineEnd = text.Lines.GetLineFromPosition(rawEnd).LineNumber;
+
+                for (var currentLineNumber = contentLineStart; currentLineNumber <= contentLineEnd; currentLineNumber++)
+                {
+                    var currentLine = text.Lines[currentLineNumber];
+                    if (currentLine.Span.Length < indentationLength)
+                    {
+                        // this is a blank line.  Don't include any of it in the content spans except its newline.
+                        withoutIndentationBuilder.Add(TextSpan.FromBounds(currentLine.Span.End, currentLine.SpanIncludingLineBreak.End));
+                    }
+                    else
+                    {
+                        // Normal line, include the contents after the indentation whitespace.  If this is not the last
+                        // line, include the linebreak as well, otherwise ignore it (it's not part of a raw string's
+                        // content).
+                        withoutIndentationBuilder.Add(TextSpan.FromBounds(
+                            start: currentLine.Start + indentationLength,
+                            end: currentLineNumber == contentLineEnd ? currentLine.Span.End : currentLine.SpanIncludingLineBreak.End));
+                    }
+                }
+
+                return new StringInfo(
+                    delimiterQuoteCount,
+                    delimiterDollarCount: 0,
+                    TextSpan.FromBounds(literal.SpanStart, rawStart),
+                    TextSpan.FromBounds(rawEnd, literal.Span.End),
+                    contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)),
+                    withoutIndentationContentSpans: withoutIndentationBuilder.ToImmutable());
             }
             else
             {
                 throw ExceptionUtilities.UnexpectedValue(literal.Kind());
             }
-
-            return TextSpan.FromBounds(start, end);
         }
 
-        private static TextSpan GetNormalStringLiteralTextContentSpan(SourceText text, LiteralExpressionSyntax literal, out int delimiterQuoteCount, out TextSpan startQuoteSpan, out TextSpan endQuoteSpan)
+        private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, LiteralExpressionSyntax literal)
         {
             var start = literal.SpanStart;
             if (SafeCharAt(text, start) == '@')
@@ -340,7 +355,7 @@ private static TextSpan GetNormalStringLiteralTextContentSpan(SourceText text, L
             var position = start;
             if (SafeCharAt(text, start) == '"')
                 start++;
-            delimiterQuoteCount = start - position;
+            var delimiterQuoteCount = start - position;
 
             var end = literal.Span.End;
 
@@ -348,10 +363,15 @@ private static TextSpan GetNormalStringLiteralTextContentSpan(SourceText text, L
             if (end > start && text[end - 1] == '"')
                 end--;
 
-            startQuoteSpan = TextSpan.FromBounds(literal.SpanStart, start);
-            endQuoteSpan = TextSpan.FromBounds(end, literal.Span.End);
+            var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
 
-            return TextSpan.FromBounds(start, end);
+            return new StringInfo(
+                delimiterQuoteCount,
+                delimiterDollarCount: 0,
+                startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
+                endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+                contentSpans,
+                contentSpans);
         }
 
         /// <summary>
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
new file mode 100644
index 0000000000000..03494fb319b40
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
@@ -0,0 +1,66 @@
+// 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.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste;
+
+internal readonly struct StringInfo
+{
+    /// <summary>
+    /// Number of quotes in the delimiter of the string being pasted into.  Given that the string should have no errors
+    /// in it, this quote count should be the same for the start and end delimiter.This will be <c>1</c> for
+    /// non-raw-strings, and will be 3-or-more for raw-strings
+    /// </summary>
+    public readonly int DelimiterQuoteCount;
+
+    /// <summary>
+    /// Number of dollar signs (<c>$</c>) in the starting delimiter of the string being pasted into. This will be
+    /// <c>1</c> for non-raw-strings, and will be 1-or-more for raw-interpolated-strings.
+    /// </summary>
+    public readonly int DelimiterDollarCount;
+
+    /// <summary>
+    /// The span of the starting delimiter quotes (including characters like <c>$</c> or <c>@</c>)
+    /// </summary>
+    public readonly TextSpan StartDelimiterSpan;
+
+    /// <summary>
+    /// The span of the ending delimiter quotes (including a suffix like <c>u8</c>)
+    /// </summary>
+    public readonly TextSpan EndDelimiterSpan;
+
+    /// <summary>
+    /// Spans of text-content within the string.  These represent the spans where text can go within a string
+    /// literal/interpolation.  Note that these spans may be empty.  For example, this happens for cases like the empty
+    /// string <c>""</c>, or between interpolation holes like <c>$"x{a}{b}y"</c>. These spans can be examined to
+    /// determine if pasted content is only impacting the content portion of a string, and not the delimiters or
+    /// interpolation-holes. For raw strings, this will include the whitespace and newlines after the starting quotes
+    /// and before the ending quotes.
+    /// </summary>
+    public readonly ImmutableArray<TextSpan> ContentSpans;
+
+    /// <summary>
+    /// Similar to <see cref="ContentSpans"/> except that whitespace in a raw-string-literal that is not considered part
+    /// of the final content will not be included.
+    /// </summary>
+    public readonly ImmutableArray<TextSpan> WithoutIndentationContentSpans;
+
+    public StringInfo(
+        int delimiterQuoteCount,
+        int delimiterDollarCount,
+        TextSpan startDelimiterSpan,
+        TextSpan endDelimiterSpan,
+        ImmutableArray<TextSpan> contentSpans,
+        ImmutableArray<TextSpan> withoutIndentationContentSpans)
+    {
+        DelimiterQuoteCount = delimiterQuoteCount;
+        DelimiterDollarCount = delimiterDollarCount;
+        StartDelimiterSpan = startDelimiterSpan;
+        EndDelimiterSpan = endDelimiterSpan;
+        ContentSpans = contentSpans;
+        WithoutIndentationContentSpans = withoutIndentationContentSpans;
+    }
+}
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 73f5a7bdd4d88..9d238ce1b643d 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -136,7 +136,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then any quotes to your starting delimiter
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
             // Then add the actual changes in the content.
 
@@ -147,7 +147,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.Last().End, 0), quotesToAdd));
 
             return editsToMake.ToImmutable();
         }
@@ -172,7 +172,7 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
 
             // Then a newline and the indentation to start with.
             if (mustBeMultiLine)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), NewLine + indentationWhitespace));
+                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
 
             SourceText? textOfCurrentChange = null;
             var commonIndentationPrefix = GetCommonIndentationPrefix(Changes) ?? "";
@@ -216,14 +216,14 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
             // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
             // final newline-space at the end because we will have already done that.
             if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), NewLine + indentationWhitespace));
+                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
 
             return;
 
             bool LastPastedLineAddedNewLine()
             {
                 return textOfCurrentChange != null &&
-                    Changes.Last().OldEnd == TextContentsSpansBeforePaste.Last().End &&
+                    Changes.Last().OldEnd == StringExpressionBeforePasteInfo.ContentSpans.Last().End &&
                       HasNewLine(textOfCurrentChange.Lines.Last());
             }
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
index 26219b0d8e3c9..06fffa17920b3 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
@@ -164,7 +164,7 @@ public void TestTripleQuoteIntoSingleLineRawString1_B()
 @"var x = """""" [||]""""""",
 @"var x = """"""""
      """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = """""" """"""[||]""""""");
         }
@@ -617,7 +617,7 @@ public void TestQuotesIntoHeader2()
 @"var x = """"""[||]{|Selection:    |}""""""",
 @"var x = """"""""
     """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = """"""""""""[||]""""""");
         }

From 2993ea9173ace4e880cbe3930a8560ce02f67249 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 15:48:44 -0700
Subject: [PATCH 217/413] Simplify

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |   2 +-
 .../KnownSourcePasteProcessor.cs              |   2 +-
 .../StringCopyPasteCommandHandler.cs          |   2 +-
 .../StringCopyPaste/StringCopyPasteHelpers.cs | 200 +----------------
 .../CSharp/StringCopyPaste/StringInfo.cs      | 203 ++++++++++++++++++
 5 files changed, 208 insertions(+), 201 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 195f0b5c83aa8..d6af68f2d1fec 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -110,7 +110,7 @@ protected AbstractPasteProcessor(
             DocumentAfterPaste = documentAfterPaste;
 
             StringExpressionBeforePaste = stringExpressionBeforePaste;
-            StringExpressionBeforePasteInfo = GetStringInfo(TextBeforePaste, stringExpressionBeforePaste);
+            StringExpressionBeforePasteInfo = StringInfo.GetStringInfo(TextBeforePaste, stringExpressionBeforePaste);
             TextContentsSpansAfterPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(MapSpanForward);
 
             Contract.ThrowIfTrue(StringExpressionBeforePasteInfo.ContentSpans.IsEmpty);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 7b037c602c6b2..087da2fd0200d 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -191,7 +191,7 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
         private string WrapChangeWithOriginalQuotes(string pastedText)
         {
             var textCopiedFrom = _snapshotCopiedFrom.AsText();
-            var stringExpressionCopiedFromInfo = GetStringInfo(textCopiedFrom, _stringExpressionCopiedFrom);
+            var stringExpressionCopiedFromInfo = StringInfo.GetStringInfo(textCopiedFrom, _stringExpressionCopiedFrom);
 
             var startQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.StartDelimiterSpan);
             var endQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.EndDelimiterSpan);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index c89208d267a94..3608a72515d58 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -316,7 +316,7 @@ private static bool ContentsAreSame(
             // Now, given that string expression, find the inside 'text' spans of the expression.  These are the parts
             // of the literal between the quotes.  It does not include the interpolation holes in an interpolated
             // string.  These spans may be empty (for an empty string, or empty text gap between interpolations).
-            var contentSpans = GetStringInfo(snapshot.AsText(), stringExpression).ContentSpans;
+            var contentSpans = StringInfo.GetStringInfo(snapshot.AsText(), stringExpression).ContentSpans;
             foreach (var snapshotSpan in spans)
             {
                 var startIndex = contentSpans.BinarySearch(snapshotSpan.Span.Start, FindIndex);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 177fc47ec6abb..3769c7ca13c8b 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -29,7 +29,7 @@ public static bool HasNewLine(TextLine line)
         /// <summary>
         /// Gets the character at the requested position, or <c>\0</c> if out of bounds. 
         /// </summary>
-        private static char SafeCharAt(SourceText text, int index)
+        public static char SafeCharAt(SourceText text, int index)
             => index >= 0 && index < text.Length ? text[index] : '\0';
 
         /// <summary>
@@ -169,15 +169,7 @@ public static bool IsRawStringLiteral(InterpolatedStringExpressionSyntax interpo
         public static bool IsRawStringLiteral(LiteralExpressionSyntax literal)
             => literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.MultiLineRawStringLiteralToken;
 
-        public static StringInfo GetStringInfo(SourceText text, ExpressionSyntax stringExpression)
-            => stringExpression switch
-            {
-                LiteralExpressionSyntax literal => GetStringLiteralInfo(text, literal),
-                InterpolatedStringExpressionSyntax interpolatedString => GetInterpolatedStringInfo(text, interpolatedString),
-                _ => throw ExceptionUtilities.UnexpectedValue(stringExpression)
-            };
-
-        private static int SkipU8Suffix(SourceText text, int end)
+        public static int SkipU8Suffix(SourceText text, int end)
         {
             if (SafeCharAt(text, end - 1) == '8')
                 end--;
@@ -186,194 +178,6 @@ private static int SkipU8Suffix(SourceText text, int end)
             return end;
         }
 
-        private static StringInfo GetInterpolatedStringInfo(
-            SourceText text, InterpolatedStringExpressionSyntax interpolatedString)
-        {
-            // Interpolated string.  Normal, verbatim, or raw.
-            //
-            // Skip past the leading and trailing delimiters.
-            var start = interpolatedString.SpanStart;
-            while (SafeCharAt(text, start) is '@' or '$')
-                start++;
-            var delimiterDollarCount = start - interpolatedString.SpanStart;
-
-            var position = start;
-            while (start < interpolatedString.StringStartToken.Span.End && text[start] == '"')
-                start++;
-            var delimiterQuoteCount = start - position;
-
-            var end = interpolatedString.Span.End;
-
-            end = SkipU8Suffix(text, end);
-            while (end > interpolatedString.StringEndToken.Span.Start && text[end - 1] == '"')
-                end--;
-
-            using var result = TemporaryArray<TextSpan>.Empty;
-            var currentPosition = start;
-            for (var i = 0; i < interpolatedString.Contents.Count; i++)
-            {
-                var content = interpolatedString.Contents[i];
-                if (content is InterpolationSyntax)
-                {
-                    result.Add(TextSpan.FromBounds(currentPosition, content.SpanStart));
-                    currentPosition = content.Span.End;
-                }
-            }
-
-            var startDelimiterSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
-            var endDelimiterSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
-
-            // Then, once through the body, add a final span from the end of the last interpolation to the end delimiter.
-            result.Add(TextSpan.FromBounds(currentPosition, end));
-            var contentSpans = result.ToImmutableAndClear();
-
-            // todo: implement withoutIndentationSpans properly
-            var withoutIndentationSpans = contentSpans;
-
-            return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, contentSpans, withoutIndentationSpans);
-        }
-
-        private static StringInfo GetStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
-        {
-            // simple string literal (normal, verbatim or raw).
-            //
-            // Skip past the leading and trailing delimiters and add the span in between.
-            //
-            // The two cases look similar but are subtly different.  Ignoring the fact that raw strings don't start with
-            // '@', there's also the issue that normal strings just have a single starting/ending quote, where as
-            // raw-strings can have an unbounded number of them.
-            return IsRawStringLiteral(literal)
-                ? GetRawStringLiteralInfo(text, literal)
-                : GetNormalStringLiteralStringInfo(text, literal);
-        }
-
-        private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
-        {
-            var start = literal.SpanStart;
-            while (SafeCharAt(text, start) == '"')
-                start++;
-            var delimiterQuoteCount = start - literal.SpanStart;
-
-            var end = literal.Span.End;
-
-            end = SkipU8Suffix(text, end);
-            while (end > start && text[end - 1] == '"')
-                end--;
-
-            if (literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
-            {
-                var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
-
-                // A single line raw literal doesn't have any indentation processing.  So we use the same spans for both
-                // sets of content.
-                return new StringInfo(
-                    delimiterQuoteCount, delimiterDollarCount: 0,
-                    startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
-                    endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
-                    contentSpans,
-                    withoutIndentationContentSpans: contentSpans);
-            }
-            else if (literal.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
-            {
-                // Consume the whitespace and newline after the initial quotes.
-                var rawStart = start;
-                while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawStart)))
-                    rawStart++;
-
-                if (SafeCharAt(text, rawStart) == '\r' && SafeCharAt(text, rawStart + 1) == '\n')
-                {
-                    rawStart += 2;
-                }
-                else
-                {
-                    // Guaranteed by us not having any syntax errors on the node.
-                    Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawStart]));
-                    rawStart++;
-                }
-
-                // Consume the whitespace and newline preceding the end quote.
-                var rawEnd = end;
-                while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawEnd - 1)))
-                    rawEnd--;
-
-                var indentationLength = end - rawEnd;
-
-                if (SafeCharAt(text, rawEnd - 2) == '\r' && SafeCharAt(text, rawEnd - 1) == '\n')
-                {
-                    rawEnd -= 2;
-                }
-                else
-                {
-                    Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawEnd - 1]));
-                    rawEnd--;
-                }
-
-                using var _ = ArrayBuilder<TextSpan>.GetInstance(out var withoutIndentationBuilder);
-
-                var contentLineStart = text.Lines.GetLineFromPosition(rawStart).LineNumber;
-                var contentLineEnd = text.Lines.GetLineFromPosition(rawEnd).LineNumber;
-
-                for (var currentLineNumber = contentLineStart; currentLineNumber <= contentLineEnd; currentLineNumber++)
-                {
-                    var currentLine = text.Lines[currentLineNumber];
-                    if (currentLine.Span.Length < indentationLength)
-                    {
-                        // this is a blank line.  Don't include any of it in the content spans except its newline.
-                        withoutIndentationBuilder.Add(TextSpan.FromBounds(currentLine.Span.End, currentLine.SpanIncludingLineBreak.End));
-                    }
-                    else
-                    {
-                        // Normal line, include the contents after the indentation whitespace.  If this is not the last
-                        // line, include the linebreak as well, otherwise ignore it (it's not part of a raw string's
-                        // content).
-                        withoutIndentationBuilder.Add(TextSpan.FromBounds(
-                            start: currentLine.Start + indentationLength,
-                            end: currentLineNumber == contentLineEnd ? currentLine.Span.End : currentLine.SpanIncludingLineBreak.End));
-                    }
-                }
-
-                return new StringInfo(
-                    delimiterQuoteCount,
-                    delimiterDollarCount: 0,
-                    TextSpan.FromBounds(literal.SpanStart, rawStart),
-                    TextSpan.FromBounds(rawEnd, literal.Span.End),
-                    contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)),
-                    withoutIndentationContentSpans: withoutIndentationBuilder.ToImmutable());
-            }
-            else
-            {
-                throw ExceptionUtilities.UnexpectedValue(literal.Kind());
-            }
-        }
-
-        private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, LiteralExpressionSyntax literal)
-        {
-            var start = literal.SpanStart;
-            if (SafeCharAt(text, start) == '@')
-                start++;
-
-            var position = start;
-            if (SafeCharAt(text, start) == '"')
-                start++;
-            var delimiterQuoteCount = start - position;
-
-            var end = literal.Span.End;
-
-            end = SkipU8Suffix(text, end);
-            if (end > start && text[end - 1] == '"')
-                end--;
-
-            var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
-
-            return new StringInfo(
-                delimiterQuoteCount,
-                delimiterDollarCount: 0,
-                startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
-                endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
-                contentSpans,
-                contentSpans);
-        }
-
         /// <summary>
         /// Given a section of a document, finds the longest sequence of quote (<c>"</c>) characters in it.  Used to
         /// determine if a raw string literal needs to grow its delimiters to ensure that the quote sequence will no
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
index 03494fb319b40..ae6f47baef6c8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
@@ -3,10 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.CodeAnalysis.Shared.Collections;
 using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste;
 
+using static StringCopyPasteHelpers;
+
 internal readonly struct StringInfo
 {
     /// <summary>
@@ -63,4 +70,200 @@ public StringInfo(
         ContentSpans = contentSpans;
         WithoutIndentationContentSpans = withoutIndentationContentSpans;
     }
+
+    public static StringInfo GetStringInfo(SourceText text, ExpressionSyntax stringExpression)
+        => stringExpression switch
+        {
+            LiteralExpressionSyntax literal => GetStringLiteralInfo(text, literal),
+            InterpolatedStringExpressionSyntax interpolatedString => GetInterpolatedStringInfo(text, interpolatedString),
+            _ => throw ExceptionUtilities.UnexpectedValue(stringExpression)
+        };
+
+    private static StringInfo GetStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
+    {
+        // simple string literal (normal, verbatim or raw).
+        //
+        // Skip past the leading and trailing delimiters and add the span in between.
+        //
+        // The two cases look similar but are subtly different.  Ignoring the fact that raw strings don't start with
+        // '@', there's also the issue that normal strings just have a single starting/ending quote, where as
+        // raw-strings can have an unbounded number of them.
+        return IsRawStringLiteral(literal)
+            ? GetRawStringLiteralInfo(text, literal)
+            : GetNormalStringLiteralStringInfo(text, literal);
+    }
+
+    private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpressionSyntax literal)
+    {
+        var start = literal.SpanStart;
+        while (SafeCharAt(text, start) == '"')
+            start++;
+        var delimiterQuoteCount = start - literal.SpanStart;
+
+        var end = literal.Span.End;
+
+        end = SkipU8Suffix(text, end);
+        while (end > start && text[end - 1] == '"')
+            end--;
+
+        if (literal.Token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken)
+        {
+            var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
+
+            // A single line raw literal doesn't have any indentation processing.  So we use the same spans for both
+            // sets of content.
+            return new StringInfo(
+                delimiterQuoteCount, delimiterDollarCount: 0,
+                startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
+                endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+                contentSpans,
+                withoutIndentationContentSpans: contentSpans);
+        }
+        else if (literal.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
+        {
+            // Consume the whitespace and newline after the initial quotes.
+            var rawStart = start;
+            while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawStart)))
+                rawStart++;
+
+            if (SafeCharAt(text, rawStart) == '\r' && SafeCharAt(text, rawStart + 1) == '\n')
+            {
+                rawStart += 2;
+            }
+            else
+            {
+                // Guaranteed by us not having any syntax errors on the node.
+                Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawStart]));
+                rawStart++;
+            }
+
+            // Consume the whitespace and newline preceding the end quote.
+            var rawEnd = end;
+            while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawEnd - 1)))
+                rawEnd--;
+
+            var indentationLength = end - rawEnd;
+
+            if (SafeCharAt(text, rawEnd - 2) == '\r' && SafeCharAt(text, rawEnd - 1) == '\n')
+            {
+                rawEnd -= 2;
+            }
+            else
+            {
+                Contract.ThrowIfFalse(SyntaxFacts.IsNewLine(text[rawEnd - 1]));
+                rawEnd--;
+            }
+
+            using var _ = ArrayBuilder<TextSpan>.GetInstance(out var withoutIndentationBuilder);
+
+            var contentLineStart = text.Lines.GetLineFromPosition(rawStart).LineNumber;
+            var contentLineEnd = text.Lines.GetLineFromPosition(rawEnd).LineNumber;
+
+            for (var currentLineNumber = contentLineStart; currentLineNumber <= contentLineEnd; currentLineNumber++)
+            {
+                var currentLine = text.Lines[currentLineNumber];
+                if (currentLine.Span.Length < indentationLength)
+                {
+                    // this is a blank line.  Don't include any of it in the content spans except its newline.
+                    withoutIndentationBuilder.Add(TextSpan.FromBounds(currentLine.Span.End, currentLine.SpanIncludingLineBreak.End));
+                }
+                else
+                {
+                    // Normal line, include the contents after the indentation whitespace.  If this is not the last
+                    // line, include the linebreak as well, otherwise ignore it (it's not part of a raw string's
+                    // content).
+                    withoutIndentationBuilder.Add(TextSpan.FromBounds(
+                        start: currentLine.Start + indentationLength,
+                        end: currentLineNumber == contentLineEnd ? currentLine.Span.End : currentLine.SpanIncludingLineBreak.End));
+                }
+            }
+
+            return new StringInfo(
+                delimiterQuoteCount,
+                delimiterDollarCount: 0,
+                TextSpan.FromBounds(literal.SpanStart, rawStart),
+                TextSpan.FromBounds(rawEnd, literal.Span.End),
+                contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)),
+                withoutIndentationContentSpans: withoutIndentationBuilder.ToImmutable());
+        }
+        else
+        {
+            throw ExceptionUtilities.UnexpectedValue(literal.Kind());
+        }
+    }
+
+    private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, LiteralExpressionSyntax literal)
+    {
+        var start = literal.SpanStart;
+        if (SafeCharAt(text, start) == '@')
+            start++;
+
+        var position = start;
+        if (SafeCharAt(text, start) == '"')
+            start++;
+        var delimiterQuoteCount = start - position;
+
+        var end = literal.Span.End;
+
+        end = SkipU8Suffix(text, end);
+        if (end > start && text[end - 1] == '"')
+            end--;
+
+        var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
+
+        return new StringInfo(
+            delimiterQuoteCount,
+            delimiterDollarCount: 0,
+            startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
+            endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+            contentSpans,
+            contentSpans);
+    }
+
+    private static StringInfo GetInterpolatedStringInfo(
+        SourceText text, InterpolatedStringExpressionSyntax interpolatedString)
+    {
+        // Interpolated string.  Normal, verbatim, or raw.
+        //
+        // Skip past the leading and trailing delimiters.
+        var start = interpolatedString.SpanStart;
+        while (SafeCharAt(text, start) is '@' or '$')
+            start++;
+        var delimiterDollarCount = start - interpolatedString.SpanStart;
+
+        var position = start;
+        while (start < interpolatedString.StringStartToken.Span.End && text[start] == '"')
+            start++;
+        var delimiterQuoteCount = start - position;
+
+        var end = interpolatedString.Span.End;
+
+        end = SkipU8Suffix(text, end);
+        while (end > interpolatedString.StringEndToken.Span.Start && text[end - 1] == '"')
+            end--;
+
+        using var result = TemporaryArray<TextSpan>.Empty;
+        var currentPosition = start;
+        for (var i = 0; i < interpolatedString.Contents.Count; i++)
+        {
+            var content = interpolatedString.Contents[i];
+            if (content is InterpolationSyntax)
+            {
+                result.Add(TextSpan.FromBounds(currentPosition, content.SpanStart));
+                currentPosition = content.Span.End;
+            }
+        }
+
+        var startDelimiterSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
+        var endDelimiterSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
+
+        // Then, once through the body, add a final span from the end of the last interpolation to the end delimiter.
+        result.Add(TextSpan.FromBounds(currentPosition, end));
+        var contentSpans = result.ToImmutableAndClear();
+
+        // todo: implement withoutIndentationSpans properly
+        var withoutIndentationSpans = contentSpans;
+
+        return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, contentSpans, withoutIndentationSpans);
+    }
 }

From 53af7ddb141a44905c00abd78b1d1f0c38567b30 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 15:59:55 -0700
Subject: [PATCH 218/413] Improve caret location placemnet

---
 .../CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs   | 6 +++++-
 ...eUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs | 2 +-
 .../PasteUnknownSourceIntoMultiLineRawStringTests.cs        | 2 +-
 ...UnknownSourceIntoSingleLineInterpolatedRawStringTests.cs | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 9d238ce1b643d..00a4b19c95bc4 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -147,7 +147,11 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.Last().End, 0), quotesToAdd));
+            {
+                var end = StringExpressionBeforePasteInfo.EndDelimiterSpan.End;
+                end = SkipU8Suffix(TextBeforePaste, end);
+                editsToMake.Add(new TextChange(new TextSpan(end, 0), quotesToAdd));
+            }
 
             return editsToMake.ToImmutable();
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
index 273050270222d..8c7d45c43dc5b 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
@@ -707,7 +707,7 @@ public void TestQuotesIntoHeader2()
     |}""""""",
 @"var x = $""""""""
     """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = $""""""""""""[||]""""""");
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
index 1173ff5d8ffc3..6bfea24393734 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
@@ -537,7 +537,7 @@ public void TestQuotesIntoHeader2()
     |}""""""",
 @"var x = """"""""
     """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = """"""""""""[||]""""""");
         }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
index b52f58fcd190d..6de9e7ed884fc 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
@@ -163,7 +163,7 @@ public void TestTripleQuoteIntoSingleLineRawString1_B()
 @"var x = $"""""" [||]""""""",
 @"var x = $""""""""
      """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = $"""""" """"""[||]""""""");
         }
@@ -785,7 +785,7 @@ public void TestQuotesIntoHeader2()
 @"var x = $""""""[||]{|Selection:    |}""""""",
 @"var x = $""""""""
     """"""
-    ""[||]""""""",
+    [||]""""""""",
                 afterUndo:
 @"var x = $""""""""""""[||]""""""");
         }

From cbe43267408fba629972f6be24e7834f01540771 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 16:45:34 -0700
Subject: [PATCH 219/413] In progress

---
 .../StringCopyPaste/AbstractPasteProcessor.cs | 13 +---
 .../KnownSourcePasteProcessor.cs              | 65 ++++++++++---------
 .../StringCopyPasteCommandHandler.cs          |  3 +-
 .../CSharp/StringCopyPaste/StringInfo.cs      | 20 ++++--
 .../UnknownSourcePasteProcessor.cs            | 14 ++--
 5 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 34c6dfa7b344d..7618d46b56b38 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -123,24 +123,17 @@ protected AbstractPasteProcessor(
         /// cref="SpanTrackingMode.EdgeInclusive"/> manner) to <see cref="SnapshotAfterPaste"/>.
         /// </summary>
         protected TextSpan MapSpanForward(TextSpan span)
+            => MapSpanForward(span, SnapshotBeforePaste, SnapshotAfterPaste);
         {
             var trackingSpan = SnapshotBeforePaste.CreateTrackingSpan(span.ToSpan(), SpanTrackingMode.EdgeInclusive);
             return trackingSpan.GetSpan(SnapshotAfterPaste).Span.ToTextSpan();
         }
 
-        /// <inheritdoc cref="GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
-        protected string? GetQuotesToAddToRawString()
-            => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
-
-        /// <inheritdoc cref="GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
-        protected string? GetDollarSignsToAddToRawString()
-            => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
-
         /// <summary>
         /// Given an initial raw string literal, and the changes made to it by the paste, determines how many quotes to
         /// add to the start and end to keep things parsing properly.
         /// </summary>
-        private string? GetQuotesToAddToRawString(
+        protected string? GetQuotesToAddToRawString(
             SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
         {
             Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
@@ -155,7 +148,7 @@ protected TextSpan MapSpanForward(TextSpan span)
         /// Given an initial raw string literal, and the changes made to it by the paste, determines how many dollar
         /// signs to add to the start to keep things parsing properly.
         /// </summary>
-        private string? GetDollarSignsToAddToRawString(
+        protected string? GetDollarSignsToAddToRawString(
             SourceText textAfterChange, ImmutableArray<TextSpan> textContentSpansAfterChange)
         {
             Contract.ThrowIfFalse(IsAnyRawStringExpression(StringExpressionBeforePaste));
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index dc3b0dee1da2c..d97e204eae5bf 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -39,6 +39,7 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
         /// The text snapshot of the document the original text was cut/copied from.
         /// </summary>
         private readonly ITextSnapshot _snapshotCopiedFrom;
+        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
 
         public KnownSourcePasteProcessor(
             string newLine,
@@ -49,11 +50,13 @@ public KnownSourcePasteProcessor(
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             ExpressionSyntax stringExpressionCopiedFrom,
-            ITextSnapshot snapshotCopiedFrom)
+            ITextSnapshot snapshotCopiedFrom,
+            ITextBufferFactoryService3 textBufferFactoryService)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
             _snapshotCopiedFrom = snapshotCopiedFrom;
+            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
@@ -65,7 +68,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             // Smart Pasting into raw string not supported yet.  
             if (IsAnyRawStringExpression(StringExpressionBeforePaste))
                 // return default;
-                return GetEditsForRawString();
+                return GetEditsForRawString(cancellationToken);
 
             return GetEditsForNonRawString();
         }
@@ -246,6 +249,8 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
 
+#if false
+
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
             // Can't really figure anything out if the raw string is in error.
@@ -272,7 +277,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then any quotes to your starting delimiter
             if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
             if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
                 AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(edits);
@@ -281,7 +286,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
 
             foreach (var change in Changes)
             {
@@ -296,19 +301,6 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
                 edits.Add(new TextChange(change.OldSpan.ToTextSpan(), modifiedText));
             }
 
-
-            if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
-            {
-
-            }
-            else
-            {
-                // If we pasted into a single-line raw literal we may have to make it multiline if it starts/ends with a
-                // quote, or contains a newline.
-
-            }
-
-
             return edits.ToImmutable();
         }
 
@@ -325,25 +317,34 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(Arra
 
             // A newline and the indentation to start with.
             if (mustBeMultiLine)
-                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
 
 
 
             // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
             // final newline-space at the end because we will have already done that.
             if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                edits.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
         }
 
         private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(ArrayBuilder<TextChange> edits)
         {
             throw new NotImplementedException();
         }
-
-#if false
+#endif
 
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
+
+            // Can't really figure anything out if the raw string is in error.
+            if (NodeOrTokenContainsError(StringExpressionBeforePaste))
+                return default;
+
+            // If all we're going to do is insert whitespace, then don't make any adjustments to the text. We don't want
+            // to end up inserting nothing and having the user very confused why their paste did nothing.
+            if (AllWhitespace(SnapshotBeforePaste.Version.Changes))
+                return default;
+
             // Determine the basic updates to the pasted pieces we need to make to properly unescape the pieces for a
             // raw string.
 
@@ -354,34 +355,38 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             //
             var internalContentChanges = GetRawStringContentChanges(cancellationToken);
             var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
-            var clonedSnapshotBeforePaste = clonedBuffer.CurrentSnapshot;
+            var clonedSnapshotBeforeFakePaste = clonedBuffer.CurrentSnapshot;
             var edit = clonedBuffer.CreateEdit();
             foreach (var change in internalContentChanges)
                 edit.Replace(change.Span.ToSpan(), change.NewText);
             edit.Apply();
-            var clonedSnapshotAfterPaste = clonedBuffer.CurrentSnapshot;
 
-            var quotesToAdd = GetQuotesToAddToRawString();
+            var clonedSnapshotAfterFakePaste = clonedBuffer.CurrentSnapshot;
+            var clonedTextAfterFakePaste = clonedSnapshotAfterFakePaste.AsText();
+            var contentSpansAfterFakePaste = this.StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
+                ts => ts.Map.ToSnapshotSpan(clonedSnapshotBeforeFakePaste).)
+
+            var quotesToAdd = GetQuotesToAddToRawString(clonedTextAfterPaste);
             var dollarSignsToAdd = GetDollarSignsToAddToRawString();
 
-            using var _ = ArrayBuilder<TextChange>.GetInstance(out var editsToMake);
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
 
             // First, add any extra dollar signs needed.
             if (dollarSignsToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
 
             // Then any quotes to your starting delimiter
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.First().Start, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
             // Then add the actual changes in the content.
-            editsToMake.AddRange(internalContentChanges);
+            edits.AddRange(internalContentChanges);
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-                editsToMake.Add(new TextChange(new TextSpan(TextContentsSpansBeforePaste.Last().End, 0), quotesToAdd));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
 
-            return editsToMake.ToImmutable();
+            return edits.ToImmutable();
         }
 
         private string GetDollarSignsToAddToRawString()
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 3608a72515d58..9a89f1067512a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -230,7 +230,8 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                                 snapshotBeforePaste, snapshotAfterPaste,
                                 documentBeforePaste, documentAfterPaste,
                                 stringExpressionBeforePaste, stringExpressionCopiedFrom,
-                                _lastSelectedSpans[0].Snapshot);
+                                _lastSelectedSpans[0].Snapshot,
+                                _textBufferFactoryService);
                             return knownProcessor.GetEdits(cancellationToken);
                         }
                     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
index ae6f47baef6c8..862c4fcb98623 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
@@ -39,6 +39,11 @@ internal readonly struct StringInfo
     /// </summary>
     public readonly TextSpan EndDelimiterSpan;
 
+    /// <summary>
+    /// The span of the ending delimiter quotes (not including a suffix like <c>u8</c>)
+    /// </summary>
+    public readonly TextSpan EndDelimiterSpanWithoutSuffix;
+
     /// <summary>
     /// Spans of text-content within the string.  These represent the spans where text can go within a string
     /// literal/interpolation.  Note that these spans may be empty.  For example, this happens for cases like the empty
@@ -60,6 +65,7 @@ public StringInfo(
         int delimiterDollarCount,
         TextSpan startDelimiterSpan,
         TextSpan endDelimiterSpan,
+        TextSpan endDelimiterSpanWithoutSuffix,
         ImmutableArray<TextSpan> contentSpans,
         ImmutableArray<TextSpan> withoutIndentationContentSpans)
     {
@@ -67,6 +73,7 @@ public StringInfo(
         DelimiterDollarCount = delimiterDollarCount;
         StartDelimiterSpan = startDelimiterSpan;
         EndDelimiterSpan = endDelimiterSpan;
+        EndDelimiterSpanWithoutSuffix = endDelimiterSpanWithoutSuffix;
         ContentSpans = contentSpans;
         WithoutIndentationContentSpans = withoutIndentationContentSpans;
     }
@@ -100,9 +107,8 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
             start++;
         var delimiterQuoteCount = start - literal.SpanStart;
 
-        var end = literal.Span.End;
-
-        end = SkipU8Suffix(text, end);
+        var end = SkipU8Suffix(text, literal.Span.End);
+        var endBeforeU8Suffix = end;
         while (end > start && text[end - 1] == '"')
             end--;
 
@@ -116,6 +122,7 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
                 delimiterQuoteCount, delimiterDollarCount: 0,
                 startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
                 endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+                endDelimiterSpanWithoutSuffix: TextSpan.FromBounds(end, endBeforeU8Suffix),
                 contentSpans,
                 withoutIndentationContentSpans: contentSpans);
         }
@@ -183,6 +190,7 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
                 delimiterDollarCount: 0,
                 TextSpan.FromBounds(literal.SpanStart, rawStart),
                 TextSpan.FromBounds(rawEnd, literal.Span.End),
+                TextSpan.FromBounds(rawEnd, endBeforeU8Suffix),
                 contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)),
                 withoutIndentationContentSpans: withoutIndentationBuilder.ToImmutable());
         }
@@ -203,9 +211,8 @@ private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, Lite
             start++;
         var delimiterQuoteCount = start - position;
 
-        var end = literal.Span.End;
-
-        end = SkipU8Suffix(text, end);
+        var end = SkipU8Suffix(text, literal.Span.End);
+        var endBeforeU8Suffix = end;
         if (end > start && text[end - 1] == '"')
             end--;
 
@@ -216,6 +223,7 @@ private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, Lite
             delimiterDollarCount: 0,
             startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
             endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
+            endDelimiterSpanWithoutSuffix: TextSpan.FromBounds(end, endBeforeU8Suffix),
             contentSpans,
             contentSpans);
     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 78e80a1976295..c9ffb163a0b89 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -139,15 +139,19 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
-            {
-                var end = StringExpressionBeforePasteInfo.EndDelimiterSpan.End;
-                end = SkipU8Suffix(TextBeforePaste, end);
-                edits.Add(new TextChange(new TextSpan(end, 0), quotesToAdd));
-            }
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
 
             return edits.ToImmutable();
         }
 
+        /// <inheritdoc cref="GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        private string? GetQuotesToAddToRawString()
+            => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
+
+        /// <inheritdoc cref="GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        private string? GetDollarSignsToAddToRawString()
+            => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
+
         // Pasting with single line case.
 
         private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(

From 6e6f7e9b22dfbe68fd474b933cc189e704ff7519 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 16:47:27 -0700
Subject: [PATCH 220/413] Share code

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index d6af68f2d1fec..53af0c8503089 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -123,10 +123,7 @@ protected AbstractPasteProcessor(
         /// cref="SpanTrackingMode.EdgeInclusive"/> manner) to <see cref="SnapshotAfterPaste"/>.
         /// </summary>
         protected TextSpan MapSpanForward(TextSpan span)
-        {
-            var trackingSpan = SnapshotBeforePaste.CreateTrackingSpan(span.ToSpan(), SpanTrackingMode.EdgeInclusive);
-            return trackingSpan.GetSpan(SnapshotAfterPaste).Span.ToTextSpan();
-        }
+            => MapSpan(span, SnapshotBeforePaste, SnapshotAfterPaste);
 
         /// <summary>
         /// Given an initial raw string literal, and the changes made to it by the paste, determines how many quotes to

From d341246289257c67e2c42473f894c553b854a85d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 4 May 2022 17:00:13 -0700
Subject: [PATCH 221/413] In progress

---
 .../KnownSourcePasteProcessor.cs              | 48 ++++++++++++-------
 .../UnknownSourcePasteProcessor.cs            |  4 +-
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index d97e204eae5bf..7bf3d9b6f5411 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -345,14 +345,17 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             if (AllWhitespace(SnapshotBeforePaste.Version.Changes))
                 return default;
 
-            // Determine the basic updates to the pasted pieces we need to make to properly unescape the pieces for a
-            // raw string.
-
-            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
-            // quotes in it now).  Update the delimiters to make the content legal if necessary.
-            // if the content we're going to add itself contains quotes, then figure out how many start/end quotes the
-            // final string literal will need (which also gives us the number of quotes to add to the start/end).
+            // Pasting into a raw string is complicated.  The code we are copying may have something like `"\"\"\""`
+            // (where the middle \"\"\" is what is being copied).  That means we're actually going to be inserting 3
+            // quotes into the raw string.  But we need to see that that's what's been inserted so that we can then
+            // count and figure out how many total quotes there are in a row to determine what to do with the start/end
+            // delimiter of the raw string.
             //
+            // So, we do this work in two passes.  First, we take the pasted text, figure out what the actual
+            // interpreted characters were that it was adding (e.g. `\"\"\"` -> `"""`).  Then, from that, we can figure
+            // out what changes need to happen to happen to the raw literal itself, along with the actual content
+            // changes to make.
+
             var internalContentChanges = GetRawStringContentChanges(cancellationToken);
             var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
             var clonedSnapshotBeforeFakePaste = clonedBuffer.CurrentSnapshot;
@@ -364,10 +367,19 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             var clonedSnapshotAfterFakePaste = clonedBuffer.CurrentSnapshot;
             var clonedTextAfterFakePaste = clonedSnapshotAfterFakePaste.AsText();
             var contentSpansAfterFakePaste = this.StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
-                ts => ts.Map.ToSnapshotSpan(clonedSnapshotBeforeFakePaste).)
+                ts => MapSpan(ts, clonedSnapshotBeforeFakePaste, clonedSnapshotAfterFakePaste));
 
-            var quotesToAdd = GetQuotesToAddToRawString(clonedTextAfterPaste);
-            var dollarSignsToAdd = GetDollarSignsToAddToRawString();
+            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
+            // quotes in it now).  Update the delimiters to make the content legal if necessary.
+            // if the content we're going to add itself contains quotes, then figure out how many start/end quotes the
+            // final string literal will need (which also gives us the number of quotes to add to the start/end).
+
+            var quotesToAdd = GetQuotesToAddToRawString(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
+            var dollarSignsToAdd = GetDollarSignsToAddToRawString(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
+            var mustBeMultiLine =
+                !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) &&
+                RawContentMustBeMultiLine(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
+            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
 
             using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
 
@@ -375,13 +387,22 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             if (dollarSignsToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
 
-            // Then any quotes to your starting delimiter
+            // Then any quotes to the starting delimiter
             if (quotesToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
+            // A newline and the indentation to start with if we're converting to multi-line
+            if (mustBeMultiLine)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
+
             // Then add the actual changes in the content.
             edits.AddRange(internalContentChanges);
 
+            // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
+            // final newline-space at the end because we will have already done that.
+            if (mustBeMultiLine && !LastPastedLineAddedNewLine())
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
+
             // Then add any extra end quotes needed.
             if (quotesToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
@@ -389,11 +410,6 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             return edits.ToImmutable();
         }
 
-        private string GetDollarSignsToAddToRawString()
-        {
-            throw new NotImplementedException();
-        }
-
         private ImmutableArray<TextChange> GetRawStringContentChanges(CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index c9ffb163a0b89..5f73c94955deb 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -144,11 +144,11 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             return edits.ToImmutable();
         }
 
-        /// <inheritdoc cref="GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        /// <inheritdoc cref="AbstractPasteProcessor.GetQuotesToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
         private string? GetQuotesToAddToRawString()
             => GetQuotesToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
 
-        /// <inheritdoc cref="GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
+        /// <inheritdoc cref="AbstractPasteProcessor.GetDollarSignsToAddToRawString(SourceText, ImmutableArray{TextSpan})" />
         private string? GetDollarSignsToAddToRawString()
             => GetDollarSignsToAddToRawString(TextAfterPaste, TextContentsSpansAfterPaste);
 

From 2fdde6873fe807851316db6e16e3566a42957174 Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Wed, 4 May 2022 17:04:09 -0700
Subject: [PATCH 222/413] fix + tests

---
 .../GenerateVariable/GenerateVariableTests.cs | 78 +++++++++++++++++++
 .../AbstractGenerateVariableService.cs        | 11 ++-
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index a790a105189fc..ad2be4140ef4c 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9776,6 +9776,84 @@ public async Task M(string someParameter, System.TimeSpan time, CancellationToke
     {
         await Task.Delay(time);
     }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeCancellationTokenAndOptionalParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(bool someParameter = true, CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(System.TimeSpan time, bool someParameter = true, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeCancellationTokenAndOptionalParameter_MultipleParameters()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(int value, bool someParameter = true, CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(int value, System.TimeSpan time, bool someParameter = true, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeOptionalParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(bool someParameter = true)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(System.TimeSpan time, bool someParameter = true)
+    {
+        await Task.Delay(time);
+    }
 }", index: 4);
         }
     }
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 52db3de9416d1..68b05904f1b37 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -216,10 +216,15 @@ private static async Task AddParameterCodeActionsAsync(
                 if (containingMethod.Parameters.Length > 0)
                 {
                     var compilation = await document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
-                    var lastParameterIsCancellationToken = Equals(containingMethod.Parameters.Last().Type, compilation.CancellationTokenType());
 
-                    if (lastParameterIsCancellationToken)
-                        parameterIndex--;
+                    for (var i = containingMethod.Parameters.Length - 1; i >= 0; i--)
+                    {
+                        var parameter = containingMethod.Parameters[i];
+                        if (parameter.HasExplicitDefaultValue || Equals(parameter.Type, compilation.CancellationTokenType()))
+                        {
+                            parameterIndex--;
+                        }
+                    }
                 }
 
                 result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false, parameterIndex));

From 631989694ae4414bbf2cdafa31cf6cfe278077e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Wed, 4 May 2022 17:18:59 -0700
Subject: [PATCH 223/413] Revert to pass isBlocking as a parameter (#61123)

* Revert to pass isBlocking as a parameter

* link
---
 .../Suppression/SuppressionTests.cs           |  2 +-
 .../AsyncSuggestedActionsSource.cs            |  4 +-
 .../Suggestions/SuggestedActionsSource.cs     | 14 ++---
 .../Handlers/CodeActions/CodeActionHelpers.cs |  4 +-
 .../CodeActions/AbstractCodeActionTest.cs     |  2 +-
 .../CSharpCodeFixVerifier`2+Test.cs           |  2 +-
 .../Diagnostics/AbstractUserDiagnosticTest.cs |  1 +
 .../Test/CodeFixes/CodeFixServiceTests.cs     | 18 +++----
 .../CodeRefactoringServiceTest.cs             | 51 ++++++++++++++++++-
 .../Test2/CodeFixes/CodeFixServiceTests.vb    |  5 ++
 .../CodeRefactoringService.cs                 |  7 ++-
 .../ICodeRefactoringService.cs                |  6 +--
 .../AbstractSyncNamespacesSevice.cs           |  1 +
 .../Features/CodeFixes/CodeFixService.cs      | 17 ++++---
 .../Features/CodeFixes/ICodeFixService.cs     | 16 +++---
 .../Options/CodeActionOptionsStorage.cs       | 21 ++------
 .../UnifiedSuggestedActionsSource.cs          |  5 +-
 .../OmniSharpCodeFixContextFactory.cs         |  4 +-
 .../Core/Portable/CodeFixes/CodeFixContext.cs | 11 +++-
 .../FixAllOccurrences/BatchFixAllProvider.cs  | 14 +----
 .../CodeRefactoringContext.cs                 | 11 +++-
 .../Core/CodeFixes/CodeActionOptions.cs       |  3 --
 22 files changed, 136 insertions(+), 83 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs
index 99a81b7a362ae..f8907fa8f104b 100644
--- a/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs
@@ -467,7 +467,7 @@ void Method()
                     var diagnostics = await diagnosticService.GetDiagnosticsForSpanAsync(document, span);
                     Assert.Equal(2, diagnostics.Where(d => d.Id == "CS0219").Count());
 
-                    var allFixes = (await fixService.GetFixesAsync(document, span, CodeActionOptions.DefaultProvider, CancellationToken.None))
+                    var allFixes = (await fixService.GetFixesAsync(document, span, CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None))
                         .SelectMany(fixCollection => fixCollection.Fixes);
 
                     var cs0219Fixes = allFixes.Where(fix => fix.PrimaryDiagnostic.Id == "CS0219").ToArray();
diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/AsyncSuggestedActionsSource.cs b/src/EditorFeatures/Core.Wpf/Suggestions/AsyncSuggestedActionsSource.cs
index c31d60df922a9..3679968396db7 100644
--- a/src/EditorFeatures/Core.Wpf/Suggestions/AsyncSuggestedActionsSource.cs
+++ b/src/EditorFeatures/Core.Wpf/Suggestions/AsyncSuggestedActionsSource.cs
@@ -166,10 +166,10 @@ private async IAsyncEnumerable<SuggestedActionSet> GetCodeFixesAndRefactoringsAs
 
                 var fixesTask = GetCodeFixesAsync(
                     state, supportsFeatureService, requestedActionCategories, workspace, document, range,
-                    addOperationScope, priority, options, cancellationToken);
+                    addOperationScope, priority, options, isBlocking: false, cancellationToken);
                 var refactoringsTask = GetRefactoringsAsync(
                     state, supportsFeatureService, requestedActionCategories, GlobalOptions, workspace, document, selection,
-                    addOperationScope, priority, options, cancellationToken);
+                    addOperationScope, priority, options, isBlocking: false, cancellationToken);
 
                 await Task.WhenAll(fixesTask, refactoringsTask).ConfigureAwait(false);
 
diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
index e3f1eef0979f8..facd6b6bfe102 100644
--- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
+++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
@@ -177,18 +177,18 @@ public bool TryGetTelemetryId(out Guid telemetryId)
                     Func<string, IDisposable?> addOperationScope =
                         description => operationContext?.AddScope(allowCancellation: true, string.Format(EditorFeaturesResources.Gathering_Suggestions_0, description));
 
-                    var options = GlobalOptions.GetBlockingCodeActionOptionsProvider();
+                    var options = GlobalOptions.GetCodeActionOptionsProvider();
 
                     // We convert the code fixes and refactorings to UnifiedSuggestedActionSets instead of
                     // SuggestedActionSets so that we can share logic between local Roslyn and LSP.
                     var fixesTask = GetCodeFixesAsync(
                         state, supportsFeatureService, requestedActionCategories, workspace, document, range,
                         addOperationScope, CodeActionRequestPriority.None,
-                        options, cancellationToken);
+                        options, isBlocking: true, cancellationToken);
 
                     var refactoringsTask = GetRefactoringsAsync(
                         state, supportsFeatureService, requestedActionCategories, GlobalOptions, workspace, document, selection,
-                        addOperationScope, CodeActionRequestPriority.None, options, cancellationToken);
+                        addOperationScope, CodeActionRequestPriority.None, options, isBlocking: true, cancellationToken);
 
                     Task.WhenAll(fixesTask, refactoringsTask).WaitAndGetResult(cancellationToken);
 
@@ -271,6 +271,7 @@ protected static Task<ImmutableArray<UnifiedSuggestedActionSet>> GetCodeFixesAsy
                 Func<string, IDisposable?> addOperationScope,
                 CodeActionRequestPriority priority,
                 CodeActionOptionsProvider options,
+                bool isBlocking,
                 CancellationToken cancellationToken)
             {
                 if (state.Target.Owner._codeFixService == null ||
@@ -282,7 +283,7 @@ protected static Task<ImmutableArray<UnifiedSuggestedActionSet>> GetCodeFixesAsy
 
                 return UnifiedSuggestedActionsSource.GetFilterAndOrderCodeFixesAsync(
                     workspace, state.Target.Owner._codeFixService, document, range.Span.ToTextSpan(),
-                    priority, options, addOperationScope, cancellationToken).AsTask();
+                    priority, options, isBlocking, addOperationScope, cancellationToken).AsTask();
             }
 
             private static string GetFixCategory(DiagnosticSeverity severity)
@@ -311,6 +312,7 @@ protected static Task<ImmutableArray<UnifiedSuggestedActionSet>> GetRefactorings
                 Func<string, IDisposable?> addOperationScope,
                 CodeActionRequestPriority priority,
                 CodeActionOptionsProvider options,
+                bool isBlocking,
                 CancellationToken cancellationToken)
             {
                 if (!selection.HasValue)
@@ -339,7 +341,7 @@ protected static Task<ImmutableArray<UnifiedSuggestedActionSet>> GetRefactorings
                 var filterOutsideSelection = !requestedActionCategories.Contains(PredefinedSuggestedActionCategoryNames.Refactoring);
 
                 return UnifiedSuggestedActionsSource.GetFilterAndOrderCodeRefactoringsAsync(
-                    workspace, state.Target.Owner._codeRefactoringService, document, selection.Value, priority, options,
+                    workspace, state.Target.Owner._codeRefactoringService, document, selection.Value, priority, options, isBlocking,
                     addOperationScope, filterOutsideSelection, cancellationToken);
             }
 
@@ -439,7 +441,7 @@ await InvokeBelowInputPriorityAsync(() =>
                         state.Target.SubjectBuffer.SupportsCodeFixes())
                     {
                         var result = await state.Target.Owner._codeFixService.GetMostSevereFixAsync(
-                            document, range.Span.ToTextSpan(), priority, options, cancellationToken).ConfigureAwait(false);
+                            document, range.Span.ToTextSpan(), priority, options, isBlocking: false, cancellationToken).ConfigureAwait(false);
 
                         if (result.HasFix)
                         {
diff --git a/src/EditorFeatures/Core/LanguageServer/Handlers/CodeActions/CodeActionHelpers.cs b/src/EditorFeatures/Core/LanguageServer/Handlers/CodeActions/CodeActionHelpers.cs
index b1b91e3e78fe3..5c23208f8d35f 100644
--- a/src/EditorFeatures/Core/LanguageServer/Handlers/CodeActions/CodeActionHelpers.cs
+++ b/src/EditorFeatures/Core/LanguageServer/Handlers/CodeActions/CodeActionHelpers.cs
@@ -254,10 +254,10 @@ private static async ValueTask<ImmutableArray<UnifiedSuggestedActionSet>> GetAct
             var codeFixes = await UnifiedSuggestedActionsSource.GetFilterAndOrderCodeFixesAsync(
                 document.Project.Solution.Workspace, codeFixService, document, textSpan,
                 CodeActionRequestPriority.None,
-                options, addOperationScope: _ => null, cancellationToken).ConfigureAwait(false);
+                options, isBlocking: false, addOperationScope: _ => null, cancellationToken).ConfigureAwait(false);
 
             var codeRefactorings = await UnifiedSuggestedActionsSource.GetFilterAndOrderCodeRefactoringsAsync(
-                document.Project.Solution.Workspace, codeRefactoringService, document, textSpan, CodeActionRequestPriority.None, options,
+                document.Project.Solution.Workspace, codeRefactoringService, document, textSpan, CodeActionRequestPriority.None, options, isBlocking: false,
                 addOperationScope: _ => null, filterOutsideSelection: false, cancellationToken).ConfigureAwait(false);
 
             var actionSets = UnifiedSuggestedActionsSource.FilterAndOrderActionSets(
diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
index 6c881dc7e2d13..84134fa553a61 100644
--- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
+++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
@@ -108,7 +108,7 @@ internal async Task<CodeRefactoring> GetCodeRefactoringAsync(
                 CodeActionOptionsStorage.GetCodeActionOptionsProvider(workspace.GlobalOptions) :
                 CodeActionOptions.DefaultProvider;
 
-            var context = new CodeRefactoringContext(document, selectedOrAnnotatedSpan, (a, t) => actions.Add((a, t)), codeActionOptionsProvider, CancellationToken.None);
+            var context = new CodeRefactoringContext(document, selectedOrAnnotatedSpan, (a, t) => actions.Add((a, t)), codeActionOptionsProvider, isBlocking: false, CancellationToken.None);
             await provider.ComputeRefactoringsAsync(context);
             var result = actions.Count > 0 ? new CodeRefactoring(provider, actions.ToImmutable(), FixAllProviderInfo.Create(provider)) : null;
             actions.Free();
diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeFixVerifier`2+Test.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeFixVerifier`2+Test.cs
index 1ec111c9f6834..237301cd76638 100644
--- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeFixVerifier`2+Test.cs
+++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeFixVerifier`2+Test.cs
@@ -109,7 +109,7 @@ protected override AnalyzerOptions GetAnalyzerOptions(Project project)
                 => new WorkspaceAnalyzerOptions(base.GetAnalyzerOptions(project), project.Solution, _sharedState.GetIdeAnalyzerOptions(project));
 
             protected override CodeFixContext CreateCodeFixContext(Document document, TextSpan span, ImmutableArray<Diagnostic> diagnostics, Action<CodeAction, ImmutableArray<Diagnostic>> registerCodeFix, CancellationToken cancellationToken)
-                => new(document, span, diagnostics, registerCodeFix, new DelegatingCodeActionOptionsProvider(_ => _sharedState.CodeActionOptions), cancellationToken);
+                => new(document, span, diagnostics, registerCodeFix, new DelegatingCodeActionOptionsProvider(_ => _sharedState.CodeActionOptions), isBlocking: false, cancellationToken);
 
             protected override FixAllContext CreateFixAllContext(
                 Document? document,
diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs
index 52ebcccb78bb8..e7f1d02298604 100644
--- a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs
+++ b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs
@@ -154,6 +154,7 @@ protected static Document GetDocumentAndSelectSpan(TestWorkspace workspace, out
                     ImmutableArray.Create(diagnostic),
                     (a, d) => fixes.Add(new CodeFix(document.Project, a, d)),
                     testDriver.FallbackOptions,
+                    isBlocking: false,
                     CancellationToken.None);
 
                 await fixer.RegisterCodeFixesAsync(context);
diff --git a/src/EditorFeatures/Test/CodeFixes/CodeFixServiceTests.cs b/src/EditorFeatures/Test/CodeFixes/CodeFixServiceTests.cs
index e779264c08114..f35455dc0d251 100644
--- a/src/EditorFeatures/Test/CodeFixes/CodeFixServiceTests.cs
+++ b/src/EditorFeatures/Test/CodeFixes/CodeFixServiceTests.cs
@@ -62,7 +62,7 @@ public async Task TestGetFirstDiagnosticWithFixAsync()
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
             var document = project.Documents.Single();
             var unused = await fixService.GetMostSevereFixAsync(
-                document, TextSpan.FromBounds(0, 0), CodeActionRequestPriority.None, CodeActionOptions.DefaultProvider, CancellationToken.None);
+                document, TextSpan.FromBounds(0, 0), CodeActionRequestPriority.None, CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
 
             var fixer1 = (MockFixer)fixers.Single().Value;
             var fixer2 = (MockFixer)reference.Fixer!;
@@ -89,7 +89,7 @@ public async Task TestGetFixesAsyncWithDuplicateDiagnostics()
             GetDocumentAndExtensionManager(tuple.analyzerService, workspace, out var document, out var extensionManager, analyzerReference);
 
             // Verify that we do not crash when computing fixes.
-            _ = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            _ = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
 
             // Verify that code fix is invoked with both the diagnostics in the context,
             // i.e. duplicate diagnostics are not silently discarded by the CodeFixService.
@@ -115,7 +115,7 @@ public async Task TestGetFixesAsyncHasNoDuplicateConfigurationActions()
             GetDocumentAndExtensionManager(tuple.analyzerService, workspace, out var document, out var extensionManager, analyzerReference);
 
             // Verify registered configuration code actions do not have duplicates.
-            var fixCollections = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            var fixCollections = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
             var codeActions = fixCollections.SelectMany(c => c.Fixes.Select(f => f.Action)).ToImmutableArray();
             Assert.Equal(7, codeActions.Length);
             var uniqueTitles = new HashSet<string>();
@@ -147,14 +147,14 @@ public async Task TestGetFixesAsyncForFixableAndNonFixableAnalyzersAsync()
 
             // Verify only analyzerWithFix is executed when GetFixesAsync is invoked with 'CodeActionRequestPriority.Normal'.
             _ = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0),
-                priority: CodeActionRequestPriority.Normal, CodeActionOptions.DefaultProvider,
+                priority: CodeActionRequestPriority.Normal, CodeActionOptions.DefaultProvider, isBlocking: false,
                 addOperationScope: _ => null, cancellationToken: CancellationToken.None);
             Assert.True(analyzerWithFix.ReceivedCallback);
             Assert.False(analyzerWithoutFix.ReceivedCallback);
 
             // Verify both analyzerWithFix and analyzerWithoutFix are executed when GetFixesAsync is invoked with 'CodeActionRequestPriority.Lowest'.
             _ = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0),
-                priority: CodeActionRequestPriority.Lowest, CodeActionOptions.DefaultProvider,
+                priority: CodeActionRequestPriority.Lowest, CodeActionOptions.DefaultProvider, isBlocking: false,
                 addOperationScope: _ => null, cancellationToken: CancellationToken.None);
             Assert.True(analyzerWithFix.ReceivedCallback);
             Assert.True(analyzerWithoutFix.ReceivedCallback);
@@ -183,7 +183,7 @@ public async Task TestGetFixesAsyncForDocumentDiagnosticAnalyzerAsync()
 
             // Verify both analyzers are executed when GetFixesAsync is invoked with 'CodeActionRequestPriority.Normal'.
             _ = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0),
-                priority: CodeActionRequestPriority.Normal, CodeActionOptions.DefaultProvider,
+                priority: CodeActionRequestPriority.Normal, CodeActionOptions.DefaultProvider, isBlocking: false,
                 addOperationScope: _ => null, cancellationToken: CancellationToken.None);
             Assert.True(documentDiagnosticAnalyzer.ReceivedCallback);
         }
@@ -267,7 +267,7 @@ private static async Task<ImmutableArray<CodeFixCollection>> GetAddedFixesAsync(
             var reference = new MockAnalyzerReference(codefix, ImmutableArray.Create(diagnosticAnalyzer));
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
             document = project.Documents.Single();
-            var fixes = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            var fixes = await tuple.codeFixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
 
             if (exception)
             {
@@ -292,7 +292,7 @@ private static async Task GetFirstDiagnosticWithFixWithExceptionValidationAsync(
 
             GetDocumentAndExtensionManager(tuple.analyzerService, workspace, out var document, out var extensionManager);
             var unused = await tuple.codeFixService.GetMostSevereFixAsync(
-                document, TextSpan.FromBounds(0, 0), CodeActionRequestPriority.None, CodeActionOptions.DefaultProvider, CancellationToken.None);
+                document, TextSpan.FromBounds(0, 0), CodeActionRequestPriority.None, CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
             Assert.True(extensionManager.IsDisabled(codefix));
             Assert.False(extensionManager.IsIgnored(codefix));
             Assert.True(errorReported);
@@ -683,7 +683,7 @@ private static async Task<ImmutableArray<CodeFixCollection>> GetNuGetAndVsixCode
 
             var document = project.Documents.Single();
 
-            return await fixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            return await fixService.GetFixesAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
         }
 
         private sealed class NuGetCodeFixProvider : AbstractNuGetOrVsixCodeFixProvider
diff --git a/src/EditorFeatures/Test/CodeRefactorings/CodeRefactoringServiceTest.cs b/src/EditorFeatures/Test/CodeRefactorings/CodeRefactoringServiceTest.cs
index 2fa86a83db93a..17f0a015cd6c0 100644
--- a/src/EditorFeatures/Test/CodeRefactorings/CodeRefactoringServiceTest.cs
+++ b/src/EditorFeatures/Test/CodeRefactorings/CodeRefactoringServiceTest.cs
@@ -4,7 +4,9 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Immutable;
+using System.Composition;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,8 +16,11 @@
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Extensions;
+using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.UnitTests;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.CodeRefactoringService
@@ -44,12 +49,54 @@ public async Task TestProjectRefactoringAsync()
             var reference = new StubAnalyzerReference();
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
             var document = project.Documents.Single();
-            var refactorings = await refactoringService.GetRefactoringsAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            var refactorings = await refactoringService.GetRefactoringsAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
 
             var stubRefactoringAction = refactorings.Single(refactoring => refactoring.CodeActions.FirstOrDefault().action?.Title == nameof(StubRefactoring));
             Assert.True(stubRefactoringAction is object);
         }
 
+        [ExportCodeRefactoringProvider(InternalLanguageNames.TypeScript, Name = "TypeScript CodeRefactoring Provider"), Shared, PartNotDiscoverable]
+        internal sealed class TypeScriptCodeRefactoringProvider : CodeRefactoringProvider
+        {
+            [ImportingConstructor]
+            [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+            public TypeScriptCodeRefactoringProvider()
+            {
+            }
+
+            public override Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+            {
+#pragma warning disable CS0612 // Type or member is obsolete
+                var isBlocking = ((ITypeScriptCodeRefactoringContext)context).IsBlocking;
+#pragma warning restore
+
+                context.RegisterRefactoring(CodeAction.Create($"Blocking={isBlocking}", _ => Task.FromResult<Document>(null)));
+
+                return Task.CompletedTask;
+            }
+        }
+
+        [Theory]
+        [CombinatorialData]
+        public async Task TestTypeScriptRefactorings(bool isBlocking)
+        {
+            var composition = FeaturesTestCompositions.Features.AddParts(typeof(TypeScriptCodeRefactoringProvider));
+
+            using var workspace = TestWorkspace.Create(@"
+<Workspace>
+    <Project Language=""TypeScript"">
+        <Document FilePath=""Test"">abc</Document>
+    </Project>
+</Workspace>", composition: composition);
+
+            var refactoringService = workspace.GetService<ICodeRefactoringService>();
+
+            var document = workspace.CurrentSolution.Projects.Single().Documents.Single();
+            var optionsProvider = workspace.GlobalOptions.GetCodeActionOptionsProvider();
+            var refactorings = await refactoringService.GetRefactoringsAsync(document, TextSpan.FromBounds(0, 0), optionsProvider, isBlocking, CancellationToken.None);
+            Assert.Equal($"Blocking={isBlocking}", refactorings.Single().CodeActions.Single().action.Title);
+        }
+
         private static async Task VerifyRefactoringDisabledAsync<T>()
             where T : CodeRefactoringProvider
         {
@@ -67,7 +114,7 @@ private static async Task VerifyRefactoringDisabledAsync<T>()
             var project = workspace.CurrentSolution.Projects.Single();
             var document = project.Documents.Single();
             var extensionManager = (EditorLayerExtensionManager.ExtensionManager)document.Project.Solution.Workspace.Services.GetRequiredService<IExtensionManager>();
-            var result = await refactoringService.GetRefactoringsAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, CancellationToken.None);
+            var result = await refactoringService.GetRefactoringsAsync(document, TextSpan.FromBounds(0, 0), CodeActionOptions.DefaultProvider, isBlocking: false, CancellationToken.None);
             Assert.True(extensionManager.IsDisabled(codeRefactoring));
             Assert.False(extensionManager.IsIgnored(codeRefactoring));
 
diff --git a/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb b/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb
index e6636df9452ee..6cbe6b853ee25 100644
--- a/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb
+++ b/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb
@@ -77,6 +77,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeFixes.UnitTests
                     document,
                     (Await document.GetSyntaxRootAsync()).FullSpan,
                     CodeActionOptions.DefaultProvider,
+                    isBlocking:=False,
                     CancellationToken.None)
 
                 Assert.Equal(0, fixes.Count())
@@ -93,6 +94,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeFixes.UnitTests
                     document,
                     (Await document.GetSyntaxRootAsync()).FullSpan,
                     CodeActionOptions.DefaultProvider,
+                    isBlocking:=False,
                     CancellationToken.None)
                 Assert.Equal(1, fixes.Count())
 
@@ -103,6 +105,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeFixes.UnitTests
                     document,
                     (Await document.GetSyntaxRootAsync()).FullSpan,
                     CodeActionOptions.DefaultProvider,
+                    isBlocking:=False,
                     CancellationToken.None)
 
                 Assert.Equal(0, fixes.Count())
@@ -153,6 +156,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeFixes.UnitTests
                     document,
                     (Await document.GetSyntaxRootAsync()).FullSpan,
                     CodeActionOptions.DefaultProvider,
+                    isBlocking:=False,
                     CancellationToken.None)
 
                 Assert.Equal(0, fixes.Count())
@@ -169,6 +173,7 @@ Namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeFixes.UnitTests
                     document,
                     (Await document.GetSyntaxRootAsync()).FullSpan,
                     CodeActionOptions.DefaultProvider,
+                    isBlocking:=False,
                     CancellationToken.None)
 
                 Assert.Equal(0, fixes.Count())
diff --git a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
index c4c076031f14e..5eb1f1108a894 100644
--- a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoringService.cs
@@ -93,7 +93,7 @@ public async Task<bool> HasRefactoringsAsync(
                 RefactoringToMetadataMap.TryGetValue(provider, out var providerMetadata);
 
                 var refactoring = await GetRefactoringFromProviderAsync(
-                    document, state, provider, providerMetadata, extensionManager, options, cancellationToken).ConfigureAwait(false);
+                    document, state, provider, providerMetadata, extensionManager, options, isBlocking: false, cancellationToken).ConfigureAwait(false);
 
                 if (refactoring != null)
                 {
@@ -109,6 +109,7 @@ public async Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(
             TextSpan state,
             CodeActionRequestPriority priority,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             Func<string, IDisposable?> addOperationScope,
             CancellationToken cancellationToken)
         {
@@ -131,7 +132,7 @@ public async Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(
                             using (RoslynEventSource.LogInformationalBlock(FunctionId.Refactoring_CodeRefactoringService_GetRefactoringsAsync, providerName, cancellationToken))
                             {
                                 return GetRefactoringFromProviderAsync(document, state, provider, providerMetadata,
-                                    extensionManager, options, cancellationToken);
+                                    extensionManager, options, isBlocking, cancellationToken);
                             }
                         },
                         cancellationToken));
@@ -149,6 +150,7 @@ public async Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(
             CodeChangeProviderMetadata? providerMetadata,
             IExtensionManager extensionManager,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -177,6 +179,7 @@ public async Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(
                         }
                     },
                     options,
+                    isBlocking,
                     cancellationToken);
 
                 var task = provider.ComputeRefactoringsAsync(context) ?? Task.CompletedTask;
diff --git a/src/Features/Core/Portable/CodeRefactorings/ICodeRefactoringService.cs b/src/Features/Core/Portable/CodeRefactorings/ICodeRefactoringService.cs
index 2bae2385a216f..2249b0d8e3566 100644
--- a/src/Features/Core/Portable/CodeRefactorings/ICodeRefactoringService.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/ICodeRefactoringService.cs
@@ -15,12 +15,12 @@ internal interface ICodeRefactoringService
     {
         Task<bool> HasRefactoringsAsync(Document document, TextSpan textSpan, CodeActionOptionsProvider options, CancellationToken cancellationToken);
 
-        Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken);
+        Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, bool isBlocking, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken);
     }
 
     internal static class ICodeRefactoringServiceExtensions
     {
-        public static Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(this ICodeRefactoringService service, Document document, TextSpan state, CodeActionOptionsProvider options, CancellationToken cancellationToken)
-            => service.GetRefactoringsAsync(document, state, CodeActionRequestPriority.None, options, addOperationScope: _ => null, cancellationToken);
+        public static Task<ImmutableArray<CodeRefactoring>> GetRefactoringsAsync(this ICodeRefactoringService service, Document document, TextSpan state, CodeActionOptionsProvider options, bool isBlocking, CancellationToken cancellationToken)
+            => service.GetRefactoringsAsync(document, state, CodeActionRequestPriority.None, options, isBlocking, addOperationScope: _ => null, cancellationToken);
     }
 }
diff --git a/src/Features/Core/Portable/SyncNamespaces/AbstractSyncNamespacesSevice.cs b/src/Features/Core/Portable/SyncNamespaces/AbstractSyncNamespacesSevice.cs
index cc1c99b8e1998..5e08a39f5629d 100644
--- a/src/Features/Core/Portable/SyncNamespaces/AbstractSyncNamespacesSevice.cs
+++ b/src/Features/Core/Portable/SyncNamespaces/AbstractSyncNamespacesSevice.cs
@@ -112,6 +112,7 @@ private static async Task<FixAllContext> GetFixAllContextAsync(
                 ImmutableArray.Create(firstDiagnostic),
                 (a, _) => action ??= a,
                 options,
+                isBlocking: false,
                 cancellationToken);
             await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
 
diff --git a/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs b/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
index 5ae2e35a6ab31..098f4a9f2f30d 100644
--- a/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
+++ b/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
@@ -97,7 +97,7 @@ public CodeFixService(
         }
 
         public async Task<FirstFixResult> GetMostSevereFixAsync(
-            Document document, TextSpan range, CodeActionRequestPriority priority, CodeActionOptionsProvider fallbackOptions, CancellationToken cancellationToken)
+            Document document, TextSpan range, CodeActionRequestPriority priority, CodeActionOptionsProvider fallbackOptions, bool isBlocking, CancellationToken cancellationToken)
         {
             var (allDiagnostics, upToDate) = await _diagnosticService.TryGetDiagnosticsForSpanAsync(
                 document, range, GetShouldIncludeDiagnosticPredicate(document, priority),
@@ -140,7 +140,7 @@ public async Task<FirstFixResult> GetMostSevereFixAsync(
             {
                 await foreach (var collection in StreamFixesAsync(
                     document, spanToDiagnostics, fixAllForInSpan: false,
-                    priority, fallbackOptions, _ => null, cancellationToken).ConfigureAwait(false))
+                    priority, fallbackOptions, isBlocking, _ => null, cancellationToken).ConfigureAwait(false))
                 {
                     // Stop at the result error we see.
                     return collection;
@@ -155,6 +155,7 @@ public async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
             TextSpan range,
             CodeActionRequestPriority priority,
             CodeActionOptionsProvider fallbackOptions,
+            bool isBlocking,
             Func<string, IDisposable?> addOperationScope,
             [EnumeratorCancellation] CancellationToken cancellationToken)
         {
@@ -184,7 +185,7 @@ public async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
             {
                 await foreach (var collection in StreamFixesAsync(
                     document, spanToDiagnostics, fixAllForInSpan: false,
-                    priority, fallbackOptions, addOperationScope, cancellationToken).ConfigureAwait(false))
+                    priority, fallbackOptions, isBlocking, addOperationScope, cancellationToken).ConfigureAwait(false))
                 {
                     yield return collection;
                 }
@@ -246,7 +247,7 @@ private static SortedDictionary<TextSpan, List<DiagnosticData>> ConvertToMap(
 
             await foreach (var collection in StreamFixesAsync(
                 document, spanToDiagnostics, fixAllForInSpan: true, CodeActionRequestPriority.None,
-                fallbackOptions, addOperationScope: static _ => null, cancellationToken).ConfigureAwait(false))
+                fallbackOptions, isBlocking: false, addOperationScope: static _ => null, cancellationToken).ConfigureAwait(false))
             {
                 // TODO: Just get the first fix for now until we have a way to config user's preferred fix
                 // https://github.com/dotnet/roslyn/issues/27066
@@ -326,6 +327,7 @@ private async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
             bool fixAllForInSpan,
             CodeActionRequestPriority priority,
             CodeActionOptionsProvider fallbackOptions,
+            bool isBlocking,
             Func<string, IDisposable?> addOperationScope,
             [EnumeratorCancellation] CancellationToken cancellationToken)
         {
@@ -418,13 +420,13 @@ private async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
                                     if (fixAllForInSpan)
                                     {
                                         var primaryDiagnostic = dxs.First();
-                                        return GetCodeFixesAsync(document, primaryDiagnostic.Location.SourceSpan, fixer, fixerMetadata, fallbackOptions,
+                                        return GetCodeFixesAsync(document, primaryDiagnostic.Location.SourceSpan, fixer, fixerMetadata, fallbackOptions, isBlocking,
                                             ImmutableArray.Create(primaryDiagnostic), uniqueDiagosticToEquivalenceKeysMap,
                                             diagnosticAndEquivalenceKeyToFixersMap, cancellationToken);
                                     }
                                     else
                                     {
-                                        return GetCodeFixesAsync(document, span, fixer, fixerMetadata, fallbackOptions, dxs,
+                                        return GetCodeFixesAsync(document, span, fixer, fixerMetadata, fallbackOptions, isBlocking, dxs,
                                             uniqueDiagosticToEquivalenceKeysMap, diagnosticAndEquivalenceKeyToFixersMap, cancellationToken);
                                     }
                                 }
@@ -488,7 +490,7 @@ void AddAllFixers(
         }
 
         private static async Task<ImmutableArray<CodeFix>> GetCodeFixesAsync(
-            Document document, TextSpan span, CodeFixProvider fixer, CodeChangeProviderMetadata? fixerMetadata, CodeActionOptionsProvider fallbackOptions,
+            Document document, TextSpan span, CodeFixProvider fixer, CodeChangeProviderMetadata? fixerMetadata, CodeActionOptionsProvider fallbackOptions, bool isBlocking,
             ImmutableArray<Diagnostic> diagnostics,
             Dictionary<Diagnostic, PooledHashSet<string?>> uniqueDiagosticToEquivalenceKeysMap,
             Dictionary<(Diagnostic diagnostic, string? equivalenceKey), CodeFixProvider> diagnosticAndEquivalenceKeyToFixersMap,
@@ -520,6 +522,7 @@ private static async Task<ImmutableArray<CodeFix>> GetCodeFixesAsync(
                     }
                 },
                 fallbackOptions,
+                isBlocking,
                 cancellationToken);
 
             var task = fixer.RegisterCodeFixesAsync(context) ?? Task.CompletedTask;
diff --git a/src/Features/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs b/src/Features/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs
index 15238c4109eed..80a9ccef1f916 100644
--- a/src/Features/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs
+++ b/src/Features/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs
@@ -16,14 +16,14 @@ namespace Microsoft.CodeAnalysis.CodeFixes
 {
     internal interface ICodeFixService
     {
-        IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken);
+        IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, bool isBlocking, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken);
 
         /// <summary>
         /// Similar to <see cref="StreamFixesAsync"/> except that instead of streaming all results, this ends with the
         /// first.  This will also attempt to return a fix for an error first, but will fall back to any fix if that
         /// does not succeed.
         /// </summary>
-        Task<FirstFixResult> GetMostSevereFixAsync(Document document, TextSpan range, CodeActionRequestPriority priority, CodeActionOptionsProvider fallbackOptions, CancellationToken cancellationToken);
+        Task<FirstFixResult> GetMostSevereFixAsync(Document document, TextSpan range, CodeActionRequestPriority priority, CodeActionOptionsProvider fallbackOptions, bool isBlocking, CancellationToken cancellationToken);
 
         Task<CodeFixCollection?> GetDocumentFixAllForIdInSpanAsync(Document document, TextSpan textSpan, string diagnosticId, CodeActionOptionsProvider fallbackOptions, CancellationToken cancellationToken);
         CodeFixProvider? GetSuppressionFixer(string language, IEnumerable<string> diagnosticIds);
@@ -31,13 +31,13 @@ internal interface ICodeFixService
 
     internal static class ICodeFixServiceExtensions
     {
-        public static IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(this ICodeFixService service, Document document, TextSpan range, CodeActionOptionsProvider options, CancellationToken cancellationToken)
-            => service.StreamFixesAsync(document, range, CodeActionRequestPriority.None, options, addOperationScope: _ => null, cancellationToken);
+        public static IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(this ICodeFixService service, Document document, TextSpan range, CodeActionOptionsProvider options, bool isBlocking, CancellationToken cancellationToken)
+            => service.StreamFixesAsync(document, range, CodeActionRequestPriority.None, options, isBlocking, addOperationScope: _ => null, cancellationToken);
 
-        public static Task<ImmutableArray<CodeFixCollection>> GetFixesAsync(this ICodeFixService service, Document document, TextSpan range, CodeActionOptionsProvider options, CancellationToken cancellationToken)
-            => service.StreamFixesAsync(document, range, options, cancellationToken).ToImmutableArrayAsync(cancellationToken);
+        public static Task<ImmutableArray<CodeFixCollection>> GetFixesAsync(this ICodeFixService service, Document document, TextSpan range, CodeActionOptionsProvider options, bool isBlocking, CancellationToken cancellationToken)
+            => service.StreamFixesAsync(document, range, options, isBlocking, cancellationToken).ToImmutableArrayAsync(cancellationToken);
 
-        public static Task<ImmutableArray<CodeFixCollection>> GetFixesAsync(this ICodeFixService service, Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken)
-            => service.StreamFixesAsync(document, textSpan, priority, options, addOperationScope, cancellationToken).ToImmutableArrayAsync(cancellationToken);
+        public static Task<ImmutableArray<CodeFixCollection>> GetFixesAsync(this ICodeFixService service, Document document, TextSpan textSpan, CodeActionRequestPriority priority, CodeActionOptionsProvider options, bool isBlocking, Func<string, IDisposable?> addOperationScope, CancellationToken cancellationToken)
+            => service.StreamFixesAsync(document, textSpan, priority, options, isBlocking, addOperationScope, cancellationToken).ToImmutableArrayAsync(cancellationToken);
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs b/src/Features/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs
index d54ef3d3a0ac3..75334f139fb34 100644
--- a/src/Features/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs
@@ -21,13 +21,7 @@ internal static class CodeActionOptionsStorage
         public static readonly PerLanguageOption2<int> WrappingColumn =
             new("FormattingOptions", "WrappingColumn", CodeActionOptions.DefaultWrappingColumn);
 
-        internal static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService globalOptions, HostLanguageServices languageServices)
-            => GetCodeActionOptions(globalOptions, languageServices, isBlocking: false);
-
-        internal static CodeActionOptions GetBlockingCodeActionOptions(this IGlobalOptionService globalOptions, HostLanguageServices languageServices)
-            => GetCodeActionOptions(globalOptions, languageServices, isBlocking: true);
-
-        private static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService globalOptions, HostLanguageServices languageServices, bool isBlocking)
+        public static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService globalOptions, HostLanguageServices languageServices)
             => new(
                 SearchOptions: globalOptions.GetSymbolSearchOptions(languageServices.Language),
                 ImplementTypeOptions: globalOptions.GetImplementTypeOptions(languageServices.Language),
@@ -35,30 +29,23 @@ private static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService
                 CleanupOptions: globalOptions.GetCodeCleanupOptions(languageServices),
                 CodeGenerationOptions: globalOptions.GetCodeGenerationOptions(languageServices),
                 HideAdvancedMembers: globalOptions.GetOption(CompletionOptionsStorage.HideAdvancedMembers, languageServices.Language),
-                IsBlocking: isBlocking,
                 WrappingColumn: globalOptions.GetOption(WrappingColumn, languageServices.Language));
 
         internal static CodeActionOptionsProvider GetCodeActionOptionsProvider(this IGlobalOptionService globalOptions)
-            => new CachingCodeActionsOptionsProvider(globalOptions, isBlocking: false);
-
-        internal static CodeActionOptionsProvider GetBlockingCodeActionOptionsProvider(this IGlobalOptionService globalOptions)
-            => new CachingCodeActionsOptionsProvider(globalOptions, isBlocking: true);
+            => new CachingCodeActionsOptionsProvider(globalOptions);
 
         private sealed class CachingCodeActionsOptionsProvider : AbstractCodeActionOptionsProvider
         {
             private readonly IGlobalOptionService _globalOptions;
-            private readonly bool _isBlocking;
-
             private ImmutableDictionary<string, CodeActionOptions> _cache = ImmutableDictionary<string, CodeActionOptions>.Empty;
 
-            public CachingCodeActionsOptionsProvider(IGlobalOptionService globalOptions, bool isBlocking)
+            public CachingCodeActionsOptionsProvider(IGlobalOptionService globalOptions)
             {
                 _globalOptions = globalOptions;
-                _isBlocking = isBlocking;
             }
 
             public override CodeActionOptions GetOptions(HostLanguageServices languageService)
-                => ImmutableInterlocked.GetOrAdd(ref _cache, languageService.Language, (language, options) => GetCodeActionOptions(options, languageService, _isBlocking), _globalOptions);
+                => ImmutableInterlocked.GetOrAdd(ref _cache, languageService.Language, (language, options) => GetCodeActionOptions(options, languageService), _globalOptions);
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs b/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
index 141a25762da1c..a3c661a79f16d 100644
--- a/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
+++ b/src/Features/LanguageServer/Protocol/Features/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs
@@ -38,6 +38,7 @@ public static async ValueTask<ImmutableArray<UnifiedSuggestedActionSet>> GetFilt
             TextSpan selection,
             CodeActionRequestPriority priority,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             Func<string, IDisposable?> addOperationScope,
             CancellationToken cancellationToken)
         {
@@ -48,6 +49,7 @@ public static async ValueTask<ImmutableArray<UnifiedSuggestedActionSet>> GetFilt
                 selection,
                 priority,
                 options,
+                isBlocking,
                 addOperationScope,
                 cancellationToken), cancellationToken).ConfigureAwait(false);
 
@@ -413,6 +415,7 @@ public static async Task<ImmutableArray<UnifiedSuggestedActionSet>> GetFilterAnd
             TextSpan selection,
             CodeActionRequestPriority priority,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             Func<string, IDisposable?> addOperationScope,
             bool filterOutsideSelection,
             CancellationToken cancellationToken)
@@ -423,7 +426,7 @@ public static async Task<ImmutableArray<UnifiedSuggestedActionSet>> GetFilterAnd
             // the UI thread.
             var refactorings = await Task.Run(
                 () => codeRefactoringService.GetRefactoringsAsync(
-                    document, selection, priority, options, addOperationScope,
+                    document, selection, priority, options, isBlocking, addOperationScope,
                     cancellationToken), cancellationToken).ConfigureAwait(false);
 
             var filteredRefactorings = FilterOnAnyThread(refactorings, selection, filterOutsideSelection);
diff --git a/src/Tools/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeFixContextFactory.cs b/src/Tools/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeFixContextFactory.cs
index 5b1062e6e0339..a073e85127469 100644
--- a/src/Tools/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeFixContextFactory.cs
+++ b/src/Tools/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeFixContextFactory.cs
@@ -22,7 +22,7 @@ public static CodeFixContext CreateCodeFixContext(
             Action<CodeAction, ImmutableArray<Diagnostic>> registerCodeFix,
             OmniSharpCodeActionOptions options,
             CancellationToken cancellationToken)
-            => new(document, span, diagnostics, registerCodeFix, new DelegatingCodeActionOptionsProvider(_ => options.GetCodeActionOptions()), cancellationToken);
+            => new(document, span, diagnostics, registerCodeFix, new DelegatingCodeActionOptionsProvider(_ => options.GetCodeActionOptions()), isBlocking: false, cancellationToken);
 
         public static CodeAnalysis.CodeRefactorings.CodeRefactoringContext CreateCodeRefactoringContext(
             Document document,
@@ -30,7 +30,7 @@ public static CodeAnalysis.CodeRefactorings.CodeRefactoringContext CreateCodeRef
             Action<CodeAction, TextSpan?> registerRefactoring,
             OmniSharpCodeActionOptions options,
             CancellationToken cancellationToken)
-            => new(document, span, registerRefactoring, new DelegatingCodeActionOptionsProvider(_ => options.GetCodeActionOptions()), cancellationToken);
+            => new(document, span, registerRefactoring, new DelegatingCodeActionOptionsProvider(_ => options.GetCodeActionOptions()), isBlocking: false, cancellationToken);
 
         public static FixAllContext CreateFixAllContext(
             Document? document,
diff --git a/src/Workspaces/Core/Portable/CodeFixes/CodeFixContext.cs b/src/Workspaces/Core/Portable/CodeFixes/CodeFixContext.cs
index c3d347945bba0..9e2eb91a1341b 100644
--- a/src/Workspaces/Core/Portable/CodeFixes/CodeFixContext.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/CodeFixContext.cs
@@ -56,9 +56,14 @@ namespace Microsoft.CodeAnalysis.CodeFixes
         /// </remarks>
         internal readonly CodeActionOptionsProvider Options;
 
+        /// <summary>
+        /// TypeScript specific. https://github.com/dotnet/roslyn/issues/61122
+        /// </summary>
+        private readonly bool _isBlocking;
+
         [Obsolete]
         bool ITypeScriptCodeFixContext.IsBlocking
-            => Options.GetOptions(Document.Project.LanguageServices).IsBlocking;
+            => _isBlocking;
 
         /// <summary>
         /// Creates a code fix context to be passed into <see cref="CodeFixProvider.RegisterCodeFixesAsync(CodeFixContext)"/> method.
@@ -88,6 +93,7 @@ public CodeFixContext(
                    VerifyDiagnosticsArgument(diagnostics, span),
                    registerCodeFix ?? throw new ArgumentNullException(nameof(registerCodeFix)),
                    CodeActionOptions.DefaultProvider,
+                   isBlocking: false,
                    cancellationToken)
         {
         }
@@ -113,6 +119,7 @@ public CodeFixContext(
                    ImmutableArray.Create(diagnostic),
                    registerCodeFix ?? throw new ArgumentNullException(nameof(registerCodeFix)),
                    CodeActionOptions.DefaultProvider,
+                   isBlocking: false,
                    cancellationToken)
         {
         }
@@ -123,6 +130,7 @@ internal CodeFixContext(
             ImmutableArray<Diagnostic> diagnostics,
             Action<CodeAction, ImmutableArray<Diagnostic>> registerCodeFix,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             CancellationToken cancellationToken)
         {
             Debug.Assert(diagnostics.Any(d => d.Location.SourceSpan == span));
@@ -132,6 +140,7 @@ internal CodeFixContext(
             _diagnostics = diagnostics;
             _registerCodeFix = registerCodeFix;
             Options = options;
+            _isBlocking = isBlocking;
             _cancellationToken = cancellationToken;
         }
 
diff --git a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/BatchFixAllProvider.cs b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/BatchFixAllProvider.cs
index 656f5ef63839f..bf9c6af8d6b7b 100644
--- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/BatchFixAllProvider.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/BatchFixAllProvider.cs
@@ -148,7 +148,6 @@ private static async Task<ImmutableArray<Document>> GetAllChangedDocumentsInDiag
             foreach (var diagnostic in orderedDiagnostics)
             {
                 var document = solution.GetRequiredDocument(diagnostic.Location.SourceTree!);
-                var options = new NonBlockingCodeActionOptionsProvider(fixAllContext.State.CodeActionOptionsProvider);
 
                 cancellationToken.ThrowIfCancellationRequested();
                 tasks.Add(Task.Run(async () =>
@@ -156,7 +155,7 @@ private static async Task<ImmutableArray<Document>> GetAllChangedDocumentsInDiag
                     // Create a context that will add the reported code actions into this
                     using var _2 = ArrayBuilder<CodeAction>.GetInstance(out var codeActions);
                     var action = GetRegisterCodeFixAction(fixAllContext.CodeActionEquivalenceKey, codeActions);
-                    var context = new CodeFixContext(document, diagnostic.Location.SourceSpan, ImmutableArray.Create(diagnostic), action, options, cancellationToken);
+                    var context = new CodeFixContext(document, diagnostic.Location.SourceSpan, ImmutableArray.Create(diagnostic), action, fixAllContext.State.CodeActionOptionsProvider, isBlocking: false, cancellationToken);
 
                     // Wait for the all the code actions to be reported for this diagnostic.
                     var registerTask = fixAllContext.CodeFixProvider.RegisterCodeFixesAsync(context) ?? Task.CompletedTask;
@@ -191,17 +190,6 @@ private static async Task<ImmutableArray<Document>> GetAllChangedDocumentsInDiag
             return result.ToImmutable();
         }
 
-        private sealed class NonBlockingCodeActionOptionsProvider : AbstractCodeActionOptionsProvider
-        {
-            private readonly CodeActionOptionsProvider _provider;
-
-            public NonBlockingCodeActionOptionsProvider(CodeActionOptionsProvider provider)
-                => _provider = provider;
-
-            public override CodeActionOptions GetOptions(HostLanguageServices languageService)
-                => _provider.GetOptions(languageService) with { IsBlocking = false };
-        }
-
         /// <summary>
         /// Take all the changes made to a particular document and determine the text changes caused by each one.  Take
         /// those individual text changes and attempt to merge them together in order into <paramref
diff --git a/src/Workspaces/Core/Portable/CodeRefactorings/CodeRefactoringContext.cs b/src/Workspaces/Core/Portable/CodeRefactorings/CodeRefactoringContext.cs
index f8af535a145c6..27a4648ffaa41 100644
--- a/src/Workspaces/Core/Portable/CodeRefactorings/CodeRefactoringContext.cs
+++ b/src/Workspaces/Core/Portable/CodeRefactorings/CodeRefactoringContext.cs
@@ -34,9 +34,14 @@ namespace Microsoft.CodeAnalysis.CodeRefactorings
 
         internal readonly CodeActionOptionsProvider Options;
 
+        /// <summary>
+        /// TypeScript specific.
+        /// </summary>
+        private readonly bool _isBlocking;
+
         [Obsolete]
         bool ITypeScriptCodeRefactoringContext.IsBlocking
-            => Options.GetOptions(Document.Project.LanguageServices).IsBlocking;
+            => _isBlocking;
 
         private readonly Action<CodeAction, TextSpan?> _registerRefactoring;
 
@@ -48,7 +53,7 @@ public CodeRefactoringContext(
             TextSpan span,
             Action<CodeAction> registerRefactoring,
             CancellationToken cancellationToken)
-            : this(document, span, (action, textSpan) => registerRefactoring(action), CodeActionOptions.DefaultProvider, cancellationToken)
+            : this(document, span, (action, textSpan) => registerRefactoring(action), CodeActionOptions.DefaultProvider, isBlocking: false, cancellationToken)
         { }
 
         /// <summary>
@@ -59,6 +64,7 @@ internal CodeRefactoringContext(
             TextSpan span,
             Action<CodeAction, TextSpan?> registerRefactoring,
             CodeActionOptionsProvider options,
+            bool isBlocking,
             CancellationToken cancellationToken)
         {
             // NOTE/TODO: Don't make this overload public & obsolete the `Action<CodeAction> registerRefactoring`
@@ -67,6 +73,7 @@ internal CodeRefactoringContext(
             Span = span;
             _registerRefactoring = registerRefactoring ?? throw new ArgumentNullException(nameof(registerRefactoring));
             Options = options;
+            _isBlocking = isBlocking;
             CancellationToken = cancellationToken;
         }
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
index 3bff9a335dd30..f53eaf086301a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -38,7 +38,6 @@ internal record class CodeActionOptions
         [DataMember(Order = 3)] public CodeCleanupOptions? CleanupOptions { get; init; }
         [DataMember(Order = 4)] public CodeGenerationOptions? CodeGenerationOptions { get; init; }
         [DataMember(Order = 5)] public bool HideAdvancedMembers { get; init; }
-        [DataMember(Order = 6)] public bool IsBlocking { get; init; }
         [DataMember(Order = 7)] public int WrappingColumn { get; init; }
 
         /// <summary>
@@ -60,7 +59,6 @@ public CodeActionOptions(
             CodeCleanupOptions? CleanupOptions = null,
             CodeGenerationOptions? CodeGenerationOptions = null,
             bool HideAdvancedMembers = false,
-            bool IsBlocking = false,
             int WrappingColumn = DefaultWrappingColumn)
         {
             this.SearchOptions = SearchOptions ?? SymbolSearchOptions.Default;
@@ -69,7 +67,6 @@ public CodeActionOptions(
             this.CleanupOptions = CleanupOptions;
             this.CodeGenerationOptions = CodeGenerationOptions;
             this.HideAdvancedMembers = HideAdvancedMembers;
-            this.IsBlocking = IsBlocking;
             this.WrappingColumn = WrappingColumn;
         }
 

From 06af5f178e01157529abf6d4c75d1280c6bbce36 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 4 May 2022 17:49:49 -0700
Subject: [PATCH 224/413] Revert whitespace changes

---
 azure-pipelines-official.yml                  |   2 +-
 eng/common/build.sh                           |   1 -
 eng/common/msbuild.ps1                        |   2 +-
 eng/common/post-build/symbols-validation.ps1  |  28 +-
 eng/common/sdl/configure-sdl-tool.ps1         |   2 +-
 eng/common/templates/job/job.yml              |  22 +-
 .../templates/job/publish-build-assets.yml    |  22 +-
 eng/common/templates/jobs/codeql-build.yml    |   4 +-
 eng/common/templates/jobs/jobs.yml            |   4 +-
 .../templates/post-build/post-build.yml       |  16 +-
 eng/common/templates/steps/generate-sbom.yml  |   6 +-
 .../templates/variables/sdl-variables.yml     |   2 +-
 eng/publish-assets.ps1                        |   2 +-
 eng/test-determinism.ps1                      |   1 +
 global.json                                   |   2 +-
 .../Semantic/Semantics/InitOnlyMemberTests.vb | 388 ++++++++----------
 16 files changed, 229 insertions(+), 275 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 40de51efe4a9b..d8769d839667f 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -359,4 +359,4 @@ stages:
           -TsaIterationPath $(_TsaIterationPath)
           -TsaRepositoryName $(_TsaRepositoryName)
           -TsaCodebaseName $(_TsaCodebaseName)
-          -TsaPublish $True
\ No newline at end of file
+          -TsaPublish $True
diff --git a/eng/common/build.sh b/eng/common/build.sh
index a16e18b174a75..55b298f16ccd1 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -187,7 +187,6 @@ function InitializeCustomToolset {
 }
 
 function Build {
-
   InitializeToolset
   InitializeCustomToolset
 
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index e295cc9ddf604..f041e5ddd9589 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -18,7 +18,7 @@ try {
   }
 
   MSBuild @extraArgs
-}
+} 
 catch {
   Write-Host $_.ScriptStackTrace
   Write-PipelineTelemetryError -Category 'Build' -Message $_
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index bb9ffe808cc98..cd2181bafa057 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -44,7 +44,7 @@ else{
 }
 
 $CountMissingSymbols = {
-  param(
+  param( 
     [string] $PackagePath, # Path to a NuGet package
     [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs
   )
@@ -61,7 +61,7 @@ $CountMissingSymbols = {
       packagePath = $PackagePath
     }
   }
-
+  
   # Extensions for which we'll look for symbols
   $RelevantExtensions = @('.dll', '.exe', '.so', '.dylib')
 
@@ -72,7 +72,7 @@ $CountMissingSymbols = {
   $PackageGuid = New-Guid
   $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageGuid
   $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
-
+  
   try {
     [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
   }
@@ -95,7 +95,7 @@ $CountMissingSymbols = {
     }
 
     $FirstMatchingSymbolDescriptionOrDefault = {
-      param(
+      param( 
         [string] $FullPath, # Full path to the module that has to be checked
         [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
         [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs.
@@ -142,10 +142,10 @@ $CountMissingSymbols = {
         }
         elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) {
           return 'So and DBG for SO'
-        }
+        }  
         elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) {
           return 'Dylib and Dwarf for Dylib'
-        }
+        }  
         elseif (Test-Path $SymbolPath) {
           return 'Module'
         }
@@ -154,7 +154,7 @@ $CountMissingSymbols = {
           $totalRetries++
         }
       }
-
+      
       return $null
     }
 
@@ -179,7 +179,7 @@ $CountMissingSymbols = {
           -WindowsPdbVerificationParam $WindowsPdbVerificationParam
 
       Write-Host -NoNewLine "`t Checking file " $FileName "... "
-
+  
       if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
         Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)"
       }
@@ -200,11 +200,11 @@ $CountMissingSymbols = {
       }
     }
   }
-
+  
   if ($using:Clean) {
     Remove-Item $ExtractPath -Recurse -Force
   }
-
+  
   Pop-Location
 
   return [pscustomobject]@{
@@ -214,14 +214,14 @@ $CountMissingSymbols = {
 }
 
 function CheckJobResult(
-  $result,
+  $result, 
   $packagePath,
   [ref]$DupedSymbols,
   [ref]$TotalFailures) {
   if ($result -eq $ERROR_BADEXTRACT) {
     Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files"
     $DupedSymbols.Value++
-  }
+  } 
   elseif ($result -eq $ERROR_FILEDOESNOTEXIST) {
     Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath does not exist"
     $TotalFailures.Value++
@@ -296,7 +296,7 @@ function CheckSymbolsAvailable {
     if ($DupedSymbols -gt 0) {
       Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted"
     }
-
+    
     ExitWithExitCode 1
   }
   else {
@@ -323,7 +323,7 @@ function InstallDotnetSymbol {
 
 try {
   . $PSScriptRoot\post-build-utils.ps1
-
+  
   InstallDotnetSymbol
 
   foreach ($Job in @(Get-Job)) {
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index f89e98df44c94..bdbf49e6c71de 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -43,7 +43,7 @@ try {
       if (-not ($_['Args'])) { $_.Args = @() }
       $_
     }
-
+  
   Write-Host "List of tools to configure:"
   $ToolsList | ForEach-Object { $_ | Out-String | Write-Host }
 
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index cced403bd6711..e3ba9398016be 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -81,7 +81,7 @@ jobs:
     - ${{ if ne(variable.name, '') }}:
       - name: ${{ variable.name }}
         value: ${{ variable.value }}
-
+    
     # handle variable groups
     - ${{ if ne(variable.group, '') }}:
       - group: ${{ variable.group }}
@@ -149,7 +149,7 @@ jobs:
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks
+        displayName: Execute Microbuild cleanup tasks  
         condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
         continueOnError: ${{ parameters.continueOnError }}
         env:
@@ -184,7 +184,7 @@ jobs:
         continueOnError: true
         condition: always()
     - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
-      - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:    
         - task: CopyFiles@2
           displayName: Gather Asset Manifests
           inputs:
@@ -217,7 +217,7 @@ jobs:
       displayName: Publish XUnit Test Results
       inputs:
         testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml'
+        testResultsFiles: '*.xml' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
         mergeTestResults: ${{ parameters.mergeTestResults }}
@@ -228,13 +228,13 @@ jobs:
       displayName: Publish TRX Test Results
       inputs:
         testResultsFormat: 'VSTest'
-        testResultsFiles: '*.trx'
+        testResultsFiles: '*.trx' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
       condition: always()
-
+    
   - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - task: CopyFiles@2
       displayName: Gather Asset Manifests
@@ -252,15 +252,6 @@ jobs:
         ArtifactName: AssetManifests
       continueOnError: ${{ parameters.continueOnError }}
       condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-<<<<<<< HEAD
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
-    - template: /eng/common/templates/steps/generate-sbom.yml
-      parameters:
-        PackageVersion: ${{ parameters.packageVersion}}
-        BuildDropPath: ${{ parameters.buildDropPath }}
-||||||| 67da3ea9100
-=======
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
     - template: /eng/common/templates/steps/generate-sbom.yml
@@ -268,4 +259,3 @@ jobs:
         PackageVersion: ${{ parameters.packageVersion}}
         BuildDropPath: ${{ parameters.buildDropPath }}
 
->>>>>>> origin/release/dev17.0-vs-deps
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index aab6dbd61ea26..1cbb6a0c56003 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -61,14 +61,14 @@ jobs:
         checkDownloadedFiles: true
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
-
+    
     - task: NuGetAuthenticate@0
 
-    - task: PowerShell@2
-      displayName: Enable cross-org NuGet feed authentication
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
-        arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw)
+    - task: PowerShell@2 
+      displayName: Enable cross-org NuGet feed authentication 
+      inputs: 
+        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 
+        arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) 
 
     - task: PowerShell@2
       displayName: Publish Build Assets
@@ -82,7 +82,7 @@ jobs:
           /p:OfficialBuildId=$(Build.BuildNumber)
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
-
+    
     - task: powershell@2
       displayName: Create ReleaseConfigs Artifact
       inputs:
@@ -91,7 +91,7 @@ jobs:
           Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
           Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
           Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
-
+    
     - task: PublishBuildArtifacts@1
       displayName: Publish ReleaseConfigs Artifact
       inputs:
@@ -117,7 +117,7 @@ jobs:
 
     - task: PublishBuildArtifacts@1
       displayName: Publish SymbolPublishingExclusionsFile Artifact
-      condition: eq(variables['SymbolExclusionFile'], 'true')
+      condition: eq(variables['SymbolExclusionFile'], 'true') 
       inputs:
         PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
         PublishLocation: Container
@@ -133,7 +133,7 @@ jobs:
         displayName: Publish Using Darc
         inputs:
           filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-          arguments: -BuildId $(BARBuildId)
+          arguments: -BuildId $(BARBuildId) 
             -PublishingInfraVersion 3
             -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
             -MaestroToken '$(MaestroApiAccessToken)'
@@ -144,4 +144,4 @@ jobs:
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/templates/steps/publish-logs.yml
         parameters:
-          JobLabel: 'Publish_Artifacts_Logs'
+          JobLabel: 'Publish_Artifacts_Logs'     
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
index 77ea8317ff0d6..f7dc5ea4aaa63 100644
--- a/eng/common/templates/jobs/codeql-build.yml
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -26,6 +26,6 @@ jobs:
         value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
       - name: GuardianVersion
         value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
-
+  
     jobs: ${{ parameters.jobs }}
-
+        
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 7d32224833cc2..2cca53c2d1d53 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -20,7 +20,7 @@ parameters:
     enabled: false
     # Optional: Include toolset dependencies in the generated graph files
     includeToolset: false
-
+    
   # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
   jobs: []
 
@@ -47,7 +47,7 @@ parameters:
 jobs:
 - ${{ each job in parameters.jobs }}:
   - template: ../job/job.yml
-    parameters:
+    parameters: 
       # pass along parameters
       ${{ each parameter in parameters }}:
         ${{ if ne(parameter.key, 'jobs') }}:
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 75375cff4e16d..5a9056f6b2fb5 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -39,7 +39,7 @@ parameters:
     displayName: Enable NuGet validation
     type: boolean
     default: true
-
+    
   - name: publishInstallersAndChecksums
     displayName: Publish installers and checksums
     type: boolean
@@ -129,8 +129,8 @@ stages:
           displayName: Validate
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
-            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
-              -ToolDestinationPath $(Agent.BuildDirectory)/Extract/
+            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ 
+              -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ 
 
     - job:
       displayName: Signing Validation
@@ -225,9 +225,9 @@ stages:
           displayName: Validate
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
-            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
-              -ExtractPath $(Agent.BuildDirectory)/Extract/
-              -GHRepoName $(Build.Repository.Name)
+            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
+              -ExtractPath $(Agent.BuildDirectory)/Extract/ 
+              -GHRepoName $(Build.Repository.Name) 
               -GHCommit $(Build.SourceVersion)
               -SourcelinkCliVersion $(SourceLinkCLIVersion)
           continueOnError: true
@@ -274,10 +274,10 @@ stages:
           displayName: Publish Using Darc
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId)
+            arguments: -BuildId $(BARBuildId) 
               -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
               -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
               -MaestroToken '$(MaestroApiAccessToken)'
               -WaitPublishingFinish true
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
index d9c9ef508a4f2..4cea8c33187c9 100644
--- a/eng/common/templates/steps/generate-sbom.yml
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -1,6 +1,6 @@
 # BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
 # PackageName - The name of the package this SBOM represents.
-# PackageVersion - The version of the package this SBOM represents.
+# PackageVersion - The version of the package this SBOM represents. 
 # ManifestDirPath - The path of the directory where the generated manifest files will be placed
 
 parameters:
@@ -11,10 +11,10 @@ parameters:
   sbomContinueOnError: true
 
 steps:
-- task: PowerShell@2
+- task: PowerShell@2 
   displayName: Prep for SBOM generation in (Non-linux)
   condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
-  inputs:
+  inputs: 
     filePath: ./eng/common/generate-sbom-prep.ps1
     arguments: ${{parameters.manifestDirPath}}
 
diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml
index 7e2fea80b32d9..dbdd66d4a4b3a 100644
--- a/eng/common/templates/variables/sdl-variables.yml
+++ b/eng/common/templates/variables/sdl-variables.yml
@@ -4,4 +4,4 @@ variables:
 - name: DefaultGuardianVersion
   value: 0.109.0
 - name: GuardianPackagesConfigFile
-  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/eng/publish-assets.ps1 b/eng/publish-assets.ps1
index f75a06492318b..6e3043539b882 100644
--- a/eng/publish-assets.ps1
+++ b/eng/publish-assets.ps1
@@ -158,4 +158,4 @@ catch {
   Write-Host $_.Exception
   Write-Host $_.ScriptStackTrace
   exit 1
-}
\ No newline at end of file
+}
diff --git a/eng/test-determinism.ps1 b/eng/test-determinism.ps1
index ab6148fb2fc5a..e7c36de72ba8d 100644
--- a/eng/test-determinism.ps1
+++ b/eng/test-determinism.ps1
@@ -292,3 +292,4 @@ finally {
   Get-Process VBCSCompiler -ErrorAction SilentlyContinue | Stop-Process
   Write-Host "Stopped VBCSCompiler"
 }
+
diff --git a/global.json b/global.json
index 2b3e9ad4d1a36..90efbb504fff5 100644
--- a/global.json
+++ b/global.json
@@ -15,4 +15,4 @@
     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6",
     "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6"
   }
-}
\ No newline at end of file
+}
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
index eaa533fb76b8d..844772bb1df8b 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
+++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/InitOnlyMemberTests.vb
@@ -141,7 +141,7 @@ Class B
         x.Property0 = 41
 
         Dim z = Sub()
-                  Property5 = 46
+                  Property5 = 46  
                 End Sub
     End Sub
 
@@ -172,7 +172,7 @@ BC37311: Init-only property 'Property0' can only be assigned by an object member
         x.Property0 = 41
         ~~~~~~~~~~~~~~~~
 BC37311: Init-only property 'Property5' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Property5 = 46
+                  Property5 = 46  
                   ~~~~~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -438,7 +438,7 @@ Class B
         x.Property0 = 41
 
         Dim z = Sub()
-                  Property5 = 46
+                  Property5 = 46  
                 End Sub
     End Sub
 
@@ -469,7 +469,7 @@ BC37311: Init-only property 'Property0' can only be assigned by an object member
         x.Property0 = 41
         ~~~~~~~~~~~~~~~~
 BC37311: Init-only property 'Property5' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Property5 = 46
+                  Property5 = 46  
                   ~~~~~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -631,7 +631,7 @@ Class B
         x.Item(0) = 47
 
         Dim z = Sub()
-                  Item(0) = 48
+                  Item(0) = 48 
                   Me(0) = 49
                 End Sub
     End Sub
@@ -669,7 +669,7 @@ BC37311: Init-only property 'Item' can only be assigned by an object member init
         x.Item(0) = 47
         ~~~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Item(0) = 48
+                  Item(0) = 48 
                   ~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
                   Me(0) = 49
@@ -968,8 +968,8 @@ Class B
         x.Item(7) = 47
 
         Dim z = Sub()
-                  Item(8) = 48
-                  Me(9) = 49
+                  Item(8) = 48  
+                  Me(9) = 49  
                 End Sub
     End Sub
 
@@ -1006,10 +1006,10 @@ BC37311: Init-only property 'Item' can only be assigned by an object member init
         x.Item(7) = 47
         ~~~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Item(8) = 48
+                  Item(8) = 48  
                   ~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Me(9) = 49
+                  Me(9) = 49  
                   ~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -1175,7 +1175,7 @@ Class B
         x.Property0 += 41
 
         Dim z = Sub()
-                  Property5 += 46
+                  Property5 += 46  
                 End Sub
     End Sub
 
@@ -1206,7 +1206,7 @@ BC37311: Init-only property 'Property0' can only be assigned by an object member
         x.Property0 += 41
         ~~~~~~~~~~~~~~~~~
 BC37311: Init-only property 'Property5' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Property5 += 46
+                  Property5 += 46  
                   ~~~~~~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -1368,8 +1368,8 @@ Class B
         x.Item(0) += 47
 
         Dim z = Sub()
-                  Item(0) += 48
-                  Me(0) += 49
+                  Item(0) += 48  
+                  Me(0) += 49  
                 End Sub
     End Sub
 
@@ -1406,10 +1406,10 @@ BC37311: Init-only property 'Item' can only be assigned by an object member init
         x.Item(0) += 47
         ~~~~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Item(0) += 48
+                  Item(0) += 48  
                   ~~~~~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Me(0) += 49
+                  Me(0) += 49  
                   ~~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -1796,12 +1796,12 @@ public class C
 Class B1
     Inherits C
 
-    Public Overrides WriteOnly Property P0 As Integer
+    Public Overrides WriteOnly Property P0 As Integer 
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Overrides Property P1 As Integer
+    Public Overrides Property P1 As Integer 
 End Class
 
 Class B2
@@ -1809,7 +1809,7 @@ Class B2
 
     Public Overrides Property P0 As Integer
 
-    Public Overrides ReadOnly Property P1 As Integer
+    Public Overrides ReadOnly Property P1 As Integer 
 End Class
 
 Class B3
@@ -1817,10 +1817,10 @@ Class B3
 
     Public Overrides ReadOnly Property P0 As Integer
 
-    Public Overrides WriteOnly Property P1 As Integer
+    Public Overrides WriteOnly Property P1 As Integer 
         Set
         End Set
-    End Property
+    End Property 
 End Class
 ]]></file>
 </compilation>
@@ -1829,22 +1829,22 @@ End Class
             Dim expected1 =
 <expected>
 BC37312: 'Public Overrides WriteOnly Property P0 As Integer' cannot override init-only 'Public Overridable Overloads WriteOnly Property P0 As Integer'.
-    Public Overrides WriteOnly Property P0 As Integer
+    Public Overrides WriteOnly Property P0 As Integer 
                                         ~~
 BC37312: 'Public Overrides Property P1 As Integer' cannot override init-only 'Public Overridable Overloads Property P1 As Integer'.
-    Public Overrides Property P1 As Integer
+    Public Overrides Property P1 As Integer 
                               ~~
 BC30362: 'Public Overrides Property P0 As Integer' cannot override 'Public Overridable Overloads WriteOnly Property P0 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
     Public Overrides Property P0 As Integer
                               ~~
 BC30362: 'Public Overrides ReadOnly Property P1 As Integer' cannot override 'Public Overridable Overloads Property P1 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides ReadOnly Property P1 As Integer
+    Public Overrides ReadOnly Property P1 As Integer 
                                        ~~
 BC30362: 'Public Overrides ReadOnly Property P0 As Integer' cannot override 'Public Overridable Overloads WriteOnly Property P0 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
     Public Overrides ReadOnly Property P0 As Integer
                                        ~~
 BC30362: 'Public Overrides WriteOnly Property P1 As Integer' cannot override 'Public Overridable Overloads Property P1 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides WriteOnly Property P1 As Integer
+    Public Overrides WriteOnly Property P1 As Integer 
                                         ~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -1880,18 +1880,18 @@ public class C<T>
 Class B1
     Inherits C(Of Integer)
 
-    Public Overrides WriteOnly Property Item(x as Integer) As Integer
+    Public Overrides WriteOnly Property Item(x as Integer) As Integer 
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Overrides Property Item(x as Short) As Integer
+    Public Overrides Property Item(x as Short) As Integer 
         Get
             Return Nothing
         End Get
         Set
         End Set
-    End Property
+    End Property 
 End Class
 
 Class B2
@@ -1903,13 +1903,13 @@ Class B2
         End Get
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Overrides ReadOnly Property Item(x as Short) As Integer
+    Public Overrides ReadOnly Property Item(x as Short) As Integer 
         Get
             Return Nothing
         End Get
-    End Property
+    End Property 
 End Class
 
 Class B3
@@ -1919,12 +1919,12 @@ Class B3
         Get
             Return Nothing
         End Get
-    End Property
+    End Property 
 
-    Public Overrides WriteOnly Property Item(x as Short) As Integer
+    Public Overrides WriteOnly Property Item(x as Short) As Integer 
         Set
         End Set
-    End Property
+    End Property 
 End Class
 ]]></file>
 </compilation>
@@ -1933,22 +1933,22 @@ End Class
             Dim expected1 =
 <expected>
 BC37312: 'Public Overrides WriteOnly Property Item(x As Integer) As Integer' cannot override init-only 'Public Overridable Overloads WriteOnly Default Property Item(x As Integer) As Integer'.
-    Public Overrides WriteOnly Property Item(x as Integer) As Integer
+    Public Overrides WriteOnly Property Item(x as Integer) As Integer 
                                         ~~~~
 BC37312: 'Public Overrides Property Item(x As Short) As Integer' cannot override init-only 'Public Overridable Overloads Default Property Item(x As Short) As Integer'.
-    Public Overrides Property Item(x as Short) As Integer
+    Public Overrides Property Item(x as Short) As Integer 
                               ~~~~
 BC30362: 'Public Overrides Property Item(x As Integer) As Integer' cannot override 'Public Overridable Overloads WriteOnly Default Property Item(x As Integer) As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
     Public Overrides Property Item(x as Integer) As Integer
                               ~~~~
 BC30362: 'Public Overrides ReadOnly Property Item(x As Short) As Integer' cannot override 'Public Overridable Overloads Default Property Item(x As Short) As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides ReadOnly Property Item(x as Short) As Integer
+    Public Overrides ReadOnly Property Item(x as Short) As Integer 
                                        ~~~~
 BC30362: 'Public Overrides ReadOnly Property Item(x As Integer) As Integer' cannot override 'Public Overridable Overloads WriteOnly Default Property Item(x As Integer) As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
     Public Overrides ReadOnly Property Item(x as Integer) As Integer
                                        ~~~~
 BC30362: 'Public Overrides WriteOnly Property Item(x As Short) As Integer' cannot override 'Public Overridable Overloads Default Property Item(x As Short) As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides WriteOnly Property Item(x as Short) As Integer
+    Public Overrides WriteOnly Property Item(x as Short) As Integer 
                                         ~~~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -1987,15 +1987,15 @@ public class B : A
 Class C1
     Inherits B
 
-    Public Overrides WriteOnly Property P1 As Integer
+    Public Overrides WriteOnly Property P1 As Integer 
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Overrides WriteOnly Property P2 As Integer
+    Public Overrides WriteOnly Property P2 As Integer 
         Set
         End Set
-    End Property
+    End Property 
 End Class
 
 Class C2
@@ -2003,7 +2003,7 @@ Class C2
 
     Public Overrides Property P1 As Integer
 
-    Public Overrides Property P2 As Integer
+    Public Overrides Property P2 As Integer 
 End Class
 
 Class C3
@@ -2011,7 +2011,7 @@ Class C3
 
     Public Overrides ReadOnly Property P1 As Integer
 
-    Public Overrides ReadOnly Property P2 As Integer
+    Public Overrides ReadOnly Property P2 As Integer 
 End Class
 ]]></file>
 </compilation>
@@ -2020,19 +2020,19 @@ End Class
             Dim expected1 =
 <expected>
 BC30362: 'Public Overrides WriteOnly Property P1 As Integer' cannot override 'Public Overrides ReadOnly Property P1 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides WriteOnly Property P1 As Integer
+    Public Overrides WriteOnly Property P1 As Integer 
                                         ~~
 BC37312: 'Public Overrides WriteOnly Property P2 As Integer' cannot override init-only 'Public Overrides WriteOnly Property P2 As Integer'.
-    Public Overrides WriteOnly Property P2 As Integer
+    Public Overrides WriteOnly Property P2 As Integer 
                                         ~~
 BC30362: 'Public Overrides Property P1 As Integer' cannot override 'Public Overrides ReadOnly Property P1 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
     Public Overrides Property P1 As Integer
                               ~~
 BC30362: 'Public Overrides Property P2 As Integer' cannot override 'Public Overrides WriteOnly Property P2 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides Property P2 As Integer
+    Public Overrides Property P2 As Integer 
                               ~~
 BC30362: 'Public Overrides ReadOnly Property P2 As Integer' cannot override 'Public Overrides WriteOnly Property P2 As Integer' because they differ by 'ReadOnly' or 'WriteOnly'.
-    Public Overrides ReadOnly Property P2 As Integer
+    Public Overrides ReadOnly Property P2 As Integer 
                                        ~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -2060,38 +2060,38 @@ BC30362: 'Public Overrides ReadOnly Property P2 As Integer' cannot override 'Pub
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2147,38 +2147,38 @@ End Class
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 get_P() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2235,38 +2235,38 @@ End Class
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(CL1) P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2295,7 +2295,7 @@ End Class
 
             compilation.AssertTheseDiagnostics(
 <expected>
-BC30935: Member 'Public Overridable Overloads Property P As Integer' that matches this signature cannot be overridden because the class 'CL1' contains multiple members with this same name and signature:
+BC30935: Member 'Public Overridable Overloads Property P As Integer' that matches this signature cannot be overridden because the class 'CL1' contains multiple members with this same name and signature: 
    'Public Overridable Overloads Property P As Integer'
    'Public Overridable Overloads Property P As Integer'
     Overrides Property P As Integer
@@ -2329,38 +2329,38 @@ BC30935: Member 'Public Overridable Overloads Property P As Integer' that matche
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 get_P() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(CL1) P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2389,7 +2389,7 @@ End Class
 
             compilation.AssertTheseDiagnostics(
 <expected>
-BC30935: Member 'Public Overridable Overloads Property P As Integer' that matches this signature cannot be overridden because the class 'CL1' contains multiple members with this same name and signature:
+BC30935: Member 'Public Overridable Overloads Property P As Integer' that matches this signature cannot be overridden because the class 'CL1' contains multiple members with this same name and signature: 
    'Public Overridable Overloads Property P As Integer'
    'Public Overridable Overloads Property P As Integer'
     Overrides Property P As Integer
@@ -2423,76 +2423,76 @@ BC30935: Member 'Public Overridable Overloads Property P As Integer' that matche
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P1(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P1()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P1()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P1(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 get_P1() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P1(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P1()
     {
       .get instance int32 CL1::get_P1()
       .set instance void CL1::set_P1(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 get_P2() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void set_P2(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P2()
     {
       .get instance int32 CL1::get_P2()
       .set instance void CL1::set_P2(int32)
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P2() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig newslot virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P2(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P2()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P2()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P2(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2520,38 +2520,38 @@ BC30935: Member 'Public Overridable Overloads Property P As Integer' that matche
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P1(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P1()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL2::get_P1()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL2::set_P1(int32)
-    }
+    } 
 
     .method public hidebysig virtual
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P2() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig virtual
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P2(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P2()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL2::get_P2()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL2::set_P2(int32)
-    }
+    } 
 }
 
 .class public auto ansi beforefieldinit CL3
@@ -2570,38 +2570,38 @@ BC30935: Member 'Public Overridable Overloads Property P As Integer' that matche
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig virtual
             instance void set_P1(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P1()
     {
       .get instance int32 CL3::get_P1()
       .set instance void CL3::set_P1(int32)
-    }
+    } 
 
     .method public hidebysig virtual
             instance int32 get_P2() cil managed
     {
       ldc.i4.s   123
       ret
-    }
+    } 
 
     .method public hidebysig virtual
             instance void set_P2(int32 x) cil managed
     {
       ret
-    }
+    } 
 
     .property instance int32 P2()
     {
       .get instance int32 CL3::get_P2()
       .set instance void CL3::set_P2(int32)
-    }
+    } 
 }
 ]]>.Value
 
@@ -2656,9 +2656,9 @@ Class B1
     Public WriteOnly Property P0 As Integer Implements I.P0
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Property P1 As Integer Implements I.P1
+    Public Property P1 As Integer Implements I.P1 
 End Class
 
 Class B2
@@ -2666,7 +2666,7 @@ Class B2
 
     Public Property P0 As Integer Implements I.P0
 
-    Public ReadOnly Property P1 As Integer Implements I.P1
+    Public ReadOnly Property P1 As Integer Implements I.P1 
 End Class
 
 Class B3
@@ -2674,10 +2674,10 @@ Class B3
 
     Public ReadOnly Property P0 As Integer Implements I.P0
 
-    Public WriteOnly Property P1 As Integer Implements I.P1
+    Public WriteOnly Property P1 As Integer Implements I.P1 
         Set
         End Set
-    End Property
+    End Property 
 End Class
 ]]></file>
 </compilation>
@@ -2689,22 +2689,22 @@ BC37313: Init-only 'WriteOnly Property P0 As Integer' cannot be implemented.
     Public WriteOnly Property P0 As Integer Implements I.P0
                                                        ~~~~
 BC37313: Init-only 'Property P1 As Integer' cannot be implemented.
-    Public Property P1 As Integer Implements I.P1
+    Public Property P1 As Integer Implements I.P1 
                                              ~~~~
 BC37313: Init-only 'WriteOnly Property P0 As Integer' cannot be implemented.
     Public Property P0 As Integer Implements I.P0
                                              ~~~~
 BC31444: 'Property P1 As Integer' cannot be implemented by a ReadOnly property.
-    Public ReadOnly Property P1 As Integer Implements I.P1
+    Public ReadOnly Property P1 As Integer Implements I.P1 
                                                       ~~~~
 BC31444: 'WriteOnly Property P0 As Integer' cannot be implemented by a ReadOnly property.
     Public ReadOnly Property P0 As Integer Implements I.P0
                                                       ~~~~
 BC31444: 'Property P1 As Integer' cannot be implemented by a WriteOnly property.
-    Public WriteOnly Property P1 As Integer Implements I.P1
+    Public WriteOnly Property P1 As Integer Implements I.P1 
                                                        ~~~~
 BC37313: Init-only 'Property P1 As Integer' cannot be implemented.
-    Public WriteOnly Property P1 As Integer Implements I.P1
+    Public WriteOnly Property P1 As Integer Implements I.P1 
                                                        ~~~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -2741,15 +2741,15 @@ Class B1
     Public WriteOnly Property Item(x As Integer) As Integer Implements I.Item
         Set
         End Set
-    End Property
+    End Property 
 
-    Public Property Item(x As Short) As Integer Implements I.Item
+    Public Property Item(x As Short) As Integer Implements I.Item 
         Get
             Return Nothing
         End Get
         Set
         End Set
-    End Property
+    End Property 
 End Class
 
 Class B2
@@ -2761,13 +2761,13 @@ Class B2
         End Get
         Set
         End Set
-    End Property
+    End Property 
 
-    Public ReadOnly Property Item(x As Short) As Integer Implements I.Item
+    Public ReadOnly Property Item(x As Short) As Integer Implements I.Item 
         Get
             Return Nothing
         End Get
-    End Property
+    End Property 
 End Class
 
 Class B3
@@ -2777,12 +2777,12 @@ Class B3
         Get
             Return Nothing
         End Get
-    End Property
+    End Property 
 
-    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item
+    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item 
         Set
         End Set
-    End Property
+    End Property 
 End Class
 ]]></file>
 </compilation>
@@ -2794,22 +2794,22 @@ BC37313: Init-only 'WriteOnly Default Property Item(x As Integer) As Integer' ca
     Public WriteOnly Property Item(x As Integer) As Integer Implements I.Item
                                                                        ~~~~~~
 BC37313: Init-only 'Default Property Item(x As Short) As Integer' cannot be implemented.
-    Public Property Item(x As Short) As Integer Implements I.Item
+    Public Property Item(x As Short) As Integer Implements I.Item 
                                                            ~~~~~~
 BC37313: Init-only 'WriteOnly Default Property Item(x As Integer) As Integer' cannot be implemented.
     Public Property Item(x As Integer) As Integer Implements I.Item
                                                              ~~~~~~
 BC31444: 'Default Property Item(x As Short) As Integer' cannot be implemented by a ReadOnly property.
-    Public ReadOnly Property Item(x As Short) As Integer Implements I.Item
+    Public ReadOnly Property Item(x As Short) As Integer Implements I.Item 
                                                                     ~~~~~~
 BC31444: 'WriteOnly Default Property Item(x As Integer) As Integer' cannot be implemented by a ReadOnly property.
     Public ReadOnly Property Item(x As Integer) As Integer Implements I.Item
                                                                       ~~~~~~
 BC31444: 'Default Property Item(x As Short) As Integer' cannot be implemented by a WriteOnly property.
-    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item
+    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item 
                                                                      ~~~~~~
 BC37313: Init-only 'Default Property Item(x As Short) As Integer' cannot be implemented.
-    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item
+    Public WriteOnly Property Item(x As Short) As Integer Implements I.Item 
                                                                      ~~~~~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -2837,13 +2837,13 @@ public interface I
 Class B2
     Implements I
 
-    Public Property P0 As Integer Implements I.P0, I.P1
+    Public Property P0 As Integer Implements I.P0, I.P1 
 End Class
 
 Class B3
     Implements I
 
-    Public Property P0 As Integer Implements I.P1, I.P0
+    Public Property P0 As Integer Implements I.P1, I.P0 
 End Class
 ]]></file>
 </compilation>
@@ -2852,10 +2852,10 @@ End Class
             Dim expected1 =
 <expected>
 BC37313: Init-only 'Property P1 As Integer' cannot be implemented.
-    Public Property P0 As Integer Implements I.P0, I.P1
+    Public Property P0 As Integer Implements I.P0, I.P1 
                                                    ~~~~
 BC37313: Init-only 'Property P1 As Integer' cannot be implemented.
-    Public Property P0 As Integer Implements I.P1, I.P0
+    Public Property P0 As Integer Implements I.P1, I.P0 
                                              ~~~~
 </expected>
             comp1.AssertTheseDiagnostics(expected1)
@@ -2869,37 +2869,37 @@ BC37313: Init-only 'Property P1 As Integer' cannot be implemented.
             Dim ilSource = <![CDATA[
 .class interface public abstract auto ansi CL1
 {
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance int32 get_P() cil managed
     {
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance void set_P(int32 x) cil managed
     {
-    }
+    } 
 
     .property instance int32 P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P() cil managed
     {
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -2952,37 +2952,37 @@ BC30937: Member 'CL1.P' that matches this signature cannot be implemented becaus
             Dim ilSource = <![CDATA[
 .class interface public abstract auto ansi CL1
 {
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) get_P() cil managed
     {
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance void modreq(System.Runtime.CompilerServices.IsExternalInit) set_P(int32 x) cil managed
     {
-    }
+    } 
 
     .property instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) P()
     {
       .get instance int32 modopt(System.Runtime.CompilerServices.IsExternalInit) CL1::get_P()
       .set instance void modreq(System.Runtime.CompilerServices.IsExternalInit) CL1::set_P(int32)
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance int32 get_P() cil managed
     {
-    }
+    } 
 
-    .method public hidebysig newslot specialname abstract virtual
+    .method public hidebysig newslot specialname abstract virtual 
             instance void set_P(int32 x) cil managed
     {
-    }
+    } 
 
     .property instance int32 P()
     {
       .get instance int32 CL1::get_P()
       .set instance void CL1::set_P(int32)
-    }
+    } 
 } // end of class CL1
 
 .class public auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsExternalInit extends System.Object
@@ -3057,37 +3057,13 @@ Public Class Test
         Dim x = new C()
         Dim ox As Object = x
 
-        Try
-            ox.P0 = -40
-        Catch ex As System.MissingMemberException
-            System.Console.Write(x.P0)
-            System.Console.Write(" ")
-        End Try
-
+        ox.P0 = -40
         b.Init(ox.P1, -41)
         ob.Init(x.P2, -42)
         ob.Init(ox.P3, -43)
 
-        System.Console.Write(x.P1)
-        System.Console.Write(" ")
-        System.Console.Write(x.P2)
-        System.Console.Write(" ")
-        System.Console.Write(x.P3)
-
-        Try
-            ox(0) = 40
-        Catch ex As System.MissingMemberException
-            System.Console.Write(" ")
-            System.Console.Write(x(0))
-        End Try
-
-        Try
-            ox.Item(1) = 41
-        Catch ex As System.MissingMemberException
-            System.Console.Write(" ")
-            System.Console.Write(x(1))
-        End Try
-
+        ox(0) = 40
+        ox.Item(1) = 41
         b.Init(ox(2), 42)
         ob.Init(x(3), 43)
         b.Init(ox.Item(4), 44)
@@ -3095,7 +3071,15 @@ Public Class Test
         ob.Init(ox(6), 46)
         ob.Init(ox.Item(7), 47)
 
-        For i as Integer = 2 To 7
+        System.Console.Write(x.P0)
+        System.Console.Write(" ")
+        System.Console.Write(x.P1)
+        System.Console.Write(" ")
+        System.Console.Write(x.P2)
+        System.Console.Write(" ")
+        System.Console.Write(x.P3)
+
+        For i as Integer = 0 To 7
             System.Console.Write(" ")
             System.Console.Write(x(i))
         Next
@@ -3110,7 +3094,7 @@ End Class
 ]]></file>
 </compilation>
 
-            Dim expectedOutput As String = "0 0 0 0 0 0 0 0 0 0 0 0"
+            Dim expectedOutput As String = "-40 -41 0 -43 40 41 42 0 44 0 46 47"
             Dim comp1 = CreateCompilation(source1, parseOptions:=TestOptions.RegularLatest, options:=TestOptions.DebugExe, references:={csCompilation})
             CompileAndVerify(comp1, expectedOutput:=expectedOutput).VerifyDiagnostics()
 
@@ -3142,32 +3126,10 @@ Public Class Test
         Dim x = new C()
         Dim ox As Object = x
 
-        Try
-            ox(0) = 40
-        Catch ex As System.MissingMemberException
-            System.Console.Write(x(0))
-        End Try
-
-        Try
-            ox.Item(1) = 41
-        Catch ex As System.MissingMemberException
-            System.Console.Write(" ")
-            System.Console.Write(x(1))
-        End Try
-
-        Try
-            x(CObj(2)) = 42
-        Catch ex As System.MissingMemberException
-            System.Console.Write(" ")
-            System.Console.Write(x(2))
-        End Try
-
-        Try
-            x.Item(CObj(3)) = 43
-        Catch ex As System.MissingMemberException
-            System.Console.Write(" ")
-            System.Console.Write(x(3))
-        End Try
+        ox(0) = 40
+        ox.Item(1) = 41
+        x(CObj(2)) = 42
+        x.Item(CObj(3)) = 43
 
         b.Init(ox(4), 44)
         ob.Init(ox(5), 45)
@@ -3178,7 +3140,9 @@ Public Class Test
         b.Init(x.Item(CObj(10)), 50)
         ob.Init(x.Item(CObj(11)), 51)
 
-        For i as Integer = 4 To 11
+        System.Console.Write(x(0))
+
+        For i as Integer = 1 To 11
             System.Console.Write(" ")
             System.Console.Write(x(i))
         Next
@@ -3193,7 +3157,7 @@ End Class
 ]]></file>
 </compilation>
 
-            Dim expectedOutput As String = "0 0 0 0 0 0 0 0 0 0 0 0"
+            Dim expectedOutput As String = "40 41 42 43 44 45 46 47 48 49 50 51"
             Dim comp1 = CreateCompilation(source1, parseOptions:=TestOptions.RegularLatest, options:=TestOptions.DebugExe, references:={csCompilation})
             CompileAndVerify(comp1, expectedOutput:=expectedOutput).VerifyDiagnostics()
 
@@ -4218,7 +4182,7 @@ Class B
         x!c6 = 46
 
         Dim z = Sub()
-                  Me!c9 = 49
+                  Me!c9 = 49  
                 End Sub
     End Sub
 
@@ -4249,7 +4213,7 @@ BC37311: Init-only property 'Item' can only be assigned by an object member init
         x!c6 = 46
         ~~~~~~~~~
 BC37311: Init-only property 'Item' can only be assigned by an object member initializer, or on 'Me', 'MyClass` or 'MyBase' in an instance constructor.
-                  Me!c9 = 49
+                  Me!c9 = 49  
                   ~~~~~~~~~~
 </expected>
             comp3.AssertTheseDiagnostics(expected3)
@@ -4566,12 +4530,12 @@ BC30657: 'M' has a return type that is not supported or parameter types that are
     {
         IL_0000: ldnull
         IL_0001: throw
-    }
+    } 
 
     .property instance int32 P()
     {
       .set void modreq(System.Runtime.CompilerServices.IsExternalInit) C::set_P(int32)
-    }
+    } 
 
     .method public hidebysig specialname rtspecialname instance void .ctor () cil managed
     {
@@ -5071,12 +5035,12 @@ BC30643: Property 'C.Property1' is of an unsupported type.
     {
         IL_0000: ldnull
         IL_0001: throw
-    }
+    } 
 
     .property instance int32 P()
     {
       .set instance void modopt(System.Runtime.CompilerServices.IsExternalInit) C::set_P(int32)
-    }
+    } 
 
     .method public hidebysig specialname rtspecialname instance void .ctor () cil managed
     {
@@ -5138,12 +5102,12 @@ End Class
     {
         IL_0000: ldnull
         IL_0001: throw
-    }
+    } 
 
     .property instance int32 P()
     {
       .set instance void modreq(" + modifierName + ") C::set_P(int32)
-    }
+    } 
 
     .method public hidebysig specialname rtspecialname instance void .ctor () cil managed
     {
@@ -5213,7 +5177,7 @@ Class Test1(Of T)
     End Sub
 
     Public Function M2() As System.Action
-        return Sub()
+        return Sub() 
                End Sub
     End Function
 

From be12f78152e3e81fc02206d45c33a2bc04f69703 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Wed, 4 May 2022 17:52:41 -0700
Subject: [PATCH 225/413] Fix insert.yml

---
 eng/Versions.props       |  1 -
 eng/pipelines/insert.yml | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index c781a9d9e2e9d..f97c3f9ed0982 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -102,7 +102,6 @@
     <MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta2-20115-01</MicrosoftDiaSymReaderConverterXmlVersion>
     <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.5.0</MicrosoftDiaSymReaderPortablePdbVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22218.4</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
index 043d08a47aed7..9b899d1cb2432 100644
--- a/eng/pipelines/insert.yml
+++ b/eng/pipelines/insert.yml
@@ -20,7 +20,7 @@ parameters:
     type: string
   - name: componentPassword
     type: string
-
+  
   - name: publishDataURI
     type: string
   - name: publishDataAccessToken
@@ -40,6 +40,10 @@ parameters:
   - name: sourceBranch
     type: string
 
+  - name: dropPath
+    type: string
+    default: ''
+
 steps:
   - checkout: none
 
@@ -68,6 +72,7 @@ steps:
       Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($true)"
       Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('')"
       Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.DropPath]$('(default)')"
 
       Write-Host "##vso[task.setvariable variable=Template.ComponentBranchName]$branchName"
       Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$($branchData.vsBranch)"
@@ -98,6 +103,15 @@ steps:
       PublishDataAccessToken: ${{ parameters.publishDataAccessToken }}
 
   - powershell: |
+      # Set AzDO authorization template variables
+      Write-Host "Setting BuildUserName to $Env:BuildUserName"
+      Write-Host "##vso[task.setvariable variable=Template.BuildUserName]$Env:BuildUserName"
+      Write-Host "##vso[task.setvariable variable=Template.BuildPassword]$Env:BuildPassword"
+
+      Write-Host "Setting ComponentUserName to $Env:ComponentUserName"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentUserName]$Env:ComponentUserName"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentPassword]$Env:ComponentPassword"
+
       # Overwrite template variables with values passed into this template as parameters
       if ("" -ne $Env:CreateDraftPR)
       {
@@ -137,14 +151,25 @@ steps:
         Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$Env:ComponentBuildProjectName"
       }
 
+      if ("" -ne $Env:DropPath)
+      {
+        Write-Host "Setting DropPath to $Env:DropPath"
+        Write-Host "##vso[task.setvariable variable=Template.DropPath]$Env:DropPath"
+      }
+
     displayName: Set Variables from Input Parameters
     env:
+      BuildUserName: ${{ parameters.buildUserName }}
+      BuildPassword: ${{ parameters.buildPassword }}
+      ComponentUserName: ${{ parameters.componentUserName }}
+      ComponentPassword: ${{ parameters.componentPassword }}
       CreateDraftPR: ${{ parameters.createDraftPR }}
       AutoComplete: ${{ parameters.autoComplete }}
       TitlePrefix: ${{ parameters.titlePrefix }}
       InsertToolset: ${{ parameters.insertToolset }}
       VSBranchName: ${{ parameters.vsBranchName }}
       ComponentBuildProjectName: ${{ parameters.componentBuildProjectName }}
+      DropPath: ${{ parameters.dropPath }}
 
   # Now that everything is set, actually perform the insertion.
   - powershell: |
@@ -153,10 +178,10 @@ steps:
         -autoComplete "$(Template.AutoComplete)" `
         -buildQueueName "$(Build.DefinitionName)" `
         -cherryPick "(default)" `
-        -userName "${{ parameters.buildUserName }}" `
-        -password "${{ parameters.buildPassword }}" `
-        -componentUserName "${{ parameters.componentUserName }}" `
-        -componentPassword "${{ parameters.componentPassword }}" `
+        -userName "$(Template.BuildUserName)" `
+        -password "$(Template.BuildPassword)" `
+        -componentUserName "$(Template.ComponentUserName)" `
+        -componentPassword "$(Template.ComponentPassword)" `
         -componentAzdoUri "$(Template.ComponentAzdoUri)" `
         -componentProjectName "$(Template.ComponentProjectName)" `
         -componentName "Roslyn" `
@@ -164,7 +189,7 @@ steps:
         -componentBranchName "$(Template.ComponentBranchName)" `
         -createDraftPR "$(Template.CreateDraftPR)" `
         -defaultValueSentinel "(default)" `
-        -dropPath "(default)" `
+        -dropPath "$(Template.DropPath)" `
         -insertCore "(default)" `
         -insertDevDiv "(default)" `
         -insertionCount "1" `

From 5a59eddf05551b34e7d15ccb6a73fb1243cb9dd8 Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Wed, 4 May 2022 18:01:15 -0700
Subject: [PATCH 226/413] vb tests

---
 .../GenerateVariable/GenerateVariableTests.vb | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
index f17b8ee7dfcd3..47e2aa5576d14 100644
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -3032,6 +3032,69 @@ Class Test
     Private Async Function Test(someParameter As String, time As System.TimeSpan, token As CancellationToken) As Task
         Await Task.Delay(time)
     End Function
+End Class", index:=4)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeCancellationTokenAndOptionalParameter() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(Optional ByVal someParameter As Boolean = True, token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(time As System.TimeSpan, Optional ByVal someParameter As Boolean = True, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeCancellationTokenAndOptionalParameter_MultipleParameters() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(int value, Optional ByVal someParameter As Boolean = True, token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(int value, time As System.TimeSpan, Optional ByVal someParameter As Boolean = True, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeOptionalParameter() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(Optional ByVal someParameter As Boolean = True) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(time As System.TimeSpan, Optional ByVal someParameter As Boolean = True) As Task
+        Await Task.Delay(time)
+    End Function
 End Class", index:=4)
         End Function
     End Class

From 46845086b76128232fa9ee694e01f5dfedb57d2f Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Wed, 4 May 2022 18:30:35 -0700
Subject: [PATCH 227/413] params parameters as well

---
 .../GenerateVariable/GenerateVariableTests.cs | 26 +++++++++++++++++++
 .../GenerateVariable/GenerateVariableTests.vb | 21 +++++++++++++++
 .../AbstractGenerateVariableService.cs        |  4 ++-
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index ad2be4140ef4c..f9d76c9a4f598 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9854,6 +9854,32 @@ public async Task M(System.TimeSpan time, bool someParameter = true)
     {
         await Task.Delay(time);
     }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeParamsParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(params double[] x)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(System.TimeSpan time, params double[] x)
+    {
+        await Task.Delay(time);
+    }
 }", index: 4);
         }
     }
diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
index 47e2aa5576d14..3a69547f1e1ec 100644
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -3095,6 +3095,27 @@ Class Test
     Private Async Function Test(time As System.TimeSpan, Optional ByVal someParameter As Boolean = True) As Task
         Await Task.Delay(time)
     End Function
+End Class", index:=4)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeParamsParameter() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(ByVal ParamArray args() As Double) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(time As System.TimeSpan, ByVal ParamArray args() As Double) As Task
+        Await Task.Delay(time)
+    End Function
 End Class", index:=4)
         End Function
     End Class
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 68b05904f1b37..021a429bde1eb 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -220,7 +220,9 @@ private static async Task AddParameterCodeActionsAsync(
                     for (var i = containingMethod.Parameters.Length - 1; i >= 0; i--)
                     {
                         var parameter = containingMethod.Parameters[i];
-                        if (parameter.HasExplicitDefaultValue || Equals(parameter.Type, compilation.CancellationTokenType()))
+                        if (parameter.HasExplicitDefaultValue
+                            || Equals(parameter.Type, compilation.CancellationTokenType())
+                            || parameter.IsParams)
                         {
                             parameterIndex--;
                         }

From 70646deedcbe6f20b2b9cc69b00afd36302c5bab Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Wed, 4 May 2022 22:16:38 -0700
Subject: [PATCH 228/413] Address feedback

---
 ...odeRefactoringProvider.CanConvertParams.cs | 25 +++++++++++++++
 ...tringToRawStringCodeRefactoringProvider.cs | 32 ++++---------------
 .../Core/Utilities/BidirectionalMap.cs        | 26 +++++++++++++++
 3 files changed, 58 insertions(+), 25 deletions(-)
 create mode 100644 src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.CanConvertParams.cs

diff --git a/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.CanConvertParams.cs b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.CanConvertParams.cs
new file mode 100644
index 0000000000000..c8774033d0d8e
--- /dev/null
+++ b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.CanConvertParams.cs
@@ -0,0 +1,25 @@
+// 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.EmbeddedLanguages.VirtualChars;
+
+namespace Microsoft.CodeAnalysis.CSharp.ConvertToRawString
+{
+    internal partial class ConvertRegularStringToRawStringCodeRefactoringProvider
+    {
+        private readonly struct CanConvertParams
+        {
+            public CanConvertParams(VirtualCharSequence characters, bool canBeSingleLine, bool canBeMultiLineWithoutLeadingWhiteSpaces)
+            {
+                Characters = characters;
+                CanBeSingleLine = canBeSingleLine;
+                CanBeMultiLineWithoutLeadingWhiteSpaces = canBeMultiLineWithoutLeadingWhiteSpaces;
+            }
+
+            public VirtualCharSequence Characters { get; }
+            public bool CanBeSingleLine { get; }
+            public bool CanBeMultiLineWithoutLeadingWhiteSpaces { get; }
+        }
+    }
+}
diff --git a/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
index 9321004619cd3..b14b4a669e311 100644
--- a/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
+++ b/src/Features/CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs
@@ -8,8 +8,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reflection.PortableExecutable;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
@@ -20,7 +18,6 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Indentation;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -32,7 +29,7 @@ namespace Microsoft.CodeAnalysis.CSharp.ConvertToRawString
     using static ConvertToRawStringHelpers;
 
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.ConvertToRawString), Shared]
-    internal class ConvertRegularStringToRawStringCodeRefactoringProvider : SyntaxEditorBasedCodeRefactoringProvider
+    internal partial class ConvertRegularStringToRawStringCodeRefactoringProvider : SyntaxEditorBasedCodeRefactoringProvider
     {
         private enum ConvertToRawKind
         {
@@ -89,7 +86,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                         priority,
                         CSharpFeaturesResources.Convert_to_raw_string,
                         c => UpdateDocumentAsync(document, span, ConvertToRawKind.SingleLine, options, c),
-                        s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.SingleLine)!),
+                        s_kindToEquivalenceKeyMap[ConvertToRawKind.SingleLine]),
                     token.Span);
             }
             else
@@ -99,7 +96,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                         priority,
                         CSharpFeaturesResources.Convert_to_raw_string,
                         c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineIndented, options, c),
-                        s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.MultiLineIndented)!),
+                        s_kindToEquivalenceKeyMap[ConvertToRawKind.MultiLineIndented]),
                     token.Span);
 
                 if (convertParams.CanBeMultiLineWithoutLeadingWhiteSpaces)
@@ -109,7 +106,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                             priority,
                             CSharpFeaturesResources.without_leading_whitespace_may_change_semantics,
                             c => UpdateDocumentAsync(document, span, ConvertToRawKind.MultiLineWithoutLeadingWhitespace, options, c),
-                            s_kindToEquivalenceKeyMap.GetValueOrDefault(ConvertToRawKind.MultiLineWithoutLeadingWhitespace)!),
+                            s_kindToEquivalenceKeyMap[ConvertToRawKind.MultiLineWithoutLeadingWhitespace]),
                         token.Span);
                 }
             }
@@ -173,20 +170,6 @@ private static bool CanConvertStringLiteral(SyntaxToken token, out CanConvertPar
             return true;
         }
 
-        private readonly struct CanConvertParams
-        {
-            public CanConvertParams(VirtualCharSequence characters, bool canBeSingleLine, bool canBeMultiLineWithoutLeadingWhiteSpaces)
-            {
-                Characters = characters;
-                CanBeSingleLine = canBeSingleLine;
-                CanBeMultiLineWithoutLeadingWhiteSpaces = canBeMultiLineWithoutLeadingWhiteSpaces;
-            }
-
-            public VirtualCharSequence Characters { get; }
-            public bool CanBeSingleLine { get; }
-            public bool CanBeMultiLineWithoutLeadingWhiteSpaces { get; }
-        }
-
         private static bool HasLeadingWhitespace(VirtualCharSequence characters)
         {
             var index = 0;
@@ -217,7 +200,9 @@ protected override async Task FixAllAsync(
             string? equivalenceKey,
             CancellationToken cancellationToken)
         {
+            // Get the kind to be fixed from the equivalenceKey for the FixAll operation
             Debug.Assert(equivalenceKey != null);
+            var kind = s_kindToEquivalenceKeyMap[equivalenceKey];
 
             var options = await document.GetSyntaxFormattingOptionsAsync(optionsProvider, cancellationToken).ConfigureAwait(false);
             using var _ = PooledDictionary<SyntaxToken, SyntaxToken>.GetInstance(out var tokenReplacementMap);
@@ -225,15 +210,12 @@ protected override async Task FixAllAsync(
             foreach (var fixSpan in fixAllSpans)
             {
                 var node = editor.OriginalRoot.FindNode(fixSpan);
-                foreach (var stringLiteral in node.DescendantTokens(descendIntoTrivia: true).Where(token => token.Kind() == SyntaxKind.StringLiteralToken))
+                foreach (var stringLiteral in node.DescendantTokens().Where(token => token.Kind() == SyntaxKind.StringLiteralToken))
                 {
                     // Ensure we can convert the string literal
                     if (!CanConvertStringLiteral(stringLiteral, out var canConvertParams))
                         continue;
 
-                    // Get the kind to be fixed from the equivalenceKey for the FixAll operation
-                    var kind = s_kindToEquivalenceKeyMap.GetKeyOrDefault(equivalenceKey);
-
                     // Ensure we have a matching kind to fix for this literal
                     var hasMatchingKind = kind switch
                     {
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BidirectionalMap.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BidirectionalMap.cs
index d0a861f5013e2..fa234cfbab147 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BidirectionalMap.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BidirectionalMap.cs
@@ -115,5 +115,31 @@ public int Count
 
             return default;
         }
+
+        public TValue this[TKey key]
+        {
+            get
+            {
+                if (TryGetValue(key, out var result))
+                {
+                    return result;
+                }
+
+                throw new KeyNotFoundException();
+            }
+        }
+
+        public TKey this[TValue value]
+        {
+            get
+            {
+                if (TryGetKey(value, out var result))
+                {
+                    return result;
+                }
+
+                throw new KeyNotFoundException();
+            }
+        }
     }
 }

From 13a7c66c8e9c71b5d0b1f05d77e268af8c306dbe Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Wed, 4 May 2022 22:21:36 -0700
Subject: [PATCH 229/413] Revert FixAll support for Invert conditional
 refactoring

Closes #60956
---
 .../InvertConditionalTests.cs                 |   2 +-
 .../InvertConditionalTests_FixAll.cs          | 412 ------------------
 ...nvertConditionalCodeRefactoringProvider.cs |  41 +-
 3 files changed, 2 insertions(+), 453 deletions(-)
 delete mode 100644 src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests_FixAll.cs

diff --git a/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests.cs b/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests.cs
index 5374f2fd41cfa..19b8ef46748b7 100644
--- a/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests.cs
+++ b/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests.cs
@@ -14,7 +14,7 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.InvertConditional
 {
-    public partial class InvertConditionalTests : AbstractCSharpCodeActionTest
+    public class InvertConditionalTests : AbstractCSharpCodeActionTest
     {
         protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
             => new CSharpInvertConditionalCodeRefactoringProvider();
diff --git a/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests_FixAll.cs b/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests_FixAll.cs
deleted file mode 100644
index db4852821cef7..0000000000000
--- a/src/EditorFeatures/CSharpTest/InvertConditional/InvertConditionalTests_FixAll.cs
+++ /dev/null
@@ -1,412 +0,0 @@
-// 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.Tasks;
-using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
-using Microsoft.CodeAnalysis.Test.Utilities;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.InvertConditional
-{
-    [Trait(Traits.Feature, Traits.Features.CodeActionsInvertConditional)]
-    public partial class InvertConditionalTests : AbstractCSharpCodeActionTest
-    {
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInDocument()
-        {
-            await TestInRegularAndScriptAsync(
-@"class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = {|FixAllInDocument:|}x ? a : b;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}",
-@"class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}");
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInProject()
-        {
-            await TestInRegularAndScriptAsync(
-@"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = {|FixAllInProject:|}x ? a : b;
-    }
-}
-        </Document>
-        <Document>
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>",
-@"<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-        <Document>
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>");
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInSolution()
-        {
-            await TestInRegularAndScriptAsync(
-@"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = {|FixAllInSolution:|}x ? a : b;
-    }
-}
-        </Document>
-        <Document>
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>",
-@"<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-        <Document>
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>");
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInContainingMember()
-        {
-            await TestInRegularAndScriptAsync(
-@"class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = {|FixAllInContainingMember:|}x ? a : b;
-        var c2 = x ? a : b;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}
-
-class C2
-{
-    void M(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}",
-@"class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}
-
-class C2
-{
-    void M(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}");
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInContainingType()
-        {
-            await TestInRegularAndScriptAsync(
-@"partial class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = {|FixAllInContainingType:|}x ? a : b;
-        var c2 = x ? a : b;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}
-
-class C2
-{
-    void M(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}
-
-partial class C
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}",
-@"partial class C
-{
-    void M(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
-    }
-}
-
-class C2
-{
-    void M(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-        var c2 = x ? a : b;
-    }
-}
-
-partial class C
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-        var c2 = !x ? b : a;
-    }
-}");
-        }
-
-        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
-        public async Task InvertConditional_FixAllInContainingType_AcrossFiles()
-        {
-            await TestInRegularAndScriptAsync(
-@"
-<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-partial class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = {|FixAllInContainingType:|}x ? a : b;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-        <Document>
-partial class Program1
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>",
-@"<Workspace>
-    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
-        <Document>
-partial class Program1
-{
-    void M1(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-
-    void M2(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-        </Document>
-        <Document>
-partial class Program1
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = !x ? b : a;
-    }
-}
-
-class Program2
-{
-    void M2(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
-        <Document>
-class Program3
-{
-    void M3(bool x, int a, int b)
-    {
-        var c = x ? a : b;
-    }
-}
-        </Document>
-    </Project>
-</Workspace>");
-        }
-    }
-}
diff --git a/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs b/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
index 699fba088a529..2a613a5b741f2 100644
--- a/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
+++ b/src/Features/Core/Portable/InvertConditional/AbstractInvertConditionalCodeRefactoringProvider.cs
@@ -2,9 +2,6 @@
 // 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.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
@@ -16,13 +13,11 @@
 namespace Microsoft.CodeAnalysis.InvertConditional
 {
     internal abstract class AbstractInvertConditionalCodeRefactoringProvider<TConditionalExpressionSyntax>
-        : SyntaxEditorBasedCodeRefactoringProvider
+        : CodeRefactoringProvider
         where TConditionalExpressionSyntax : SyntaxNode
     {
         protected abstract bool ShouldOffer(TConditionalExpressionSyntax conditional);
 
-        protected override ImmutableArray<CodeFixes.FixAllScope> SupportedFixAllScopes => AllFixAllScopes;
-
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
             var (document, span, cancellationToken) = context;
@@ -45,40 +40,6 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
             Document document, TextSpan span, CancellationToken cancellationToken)
             => await document.TryGetRelevantNodeAsync<TConditionalExpressionSyntax>(span, cancellationToken).ConfigureAwait(false);
 
-        protected override async Task FixAllAsync(
-            Document document,
-            ImmutableArray<TextSpan> fixAllSpans,
-            SyntaxEditor editor,
-            CodeActionOptionsProvider optionsProvider,
-            string? equivalenceKey,
-            CancellationToken cancellationToken)
-        {
-            var originalRoot = editor.OriginalRoot;
-
-            // Get all conditional nodes in the given fixAllSpans.
-            var conditionals = originalRoot.DescendantNodes().OfType<TConditionalExpressionSyntax>()
-                .Where(node => fixAllSpans.Any(fixAllSpan => fixAllSpan.IntersectsWith(node.Span)));
-
-            // We're going to be continually editing this tree. Track all the nodes we
-            // care about so we can find them across each edit.
-            document = document.WithSyntaxRoot(originalRoot.TrackNodes(conditionals));
-
-            // Process the conditional expressions in reverse so the nested conditionals are processed before the outer ones.
-            foreach (var originalConditional in conditionals.Reverse())
-            {
-                // Only process conditionals fully within fixAllSpan
-                if (!fixAllSpans.Any(fixAllSpan => fixAllSpan.Contains(originalConditional.Span)))
-                    continue;
-
-                var currentRoot = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-                var currentConditional = currentRoot.GetCurrentNodes(originalConditional).Single();
-                document = await InvertConditionalAsync(document, currentConditional, cancellationToken).ConfigureAwait(false);
-            }
-
-            var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            editor.ReplaceNode(originalRoot, root);
-        }
-
         private static async Task<Document> InvertConditionalAsync(
             Document document, TConditionalExpressionSyntax conditional, CancellationToken cancellationToken)
         {

From e0de281c676b295d33847103736c2cc392490244 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Thu, 5 May 2022 16:21:05 +1000
Subject: [PATCH 230/413] Add three new options for collapsing/outlining on
 file open (#60743)

---
 .../Structure/CommentStructureTests.cs        |   2 +-
 .../CompilationUnitStructureTests.cs          |  16 +++
 .../InvalidIdentifierStructureTests.cs        |   3 +-
 .../RegionDirectiveStructureTests.cs          |   4 +-
 .../RegionDirectiveStructureTests.cs          |  13 +-
 .../AbstractStructureTaggerProvider.cs        |  75 ++++++++--
 .../AbstractStructureTaggerProviderTests.cs   | 129 ++++++++++++++++++
 ...bstractSyntaxNodeStructureProviderTests.cs |   3 +-
 .../AbstractSyntaxStructureProviderTests.cs   |  18 ++-
 ...tractSyntaxTriviaStructureProviderTests.cs |   3 +-
 .../Structure/CommentStructureTests.vb        |   2 +-
 .../CompilationUnitStructureTests.vb          |  15 ++
 .../InvalidIdentifierStructureTests.vb        |   3 +-
 .../RegionDirectiveStructureTests.vb          |   4 +-
 .../Structure/OverallStructureTests.vb        |   3 +-
 .../RegionDirectiveStructureTests.vb          |  13 ++
 .../Structure/CSharpStructureHelpers.cs       |  15 +-
 .../CompilationUnitStructureProvider.cs       |   8 +-
 ...edNamespaceDeclarationStructureProvider.cs |   2 +-
 .../NamespaceDeclarationStructureProvider.cs  |   2 +-
 .../RegionDirectiveStructureProvider.cs       |   2 +-
 .../Structure/BlockStructureOptions.cs        |   3 +
 .../Options/BlockStructureOptionsStorage.cs   |  15 ++
 .../CompilationUnitStructureProvider.vb       |   2 +-
 .../RegionDirectiveStructureProvider.vb       |   2 +-
 .../CSharp/Impl/CSharpVSResources.resx        |   3 +
 .../Options/AdvancedOptionPageControl.xaml    |  12 +-
 .../Options/AdvancedOptionPageControl.xaml.cs |  17 +++
 .../Impl/Options/AdvancedOptionPageStrings.cs |   9 ++
 .../AutomationObject.OnOff.cs                 |  19 +++
 src/VisualStudio/CSharp/Impl/VSPackage.resx   |   3 +
 .../CSharp/Impl/xlf/CSharpVSResources.cs.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.de.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.es.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.fr.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.it.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.ja.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.ko.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.pl.xlf  |   5 +
 .../Impl/xlf/CSharpVSResources.pt-BR.xlf      |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.ru.xlf  |   5 +
 .../CSharp/Impl/xlf/CSharpVSResources.tr.xlf  |   5 +
 .../Impl/xlf/CSharpVSResources.zh-Hans.xlf    |   5 +
 .../Impl/xlf/CSharpVSResources.zh-Hant.xlf    |   5 +
 .../CSharp/Impl/xlf/VSPackage.cs.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.de.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.es.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.fr.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.it.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.ja.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.ko.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.pl.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.pt-BR.xlf       |   5 +-
 .../CSharp/Impl/xlf/VSPackage.ru.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.tr.xlf          |   5 +-
 .../CSharp/Impl/xlf/VSPackage.zh-Hans.xlf     |   5 +-
 .../CSharp/Impl/xlf/VSPackage.zh-Hant.xlf     |   5 +-
 .../AbstractLanguageService`2.cs              |  45 +++---
 .../Core/Def/ServicesVSResources.resx         |   6 +
 .../Core/Def/xlf/ServicesVSResources.cs.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.de.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.es.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.fr.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.it.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.ja.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.ko.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.pl.xlf   |  10 ++
 .../Def/xlf/ServicesVSResources.pt-BR.xlf     |  10 ++
 .../Core/Def/xlf/ServicesVSResources.ru.xlf   |  10 ++
 .../Core/Def/xlf/ServicesVSResources.tr.xlf   |  10 ++
 .../Def/xlf/ServicesVSResources.zh-Hans.xlf   |  10 ++
 .../Def/xlf/ServicesVSResources.zh-Hant.xlf   |  10 ++
 .../VisualBasic/Impl/BasicVSResources.resx    |   3 +
 .../Options/AdvancedOptionPageControl.xaml    |  12 +-
 .../Options/AdvancedOptionPageControl.xaml.vb |  15 ++
 .../Impl/Options/AdvancedOptionPageStrings.vb |   9 ++
 .../AutomationObject.OnOff.vb                 |  28 ++++
 .../VisualBasic/Impl/VSPackage.resx           |   3 +
 .../Impl/xlf/BasicVSResources.cs.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.de.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.es.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.fr.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.it.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.ja.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.ko.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.pl.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.pt-BR.xlf       |   5 +
 .../Impl/xlf/BasicVSResources.ru.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.tr.xlf          |   5 +
 .../Impl/xlf/BasicVSResources.zh-Hans.xlf     |   5 +
 .../Impl/xlf/BasicVSResources.zh-Hant.xlf     |   5 +
 .../VisualBasic/Impl/xlf/VSPackage.cs.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.de.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.es.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.fr.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.it.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.ja.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.ko.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.pl.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf  |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.ru.xlf     |   5 +-
 .../VisualBasic/Impl/xlf/VSPackage.tr.xlf     |   5 +-
 .../Impl/xlf/VSPackage.zh-Hans.xlf            |   5 +-
 .../Impl/xlf/VSPackage.zh-Hant.xlf            |   5 +-
 104 files changed, 826 insertions(+), 105 deletions(-)
 create mode 100644 src/EditorFeatures/Test/Structure/AbstractStructureTaggerProviderTests.cs

diff --git a/src/EditorFeatures/CSharpTest/Structure/CommentStructureTests.cs b/src/EditorFeatures/CSharpTest/Structure/CommentStructureTests.cs
index 79e55aa34a425..4ffbd7d87b276 100644
--- a/src/EditorFeatures/CSharpTest/Structure/CommentStructureTests.cs
+++ b/src/EditorFeatures/CSharpTest/Structure/CommentStructureTests.cs
@@ -21,7 +21,7 @@ public class CommentTests : AbstractSyntaxStructureProviderTests
     {
         protected override string LanguageName => LanguageNames.CSharp;
 
-        internal override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, int position)
+        internal override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, BlockStructureOptions options, int position)
         {
             var root = await document.GetSyntaxRootAsync();
             var trivia = root.FindTrivia(position, findInsideTrivia: true);
diff --git a/src/EditorFeatures/CSharpTest/Structure/CompilationUnitStructureTests.cs b/src/EditorFeatures/CSharpTest/Structure/CompilationUnitStructureTests.cs
index 7c993caf28db1..2ee44ee036052 100644
--- a/src/EditorFeatures/CSharpTest/Structure/CompilationUnitStructureTests.cs
+++ b/src/EditorFeatures/CSharpTest/Structure/CompilationUnitStructureTests.cs
@@ -159,5 +159,21 @@ public async Task TestInvalidComment()
             await VerifyBlockSpansAsync(code,
                 Region("span", "/* / ...", autoCollapse: true));
         }
+
+        [Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Outlining)]
+        public async Task TestUsingsShouldBeCollapsedByDefault(bool collapseUsingsByDefault)
+        {
+            const string code = @"
+$${|hint:using {|textspan:System;
+using System.Core;|}|}";
+
+            var options = GetDefaultOptions() with
+            {
+                CollapseImportsWhenFirstOpened = collapseUsingsByDefault
+            };
+
+            await VerifyBlockSpansAsync(code, options,
+                Region("textspan", "hint", CSharpStructureHelpers.Ellipsis, autoCollapse: true, isDefaultCollapsed: collapseUsingsByDefault));
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.cs b/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.cs
index 51eaa4d96c0af..48a4d8104fa79 100644
--- a/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.cs
+++ b/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.cs
@@ -26,10 +26,9 @@ public class InvalidIdentifierStructureTests : AbstractSyntaxStructureProviderTe
         protected override string LanguageName => LanguageNames.CSharp;
         protected override string WorkspaceKind => CodeAnalysis.WorkspaceKind.MetadataAsSource;
 
-        internal override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, int position)
+        internal override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, BlockStructureOptions options, int position)
         {
             var outliningService = document.GetLanguageService<BlockStructureService>();
-            var options = GetOptions();
             return (await outliningService.GetBlockStructureAsync(document, options, CancellationToken.None)).Spans;
         }
 
diff --git a/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.cs b/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.cs
index 597bead9e3f17..96acf2b984c3f 100644
--- a/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.cs
+++ b/src/EditorFeatures/CSharpTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.cs
@@ -28,7 +28,7 @@ public async Task FileHeader()
 #endregion|}";
 
             await VerifyBlockSpansAsync(code,
-                Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse: true));
+                Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse: true, isDefaultCollapsed: true));
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)]
@@ -40,7 +40,7 @@ public async Task EmptyFileHeader()
 #endregion|}";
 
             await VerifyBlockSpansAsync(code,
-                Region("span", "#region", autoCollapse: true));
+                Region("span", "#region", autoCollapse: true, isDefaultCollapsed: true));
         }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/Structure/RegionDirectiveStructureTests.cs b/src/EditorFeatures/CSharpTest/Structure/RegionDirectiveStructureTests.cs
index 2edc3abb480d9..e44ec7e3f8e94 100644
--- a/src/EditorFeatures/CSharpTest/Structure/RegionDirectiveStructureTests.cs
+++ b/src/EditorFeatures/CSharpTest/Structure/RegionDirectiveStructureTests.cs
@@ -75,8 +75,8 @@ await VerifyBlockSpansAsync(code,
         }
 
         [WorkItem(953668, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/953668")]
-        [Fact, Trait(Traits.Feature, Traits.Features.Outlining)]
-        public async Task RegionsShouldBeCollapsedByDefault()
+        [Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Outlining)]
+        public async Task RegionsShouldBeCollapsedByDefault(bool collapseRegionsWhenFirstOpened)
         {
             const string code = @"
 class C
@@ -88,8 +88,13 @@ static void Main(string[] args)
     #endregion|}
 }";
 
-            await VerifyBlockSpansAsync(code,
-                Region("span", "Region", autoCollapse: false, isDefaultCollapsed: true));
+            var options = GetDefaultOptions() with
+            {
+                CollapseRegionsWhenFirstOpened = collapseRegionsWhenFirstOpened
+            };
+
+            await VerifyBlockSpansAsync(code, options,
+                Region("span", "Region", autoCollapse: false, isDefaultCollapsed: collapseRegionsWhenFirstOpened));
         }
 
         [WorkItem(4105, "https://github.com/dotnet/roslyn/issues/4105")]
diff --git a/src/EditorFeatures/Core/Structure/AbstractStructureTaggerProvider.cs b/src/EditorFeatures/Core/Structure/AbstractStructureTaggerProvider.cs
index 4db8333fc698b..d0abc110146e7 100644
--- a/src/EditorFeatures/Core/Structure/AbstractStructureTaggerProvider.cs
+++ b/src/EditorFeatures/Core/Structure/AbstractStructureTaggerProvider.cs
@@ -41,6 +41,11 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.Structure
     internal abstract partial class AbstractStructureTaggerProvider :
         AsynchronousTaggerProvider<IStructureTag>
     {
+        private const string RegionDirective = "#region";
+        private const string UsingDirective = "using";
+        private const string ExternDeclaration = "extern";
+        private const string ImportsStatement = "Imports";
+
         protected readonly IEditorOptionsFactoryService EditorOptionsFactoryService;
         protected readonly IProjectionBufferFactoryService ProjectionBufferFactoryService;
 
@@ -67,38 +72,80 @@ protected override bool ComputeInitialTagsSynchronously(ITextBuffer subjectBuffe
             if (openDocument == null)
                 return false;
 
+            // If the main Outlining option is turned off, we can just skip computing tags synchronously
+            // so when the document first opens, there won't be any tags yet. When the tags do come in
+            // the IsDefaultCollapsed property, which controls the initial collapsing, won't have any effect
+            // because the document will already be open.
             if (!GlobalOptions.GetOption(FeatureOnOffOptions.Outlining, openDocument.Project.Language))
                 return false;
 
             // If we're a metadata-as-source doc, we need to compute the initial set of tags synchronously
             // so that we can collapse all the .IsImplementation tags to keep the UI clean and condensed.
-            var isMetadataAsSource = openDocument.Project.Solution.Workspace.Kind == WorkspaceKind.MetadataAsSource;
-            if (isMetadataAsSource)
+            if (openDocument.Project.Solution.Workspace.Kind == WorkspaceKind.MetadataAsSource &&
+                GlobalOptions.GetOption(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, openDocument.Project.Language))
+            {
                 return true;
+            }
+
+            // If the user wants to collapse imports or #regions then we need to compute
+            // synchronously, but only if there are imports or #regions in the file. To
+            // save some work, we'll look for both in a single pass.
+            var collapseRegions = GlobalOptions.GetOption(BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened, openDocument.Project.Language);
+            var collapseImports = GlobalOptions.GetOption(BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened, openDocument.Project.Language);
+
+            if (!collapseRegions && !collapseImports)
+            {
+                return false;
+            }
 
-            // If we contain any #region sections, we want to collapse those automatically on open the first
-            // time a doc is ever opened.  So we need to compute the initial tags synchronously in order to
-            // do that.
-            if (ContainsRegionTag(subjectBuffer.CurrentSnapshot))
+            if (ContainsRegionOrImport(subjectBuffer.CurrentSnapshot, collapseRegions, collapseImports, openDocument.Project.Language))
+            {
                 return true;
+            }
 
             return false;
+        }
 
-            static bool ContainsRegionTag(ITextSnapshot textSnapshot)
+        // Internal for testing
+        internal static bool ContainsRegionOrImport(ITextSnapshot textSnapshot, bool collapseRegions, bool collapseImports, string language)
+        {
+            foreach (var line in textSnapshot.Lines)
             {
-                foreach (var line in textSnapshot.Lines)
+                if (collapseRegions && StartsWithRegionTag(line))
                 {
-                    if (StartsWithRegionTag(line))
-                        return true;
+                    return true;
                 }
+                else if (collapseImports && IsImport(line, language))
+                {
+                    return true;
+                }
+            }
 
-                return false;
+            return false;
+
+            static bool StartsWithRegionTag(ITextSnapshotLine line)
+            {
+                var start = line.GetFirstNonWhitespacePosition();
+                return start != null && line.StartsWith(start.Value, RegionDirective, ignoreCase: true);
+            }
+
+            static bool IsImport(ITextSnapshotLine line, string language)
+            {
+                var start = line.GetFirstNonWhitespacePosition();
+                if (start is null)
+                    return false;
 
-                static bool StartsWithRegionTag(ITextSnapshotLine line)
+                // For VB we only need to find "Imports" at the start of a line
+                if (language == LanguageNames.VisualBasic)
                 {
-                    var start = line.GetFirstNonWhitespacePosition();
-                    return start != null && line.StartsWith(start.Value, "#region", ignoreCase: true);
+                    return line.StartsWith(start.Value, ImportsStatement, ignoreCase: true);
                 }
+
+                // For the purposes of collapsing, extern aliases are grouped with usings
+                if (line.StartsWith(start.Value, ExternDeclaration, ignoreCase: false))
+                    return true;
+
+                return line.StartsWith(start.Value, UsingDirective, ignoreCase: false);
             }
         }
 
diff --git a/src/EditorFeatures/Test/Structure/AbstractStructureTaggerProviderTests.cs b/src/EditorFeatures/Test/Structure/AbstractStructureTaggerProviderTests.cs
new file mode 100644
index 0000000000000..be630b379dd52
--- /dev/null
+++ b/src/EditorFeatures/Test/Structure/AbstractStructureTaggerProviderTests.cs
@@ -0,0 +1,129 @@
+// 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.Editor.Implementation.Structure;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Roslyn.Test.EditorUtilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.UnitTests.Structure
+{
+    [UseExportProvider]
+    public class AbstractStructureTaggerProviderTests
+    {
+        private static void TextContainsRegionOrUsing(string input, bool expected, string language)
+        {
+            var exportProvider = EditorTestCompositions.EditorFeatures.ExportProviderFactory.CreateExportProvider();
+            var buffer = EditorFactory.CreateBuffer(exportProvider, input.Split(new string[] { Environment.NewLine }, StringSplitOptions.None));
+            var textSnapshot = buffer.CurrentSnapshot;
+
+            var actual = AbstractStructureTaggerProvider.ContainsRegionOrImport(textSnapshot, collapseRegions: true, collapseImports: true, language);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void UsingDirective()
+        {
+            var input = @"
+using System;
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void UsingDirectiveInNamespace()
+        {
+            var input = @"
+namespace Goo
+{
+    using System;
+}
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void UsingStaticDirective()
+        {
+            var input = @"
+using static System;
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void UsingAliasDirective()
+        {
+            var input = @"
+using A = System;
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void ExternAlias()
+        {
+            var input = @"
+extern alias Goo;
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void ImportsStatement()
+        {
+            var input = @"
+Imports System
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.VisualBasic);
+        }
+
+        [Fact]
+        public void ImportsAliasStatement()
+        {
+            var input = @"
+Imports A = System
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.VisualBasic);
+        }
+
+        [Fact]
+        public void CSharpRegion1()
+        {
+            var input = @"
+    #region
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void CSharpRegion()
+        {
+            var input = @"
+    #region Goo
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.CSharp);
+        }
+
+        [Fact]
+        public void VisualBasicRegion()
+        {
+            var input = @"
+#Region Goo
+";
+
+            TextContainsRegionOrUsing(input, true, LanguageNames.VisualBasic);
+        }
+    }
+}
diff --git a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxNodeStructureProviderTests.cs b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxNodeStructureProviderTests.cs
index 22ce86f000b9e..835eef1fa60f4 100644
--- a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxNodeStructureProviderTests.cs
+++ b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxNodeStructureProviderTests.cs
@@ -19,7 +19,7 @@ public abstract class AbstractSyntaxNodeStructureProviderTests<TSyntaxNode> : Ab
     {
         internal abstract AbstractSyntaxStructureProvider CreateProvider();
 
-        internal sealed override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, int position)
+        internal sealed override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, BlockStructureOptions options, int position)
         {
             var root = await document.GetSyntaxRootAsync(CancellationToken.None);
             var token = root.FindToken(position, findInsideTrivia: true);
@@ -42,7 +42,6 @@ internal sealed override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWork
 
             var outliner = CreateProvider();
             using var actualRegions = TemporaryArray<BlockSpan>.Empty;
-            var options = GetOptions();
             // Calculate previousToken for tests the same way it is derived in production code
             var previousToken = root.DescendantNodesAndTokens(descendIntoTrivia: true).TakeWhile(nodeOrToken => nodeOrToken != node).LastOrDefault(nodeOrToken => nodeOrToken.IsToken).AsToken();
             outliner.CollectBlockSpans(previousToken, node, ref actualRegions.AsRef(), options, CancellationToken.None);
diff --git a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxStructureProviderTests.cs b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxStructureProviderTests.cs
index 9174f91a13cb9..a14758785bfc8 100644
--- a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxStructureProviderTests.cs
+++ b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxStructureProviderTests.cs
@@ -24,15 +24,18 @@ public abstract class AbstractSyntaxStructureProviderTests
 
         protected virtual string WorkspaceKind => CodeAnalysis.WorkspaceKind.Host;
 
-        internal virtual BlockStructureOptions GetOptions()
+        internal virtual BlockStructureOptions GetDefaultOptions()
             => new(MaximumBannerLength: 120, IsMetadataAsSource: WorkspaceKind == CodeAnalysis.WorkspaceKind.MetadataAsSource);
 
-        private Task<ImmutableArray<BlockSpan>> GetBlockSpansAsync(Document document, int position)
-            => GetBlockSpansWorkerAsync(document, position);
+        private Task<ImmutableArray<BlockSpan>> GetBlockSpansAsync(Document document, BlockStructureOptions options, int position)
+            => GetBlockSpansWorkerAsync(document, options, position);
 
-        internal abstract Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, int position);
+        internal abstract Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, BlockStructureOptions options, int position);
 
-        private protected async Task VerifyBlockSpansAsync(string markupCode, params RegionData[] expectedRegionData)
+        private protected Task VerifyBlockSpansAsync(string markupCode, params RegionData[] expectedRegionData)
+            => VerifyBlockSpansAsync(markupCode, GetDefaultOptions(), expectedRegionData);
+
+        private protected async Task VerifyBlockSpansAsync(string markupCode, BlockStructureOptions options, params RegionData[] expectedRegionData)
         {
             using var workspace = TestWorkspace.Create(WorkspaceKind, LanguageName, compilationOptions: null, parseOptions: null, content: markupCode);
 
@@ -43,7 +46,7 @@ private protected async Task VerifyBlockSpansAsync(string markupCode, params Reg
             var expectedRegions = expectedRegionData.Select(data => CreateBlockSpan(data, hostDocument.AnnotatedSpans)).ToArray();
 
             var document = workspace.CurrentSolution.GetDocument(hostDocument.Id);
-            var actualRegions = await GetBlockSpansAsync(document, position);
+            var actualRegions = await GetBlockSpansAsync(document, options, position);
 
             Assert.True(expectedRegions.Length == actualRegions.Length, $"Expected {expectedRegions.Length} regions but there were {actualRegions.Length}");
 
@@ -62,7 +65,8 @@ protected async Task VerifyNoBlockSpansAsync(string markupCode)
             var position = hostDocument.CursorPosition.Value;
 
             var document = workspace.CurrentSolution.GetDocument(hostDocument.Id);
-            var actualRegions = await GetBlockSpansAsync(document, position);
+            var options = GetDefaultOptions();
+            var actualRegions = await GetBlockSpansAsync(document, options, position);
 
             Assert.True(actualRegions.Length == 0, $"Expected no regions but found {actualRegions.Length}.");
         }
diff --git a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxTriviaStructureProviderTests.cs b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxTriviaStructureProviderTests.cs
index 1d535b787984c..498ee5a0584ee 100644
--- a/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxTriviaStructureProviderTests.cs
+++ b/src/EditorFeatures/TestUtilities/Structure/AbstractSyntaxTriviaStructureProviderTests.cs
@@ -16,14 +16,13 @@ public abstract class AbstractSyntaxTriviaStructureProviderTests : AbstractSynta
     {
         internal abstract AbstractSyntaxStructureProvider CreateProvider();
 
-        internal sealed override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, int position)
+        internal sealed override async Task<ImmutableArray<BlockSpan>> GetBlockSpansWorkerAsync(Document document, BlockStructureOptions options, int position)
         {
             var root = await document.GetSyntaxRootAsync();
             var trivia = root.FindTrivia(position, findInsideTrivia: true);
 
             var outliner = CreateProvider();
             using var actualRegions = TemporaryArray<BlockSpan>.Empty;
-            var options = GetOptions();
             outliner.CollectBlockSpans(trivia, ref actualRegions.AsRef(), options, CancellationToken.None);
 
             // TODO: Determine why we get null outlining spans.
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/CommentStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/CommentStructureTests.vb
index dddb119f7026f..f2dfc40b22075 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/CommentStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/CommentStructureTests.vb
@@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
             End Get
         End Property
 
-        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
+        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, options As BlockStructureOptions, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
             Dim root = Await document.GetSyntaxRootAsync()
             Dim trivia = root.FindTrivia(position, findInsideTrivia:=True)
 
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/CompilationUnitStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/CompilationUnitStructureTests.vb
index 81aa4604c6841..26280fcecc0d6 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/CompilationUnitStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/CompilationUnitStructureTests.vb
@@ -27,6 +27,21 @@ End Class
                 Region("span", "Imports ...", autoCollapse:=True))
         End Function
 
+        <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Outlining)>
+        Public Async Function ImportsShouldBeCollapsedByDefault(collapseUsingsByDefault As Boolean) As Task
+            Const code = "
+{|span:$$Imports System
+Imports System.Linq|}
+Class C1
+End Class
+"
+
+            Dim options = New BlockStructureOptions(CollapseImportsWhenFirstOpened:=collapseUsingsByDefault)
+
+            Await VerifyBlockSpansAsync(code, options,
+                Region("span", "Imports ...", autoCollapse:=True, isDefaultCollapsed:=collapseUsingsByDefault))
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
         Public Async Function TestImportsAliases() As Task
             Const code = "
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.vb
index 7d9f11a75654b..e0884b482bd43 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/InvalidIdentifierStructureTests.vb
@@ -28,9 +28,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
             End Get
         End Property
 
-        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
+        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, options As BlockStructureOptions, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
             Dim outliningService = document.GetLanguageService(Of BlockStructureService)()
-            Dim options = GetOptions()
 
             Return (Await outliningService.GetBlockStructureAsync(document, options, CancellationToken.None)).Spans
         End Function
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.vb
index 54df19a68f752..8ae28e6dc6c2c 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/MetadataAsSource/RegionDirectiveStructureTests.vb
@@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
 #End Region|}
 "
             Await VerifyBlockSpansAsync(code,
-                Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse:=True, isDefaultCollapsed:=False))
+                Region("span", "Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", autoCollapse:=True, isDefaultCollapsed:=True))
         End Function
 
         <Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)>
@@ -39,7 +39,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining.Metadata
 #End Region|}
 "
             Await VerifyBlockSpansAsync(code,
-                Region("span", "#Region", autoCollapse:=True, isDefaultCollapsed:=False))
+                Region("span", "#Region", autoCollapse:=True, isDefaultCollapsed:=True))
         End Function
     End Class
 End Namespace
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/OverallStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/OverallStructureTests.vb
index 27165d7f36bf9..d6431f706ebfb 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/OverallStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/OverallStructureTests.vb
@@ -17,9 +17,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Outlining
             End Get
         End Property
 
-        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
+        Friend Overrides Async Function GetBlockSpansWorkerAsync(document As Document, options As BlockStructureOptions, position As Integer) As Task(Of ImmutableArray(Of BlockSpan))
             Dim outliningService = document.GetLanguageService(Of BlockStructureService)()
-            Dim options = GetOptions()
 
             Return (Await outliningService.GetBlockStructureAsync(document, options, CancellationToken.None)).Spans
         End Function
diff --git a/src/EditorFeatures/VisualBasicTest/Structure/RegionDirectiveStructureTests.vb b/src/EditorFeatures/VisualBasicTest/Structure/RegionDirectiveStructureTests.vb
index 1594bc57234a0..749a21f5a298b 100644
--- a/src/EditorFeatures/VisualBasicTest/Structure/RegionDirectiveStructureTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Structure/RegionDirectiveStructureTests.vb
@@ -34,6 +34,19 @@ $$#Region ""Goo""
                 Region("span", "Goo", autoCollapse:=False, isDefaultCollapsed:=True))
         End Function
 
+        <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Outlining)>
+        Public Async Function RegionsShouldBeCollapsedByDefault(collapseRegionsByDefault As Boolean) As Task
+            Const code = "
+{|span:$$#Region ""Goo""
+#End Region|}
+"
+
+            Dim options = New BlockStructureOptions(CollapseRegionsWhenFirstOpened:=collapseRegionsByDefault)
+
+            Await VerifyBlockSpansAsync(code, options,
+                Region("span", "Goo", autoCollapse:=False, isDefaultCollapsed:=collapseRegionsByDefault))
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.Outlining)>
         Public Async Function RegionWithNoBanner1() As Task
             Const code = "
diff --git a/src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs b/src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs
index b742396f92c21..4da0f2c1920bc 100644
--- a/src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs
+++ b/src/Features/CSharp/Portable/Structure/CSharpStructureHelpers.cs
@@ -388,13 +388,13 @@ private static BlockSpan CreateBlockSpan(
             string type, bool isCollapsible)
         {
             return CreateBlockSpan(
-                textSpan, textSpan, bannerText, autoCollapse, type, isCollapsible);
+                textSpan, textSpan, bannerText, autoCollapse, type, isCollapsible, isDefaultCollapsed: false);
         }
 
         private static BlockSpan CreateBlockSpan(
             TextSpan textSpan, TextSpan hintSpan,
             string bannerText, bool autoCollapse,
-            string type, bool isCollapsible)
+            string type, bool isCollapsible, bool isDefaultCollapsed)
         {
             return new BlockSpan(
                 textSpan: textSpan,
@@ -402,7 +402,8 @@ private static BlockSpan CreateBlockSpan(
                 bannerText: bannerText,
                 autoCollapse: autoCollapse,
                 type: type,
-                isCollapsible: isCollapsible);
+                isCollapsible: isCollapsible,
+                isDefaultCollapsed: isDefaultCollapsed);
         }
 
         public static BlockSpan CreateBlockSpan(
@@ -451,7 +452,8 @@ public static BlockSpan CreateBlockSpan(
                 bannerText,
                 autoCollapse,
                 type,
-                isCollapsible);
+                isCollapsible,
+                isDefaultCollapsed: false);
         }
 
         private static TextSpan GetHintSpan(SyntaxNode node, int endPos)
@@ -526,7 +528,7 @@ public static BlockSpan CreateBlockSpan(
         // node in the list.
         public static BlockSpan? CreateBlockSpan(
             IEnumerable<SyntaxNode> syntaxList, bool compressEmptyLines, bool autoCollapse,
-            string type, bool isCollapsible)
+            string type, bool isCollapsible, bool isDefaultCollapsed)
         {
             if (syntaxList.IsEmpty())
             {
@@ -551,7 +553,8 @@ public static BlockSpan CreateBlockSpan(
                 bannerText: Ellipsis,
                 autoCollapse: autoCollapse,
                 type: type,
-                isCollapsible: isCollapsible);
+                isCollapsible: isCollapsible,
+                isDefaultCollapsed: isDefaultCollapsed);
         }
     }
 }
diff --git a/src/Features/CSharp/Portable/Structure/Providers/CompilationUnitStructureProvider.cs b/src/Features/CSharp/Portable/Structure/Providers/CompilationUnitStructureProvider.cs
index c0c012b04da11..c3a4dcd2aa787 100644
--- a/src/Features/CSharp/Portable/Structure/Providers/CompilationUnitStructureProvider.cs
+++ b/src/Features/CSharp/Portable/Structure/Providers/CompilationUnitStructureProvider.cs
@@ -30,8 +30,12 @@ protected override void CollectBlockSpans(
             externsAndUsings.Sort((node1, node2) => node1.SpanStart.CompareTo(node2.SpanStart));
 
             spans.AddIfNotNull(CSharpStructureHelpers.CreateBlockSpan(
-                externsAndUsings, compressEmptyLines: false, autoCollapse: true,
-                type: BlockTypes.Imports, isCollapsible: true));
+                externsAndUsings,
+                compressEmptyLines: false,
+                autoCollapse: true,
+                type: BlockTypes.Imports,
+                isCollapsible: true,
+                isDefaultCollapsed: options.CollapseImportsWhenFirstOpened));
 
             if (compilationUnit.Usings.Count > 0 ||
                 compilationUnit.Externs.Count > 0 ||
diff --git a/src/Features/CSharp/Portable/Structure/Providers/FileScopedNamespaceDeclarationStructureProvider.cs b/src/Features/CSharp/Portable/Structure/Providers/FileScopedNamespaceDeclarationStructureProvider.cs
index 9a16c31d0a9be..9d2ea2b3be53c 100644
--- a/src/Features/CSharp/Portable/Structure/Providers/FileScopedNamespaceDeclarationStructureProvider.cs
+++ b/src/Features/CSharp/Portable/Structure/Providers/FileScopedNamespaceDeclarationStructureProvider.cs
@@ -34,7 +34,7 @@ protected override void CollectBlockSpans(
 
             spans.AddIfNotNull(CSharpStructureHelpers.CreateBlockSpan(
                 externsAndUsings, compressEmptyLines: false, autoCollapse: true,
-                type: BlockTypes.Imports, isCollapsible: true));
+                type: BlockTypes.Imports, isCollapsible: true, isDefaultCollapsed: options.CollapseImportsWhenFirstOpened));
         }
     }
 }
diff --git a/src/Features/CSharp/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.cs b/src/Features/CSharp/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.cs
index 26e2bb297313b..656716d2f0bb6 100644
--- a/src/Features/CSharp/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.cs
+++ b/src/Features/CSharp/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.cs
@@ -47,7 +47,7 @@ protected override void CollectBlockSpans(
 
             spans.AddIfNotNull(CSharpStructureHelpers.CreateBlockSpan(
                 externsAndUsings, compressEmptyLines: false, autoCollapse: true,
-                type: BlockTypes.Imports, isCollapsible: true));
+                type: BlockTypes.Imports, isCollapsible: true, isDefaultCollapsed: options.CollapseImportsWhenFirstOpened));
 
             // finally, add any leading comments before the end of the namespace block
             if (!namespaceDeclaration.CloseBraceToken.IsMissing)
diff --git a/src/Features/CSharp/Portable/Structure/Providers/RegionDirectiveStructureProvider.cs b/src/Features/CSharp/Portable/Structure/Providers/RegionDirectiveStructureProvider.cs
index e2d67b9339a0f..290deb1525aab 100644
--- a/src/Features/CSharp/Portable/Structure/Providers/RegionDirectiveStructureProvider.cs
+++ b/src/Features/CSharp/Portable/Structure/Providers/RegionDirectiveStructureProvider.cs
@@ -55,7 +55,7 @@ protected override void CollectBlockSpans(
                     type: BlockTypes.PreprocessorRegion,
                     bannerText: GetBannerText(regionDirective),
                     autoCollapse: autoCollapse,
-                    isDefaultCollapsed: !options.IsMetadataAsSource));
+                    isDefaultCollapsed: options.CollapseRegionsWhenFirstOpened));
             }
         }
     }
diff --git a/src/Features/Core/Portable/Structure/BlockStructureOptions.cs b/src/Features/Core/Portable/Structure/BlockStructureOptions.cs
index e13649d8ea6d9..85ea98cda9e17 100644
--- a/src/Features/Core/Portable/Structure/BlockStructureOptions.cs
+++ b/src/Features/Core/Portable/Structure/BlockStructureOptions.cs
@@ -11,6 +11,9 @@ internal readonly record struct BlockStructureOptions(
         bool ShowOutliningForCommentsAndPreprocessorRegions = true,
         bool ShowOutliningForDeclarationLevelConstructs = true,
         bool ShowOutliningForCodeLevelConstructs = true,
+        bool CollapseRegionsWhenFirstOpened = true,
+        bool CollapseImportsWhenFirstOpened = false,
+        bool CollapseMetadataImplementationsWhenFirstOpened = true,
         bool CollapseRegionsWhenCollapsingToDefinitions = false,
         int MaximumBannerLength = 80,
         bool IsMetadataAsSource = false)
diff --git a/src/Features/LanguageServer/Protocol/Features/Options/BlockStructureOptionsStorage.cs b/src/Features/LanguageServer/Protocol/Features/Options/BlockStructureOptionsStorage.cs
index 0dd1f2832a658..464b421d23d55 100644
--- a/src/Features/LanguageServer/Protocol/Features/Options/BlockStructureOptionsStorage.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Options/BlockStructureOptionsStorage.cs
@@ -19,6 +19,9 @@ public static BlockStructureOptions GetBlockStructureOptions(this IGlobalOptionS
             ShowOutliningForCommentsAndPreprocessorRegions: globalOptions.GetOption(ShowOutliningForCommentsAndPreprocessorRegions, language),
             ShowOutliningForDeclarationLevelConstructs: globalOptions.GetOption(ShowOutliningForDeclarationLevelConstructs, language),
             ShowOutliningForCodeLevelConstructs: globalOptions.GetOption(ShowOutliningForCodeLevelConstructs, language),
+            CollapseRegionsWhenFirstOpened: globalOptions.GetOption(CollapseRegionsWhenFirstOpened, language),
+            CollapseImportsWhenFirstOpened: globalOptions.GetOption(CollapseImportsWhenFirstOpened, language),
+            CollapseMetadataImplementationsWhenFirstOpened: globalOptions.GetOption(CollapseMetadataImplementationsWhenFirstOpened, language),
             CollapseRegionsWhenCollapsingToDefinitions: globalOptions.GetOption(CollapseRegionsWhenCollapsingToDefinitions, language),
             MaximumBannerLength: globalOptions.GetOption(MaximumBannerLength, language),
             IsMetadataAsSource: isMetadataAsSource);
@@ -49,6 +52,18 @@ public static BlockStructureOptions GetBlockStructureOptions(this IGlobalOptionS
         FeatureName, "ShowOutliningForCodeLevelConstructs", BlockStructureOptions.Default.ShowOutliningForCodeLevelConstructs,
         storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.ShowOutliningForCodeLevelConstructs"));
 
+    public static readonly PerLanguageOption2<bool> CollapseRegionsWhenFirstOpened = new(
+        FeatureName, "CollapseRegionsWhenFirstOpened", BlockStructureOptions.Default.CollapseRegionsWhenFirstOpened,
+        storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.CollapseRegionsWhenFirstOpened"));
+
+    public static readonly PerLanguageOption2<bool> CollapseImportsWhenFirstOpened = new(
+        FeatureName, "CollapseImportsWhenFirstOpened", BlockStructureOptions.Default.CollapseImportsWhenFirstOpened,
+        storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.CollapseImportsWhenFirstOpened"));
+
+    public static readonly PerLanguageOption2<bool> CollapseMetadataImplementationsWhenFirstOpened = new(
+        FeatureName, "CollapseMetadataImplementationsWhenFirstOpened", BlockStructureOptions.Default.CollapseMetadataImplementationsWhenFirstOpened,
+        storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.CollapseMetadataImplementationsWhenFirstOpened"));
+
     public static readonly PerLanguageOption2<bool> CollapseRegionsWhenCollapsingToDefinitions = new(
         FeatureName, "CollapseRegionsWhenCollapsingToDefinitions", BlockStructureOptions.Default.CollapseRegionsWhenCollapsingToDefinitions,
         storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.CollapseRegionsWhenCollapsingToDefinitions"));
diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb
index a7c159c0a37ba..efe88ec1e34a3 100644
--- a/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb
+++ b/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb
@@ -27,7 +27,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure
                 spans.AddIfNotNull(CreateBlockSpan(
                     span, span, bannerText:="Imports" & SpaceEllipsis,
                     autoCollapse:=True, type:=BlockTypes.Imports, isCollapsible:=True,
-                    isDefaultCollapsed:=False))
+                    isDefaultCollapsed:=options.CollapseImportsWhenFirstOpened))
             End If
 
             CollectCommentsRegions(compilationUnit.EndOfFileToken.LeadingTrivia, spans)
diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb
index 295d00778fa5b..41889b9e2492e 100644
--- a/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb
+++ b/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb
@@ -44,7 +44,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure
                     span, span,
                     GetBannerText(regionDirective),
                     autoCollapse:=autoCollapse,
-                    isDefaultCollapsed:=Not options.IsMetadataAsSource,
+                    isDefaultCollapsed:=options.CollapseRegionsWhenFirstOpened,
                     type:=BlockTypes.PreprocessorRegion,
                     isCollapsible:=True))
             End If
diff --git a/src/VisualStudio/CSharp/Impl/CSharpVSResources.resx b/src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
index 40a3b3131603e..33532e074449d 100644
--- a/src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
+++ b/src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
@@ -655,4 +655,7 @@
   <data name="Prefer_extended_property_pattern" xml:space="preserve">
     <value>Prefer extended property pattern</value>
   </data>
+  <data name="Collapse_usings_on_file_open" xml:space="preserve">
+    <value>Collapse usings on file open</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
index 17ab4678d54c7..946760b2b952d 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
@@ -112,7 +112,17 @@
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Outlining}">
                 <StackPanel>
                     <CheckBox x:Name="EnterOutliningMode"
-                              Content="{x:Static local:AdvancedOptionPageStrings.Option_EnterOutliningMode}" />
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_EnterOutliningMode}"
+                              Checked="EnterOutliningMode_Checked"
+                              Unchecked="EnterOutliningMode_Unchecked" />
+                    <StackPanel Margin="15, 0, 0, 0">
+                        <CheckBox x:Name="Collapse_regions_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_regions_on_file_open}" />
+                        <CheckBox x:Name="Collapse_usings_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_usings_on_file_open}" />
+                        <CheckBox x:Name="Collapse_metadata_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_metadata_on_file_open}" />
+                    </StackPanel>
                     <CheckBox x:Name="DisplayLineSeparators"
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_DisplayLineSeparators}" />
                     <CheckBox x:Name="Show_outlining_for_declaration_level_constructs"
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
index d96556a3a5a14..ee2694786184a 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -96,6 +96,9 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
 
             // Outlining
             BindToOption(EnterOutliningMode, FeatureOnOffOptions.Outlining, LanguageNames.CSharp);
+            BindToOption(Collapse_regions_on_file_open, BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened, LanguageNames.CSharp);
+            BindToOption(Collapse_usings_on_file_open, BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened, LanguageNames.CSharp);
+            BindToOption(Collapse_metadata_on_file_open, BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, LanguageNames.CSharp);
             BindToOption(DisplayLineSeparators, FeatureOnOffOptions.LineSeparator, LanguageNames.CSharp);
             BindToOption(Show_outlining_for_declaration_level_constructs, BlockStructureOptionsStorage.ShowOutliningForDeclarationLevelConstructs, LanguageNames.CSharp);
             BindToOption(Show_outlining_for_code_level_constructs, BlockStructureOptionsStorage.ShowOutliningForCodeLevelConstructs, LanguageNames.CSharp);
@@ -291,5 +294,19 @@ private void DisplayInlineTypeHints_Unchecked(object sender, RoutedEventArgs e)
             this.OptionStore.SetOption(InlineHintsOptionsStorage.EnabledForTypes, LanguageNames.CSharp, false);
             UpdateInlineHintsOptions();
         }
+
+        private void EnterOutliningMode_Checked(object sender, RoutedEventArgs e)
+        {
+            Collapse_regions_on_file_open.IsEnabled = true;
+            Collapse_usings_on_file_open.IsEnabled = true;
+            Collapse_metadata_on_file_open.IsEnabled = true;
+        }
+
+        private void EnterOutliningMode_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Collapse_regions_on_file_open.IsEnabled = false;
+            Collapse_usings_on_file_open.IsEnabled = false;
+            Collapse_metadata_on_file_open.IsEnabled = false;
+        }
     }
 }
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
index 44ff496df7c0d..5a78441e202f3 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
@@ -198,6 +198,15 @@ public static string Option_Compute_Quick_Actions_asynchronously_experimental
         public static string Option_Outlining
             => ServicesVSResources.Outlining;
 
+        public static string Option_Collapse_regions_on_file_open
+            => ServicesVSResources.Collapse_regions_on_file_open;
+
+        public static string Option_Collapse_usings_on_file_open
+            => CSharpVSResources.Collapse_usings_on_file_open;
+
+        public static string Option_Collapse_metadata_on_file_open
+            => ServicesVSResources.Collapse_metadata_on_file_open;
+
         public static string Option_Show_outlining_for_declaration_level_constructs
             => ServicesVSResources.Show_outlining_for_declaration_level_constructs;
 
diff --git a/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.OnOff.cs b/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.OnOff.cs
index 9727581bb4179..006a02a41b2d2 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.OnOff.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.OnOff.cs
@@ -4,6 +4,7 @@
 
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.MetadataAsSource;
+using Microsoft.CodeAnalysis.Structure;
 
 namespace Microsoft.VisualStudio.LanguageServices.CSharp.Options
 {
@@ -39,6 +40,24 @@ public int EnterOutliningModeOnOpen
             set { SetBooleanOption(FeatureOnOffOptions.Outlining, value); }
         }
 
+        public int CollapseImportsWhenFirstOpened
+        {
+            get { return GetBooleanOption(BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened); }
+            set { SetBooleanOption(BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened, value); }
+        }
+
+        public int CollapseRegionsWhenFirstOpened
+        {
+            get { return GetBooleanOption(BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened); }
+            set { SetBooleanOption(BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened, value); }
+        }
+
+        public int CollapseMetadataImplementationsWhenFirstOpened
+        {
+            get { return GetBooleanOption(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened); }
+            set { SetBooleanOption(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, value); }
+        }
+
         public int HighlightReferences
         {
             get { return GetBooleanOption(FeatureOnOffOptions.ReferenceHighlighting); }
diff --git a/src/VisualStudio/CSharp/Impl/VSPackage.resx b/src/VisualStudio/CSharp/Impl/VSPackage.resx
index f2dd51e8247d6..9675fa302a40f 100644
--- a/src/VisualStudio/CSharp/Impl/VSPackage.resx
+++ b/src/VisualStudio/CSharp/Impl/VSPackage.resx
@@ -162,6 +162,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.cs.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.cs.xlf
index 835041e3fd338..339772b38b915 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.cs.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.cs.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Pravidla formátování jazyka C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Dokončení</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.de.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.de.xlf
index 446361231aa16..eac269af410c2 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.de.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.de.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C#-Formatierungsregeln</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Abschluss</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.es.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.es.xlf
index 42bce5f3bc156..a86b0f51a4c3e 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.es.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.es.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Reglas de formato de C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Finalización</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.fr.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.fr.xlf
index f98e4d9749f24..ec5ccdb995c14 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.fr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.fr.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Règles de formatage C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Complétion</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.it.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.it.xlf
index 53b3e4f6aee00..7ca8854dd3d57 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.it.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.it.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Regole di formattazione C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Completamento</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ja.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ja.xlf
index e10d0c1e5446b..a1aebbc007f5c 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ja.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ja.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C# 書式ルール</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">入力候補</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ko.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ko.xlf
index e18459b04d8c9..fbe9e0d318bf9 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ko.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ko.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C# 서식 설정 규칙</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">완성</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pl.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pl.xlf
index e5e351824ac74..f2779e06de491 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pl.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pl.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Reguły formatowania kodu C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Uzupełnianie</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pt-BR.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pt-BR.xlf
index 68f5eee48deab..722e66c0bd34f 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pt-BR.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.pt-BR.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Regras de Formatação de C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Conclusão</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ru.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ru.xlf
index 75707382e76eb..e2230964c4e68 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ru.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.ru.xlf
@@ -57,6 +57,11 @@
         <target state="translated">Правила форматирования C#</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Завершение</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.tr.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.tr.xlf
index d68c6dd5e81d2..8411ad9415abb 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.tr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.tr.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C# biçimlendirme kuralları</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">Tamamlama</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hans.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hans.xlf
index 9660012eef9f4..0051256a3932f 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hans.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C# 格式规则</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">完成</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hant.xlf b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hant.xlf
index 2f87500620a5f..ab168bc33f4cd 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/CSharpVSResources.zh-Hant.xlf
@@ -57,6 +57,11 @@
         <target state="translated">C# 格式化規則</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_usings_on_file_open">
+        <source>Collapse usings on file open</source>
+        <target state="new">Collapse usings on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Completion">
         <source>Completion</source>
         <target state="translated">完成</target>
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
index 1dd995cc5848f..5b4c526db4aa6 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Podtrhnout znovu přiřazené proměnné;
+        <target state="needs-review-translation">Podtrhnout znovu přiřazené proměnné;
 Zobrazovat vložené nápovědy;
 Zobrazit diagnostiku pro zavřené soubory;
 Vybarvit regulární výraz;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
index ae433ca4e0358..143ba4e534f79 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Neu zugewiesene Variablen unterstreichen;
+        <target state="needs-review-translation">Neu zugewiesene Variablen unterstreichen;
 Inlinehinweise anzeigen;
 Diagnoseinformationen für geschlossene Dateien anzeigen;
 Reguläre Ausdrücke farbig hervorheben;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
index db7cad58d5531..e66f073edd51a 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Subrayar variables reasignadas;
+        <target state="needs-review-translation">Subrayar variables reasignadas;
 Mostrar sugerencias insertadas;
 Mostrar diagnóstico para archivos cerrados;
 Colorear expresión regular; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
index 03adef6fa300b..c81fb966fdaf8 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Souligner les variables réaffectées ;
+        <target state="needs-review-translation">Souligner les variables réaffectées ;
 Afficher les indications en ligne ;
 Afficher les diagnostics pour les fichiers fermés ;
 Coloriser les expressions régulières ;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
index c479b40e60208..86d067f66e711 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Sottolinea variabili riassegnate;
+        <target state="needs-review-translation">Sottolinea variabili riassegnate;
 Visualizza suggerimenti inline;
 Mostra diagnostica per file chiusi;
 Colora espressione regolare; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
index 1d9f63971b1a2..17d12325f54ea 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">再割り当てされた変数に下線を引く;
+        <target state="needs-review-translation">再割り当てされた変数に下線を引く;
 インラインのヒントを表示する;
 閉じているファイルの診断結果を表示する;
 正規表現をカラー化する;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
index 698b022e18bd3..6d65b6a206f36 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">다시 할당된 변수에 밑줄 긋기;
+        <target state="needs-review-translation">다시 할당된 변수에 밑줄 긋기;
 인라인 힌트 표시;
 닫힌 파일에 대한 진단 표시;
 정규식 색 지정; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
index 0025f1c93f0f1..6cba9cc4bd4bc 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pl.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Podkreślaj ponownie przypisane zmienne;
+        <target state="needs-review-translation">Podkreślaj ponownie przypisane zmienne;
 Wyświetlaj wskazówki w tekście;
 Pokaż dane diagnostyczne dla zamkniętych plików;
 Koloruj wyrażenia regularne; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
index aea733fbdae7d..d915c5aedcf5f 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.pt-BR.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Sublinhar variáveis ​​reatribuídas;
+        <target state="needs-review-translation">Sublinhar variáveis ​​reatribuídas;
 Exibir dicas embutidas;
 Mostrar diagnósticos para arquivos fechados;
 Colorizar expressões regulares; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
index fc1531a08e4fb..09420680087e3 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.ru.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Подчеркивать переназначенные переменные;
+        <target state="needs-review-translation">Подчеркивать переназначенные переменные;
 Показывать встроенные подсказки;
 Показывать диагностику для закрытых файлов;
 Выделять регулярные выражения цветом;
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
index bee0f59c34a5b..552843bda31b3 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.tr.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">Yeniden atanan değişkenlerin altını çiz;
+        <target state="needs-review-translation">Yeniden atanan değişkenlerin altını çiz;
 Satır içi ipuçlarını göster;
 Kapatılan dosyalara ilişkin tanılamaları göster;
 Normal ifadeyi renklendir; 
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
index f4c46719dbd59..1c80c3d93b78a 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hans.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">为重新分配的变量添加下划线；
+        <target state="needs-review-translation">为重新分配的变量添加下划线；
 显示内联提示；
 显示已关闭文件的诊断；
 对正则表达式着色；
diff --git a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
index 455feaac46fe6..7559af5f5ce12 100644
--- a/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
+++ b/src/VisualStudio/CSharp/Impl/xlf/VSPackage.zh-Hant.xlf
@@ -53,6 +53,9 @@ Highlight references to symbol under cursor;
 Highlight related keywords under cursor;
 Outlining;
 Enter outlining mode when files open;
+Collapse #regions on file open;
+Collapse usings on file open;
+Collapse metadata implementations on file open;
 Show procedure line separators;
 Show outlining for declaration level constructs;
 Show outlining for code level constructs;
@@ -91,7 +94,7 @@ Detect and offer editor features for JSON strings;
 Use enhanced colors;
 Editor Color Scheme;
 Inheritance Margin;</source>
-        <target state="translated">為重新指派的變數加上底線;
+        <target state="needs-review-translation">為重新指派的變數加上底線;
 顯示內嵌提示;
 顯示已關閉檔案的診斷;
 為規則運算式上色; 
diff --git a/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.cs b/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.cs
index 38012fbf48bbc..c3316f4760b51 100644
--- a/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.cs
+++ b/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.cs
@@ -8,11 +8,10 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
-using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Structure;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.VisualStudio.Editor;
@@ -200,7 +199,12 @@ protected virtual void SetupNewTextView(IVsTextView textView)
             var openDocument = wpfTextView.TextBuffer.AsTextContainer().GetRelatedDocuments().FirstOrDefault();
             var isOpenMetadataAsSource = openDocument != null && openDocument.Project.Solution.Workspace.Kind == WorkspaceKind.MetadataAsSource;
 
-            ConditionallyCollapseOutliningRegions(textView, wpfTextView, workspace, isOpenMetadataAsSource);
+            // If the file is metadata as source, and the user has the preference set to collapse them, then
+            // always collapse all metadata as source
+            var collapseAllImplementations = isOpenMetadataAsSource &&
+                workspace.Options.GetOption<bool>(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, openDocument.Project.Language);
+
+            ConditionallyCollapseOutliningRegions(textView, wpfTextView, collapseAllImplementations);
 
             // If this is a metadata-to-source view, we want to consider the file read-only
             if (isOpenMetadataAsSource && ErrorHandler.Succeeded(textView.GetBuffer(out var vsTextLines)))
@@ -218,34 +222,29 @@ protected virtual void SetupNewTextView(IVsTextView textView)
             }
         }
 
-        private void ConditionallyCollapseOutliningRegions(IVsTextView textView, IWpfTextView wpfTextView, Microsoft.CodeAnalysis.Workspace workspace, bool isOpenMetadataAsSource)
+        private void ConditionallyCollapseOutliningRegions(IVsTextView textView, IWpfTextView wpfTextView, bool collapseAllImplementations)
         {
             var outliningManagerService = this.Package.ComponentModel.GetService<IOutliningManagerService>();
             var outliningManager = outliningManagerService.GetOutliningManager(wpfTextView);
             if (outliningManager == null)
                 return;
 
-            if (!workspace.Options.GetOption(FeatureOnOffOptions.Outlining, this.RoslynLanguageName))
-            {
-                outliningManager.Enabled = false;
-            }
-            else
+            if (textView is IVsTextViewEx viewEx)
             {
-                if (textView is IVsTextViewEx viewEx)
+                if (collapseAllImplementations)
+                {
+                    // If this file is a metadata-from-source file, we want to force-collapse any implementations
+                    // to keep the display clean and condensed.
+                    outliningManager.CollapseAll(wpfTextView.TextBuffer.CurrentSnapshot.GetFullSpan(), c => c.Tag.IsImplementation);
+                }
+                else
                 {
-                    if (isOpenMetadataAsSource)
-                    {
-                        // If this file is a metadata-from-source file, we want to force-collapse any implementations
-                        // to keep the display clean and condensed.
-                        outliningManager.CollapseAll(wpfTextView.TextBuffer.CurrentSnapshot.GetFullSpan(), c => c.Tag.IsImplementation);
-                    }
-                    else
-                    {
-                        // Otherwise, attempt to persist any outlining state we have computed. This
-                        // ensures that any new opened files that have any IsDefaultCollapsed spans
-                        // will both have them collapsed and remembered in the SUO file.
-                        viewEx.PersistOutliningState();
-                    }
+                    // Otherwise, attempt to persist any outlining state we have computed. This
+                    // ensures that any new opened files that have any IsDefaultCollapsed spans
+                    // will both have them collapsed and remembered in the SUO file.
+                    // NOTE: Despite its name, this call will LOAD the state from the SUO file,
+                    //       or collapse to definitions if it can't do that.
+                    viewEx.PersistOutliningState();
                 }
             }
         }
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 4fc3032b781f0..c4277eeff4449 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1953,4 +1953,10 @@ Additional information: {1}</value>
   <data name="Prefer_UTF8_string_literals" xml:space="preserve">
     <value>Prefer UTF-8 string literals</value>
   </data>
+  <data name="Collapse_metadata_on_file_open" xml:space="preserve">
+    <value>Collapse metadata implementations on file open</value>
+  </data>
+  <data name="Collapse_regions_on_file_open" xml:space="preserve">
+    <value>Collapse #regions on file open</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index 133bdcba700d7..c87cde270c63b 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Analýza kódu pro řešení se ukončila dříve, než se dokončila.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Barevné nápovědy</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index 20a5ecedab287..51d86b4b87743 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Die Codeanalyse wurde für die Projektmappe vorzeitig beendet.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Farbhinweise</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 644d925aa5000..29416e8683596 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -242,6 +242,16 @@
         <target state="translated">El análisis de código terminó antes de completarse para la solución.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Sugerencias de color</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index df186aea0efc7..1b07a0d0efe5a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -242,6 +242,16 @@
         <target state="translated">L'analyse du code s'est terminée avant la fin de la solution.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Indicateurs de couleurs</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 75a1d7607386e..526a2d17304cc 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -242,6 +242,16 @@
         <target state="translated">L'esecuzione di Code Analysis è stata terminata prima del completamento per la soluzione.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Suggerimenti per i colori</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index ac67e4a71df53..8a48b66a114ad 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -242,6 +242,16 @@
         <target state="translated">コード分析が、ソリューションでの完了前に終了しました。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">色のヒント</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index a85f062cdc90e..5552d378a537f 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -242,6 +242,16 @@
         <target state="translated">솔루션 완료 전에 코드 분석이 종료되었습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">색 힌트</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index d6f4af127a259..c46c92bc1397a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Analiza kodu zakończyła się przed zakończeniem dla rozwiązania.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Wskazówki kolorów</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 779a8421547e0..9ef89077d84d1 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Análise de código terminada antes da conclusão da Solução.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Dicas com cores</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index df535140ee3d1..19457cbba2bbb 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Анализ кода прерван до завершения решения.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Цветовые подсказки</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index 7892ecc5e5d8b..4991218d116e8 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -242,6 +242,16 @@
         <target state="translated">Kod analizi, Çözüm için tamamlanmadan önce sonlandırıldı.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">Renk ipuçları</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index 8a19c787f9465..8b70728f1d274 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -242,6 +242,16 @@
         <target state="translated">解决方案的代码分析在完成之前终止。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">颜色提示</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index e7a0507285885..0d6a967342798 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -242,6 +242,16 @@
         <target state="translated">程式碼分析在解決方案完成前終止。</target>
         <note />
       </trans-unit>
+      <trans-unit id="Collapse_metadata_on_file_open">
+        <source>Collapse metadata implementations on file open</source>
+        <target state="new">Collapse metadata implementations on file open</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Collapse_regions_on_file_open">
+        <source>Collapse #regions on file open</source>
+        <target state="new">Collapse #regions on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Color_hints">
         <source>Color hints</source>
         <target state="translated">色彩提示</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx b/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx
index e0a2f6d0078e6..cd43a735a3a85 100644
--- a/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx
+++ b/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx
@@ -325,4 +325,7 @@
   <data name="Prefer_simplified_object_creation" xml:space="preserve">
     <value>Prefer simplified object creation</value>
   </data>
+  <data name="Collapse_imports_on_file_open" xml:space="preserve">
+    <value>Collapse Imports on file open</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
index d287f11c95400..a0174b43b1462 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
@@ -99,7 +99,17 @@
                       Header="{x:Static local:AdvancedOptionPageStrings.Option_Outlining}">
                 <StackPanel>
                     <CheckBox x:Name="EnableOutlining"
-                              Content="{x:Static local:AdvancedOptionPageStrings.Option_EnableOutlining}" />
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_EnableOutlining}"
+                              Checked="EnableOutlining_Checked"
+                              Unchecked="EnableOutlining_Unchecked" />
+                    <StackPanel Margin="15, 0, 0, 0">
+                        <CheckBox x:Name="Collapse_regions_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_regions_on_file_open}" />
+                        <CheckBox x:Name="Collapse_imports_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_imports_on_file_open}" />
+                        <CheckBox x:Name="Collapse_metadata_on_file_open"
+                              Content="{x:Static local:AdvancedOptionPageStrings.Option_Collapse_metadata_on_file_open}" />
+                    </StackPanel>
                     <CheckBox x:Name="DisplayLineSeparators"
                               Content="{x:Static local:AdvancedOptionPageStrings.Option_DisplayLineSeparators}" />
                     <CheckBox x:Name="Show_outlining_for_declaration_level_constructs"
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
index 9cf9eae3ce86a..386d61981a952 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
@@ -88,6 +88,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
 
             ' Outlining
             BindToOption(EnableOutlining, FeatureOnOffOptions.Outlining, LanguageNames.VisualBasic)
+            BindToOption(Collapse_regions_on_file_open, BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened, LanguageNames.VisualBasic)
+            BindToOption(Collapse_imports_on_file_open, BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened, LanguageNames.VisualBasic)
+            BindToOption(Collapse_metadata_on_file_open, BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, LanguageNames.VisualBasic)
             BindToOption(DisplayLineSeparators, FeatureOnOffOptions.LineSeparator, LanguageNames.VisualBasic)
             BindToOption(Show_outlining_for_declaration_level_constructs, BlockStructureOptionsStorage.ShowOutliningForDeclarationLevelConstructs, LanguageNames.VisualBasic)
             BindToOption(Show_outlining_for_code_level_constructs, BlockStructureOptionsStorage.ShowOutliningForCodeLevelConstructs, LanguageNames.VisualBasic)
@@ -205,5 +208,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             Me.OptionStore.SetOption(InlineHintsOptionsStorage.EnabledForParameters, LanguageNames.VisualBasic, False)
             UpdateInlineHintsOptions()
         End Sub
+
+        Private Sub EnableOutlining_Checked(sender As Object, e As RoutedEventArgs)
+            Collapse_regions_on_file_open.IsEnabled = True
+            Collapse_imports_on_file_open.IsEnabled = True
+            Collapse_metadata_on_file_open.IsEnabled = True
+        End Sub
+
+        Private Sub EnableOutlining_Unchecked(sender As Object, e As RoutedEventArgs)
+            Collapse_regions_on_file_open.IsEnabled = False
+            Collapse_imports_on_file_open.IsEnabled = False
+            Collapse_metadata_on_file_open.IsEnabled = False
+        End Sub
     End Class
 End Namespace
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
index 5f6f4103296b5..9f896aed84471 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb
@@ -121,6 +121,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
         Public ReadOnly Property Option_EnableOutlining As String =
             BasicVSResources.Enter_outlining_mode_when_files_open
 
+        Public ReadOnly Property Option_Collapse_regions_on_file_open As String =
+            ServicesVSResources.Collapse_regions_on_file_open
+
+        Public ReadOnly Property Option_Collapse_imports_on_file_open As String =
+            BasicVSResources.Collapse_imports_on_file_open
+
+        Public ReadOnly Property Option_Collapse_metadata_on_file_open As String =
+            ServicesVSResources.Collapse_metadata_on_file_open
+
         Public ReadOnly Property Option_ExtractMethod As String =
             BasicVSResources.Extract_Method
 
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb b/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
index 582aa25ee456d..07ce66fec3b03 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
@@ -4,6 +4,7 @@
 
 Imports Microsoft.CodeAnalysis.Editor.Shared.Options
 Imports Microsoft.CodeAnalysis.MetadataAsSource
+Imports Microsoft.CodeAnalysis.Structure
 
 Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
     Partial Public Class AutomationObject
@@ -70,6 +71,33 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             End Set
         End Property
 
+        Public Property CollapseImportsWhenFirstOpened As Boolean
+            Get
+                Return GetBooleanOption(BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened)
+            End Get
+            Set(value As Boolean)
+                SetBooleanOption(BlockStructureOptionsStorage.CollapseImportsWhenFirstOpened, value)
+            End Set
+        End Property
+
+        Public Property CollapseRegionsWhenFirstOpened As Boolean
+            Get
+                Return GetBooleanOption(BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened)
+            End Get
+            Set(value As Boolean)
+                SetBooleanOption(BlockStructureOptionsStorage.CollapseRegionsWhenFirstOpened, value)
+            End Set
+        End Property
+
+        Public Property CollapseMetadataImplementationsWhenFirstOpened As Boolean
+            Get
+                Return GetBooleanOption(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened)
+            End Get
+            Set(value As Boolean)
+                SetBooleanOption(BlockStructureOptionsStorage.CollapseMetadataImplementationsWhenFirstOpened, value)
+            End Set
+        End Property
+
         Public Property PrettyListing As Boolean
             Get
                 Return GetBooleanOption(FeatureOnOffOptions.PrettyListing)
diff --git a/src/VisualStudio/VisualBasic/Impl/VSPackage.resx b/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
index 8db8cc74bca1f..5d08b3c624aa9 100644
--- a/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
+++ b/src/VisualStudio/VisualBasic/Impl/VSPackage.resx
@@ -139,6 +139,9 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</value>
     <comment>Advanced options page keywords</comment>
   </data>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf
index e803f6f85e1ca..14b79af2f5f3d 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Při vložení přidat chybějící direktivy import</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">V relačních operátorech: = &lt;&gt; &lt; &gt; &lt;= &gt;= Like Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf
index 9d6a96996e208..0247923a12d0d 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Beim Einfügen fehlende import-Anweisungen hinzufügen</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">In relationalen Operatoren: = &lt;&gt; &lt; &gt; &lt;= &gt;= Like Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf
index b68322162609b..550518279e9cf 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Agregar las importaciones que faltan al pegar</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">En los operadores relacionales:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf
index fb302b449a54a..99eb54a08c4fd 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Ajouter les imports manquants au moment du collage</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">Dans les opérateurs relationnels :  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf
index 0e1ce473f2925..300fd05b2eba3 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Aggiungi Import mancanti dopo operazione Incolla</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">In operatori relazionali:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf
index 0b72b5d6bb13c..bc7ce615556ad 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf
@@ -7,6 +7,11 @@
         <target state="translated">貼り付け時に欠落している imports を追加する</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">関係演算子: = &lt;&gt; &lt; &gt; &lt;= &gt;= Like Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf
index e6b1129748cfd..740b104a0e135 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf
@@ -7,6 +7,11 @@
         <target state="translated">붙여넣을 때 누락된 import 추가</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">관계형 연산자:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf
index cff24da632379..60c88f3aebef2 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Dodaj brakujące dyrektywy import przy wklejaniu</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">W operatorach relacyjnych:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf
index 550aeb2242e12..58d74c353b3fe 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Adicionar as importações ausentes ao colar</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">Em operadores relacionais:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Como   É</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf
index f0112a2ce490d..74705314f8968 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Добавить недостающие директивы import при вставке</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">В реляционных операторах: =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf
index 4a95a682a33e5..b23967e2e7153 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf
@@ -7,6 +7,11 @@
         <target state="translated">Yapıştırırken eksik import ifadelerini ekle</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">İlişkisel işleçleri içinde: = Transfeleri'nin &lt;&gt; &lt;&gt; = nasıl olduğunu =</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf
index 9584c4348764e..fabef4d122b34 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf
@@ -7,6 +7,11 @@
         <target state="translated">粘贴时添加缺少的 imports</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">在关系运算符中: =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf
index 6190cdd159914..181c434cfa491 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf
@@ -7,6 +7,11 @@
         <target state="translated">在貼上時新增缺少的 import</target>
         <note>'import' is a Visual Basic keyword and should not be localized</note>
       </trans-unit>
+      <trans-unit id="Collapse_imports_on_file_open">
+        <source>Collapse Imports on file open</source>
+        <target state="new">Collapse Imports on file open</target>
+        <note />
+      </trans-unit>
       <trans-unit id="In_relational_binary_operators">
         <source>In relational operators:  =   &lt;&gt;   &lt;   &gt;   &lt;=   &gt;=   Like   Is</source>
         <target state="translated">在關係運算子中: = &lt;&gt; &lt; &gt; &lt;= &gt;= Like Is</target>
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
index 18aff091dad2c..f56f55b8cf5e4 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.cs.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Podtrhnout znovu přiřazené proměnné;Zobrazovat vložené nápovědy;Automatické vložení koncových konstruktorů;Změnit nastavení přehledného výpisu;Změnit režim sbalení;Automatické vkládání členů Interface a MustOverride;Zobrazit nebo skrýt oddělovače řádků procedur;Zapnout nebo vypnout návrhy oprav chyb;Zapnout nebo vypnout zvýrazňování odkazů a klíčových slov;
+        <target state="needs-review-translation">Podtrhnout znovu přiřazené proměnné;Zobrazovat vložené nápovědy;Automatické vložení koncových konstruktorů;Změnit nastavení přehledného výpisu;Změnit režim sbalení;Automatické vkládání členů Interface a MustOverride;Zobrazit nebo skrýt oddělovače řádků procedur;Zapnout nebo vypnout návrhy oprav chyb;Zapnout nebo vypnout zvýrazňování odkazů a klíčových slov;
 Regex;
 regulární výrazy;
 související komponenty pod kurzorem;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
index bb636d6c9e6e0..d26234c122205 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.de.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Neu zugewiesene Variablen unterstreichen;Inlinehinweise anzeigen; Automatisches Einfügen von Endkonstrukten;Pretty Listing-Einstellungen ändern;Gliederungsmodus ändern;Automatisches Einfügen von Schnittstellen- und MustOverride-Membern;Prozedurzeilentrennzeichen ein- oder ausblenden;Fehlerkorrekturvorschläge aktivieren oder deaktivieren;Aktivieren oder Deaktivieren der Hervorhebung von Verweisen und Schlüsselwörtern;
+        <target state="needs-review-translation">Neu zugewiesene Variablen unterstreichen;Inlinehinweise anzeigen; Automatisches Einfügen von Endkonstrukten;Pretty Listing-Einstellungen ändern;Gliederungsmodus ändern;Automatisches Einfügen von Schnittstellen- und MustOverride-Membern;Prozedurzeilentrennzeichen ein- oder ausblenden;Fehlerkorrekturvorschläge aktivieren oder deaktivieren;Aktivieren oder Deaktivieren der Hervorhebung von Verweisen und Schlüsselwörtern;
 Regex;
 reguläre Ausdrücke;
 zugehörige Komponenten unter dem Cursor;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
index e906d173c9894..c33a60803e7b6 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.es.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Subrayar variables reasignadas;Mostrar sugerencias alineadas;Insertar automáticamente las construcciones finales;Cambiar configuración de la lista descriptiva;Cambiar el modo de esquematización;Inserción automática de miembros Interface y MustOverride; Mostrar u ocultar separadores de línea de procedimiento;Activar o desactivar las sugerencias de corrección de errores; Activar o desactivar el resaltado de referencias y palabras clave;
+        <target state="needs-review-translation">Subrayar variables reasignadas;Mostrar sugerencias alineadas;Insertar automáticamente las construcciones finales;Cambiar configuración de la lista descriptiva;Cambiar el modo de esquematización;Inserción automática de miembros Interface y MustOverride; Mostrar u ocultar separadores de línea de procedimiento;Activar o desactivar las sugerencias de corrección de errores; Activar o desactivar el resaltado de referencias y palabras clave;
 Expresión regular;
 expresiones regulares;
 componentes relacionados bajo el cursor;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
index ab3901bddbfb9..54bccda3f3c75 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.fr.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Souligner les variables réaffectées; afficher les indications en ligne; insérer automatiquement les constructions de fin; modifier les paramètres du listing en mode pretty; modifier le mode de contournement; insérer automatiquement les membres Interface et MustOverride; afficher ou masquer les séparateurs de ligne de procédure; activer ou désactiver les suggestions de correction des erreurs; activer ou désactiver la mise en évidence des références et des mots-clés; 
+        <target state="needs-review-translation">Souligner les variables réaffectées; afficher les indications en ligne; insérer automatiquement les constructions de fin; modifier les paramètres du listing en mode pretty; modifier le mode de contournement; insérer automatiquement les membres Interface et MustOverride; afficher ou masquer les séparateurs de ligne de procédure; activer ou désactiver les suggestions de correction des erreurs; activer ou désactiver la mise en évidence des références et des mots-clés; 
 Regex;
  expressions régulières; 
 composants associés sous le curseur; 
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
index 42e9e912d70e5..09e712d305fd3 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.it.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Sottolinea le variabili riassegnate;Visualizza hint inline; Inserimento automatico di costrutti finali; Modifica riformattazione dell'elenco; Modifica la modalità di struttura; Inserimento automatico dei membri Interface e MustOverride; Mostra o nasconde i separatori di riga della procedura; Attiva o disattiva i suggerimenti per la correzione degli errori; Attiva o disattiva l'evidenziazione di riferimenti e parole chiave; 
+        <target state="needs-review-translation">Sottolinea le variabili riassegnate;Visualizza hint inline; Inserimento automatico di costrutti finali; Modifica riformattazione dell'elenco; Modifica la modalità di struttura; Inserimento automatico dei membri Interface e MustOverride; Mostra o nasconde i separatori di riga della procedura; Attiva o disattiva i suggerimenti per la correzione degli errori; Attiva o disattiva l'evidenziazione di riferimenti e parole chiave; 
 regex;
 espressioni regolari;
 componenti correlati sotto il cursore;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
index 61d8a28e22dcb..3a3b243b1338c 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ja.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">再割り当てされる変数に下線を引く;インラインのヒントを表示する;コンストラクトの終端の自動挿入;再フォーマット設定の変更;アウトライン モードの変更;Interface と MustOverride メンバーの自動挿入;プロシージャ行の区切り記号の表示/非表示;エラー修正候補のオン/オフの切り替え;参照とキーワードの強調表示のオン/オフの切り替え;
+        <target state="needs-review-translation">再割り当てされる変数に下線を引く;インラインのヒントを表示する;コンストラクトの終端の自動挿入;再フォーマット設定の変更;アウトライン モードの変更;Interface と MustOverride メンバーの自動挿入;プロシージャ行の区切り記号の表示/非表示;エラー修正候補のオン/オフの切り替え;参照とキーワードの強調表示のオン/オフの切り替え;
 Regex;
 正規表現;
 カーソルの下の関連コンポーネント;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
index 1dd9985c5fbb7..b7e76297ae4d4 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ko.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">다시 할당된 변수에 밑줄 긋기;인라인 힌트 표시; 맺음 구문 자동 삽입;자동 서식 지정 설정 변경;개요 모드 변경;인터페이스 및 MustOverride 멤버 자동 삽입;프로시저 줄 구분 기호 표시/숨기기;오류 수정 제안 설정/해제;참조 및 키워드 강조 표시 설정/해제;
+        <target state="needs-review-translation">다시 할당된 변수에 밑줄 긋기;인라인 힌트 표시; 맺음 구문 자동 삽입;자동 서식 지정 설정 변경;개요 모드 변경;인터페이스 및 MustOverride 멤버 자동 삽입;프로시저 줄 구분 기호 표시/숨기기;오류 수정 제안 설정/해제;참조 및 키워드 강조 표시 설정/해제;
 Regex;
 정규식;
 커서 아래의 관련 구성;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
index 00aa3b4b6f55f..cf177973f6353 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pl.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Podkreślanie ponownie przypisanych zmiennych;Wyświatlnie wskazówek śródwierszowych; Automatyczne wstawianie konstrukcji końcowych; Zmiana ustawień wyświetlania listy;Zmiana trybu konspektu; Automatyczne wstawianie elementów członkowskich Interfejs i Należy Zastąpić; Pokazywanie lub ukrywanie separatorów wierszy procedury; Włączanie lub wyłączanie sugestii poprawek błędów; Włączanie lub wyłączanie wyróżnianie odwołań i słów kluczowych;
+        <target state="needs-review-translation">Podkreślanie ponownie przypisanych zmiennych;Wyświatlnie wskazówek śródwierszowych; Automatyczne wstawianie konstrukcji końcowych; Zmiana ustawień wyświetlania listy;Zmiana trybu konspektu; Automatyczne wstawianie elementów członkowskich Interfejs i Należy Zastąpić; Pokazywanie lub ukrywanie separatorów wierszy procedury; Włączanie lub wyłączanie sugestii poprawek błędów; Włączanie lub wyłączanie wyróżnianie odwołań i słów kluczowych;
 Wyrażenie regularne;
 Wyrażenia regularne;
 Powiązane składniki pod kursorem;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
index e149803889908..e7fa4568ba4ec 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.pt-BR.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Sublinhar variáveis reatribuídas;exibir dicas incorporadas;inserção automática de construções finais;Alterar as configurações de reformatação automática;Alterar o modo de estrutura de tópicos;Inserção automática de interface e membros MustOverride;Mostrar ou ocultar separadores de linha de procedimento;Ativar ou desativar as sugestões de correção de erros;ativar ou desativar o realce de referências e palavras-chave;
+        <target state="needs-review-translation">Sublinhar variáveis reatribuídas;exibir dicas incorporadas;inserção automática de construções finais;Alterar as configurações de reformatação automática;Alterar o modo de estrutura de tópicos;Inserção automática de interface e membros MustOverride;Mostrar ou ocultar separadores de linha de procedimento;Ativar ou desativar as sugestões de correção de erros;ativar ou desativar o realce de referências e palavras-chave;
 Regex; 
 expressões regulares;
 componentes relacionados sob o cursor;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
index b654a411b5c6a..90a3ebb825873 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.ru.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Подчеркивать переназначенные переменные;Показывать встроенные подсказки;Автоматическая вставка конечных конструкций;Изменять параметры автоматического форматирования;Изменять режим структуры;Автоматическая вставка интерфейса и элементов MustOverride;Показывать или скрывать разделители строк для процедуры;Включить или отключить предложения по исправлению ошибок;Включить или отключить выделение ссылок и ключевых слов;
+        <target state="needs-review-translation">Подчеркивать переназначенные переменные;Показывать встроенные подсказки;Автоматическая вставка конечных конструкций;Изменять параметры автоматического форматирования;Изменять режим структуры;Автоматическая вставка интерфейса и элементов MustOverride;Показывать или скрывать разделители строк для процедуры;Включить или отключить предложения по исправлению ошибок;Включить или отключить выделение ссылок и ключевых слов;
 Регулярные выражения;
 регулярные выражения;
 связанные компоненты под курсором
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
index 2fdd4cfca2d28..d462e9c788e99 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.tr.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">Yeniden atanan değişkenleri altını çiz;Satır içi ipuçlarını göster;Bitiş yapılarının otomatik olarak eklenmesi;Düzgün listeleme ayarlarını değiştir;Ana hat modunu değiştir;Interface ve MustOverride üyelerinin otomatik olarak eklenmesi;Yordam satır ayraçlarını göster veya gizle;Hata düzeltme önerilerini aç veya kapat;Başvuruları ve anahtar sözcükleri vurgulamayı aç veya kapat;
+        <target state="needs-review-translation">Yeniden atanan değişkenleri altını çiz;Satır içi ipuçlarını göster;Bitiş yapılarının otomatik olarak eklenmesi;Düzgün listeleme ayarlarını değiştir;Ana hat modunu değiştir;Interface ve MustOverride üyelerinin otomatik olarak eklenmesi;Yordam satır ayraçlarını göster veya gizle;Hata düzeltme önerilerini aç veya kapat;Başvuruları ve anahtar sözcükleri vurgulamayı aç veya kapat;
 Normal ifade;
 normal ifadeler; 
 imlecin altındaki ilgili bileşenler; 
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
index 92224c12b637c..e7bf53a84aaa3 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hans.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">为重新分配变量添加下划线;显示内联提示;自动插入 End 构造;更改整齐排列设置;更改大纲模式;自动插入 Interface 和 MustOverride 成员;显示或隐藏过程行分隔符;打开或关闭错误纠正建议;打开或关闭引用和关键字的突出显示;
+        <target state="needs-review-translation">为重新分配变量添加下划线;显示内联提示;自动插入 End 构造;更改整齐排列设置;更改大纲模式;自动插入 Interface 和 MustOverride 成员;显示或隐藏过程行分隔符;打开或关闭错误纠正建议;打开或关闭引用和关键字的突出显示;
 正则表达式;
 正则表达式;
 游标下的相关组件;
diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
index 72c416d0ca9ce..8d196454fafba 100644
--- a/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
+++ b/src/VisualStudio/VisualBasic/Impl/xlf/VSPackage.zh-Hant.xlf
@@ -29,8 +29,11 @@ JSON;
 Colorize JSON strings;
 Report invalid JSON strings;
 Detect and offer editor features for JSON strings;
+Collapse #regions on file open;
+Collapse Imports on file open;
+Collapse metadata implementations on file open;
 Use enhanced colors;Editor Color Scheme;Inheritance Margin;Import Directives;</source>
-        <target state="translated">為重新指派的變數加上底線;顯示內嵌提示;自動插入結束建構;變更美化排列設定;變更大綱模式;自動插入介面和 MustOverride 成員;顯示或隱藏程序行分隔符號;開啟或關閉錯誤校正建議;開啟或關閉參考及關鍵字的醒目提示;
+        <target state="needs-review-translation">為重新指派的變數加上底線;顯示內嵌提示;自動插入結束建構;變更美化排列設定;變更大綱模式;自動插入介面和 MustOverride 成員;顯示或隱藏程序行分隔符號;開啟或關閉錯誤校正建議;開啟或關閉參考及關鍵字的醒目提示;
 Regex;
 規則運算式;
 游標下的相關元件;

From 324a0f848ad8c4f5cc27980d1d2721b8f3ac0a78 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Thu, 5 May 2022 19:02:47 +0300
Subject: [PATCH 231/413] Suggest fixed keyword in unsafe local functions

---
 .../FixedKeywordRecommenderTests.cs           | 35 +++++++++++++++++++
 .../ContextQuery/SyntaxTokenExtensions.cs     |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/FixedKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/FixedKeywordRecommenderTests.cs
index ca6aee72ec313..622790426a94f 100644
--- a/src/EditorFeatures/CSharpTest2/Recommendations/FixedKeywordRecommenderTests.cs
+++ b/src/EditorFeatures/CSharpTest2/Recommendations/FixedKeywordRecommenderTests.cs
@@ -6,6 +6,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Test.Utilities;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Recommendations
@@ -148,5 +149,39 @@ await VerifyAbsenceAsync(
 @"unsafe struct S {
     static $$");
         }
+
+        [WorkItem(52296, "https://github.com/dotnet/roslyn/issues/52296")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public async Task TestInUnsafeLocalFunction()
+        {
+            await VerifyKeywordAsync(
+@"public class C
+{
+    public void M()
+    {
+        unsafe void Local()
+        {
+            $$
+        }
+    }
+}");
+        }
+
+        [WorkItem(52296, "https://github.com/dotnet/roslyn/issues/52296")]
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public async Task TestNotInOrdinaryLocalFunction()
+        {
+            await VerifyAbsenceAsync(
+@"public class C
+{
+    public void M()
+    {
+        void Local()
+        {
+            $$
+        }
+    }
+}");
+        }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/SyntaxTokenExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/SyntaxTokenExtensions.cs
index 85f7f5bd04dff..a6d6a852b3885 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/SyntaxTokenExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/CSharp/Extensions/ContextQuery/SyntaxTokenExtensions.cs
@@ -504,7 +504,8 @@ public static bool IsUnsafeContext(this SyntaxToken targetToken)
         {
             return
                 targetToken.GetAncestors<StatementSyntax>().Any(s => s.IsKind(SyntaxKind.UnsafeStatement)) ||
-                targetToken.GetAncestors<MemberDeclarationSyntax>().Any(m => m.GetModifiers().Any(SyntaxKind.UnsafeKeyword));
+                targetToken.GetAncestors<MemberDeclarationSyntax>().Any(m => m.GetModifiers().Any(SyntaxKind.UnsafeKeyword) ||
+                targetToken.GetAncestors<LocalFunctionStatementSyntax>().Any(f => f.GetModifiers().Any(SyntaxKind.UnsafeKeyword)));
         }
 
         public static bool IsAfterYieldKeyword(this SyntaxToken targetToken)

From 416e600cc88d2f407f805b90be294c0dc9ee9165 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 11:50:40 -0700
Subject: [PATCH 232/413] Support utf8 strings in the virtual char service

---
 .../Classification/SemanticClassifierTests.cs | 316 ++++++++++++++++++
 ...ctEmbeddedLanguageClassificationService.cs |  12 +
 ...tractFallbackEmbeddedLanguageClassifier.cs |  15 +-
 .../EmbeddedLanguages/EmbeddedLanguageInfo.cs |   5 +-
 .../VirtualChars/CSharpVirtualCharService.cs  |  42 ++-
 .../Services/SyntaxFacts/CSharpSyntaxKinds.cs |   3 +
 .../AbstractVirtualCharService.cs             |   7 +-
 .../Core/Services/SyntaxFacts/ISyntaxKinds.cs |   3 +
 .../SyntaxFacts/VisualBasicSyntaxKinds.vb     |   3 +
 9 files changed, 386 insertions(+), 20 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
index d2c5d07de0036..2496df34f144d 100644
--- a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
+++ b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
@@ -3236,6 +3236,56 @@ void Goo()
 Regex.Comment("(?#comment)"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestRegex4_utf8_1(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    void Goo()
+    {
+        var r = /* lang=regex */""$\\a(?#comment)"";
+    }
+}",
+testHost, Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Keyword("var"),
+Regex.Anchor("$"),
+Regex.OtherEscape(@"\\"),
+Regex.OtherEscape("a"),
+Regex.Comment("(?#comment)"));
+        }
+
+        [Theory]
+        [CombinatorialData]
+        public async Task TestRegex4_utf8_2(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    void Goo()
+    {
+        var r = /* lang=regex */@""$\a(?#comment)""u8;
+    }
+}",
+testHost, Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Keyword("var"),
+Regex.Anchor("$"),
+Regex.OtherEscape("\\"),
+Regex.OtherEscape("a"),
+Regex.Comment("(?#comment)"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestRegex5(TestHost testHost)
@@ -3395,6 +3445,33 @@ void Goo()
 Regex.Text(" # is not end of line comment"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestRegex10_utf8(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    void Goo()
+    {
+        // lang=regex
+        var r = @""$\a(?#comment) # is not end of line comment""u8;
+    }
+}",
+testHost, Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Keyword("var"),
+Regex.Anchor("$"),
+Regex.OtherEscape("\\"),
+Regex.OtherEscape("a"),
+Regex.Comment("(?#comment)"),
+Regex.Text(" # is not end of line comment"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestRegex11(TestHost testHost)
@@ -3448,6 +3525,31 @@ void Goo()
 Regex.Comment("(?#comment)"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestRegexSingleLineRawStringLiteral_utf8(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    void Goo()
+    {
+        var r = /* lang=regex */ """"""$\a(?#comment)""""""u8;
+    }
+}",
+testHost, Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Keyword("var"),
+Regex.Anchor("$"),
+Regex.OtherEscape("\\"),
+Regex.OtherEscape("a"),
+Regex.Comment("(?#comment)"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestRegexMultiLineRawStringLiteral(TestHost testHost)
@@ -3479,6 +3581,37 @@ void Goo()
             "));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestRegexMultiLineRawStringLiteral_utf8(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    void Goo()
+    {
+        var r = /* lang=regex */ """"""
+            $\a(?#comment)
+            """"""u8;
+    }
+}",
+testHost, Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Keyword("var"),
+Regex.Text(@"
+            "),
+Regex.Anchor("$"),
+Regex.OtherEscape("\\"),
+Regex.OtherEscape("a"),
+Regex.Comment("(?#comment)"),
+Regex.Text(@"
+            "));
+        }
+
         [Theory, WorkItem(47079, "https://github.com/dotnet/roslyn/issues/47079")]
         [CombinatorialData]
         public async Task TestRegexWithSpecialCSharpCharLiterals(TestHost testHost)
@@ -3503,6 +3636,28 @@ class Program
 Regex.Anchor("$"));
         }
 
+        [Theory, WorkItem(47079, "https://github.com/dotnet/roslyn/issues/47079")]
+        [CombinatorialData]
+        public async Task TestRegexWithSpecialCSharpCharLiterals_utf8(TestHost testHost)
+        {
+            await TestAsync(
+@"
+using System.Text.RegularExpressions;
+
+class Program
+{
+    // lang=regex
+    private string myRegex = @""^ """" $""u8;
+}",
+testHost,
+Namespace("System"),
+Namespace("Text"),
+Namespace("RegularExpressions"),
+Regex.Anchor("^"),
+Regex.Text(@" """" "),
+Regex.Anchor("$"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestRegexOnApiWithStringSyntaxAttribute_Field(TestHost testHost)
@@ -4229,6 +4384,17 @@ public async Task TestStringEscape1(TestHost testHost)
                 Escape(@"\n"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape1_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = ""goo\r\nbar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"\r"),
+                Escape(@"\n"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape2(TestHost testHost)
@@ -4238,6 +4404,15 @@ public async Task TestStringEscape2(TestHost testHost)
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape2_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = @""goo\r\nbar""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape3(TestHost testHost)
@@ -4249,6 +4424,17 @@ public async Task TestStringEscape3(TestHost testHost)
                 Escape(@"}}"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape3_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $""goo{{1}}bar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"{{"),
+                Escape(@"}}"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape4(TestHost testHost)
@@ -4260,6 +4446,17 @@ public async Task TestStringEscape4(TestHost testHost)
                 Escape(@"}}"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape4_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $@""goo{{1}}bar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"{{"),
+                Escape(@"}}"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape5(TestHost testHost)
@@ -4273,6 +4470,19 @@ public async Task TestStringEscape5(TestHost testHost)
                 Escape(@"\n"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape5_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $""goo\r{{1}}\nbar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"\r"),
+                Escape(@"{{"),
+                Escape(@"}}"),
+                Escape(@"\n"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape6(TestHost testHost)
@@ -4284,6 +4494,17 @@ public async Task TestStringEscape6(TestHost testHost)
                 Escape(@"}}"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape6_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $@""goo\r{{1}}\nbar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"{{"),
+                Escape(@"}}"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape7(TestHost testHost)
@@ -4295,6 +4516,17 @@ public async Task TestStringEscape7(TestHost testHost)
                 Escape(@"\n"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape7_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $""goo\r{1}\nbar""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"\r"),
+                Escape(@"\n"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape8(TestHost testHost)
@@ -4306,6 +4538,17 @@ public async Task TestStringEscape8(TestHost testHost)
                 Escape(@"}}"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape8_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $@""{{goo{1}bar}}""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"{{"),
+                Escape(@"}}"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestStringEscape9(TestHost testHost)
@@ -4317,6 +4560,17 @@ public async Task TestStringEscape9(TestHost testHost)
                 Escape(@"}}"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestStringEscape9_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $@""{{{12:X}}}""u8;",
+                testHost,
+                Keyword("var"),
+                Escape(@"{{"),
+                Escape(@"}}"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral1(TestHost testHost)
@@ -4326,6 +4580,15 @@ public async Task TestNotStringEscapeInRawLiteral1(TestHost testHost)
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral1_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = """"""goo\r\nbar""""""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral2(TestHost testHost)
@@ -4337,6 +4600,17 @@ await TestInMethodAsync(@"var goo = """"""
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral2_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = """"""
+    goo\r\nbar
+    """"""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral3(TestHost testHost)
@@ -4348,6 +4622,17 @@ await TestInMethodAsync(@"var goo = $""""""
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral3_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $""""""
+    goo\r\nbar
+    """"""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral4(TestHost testHost)
@@ -4357,6 +4642,15 @@ public async Task TestNotStringEscapeInRawLiteral4(TestHost testHost)
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral4_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = """"""\""""""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral5(TestHost testHost)
@@ -4368,6 +4662,17 @@ await TestInMethodAsync(@"var goo = """"""
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral5_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = """"""
+    \
+    """"""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [Theory]
         [CombinatorialData]
         public async Task TestNotStringEscapeInRawLiteral6(TestHost testHost)
@@ -4379,6 +4684,17 @@ await TestInMethodAsync(@"var goo = $""""""
                 Keyword("var"));
         }
 
+        [Theory]
+        [CombinatorialData]
+        public async Task TestNotStringEscapeInRawLiteral6_utf8(TestHost testHost)
+        {
+            await TestInMethodAsync(@"var goo = $""""""
+    \
+    """"""u8;",
+                testHost,
+                Keyword("var"));
+        }
+
         [WorkItem(31200, "https://github.com/dotnet/roslyn/issues/31200")]
         [Theory]
         [CombinatorialData]
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index 83ca6b0ea8e64..fa21f975dc790 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -77,11 +77,23 @@ protected AbstractEmbeddedLanguageClassificationService(
             _syntaxTokenKinds.Add(syntaxKinds.StringLiteralToken);
             _syntaxTokenKinds.Add(syntaxKinds.InterpolatedStringTextToken);
 
+            if (syntaxKinds.SingleLineRawStringLiteralToken != null)
+                _syntaxTokenKinds.Add(syntaxKinds.SingleLineRawStringLiteralToken.Value);
+
             if (syntaxKinds.SingleLineRawStringLiteralToken != null)
                 _syntaxTokenKinds.Add(syntaxKinds.SingleLineRawStringLiteralToken.Value);
 
             if (syntaxKinds.MultiLineRawStringLiteralToken != null)
                 _syntaxTokenKinds.Add(syntaxKinds.MultiLineRawStringLiteralToken.Value);
+
+            if (syntaxKinds.UTF8StringLiteralToken != null)
+                _syntaxTokenKinds.Add(syntaxKinds.UTF8StringLiteralToken.Value);
+
+            if (syntaxKinds.UTF8SingleLineRawStringLiteralToken != null)
+                _syntaxTokenKinds.Add(syntaxKinds.UTF8SingleLineRawStringLiteralToken.Value);
+
+            if (syntaxKinds.UTF8MultiLineRawStringLiteralToken != null)
+                _syntaxTokenKinds.Add(syntaxKinds.UTF8MultiLineRawStringLiteralToken.Value);
         }
 
         public async Task AddEmbeddedLanguageClassificationsAsync(
diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
index 6721a8d5d495f..6aa2648fcf717 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractFallbackEmbeddedLanguageClassifier.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
+using Microsoft.CodeAnalysis.Shared.Collections;
 
 namespace Microsoft.CodeAnalysis.Classification
 {
@@ -15,10 +16,16 @@ internal abstract class AbstractFallbackEmbeddedLanguageClassifier : IEmbeddedLa
         protected AbstractFallbackEmbeddedLanguageClassifier(EmbeddedLanguageInfo info)
         {
             _info = info;
-            _supportedKinds = ImmutableArray.Create(
-                info.SyntaxKinds.CharacterLiteralToken,
-                info.SyntaxKinds.StringLiteralToken,
-                info.SyntaxKinds.InterpolatedStringTextToken);
+
+            using var array = TemporaryArray<int>.Empty;
+
+            array.Add(info.SyntaxKinds.CharacterLiteralToken);
+            array.Add(info.SyntaxKinds.StringLiteralToken);
+            array.Add(info.SyntaxKinds.InterpolatedStringTextToken);
+
+            array.AsRef().AddIfNotNull(info.SyntaxKinds.UTF8StringLiteralToken);
+
+            _supportedKinds = array.ToImmutableAndClear();
         }
 
         public void RegisterClassifications(EmbeddedLanguageClassificationContext context)
diff --git a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageInfo.cs b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageInfo.cs
index f2f36cceecfc3..9553e2b3ccf9d 100644
--- a/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageInfo.cs
+++ b/src/Workspaces/Core/Portable/EmbeddedLanguages/EmbeddedLanguageInfo.cs
@@ -39,7 +39,10 @@ public readonly bool IsAnyStringLiteral(int rawKind)
         {
             return rawKind == SyntaxKinds.StringLiteralToken ||
                    rawKind == SyntaxKinds.SingleLineRawStringLiteralToken ||
-                   rawKind == SyntaxKinds.MultiLineRawStringLiteralToken;
+                   rawKind == SyntaxKinds.MultiLineRawStringLiteralToken ||
+                   rawKind == SyntaxKinds.UTF8StringLiteralToken ||
+                   rawKind == SyntaxKinds.UTF8SingleLineRawStringLiteralToken ||
+                   rawKind == SyntaxKinds.UTF8MultiLineRawStringLiteralToken;
         }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index 8e9d1e58ad99b..70316224bcdf3 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -2,6 +2,7 @@
 // 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.Diagnostics;
 using System.Text;
 using Microsoft.CodeAnalysis.Collections;
@@ -28,22 +29,21 @@ protected CSharpVirtualCharService()
 
         protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToken token)
         {
-            // C# preprocessor directives can contain string literals.  However, these string
-            // literals do not behave like normal literals.  Because they are used for paths (i.e.
-            // in a #line directive), the language does not do any escaping within them.  i.e. if
-            // you have a \ it's just a \   Note that this is not a verbatim string.  You can't put
-            // a double quote in it either, and you cannot have newlines and whatnot.
+            // C# preprocessor directives can contain string literals.  However, these string literals do not behave
+            // like normal literals.  Because they are used for paths (i.e. in a #line directive), the language does not
+            // do any escaping within them.  i.e. if you have a \ it's just a \   Note that this is not a verbatim
+            // string.  You can't put a double quote in it either, and you cannot have newlines and whatnot.
             //
-            // We technically could convert this trivially to an array of virtual chars.  After all,
-            // there would just be a 1:1 correspondance with the literal contents and the chars
-            // returned.  However, we don't even both returning anything here.  That's because
-            // there's no useful features we can offer here.  Because there are no escape characters
-            // we won't classify any escape characters.  And there is no way that these strings would
-            // be Regex/Json snippets.  So it's easier to just bail out and return nothing.
+            // We technically could convert this trivially to an array of virtual chars.  After all, there would just be
+            // a 1:1 correspondence with the literal contents and the chars returned.  However, we don't even both
+            // returning anything here.  That's because there's no useful features we can offer here.  Because there are
+            // no escape characters we won't classify any escape characters.  And there is no way that these strings
+            // would be Regex/Json snippets.  So it's easier to just bail out and return nothing.
             if (IsInDirective(token.Parent))
                 return default;
 
             Debug.Assert(!token.ContainsDiagnostics);
+
             if (token.Kind() == SyntaxKind.StringLiteralToken)
             {
                 return token.IsVerbatimStringLiteral()
@@ -51,11 +51,23 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                     : TryConvertStringToVirtualChars(token, "\"", "\"", escapeBraces: false);
             }
 
+            if (token.Kind() == SyntaxKind.UTF8StringLiteralToken)
+            {
+                return token.IsVerbatimStringLiteral()
+                    ? TryConvertVerbatimStringToVirtualChars(token, "@\"", "\"u8", escapeBraces: false)
+                    : TryConvertStringToVirtualChars(token, "\"", "\"u8", escapeBraces: false);
+            }
+
             if (token.Kind() == SyntaxKind.CharacterLiteralToken)
                 return TryConvertStringToVirtualChars(token, "'", "'", escapeBraces: false);
 
-            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.MultiLineRawStringLiteralToken)
+            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or
+                                SyntaxKind.MultiLineRawStringLiteralToken or
+                                SyntaxKind.UTF8SingleLineRawStringLiteralToken or
+                                SyntaxKind.UTF8MultiLineRawStringLiteralToken)
+            {
                 return TryConvertRawStringToVirtualChars(token, skipDelimiterQuotes: true);
+            }
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -111,7 +123,9 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(
             if (skipDelimiterQuotes)
             {
                 Contract.ThrowIfFalse(tokenText[0] == '"');
-                Contract.ThrowIfFalse(tokenText[^1] == '"');
+
+                if (tokenText.Length >= 2 && tokenText[endIndexExclusive - 1] == '8' && tokenText[endIndexExclusive - 2] is 'u' or 'U')
+                    endIndexExclusive -= 2;
 
                 while (tokenText[startIndexInclusive] == '"')
                 {
@@ -138,7 +152,7 @@ private static VirtualCharSequence TryConvertStringToVirtualChars(
                 return default;
             }
 
-            if (endDelimiter.Length > 0 && !tokenText.EndsWith(endDelimiter))
+            if (endDelimiter.Length > 0 && !tokenText.EndsWith(endDelimiter, StringComparison.OrdinalIgnoreCase))
             {
                 Debug.Fail("This should not be reachable as long as the compiler added no diagnostics.");
                 return default;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxKinds.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxKinds.cs
index 8a75d07297e83..47b1c3a560046 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxKinds.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxKinds.cs
@@ -39,6 +39,9 @@ public TSyntaxKind Convert<TSyntaxKind>(int kind) where TSyntaxKind : struct
         public int StringLiteralToken => (int)SyntaxKind.StringLiteralToken;
         public int? SingleLineRawStringLiteralToken => (int)SyntaxKind.SingleLineRawStringLiteralToken;
         public int? MultiLineRawStringLiteralToken => (int)SyntaxKind.MultiLineRawStringLiteralToken;
+        public int? UTF8StringLiteralToken => (int)SyntaxKind.UTF8StringLiteralToken;
+        public int? UTF8SingleLineRawStringLiteralToken => (int)SyntaxKind.UTF8SingleLineRawStringLiteralToken;
+        public int? UTF8MultiLineRawStringLiteralToken => (int)SyntaxKind.UTF8MultiLineRawStringLiteralToken;
 
         public int XmlTextLiteralToken => (int)SyntaxKind.XmlTextLiteralToken;
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
index 9505a4051f5f5..a5d1a5eb90623 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
@@ -71,6 +71,7 @@ private void CheckInvariants(SyntaxToken token, VirtualCharSequence result)
                 // matches what the compiler did.
                 var syntaxKinds = this.SyntaxFacts.SyntaxKinds;
                 if (token.RawKind == syntaxKinds.StringLiteralToken ||
+                    token.RawKind == syntaxKinds.UTF8StringLiteralToken ||
                     token.RawKind == syntaxKinds.CharacterLiteralToken)
                 {
                     var expectedValueText = token.ValueText;
@@ -105,7 +106,11 @@ private void CheckInvariants(SyntaxToken token, VirtualCharSequence result)
                     if (token.RawKind == syntaxKinds.StringLiteralToken ||
                         token.RawKind == syntaxKinds.CharacterLiteralToken)
                     {
-                        Debug.Assert(lastVC.Span.End == token.Span.End - 1, "Last span has to end right before the end of the string token.");
+                        Debug.Assert(lastVC.Span.End == token.Span.End - "\"".Length, "Last span has to end right before the end of the string token.");
+                    }
+                    else if (token.RawKind == syntaxKinds.UTF8StringLiteralToken)
+                    {
+                        Debug.Assert(lastVC.Span.End == token.Span.End - "\"u8".Length, "Last span has to end right before the end of the string token.");
                     }
                     else if (token.RawKind == syntaxKinds.InterpolatedStringTextToken)
                     {
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxKinds.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxKinds.cs
index 724be53fe366e..54d39531dea7a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxKinds.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/ISyntaxKinds.cs
@@ -57,6 +57,9 @@ internal interface ISyntaxKinds
         int StringLiteralToken { get; }
         int? SingleLineRawStringLiteralToken { get; }
         int? MultiLineRawStringLiteralToken { get; }
+        int? UTF8StringLiteralToken { get; }
+        int? UTF8SingleLineRawStringLiteralToken { get; }
+        int? UTF8MultiLineRawStringLiteralToken { get; }
 
         #endregion
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxKinds.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxKinds.vb
index 74eca068b2f95..6e48cbf9937c6 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxKinds.vb
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxKinds.vb
@@ -41,6 +41,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices
         Public ReadOnly Property StringLiteralToken As Integer = SyntaxKind.StringLiteralToken Implements ISyntaxKinds.StringLiteralToken
         Public ReadOnly Property SingleLineRawStringLiteralToken As Integer? = Nothing Implements ISyntaxKinds.SingleLineRawStringLiteralToken
         Public ReadOnly Property MultiLineRawStringLiteralToken As Integer? = Nothing Implements ISyntaxKinds.MultiLineRawStringLiteralToken
+        Public ReadOnly Property UTF8StringLiteralToken As Integer? = Nothing Implements ISyntaxKinds.UTF8StringLiteralToken
+        Public ReadOnly Property UTF8SingleLineRawStringLiteralToken As Integer? = Nothing Implements ISyntaxKinds.UTF8SingleLineRawStringLiteralToken
+        Public ReadOnly Property UTF8MultiLineRawStringLiteralToken As Integer? = Nothing Implements ISyntaxKinds.UTF8MultiLineRawStringLiteralToken
 
         Public ReadOnly Property XmlTextLiteralToken As Integer = SyntaxKind.XmlTextLiteralToken Implements ISyntaxKinds.XmlTextLiteralToken
 

From 08a380511c6ee82392679ccaedc8596c96267623 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Thu, 5 May 2022 22:00:36 +0300
Subject: [PATCH 233/413] Take trivia from old method references when replacing
 them with generated property references

---
 .../ReplaceMethodWithPropertyTests.cs         | 58 +++++++++++++++++++
 .../CSharpReplaceMethodWithPropertyService.cs |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs b/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
index b7c453c5ffc8b..0ac84f3120791 100644
--- a/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
+++ b/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
@@ -2560,5 +2560,63 @@ class C
     public Task<string> SomeTask { get => this.someTask; set => this.someTask = value; }
 }", index: 1);
         }
+
+        [WorkItem(40758, "https://github.com/dotnet/roslyn/issues/40758")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        public async Task TestReferenceTrivia1()
+        {
+            await TestInRegularAndScriptAsync(
+@"class Class
+{
+    static bool [||]Value() => default;
+
+    static void Main()
+    {
+        if (/*test*/Value())
+        {
+        }
+    }
+}",
+@"class Class
+{
+    static bool Value => default;
+
+    static void Main()
+    {
+        if (/*test*/Value)
+        {
+        }
+    }
+}");
+        }
+
+        [WorkItem(40758, "https://github.com/dotnet/roslyn/issues/40758")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        public async Task TestReferenceTrivia2()
+        {
+            await TestInRegularAndScriptAsync(
+@"class Class
+{
+    static bool [||]Value() => default;
+
+    static void Main()
+    {
+        if (Value()/*test*/)
+        {
+        }
+    }
+}",
+@"class Class
+{
+    static bool Value => default;
+
+    static void Main()
+    {
+        if (Value/*test*/)
+        {
+        }
+    }
+}");
+        }
     }
 }
diff --git a/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs b/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
index ecf15b6b8d3ed..123acadd39f2c 100644
--- a/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
+++ b/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
@@ -396,7 +396,7 @@ public static void ReplaceInvocation(SyntaxEditor editor, SyntaxToken nameToken,
             }
 
             // It was invoked.  Remove the invocation, and also change the name if necessary.
-            replace(editor, invocation, nameNode, newName);
+            replace(editor, invocation, nameNode, newName.WithTriviaFrom(invocation));
         }
 
         private static bool IsInvocationName(IdentifierNameSyntax nameNode, ExpressionSyntax invocationExpression)

From 01d049f3ee34f941d9427f172183b9559a0095f3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 12:00:41 -0700
Subject: [PATCH 234/413] Simplify

---
 ...ctEmbeddedLanguageClassificationService.cs | 22 +++++--------------
 .../Core/Extensions/ICollectionExtensions.cs  | 12 ++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
index fa21f975dc790..9a0d838935e07 100644
--- a/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
+++ b/src/Workspaces/Core/Portable/Classification/EmbeddedLanguages/AbstractEmbeddedLanguageClassificationService.cs
@@ -77,23 +77,11 @@ protected AbstractEmbeddedLanguageClassificationService(
             _syntaxTokenKinds.Add(syntaxKinds.StringLiteralToken);
             _syntaxTokenKinds.Add(syntaxKinds.InterpolatedStringTextToken);
 
-            if (syntaxKinds.SingleLineRawStringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.SingleLineRawStringLiteralToken.Value);
-
-            if (syntaxKinds.SingleLineRawStringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.SingleLineRawStringLiteralToken.Value);
-
-            if (syntaxKinds.MultiLineRawStringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.MultiLineRawStringLiteralToken.Value);
-
-            if (syntaxKinds.UTF8StringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.UTF8StringLiteralToken.Value);
-
-            if (syntaxKinds.UTF8SingleLineRawStringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.UTF8SingleLineRawStringLiteralToken.Value);
-
-            if (syntaxKinds.UTF8MultiLineRawStringLiteralToken != null)
-                _syntaxTokenKinds.Add(syntaxKinds.UTF8MultiLineRawStringLiteralToken.Value);
+            _syntaxTokenKinds.AddIfNotNull(syntaxKinds.SingleLineRawStringLiteralToken);
+            _syntaxTokenKinds.AddIfNotNull(syntaxKinds.MultiLineRawStringLiteralToken);
+            _syntaxTokenKinds.AddIfNotNull(syntaxKinds.UTF8StringLiteralToken);
+            _syntaxTokenKinds.AddIfNotNull(syntaxKinds.UTF8SingleLineRawStringLiteralToken);
+            _syntaxTokenKinds.AddIfNotNull(syntaxKinds.UTF8MultiLineRawStringLiteralToken);
         }
 
         public async Task AddEmbeddedLanguageClassificationsAsync(
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICollectionExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICollectionExtensions.cs
index b888235de4b4f..a2b71c59a2705 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICollectionExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICollectionExtensions.cs
@@ -24,5 +24,17 @@ public static void RemoveRange<T>(this ICollection<T> collection, IEnumerable<T>
                 }
             }
         }
+
+        public static void AddIfNotNull<T>(this ICollection<T> collection, T? value) where T : struct
+        {
+            if (value != null)
+                collection.Add(value.Value);
+        }
+
+        public static void AddIfNotNull<T>(this ICollection<T> collection, T? value) where T : class
+        {
+            if (value != null)
+                collection.Add(value);
+        }
     }
 }

From c2a59de27346542284d8c8dacaf988f15ea9f77e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 12:04:37 -0700
Subject: [PATCH 235/413] Simplify

---
 .../EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index 70316224bcdf3..1e4d325679185 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -124,7 +124,7 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(
             {
                 Contract.ThrowIfFalse(tokenText[0] == '"');
 
-                if (tokenText.Length >= 2 && tokenText[endIndexExclusive - 1] == '8' && tokenText[endIndexExclusive - 2] is 'u' or 'U')
+                if (tokenText is [.., 'u' or 'U', '8'])
                     endIndexExclusive -= 2;
 
                 while (tokenText[startIndexInclusive] == '"')

From ed0fff630e3c96ea646e2c6987049c28d7fd52e0 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 12:15:30 -0700
Subject: [PATCH 236/413] Simplify

---
 .../VirtualChars/CSharpVirtualCharService.cs  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index 1e4d325679185..b3d83ada47339 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -61,13 +61,8 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
             if (token.Kind() == SyntaxKind.CharacterLiteralToken)
                 return TryConvertStringToVirtualChars(token, "'", "'", escapeBraces: false);
 
-            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or
-                                SyntaxKind.MultiLineRawStringLiteralToken or
-                                SyntaxKind.UTF8SingleLineRawStringLiteralToken or
-                                SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-            {
-                return TryConvertRawStringToVirtualChars(token, skipDelimiterQuotes: true);
-            }
+            if (IsAnyRawStringLiteralToken(token))
+                return TryConvertRawStringToVirtualChars(token);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -84,7 +79,7 @@ SyntaxKind.UTF8SingleLineRawStringLiteralToken or
                         SyntaxKind.InterpolatedVerbatimStringStartToken
                             => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
                         SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedMultiLineRawStringStartToken
-                            => TryConvertRawStringToVirtualChars(token, skipDelimiterQuotes: false),
+                            => TryConvertRawStringToVirtualChars(token),
                         _ => default,
                     };
                 }
@@ -93,6 +88,12 @@ SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedM
             return default;
         }
 
+        private static bool IsAnyRawStringLiteralToken(SyntaxToken token)
+            => token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or
+                               SyntaxKind.MultiLineRawStringLiteralToken or
+                               SyntaxKind.UTF8SingleLineRawStringLiteralToken or
+                               SyntaxKind.UTF8MultiLineRawStringLiteralToken;
+
         private static bool IsInDirective(SyntaxNode? node)
         {
             while (node != null)
@@ -109,8 +110,7 @@ private static bool IsInDirective(SyntaxNode? node)
         private static VirtualCharSequence TryConvertVerbatimStringToVirtualChars(SyntaxToken token, string startDelimiter, string endDelimiter, bool escapeBraces)
             => TryConvertSimpleDoubleQuoteString(token, startDelimiter, endDelimiter, escapeBraces);
 
-        private static VirtualCharSequence TryConvertRawStringToVirtualChars(
-            SyntaxToken token, bool skipDelimiterQuotes)
+        private static VirtualCharSequence TryConvertRawStringToVirtualChars(SyntaxToken token)
         {
             var tokenText = token.Text;
             var offset = token.SpanStart;
@@ -120,12 +120,15 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(
             var startIndexInclusive = 0;
             var endIndexExclusive = tokenText.Length;
 
-            if (skipDelimiterQuotes)
+            if (IsAnyRawStringLiteralToken(token))
             {
                 Contract.ThrowIfFalse(tokenText[0] == '"');
 
-                if (tokenText is [.., 'u' or 'U', '8'])
-                    endIndexExclusive -= 2;
+                if (token.Kind() is SyntaxKind.UTF8SingleLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
+                {
+                    Contract.ThrowIfFalse(tokenText is [.., 'u' or 'U', '8']);
+                    endIndexExclusive -= "u8".Length;
+                }
 
                 while (tokenText[startIndexInclusive] == '"')
                 {

From bd35cdc5fccf25a6e035fdac7cb3e5d20439003f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simona=20Kon=C3=AD=C4=8Dkov=C3=A1?= <neme112@outlook.com>
Date: Thu, 5 May 2022 21:17:48 +0200
Subject: [PATCH 237/413] Improve performance of SourceText.IsBinary on .NET
 Core by using Contains (#61148)

---
 src/Compilers/Core/Portable/Text/LargeText.cs | 28 -------------------
 .../Core/Portable/Text/SourceText.cs          | 10 ++++++-
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/Compilers/Core/Portable/Text/LargeText.cs b/src/Compilers/Core/Portable/Text/LargeText.cs
index a03e52ff89b94..b370fffd8d1ec 100644
--- a/src/Compilers/Core/Portable/Text/LargeText.cs
+++ b/src/Compilers/Core/Portable/Text/LargeText.cs
@@ -132,34 +132,6 @@ private static ImmutableArray<char[]> ReadChunksFromTextReader(TextReader reader
             return chunks.ToImmutableAndFree();
         }
 
-        /// <summary>
-        /// Check for occurrence of two consecutive NUL (U+0000) characters.
-        /// This is unlikely to appear in genuine text, so it's a good heuristic
-        /// to detect binary files.
-        /// </summary>
-        private static bool IsBinary(char[] chunk)
-        {
-            // PERF: We can advance two chars at a time unless we find a NUL.
-            for (int i = 1; i < chunk.Length;)
-            {
-                if (chunk[i] == '\0')
-                {
-                    if (chunk[i - 1] == '\0')
-                    {
-                        return true;
-                    }
-
-                    i += 1;
-                }
-                else
-                {
-                    i += 2;
-                }
-            }
-
-            return false;
-        }
-
         private int GetIndexFromPosition(int position)
         {
             // Binary search to find the chunk that contains the given position.
diff --git a/src/Compilers/Core/Portable/Text/SourceText.cs b/src/Compilers/Core/Portable/Text/SourceText.cs
index f55088f9267fe..6a6fb68c4817d 100644
--- a/src/Compilers/Core/Portable/Text/SourceText.cs
+++ b/src/Compilers/Core/Portable/Text/SourceText.cs
@@ -337,8 +337,12 @@ private static string Decode(byte[] buffer, int length, Encoding encoding, out E
         /// <remarks>
         /// internal for unit testing
         /// </remarks>
-        internal static bool IsBinary(string text)
+        internal static bool IsBinary(ReadOnlySpan<char> text)
         {
+#if NETCOREAPP
+            // On .NET Core, Contains has an optimized vectorized implementation, much faster than a custom loop.
+            return text.Contains("\0\0", StringComparison.Ordinal);
+#else
             // PERF: We can advance two chars at a time unless we find a NUL.
             for (int i = 1; i < text.Length;)
             {
@@ -358,8 +362,12 @@ internal static bool IsBinary(string text)
             }
 
             return false;
+#endif
         }
 
+        /// <inheritdoc cref="IsBinary(ReadOnlySpan{char})" />
+        internal static bool IsBinary(string text) => IsBinary(text.AsSpan());
+
         /// <summary>
         /// Hash algorithm to use to calculate checksum of the text that's saved to PDB.
         /// </summary>

From 60e54a8f2a38785336a0c7c65146df9b1720a64b Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Thu, 5 May 2022 12:36:22 -0700
Subject: [PATCH 238/413] Update light bulb workaround to apply through 17.2
 Preview 6

The fix for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1511117
will first be available in 17.3.
---
 .../InProcess/LightBulbHelper.cs              |  2 +-
 .../TestUtilities/InProcess/Shell_InProc.cs   | 25 +++++++++++
 .../TestUtilities/LightBulbHelper.cs          | 43 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
index 956ef4c93cb75..3ba8d36fc6935 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
@@ -90,7 +90,7 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(Test
             catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
             {
                 var version = await testServices.Shell.GetVersionAsync(cancellationToken);
-                if (Version.Parse("17.2.32314.265") >= version)
+                if (Version.Parse("17.2.32427.441") >= version)
                 {
                     // Unexpected cancellation can occur when the editor dismisses the light bulb without request
                     return null;
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/Shell_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/Shell_InProc.cs
index d58cd7330c697..f0695d29823dd 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/Shell_InProc.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/Shell_InProc.cs
@@ -4,6 +4,7 @@
 
 using System;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace Microsoft.VisualStudio.IntegrationTest.Utilities.InProcess
 {
@@ -18,5 +19,29 @@ public bool IsUIContextActive(Guid context)
         {
             return UIContext.FromUIContextGuid(context).IsActive;
         }
+
+        public Version GetVersion()
+        {
+            return InvokeOnUIThread(cancellationToken =>
+            {
+                var shell = GetGlobalService<SVsShell, IVsShell>();
+                shell.GetProperty((int)__VSSPROPID5.VSSPROPID_ReleaseVersion, out var versionProperty);
+
+                var fullVersion = versionProperty?.ToString() ?? string.Empty;
+                var firstSpace = fullVersion.IndexOf(' ');
+                if (firstSpace >= 0)
+                {
+                    // e.g. "17.1.31907.60 MAIN"
+                    fullVersion = fullVersion.Substring(0, firstSpace);
+                }
+
+                if (Version.TryParse(fullVersion, out var version))
+                {
+                    return version;
+                }
+
+                throw new NotSupportedException($"Unexpected version format: {versionProperty}");
+            });
+        }
     }
 }
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs
index b4adb603a73d0..265822c1d045f 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs
@@ -5,7 +5,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.IntegrationTest.Utilities.InProcess;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Threading;
@@ -45,6 +47,21 @@ public static async Task<bool> WaitForLightBulbSessionAsync(ILightBulbBroker bro
         }
 
         public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(ILightBulbBroker broker, IWpfTextView view)
+        {
+            using var cancellationTokenSource = new CancellationTokenSource(Helper.HangMitigatingTimeout);
+            var editor = Editor_InProc.Create();
+            while (true)
+            {
+                var items = await TryWaitForItemsAsync(broker, view, cancellationTokenSource.Token);
+                if (items is not null)
+                    return items;
+
+                // The session was dismissed unexpectedly. The editor might show it again.
+                editor.WaitForEditorOperations(Helper.HangMitigatingTimeout);
+            }
+        }
+
+        private static async Task<IEnumerable<SuggestedActionSet>?> TryWaitForItemsAsync(ILightBulbBroker broker, IWpfTextView view, CancellationToken cancellationToken)
         {
             var activeSession = broker.GetSession(view);
             if (activeSession == null)
@@ -67,20 +84,42 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(ILig
                     tcs.SetResult(e.ActionSets.ToList());
                 else if (e.Status == QuerySuggestedActionCompletionStatus.CompletedWithoutData)
                     tcs.SetResult(new List<SuggestedActionSet>());
+                else if (e.Status == QuerySuggestedActionCompletionStatus.Canceled)
+                    tcs.TrySetCanceled();
                 else
-                    tcs.SetException(new InvalidOperationException($"Light bulb transitioned to non-complete state: {e.Status}"));
+                    tcs.TrySetException(new InvalidOperationException($"Light bulb transitioned to non-complete state: {e.Status}"));
 
                 asyncSession.SuggestedActionsUpdated -= handler;
             };
 
             asyncSession.SuggestedActionsUpdated += handler;
 
+            asyncSession.Dismissed += (_, _) => tcs.TrySetCanceled(new CancellationToken(true));
+
+            if (asyncSession.IsDismissed)
+                tcs.TrySetCanceled(new CancellationToken(true));
+
             // Calling PopulateWithData ensures the underlying session will call SuggestedActionsUpdated at least once
             // with the latest data computed.  This is needed so that if the lightbulb computation is already complete
             // that we hear about the results.
             asyncSession.PopulateWithData(overrideRequestedActionCategories: null, operationContext: null);
 
-            return await tcs.Task.WithTimeout(Helper.HangMitigatingTimeout).ConfigureAwait(false);
+            try
+            {
+                return await tcs.Task.WithCancellation(cancellationToken);
+            }
+            catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
+            {
+                var shell = Shell_InProc.Create();
+                var version = shell.GetVersion();
+                if (Version.Parse("17.2.32427.441") >= version)
+                {
+                    // Unexpected cancellation can occur when the editor dismisses the light bulb without request
+                    return null;
+                }
+
+                throw new OperationCanceledException($"IDE version '{version}' unexpectedly dismissed the light bulb.");
+            }
         }
     }
 }

From 4d411596393304b193b39a9ffee75a5982787518 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 13:16:44 -0700
Subject: [PATCH 239/413] Feedback about ASP.Net EA PR

---
 ...CoreEmbeddedLanguageClassifierAttribute.cs |  2 +-
 ...ernalAccessAspNetCoreResources.Designer.cs | 64 -------------------
 ...eAnalysis.ExternalAccess.AspNetCore.csproj |  8 ---
 3 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs

diff --git a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
index b2fdb7d7b3c33..4196eee6b6c54 100644
--- a/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
+++ b/src/Tools/ExternalAccess/AspNetCore/EmbeddedLanguages/ExportAspNetCoreEmbeddedLanguageClassifierAttribute.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.EmbeddedLanguages
     /// </summary>
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class)]
-    internal class ExportAspNetCoreEmbeddedLanguageClassifierAttribute : ExportAttribute
+    internal sealed class ExportAspNetCoreEmbeddedLanguageClassifierAttribute : ExportAttribute
     {
         /// <summary>
         /// Name of the classifier.
diff --git a/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs b/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs
deleted file mode 100644
index 3c5373ed28502..0000000000000
--- a/src/Tools/ExternalAccess/AspNetCore/ExternalAccessAspNetCoreResources.Designer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CodeAnalysis.ExternalAccess.AspNetCore {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class ExternalAccessAspNetCoreResources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal ExternalAccessAspNetCoreResources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.ExternalAccessAspNetCoreResource" +
-                            "s", typeof(ExternalAccessAspNetCoreResources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
index 8224b2ed9654a..b556714cd8742 100644
--- a/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
+++ b/src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
@@ -40,14 +40,6 @@
     <PublicAPI Include="PublicAPI.Shipped.txt" />
     <PublicAPI Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Compile Update="ExternalAccessAspNetCoreResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ExternalAccessAspNetCoreResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Update="ExternalAccessAspNetCoreResources.resx">

From b00251368cf92bd81a265b4dae8ecca55bf29533 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Thu, 5 May 2022 23:35:07 +0300
Subject: [PATCH 240/413] Simplify, tests with no invocation

---
 .../ReplaceMethodWithPropertyTests.cs         | 50 +++++++++++++++++++
 .../CSharpReplaceMethodWithPropertyService.cs | 16 ++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs b/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
index 0ac84f3120791..97eff093b62bc 100644
--- a/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
+++ b/src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
@@ -2616,6 +2616,56 @@ static void Main()
         {
         }
     }
+}");
+        }
+
+        [WorkItem(40758, "https://github.com/dotnet/roslyn/issues/40758")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        public async Task TestReferenceTrivia3()
+        {
+            await TestInRegularAndScriptAsync(
+@"class Class
+{
+    static bool [||]Value() => default;
+
+    static void Main()
+    {
+        var valueAsDelegate = /*test*/Value;
+    }
+}",
+@"class Class
+{
+    static bool Value => default;
+
+    static void Main()
+    {
+        var valueAsDelegate = /*test*/{|Conflict:Value|};
+    }
+}");
+        }
+
+        [WorkItem(40758, "https://github.com/dotnet/roslyn/issues/40758")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        public async Task TestReferenceTrivia4()
+        {
+            await TestInRegularAndScriptAsync(
+@"class Class
+{
+    static bool [||]Value() => default;
+
+    static void Main()
+    {
+        var valueAsDelegate = Value/*test*/;
+    }
+}",
+@"class Class
+{
+    static bool Value => default;
+
+    static void Main()
+    {
+        var valueAsDelegate = {|Conflict:Value|}/*test*/;
+    }
 }");
         }
     }
diff --git a/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs b/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
index 123acadd39f2c..a25d904041c76 100644
--- a/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
+++ b/src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs
@@ -373,19 +373,11 @@ public static void ReplaceInvocation(SyntaxEditor editor, SyntaxToken nameToken,
             var newName = nameNode;
             if (nameChanged)
             {
-                if (invocation == null)
-                {
-                    newName = SyntaxFactory.IdentifierName(SyntaxFactory.Identifier(propertyName)
-                        .WithTriviaFrom(nameToken));
-                }
-                else
-                {
-                    newName = SyntaxFactory.IdentifierName(SyntaxFactory.Identifier(propertyName)
-                        .WithLeadingTrivia(nameToken.LeadingTrivia)
-                        .WithTrailingTrivia(invocation.ArgumentList.CloseParenToken.TrailingTrivia));
-                }
+                newName = SyntaxFactory.IdentifierName(SyntaxFactory.Identifier(propertyName));
             }
 
+            newName = newName.WithTriviaFrom(invocation is null ? nameToken.Parent : invocation);
+
             var invocationExpression = invocation?.Expression;
             if (!IsInvocationName(nameNode, invocationExpression))
             {
@@ -396,7 +388,7 @@ public static void ReplaceInvocation(SyntaxEditor editor, SyntaxToken nameToken,
             }
 
             // It was invoked.  Remove the invocation, and also change the name if necessary.
-            replace(editor, invocation, nameNode, newName.WithTriviaFrom(invocation));
+            replace(editor, invocation, nameNode, newName);
         }
 
         private static bool IsInvocationName(IdentifierNameSyntax nameNode, ExpressionSyntax invocationExpression)

From 9ad38a8c1e8d3c05973db943b3a29367f7dbe8f6 Mon Sep 17 00:00:00 2001
From: "gel@microsoft.com" <gel@microsoft.com>
Date: Thu, 5 May 2022 13:37:08 -0700
Subject: [PATCH 241/413] Exclude more system libraries from Core folder

---
 ...is.Remote.ServiceHub.CoreComponents.csproj | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj b/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj
index 5b8952ce8de4d..fe67e29f9c5da 100644
--- a/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj
+++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj
@@ -26,13 +26,23 @@
       <_ExcludedFiles Include="$(PublishDir)**\*.pdb" />
       <!-- the only assembly we need under runtime folder (runtimes\win-x64\native\e_sqlite3.dll) is handled by the vsix project directly -->
       <_ExcludedFiles Include="$(PublishDir)\runtimes\**\*.*" />
-      <!-- For binaries below, we want to use the version provided by the runtime, not the ones from the NuGet packages -->
-      <_ExcludedFiles Include="$(PublishDir)\Microsoft.Win32.Registry.dll'" />
-      <_ExcludedFiles Include="$(PublishDir)\System.Diagnostics.DiagnosticSource.dll'" />
-      <_ExcludedFiles Include="$(PublishDir)\System.Runtime.CompilerServices.Unsafe.dll'" />
-      <_ExcludedFiles Include="$(PublishDir)\System.Security.AccessControl.dll'" />
-      <_ExcludedFiles Include="$(PublishDir)\System.Security.Principal.Windows.dll'" />
-      <_ExcludedFiles Include="$(PublishDir)\System.Threading.Tasks.Dataflow.dll'" />
+      <!-- For binaries below, we want to use the version provided by the runtime in VS, not the ones from the NuGet packages. 
+      However, we can't safely exclude shared dependencies from ServiceHub host folder: we might be referencing a higher version,
+      or back-compat might not be guaranteed in the version shipped by host. -->
+      <_ExcludedFiles Include="$(PublishDir)\Microsoft.Win32.Registry.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\Microsoft.Win32.SystemEvents.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.CodeDom.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Configuration.ConfigurationManager.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Diagnostics.DiagnosticSource.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Diagnostics.PerformanceCounter.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Drawing.Common.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Runtime.CompilerServices.Unsafe.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Security.AccessControl.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Security.Cryptography.ProtectedData.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Security.Permissions.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Security.Principal.Windows.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Threading.Tasks.Dataflow.dll" />
+      <_ExcludedFiles Include="$(PublishDir)\System.Windows.Extensions.dll" />
     </ItemGroup>
     <ItemGroup>
       <!-- Need to include and then update items (https://github.com/microsoft/msbuild/issues/1053) -->

From 2ca2ec4f65cc4dce3009412ef56af323cb43c7a0 Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Thu, 5 May 2022 14:34:35 -0700
Subject: [PATCH 242/413] extension method

---
 .../GenerateVariable/GenerateVariableTests.cs | 26 +++++++++++++++++++
 .../AbstractGenerateVariableService.cs        |  6 +++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index f9d76c9a4f598..12603becc5ad2 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9880,6 +9880,32 @@ public async Task M(System.TimeSpan time, params double[] x)
     {
         await Task.Delay(time);
     }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeThisParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+public static class TestClass
+{
+    public static int Method(this CancellationToken cancellationToken)
+    {
+        return [|test|];
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+public static class TestClass
+{
+    public static int Method(this CancellationToken cancellationToken, int test)
+    {
+        return test;
+    }
 }", index: 4);
         }
     }
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 021a429bde1eb..525c0b1e5ec64 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -220,9 +220,11 @@ private static async Task AddParameterCodeActionsAsync(
                     for (var i = containingMethod.Parameters.Length - 1; i >= 0; i--)
                     {
                         var parameter = containingMethod.Parameters[i];
-                        if (parameter.HasExplicitDefaultValue
+                        if ((parameter.HasExplicitDefaultValue
                             || Equals(parameter.Type, compilation.CancellationTokenType())
-                            || parameter.IsParams)
+                            || parameter.IsParams
+                            || parameter.IsRefOrOut())
+                            && !(containingMethod.IsExtensionMethod && i == 0))
                         {
                             parameterIndex--;
                         }

From 3f1ad9a6512aea05e0055da0af648ca1d6a04f60 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 14:39:32 -0700
Subject: [PATCH 243/413] In progress

---
 .../StringCopyPasteCommandHandler.cs          |   3 -
 .../StringCopyPasteCommandHandler_CutCopy.cs  | 138 ++++++++++++++++--
 .../WpfStringCopyPasteService.cs              |  25 ++--
 .../IStringCopyPasteService.cs                |  13 +-
 .../VirtualChars/VirtualCharSequence.cs       |  23 +++
 5 files changed, 162 insertions(+), 40 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 3608a72515d58..dc971f169a0af 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -59,9 +59,6 @@ internal partial class StringCopyPasteCommandHandler :
         private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
         private readonly IGlobalOptionService _globalOptions;
 
-        private NormalizedSnapshotSpanCollection? _lastSelectedSpans;
-        private int? _lastClipboardSequenceNumber;
-
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public StringCopyPasteCommandHandler(
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 347f7b19d6d5c..4b1fa1e152b8e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -3,9 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Immutable;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
 using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.ConvertCast;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Commanding;
 using Microsoft.VisualStudio.Text;
@@ -19,6 +28,8 @@ internal partial class StringCopyPasteCommandHandler :
         IChainedCommandHandler<CutCommandArgs>,
         IChainedCommandHandler<CopyCommandArgs>
     {
+        private const string KeyAndVersion = nameof(StringCopyPasteCommandHandler) + "V1";
+
         public CommandState GetCommandState(CutCommandArgs args, Func<CommandState> nextCommandHandler)
             => nextCommandHandler();
 
@@ -26,37 +37,134 @@ public CommandState GetCommandState(CopyCommandArgs args, Func<CommandState> nex
             => nextCommandHandler();
 
         public void ExecuteCommand(CutCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
-            => ExecuteCommand(args.TextView, args.SubjectBuffer, nextCommandHandler);
+            => ExecuteCutOrCopyCommand(args.TextView, args.SubjectBuffer, nextCommandHandler, executionContext);
 
         public void ExecuteCommand(CopyCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
-            => ExecuteCommand(args.TextView, args.SubjectBuffer, nextCommandHandler);
+            => ExecuteCutOrCopyCommand(args.TextView, args.SubjectBuffer, nextCommandHandler, executionContext);
 
-        private void ExecuteCommand(ITextView textView, ITextBuffer subjectBuffer, Action nextCommandHandler)
+        private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuffer, Action nextCommandHandler, CommandExecutionContext executionContext)
         {
             Contract.ThrowIfFalse(_threadingContext.HasMainThread);
+            var (dataToStore, copyPasteService) = CaptureCutCopyInformation(textView, subjectBuffer, executionContext.OperationContext.UserCancellationToken);
 
             // Ensure that the copy always goes through all other handlers.
             nextCommandHandler();
 
-            CaptureCutCopyInformation(textView, subjectBuffer);
+            if (dataToStore != null)
+                copyPasteService.TrySetClipboardData(KeyAndVersion, dataToStore);
         }
 
-        private void CaptureCutCopyInformation(ITextView textView, ITextBuffer subjectBuffer)
+        private (string dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(
+            ITextView textView, ITextBuffer subjectBuffer, CancellationToken cancellationToken)
         {
-            _lastClipboardSequenceNumber = null;
-            _lastSelectedSpans = null;
-
             var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
-            var copyPasteService = document?.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+            if (document == null)
+                return default;
+
+            var copyPasteService = document.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
             if (copyPasteService == null)
-                return;
+                return default;
+
+            //var editorOptions = textView.Options;
+            //var  editorOptions.GetOptionValue<bool>(DefaultTextViewOptions.CutOrCopyBlankLineIfNoSelectionId);
+            var spans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
+            if (spans.Count != 1)
+                return default;
+
+            var span = spans[0];
+            var snapshot = span.Snapshot;
+            if (span.IsEmpty)
+            {
+                // cut/copy on an empty span means "cut/copy the entire line".
+                var line = snapshot.GetLineFromPosition(span.Start);
+                span = line.ExtentIncludingLineBreak;
+            }
+
+            var stringExpression = TryGetCompatibleContainingStringExpression(
+                document, new NormalizedSnapshotSpanCollection(span), cancellationToken);
+            if (stringExpression is null)
+                return default;
+
+            var virtualCharService = document.GetRequiredLanguageService<IVirtualCharLanguageService>();
+            var stringData = TryGetStringCopyPasteData(virtualCharService, snapshot.AsText(), stringExpression, span.Span.ToTextSpan());
+            if (stringData is null)
+                return default;
+
+            using var stream = new MemoryStream();
+            var serializer = new DataContractJsonSerializer(
+                typeof(StringCopyPasteData), new[] { typeof(StringCopyPasteContent) });
+            serializer.WriteObject(stream, stringData);
+
+            stream.Position = 0;
+            using var reader = new StreamReader(stream);
+            var json = reader.ReadToEnd();
 
-            var nextSequenceNumber = Interlocked.Increment(ref s_sequenceNumber);
-            if (!copyPasteService.TrySetClipboardSequenceNumber(nextSequenceNumber))
-                return;
+            copyPasteService.TrySetClipboardData(KeyAndVersion, json);
+        }
+
+        private StringCopyPasteData? TryGetStringCopyPasteData(IVirtualCharLanguageService virtualCharService, SourceText text, ExpressionSyntax stringExpression, TextSpan span)
+            => stringExpression switch
+            {
+                LiteralExpressionSyntax literal => TryGetStringCopyPasteDataForLiteral(virtualCharService, text, literal, span),
+                InterpolatedStringExpressionSyntax interpolatedString => TryGetStringCopyPasteDataForInterpolatedString(text, interpolatedString, span),
+                _ => throw ExceptionUtilities.UnexpectedValue(stringExpression.Kind()),
+            };
+
+        private StringCopyPasteData? TryGetStringCopyPasteDataForLiteral(
+            IVirtualCharLanguageService virtualCharService, SourceText text, LiteralExpressionSyntax literal, TextSpan span)
+        {
+            var virtualChars = virtualCharService.TryConvertToVirtualChars(literal.Token);
+            if (virtualChars.IsDefaultOrEmpty)
+                return null;
+
+            var firstChar = virtualChars.FirstOrNull(vc => vc.Span.Start == span.Start);
+            var lastChar = virtualChars.LastOrNull(vc => vc.Span.End == span.End);
+
+            if (firstChar is null || lastChar is null)
+                return null;
+
+            var firstCharIndex = virtualChars.IndexOf(firstChar.Value);
+            var lastCharIndex = virtualChars.IndexOf(lastChar.Value);
+
+        }
 
-            _lastClipboardSequenceNumber = nextSequenceNumber;
-            _lastSelectedSpans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
+        private StringCopyPasteData? TryGetStringCopyPasteDataForInterpolatedString(SourceText text, InterpolatedStringExpressionSyntax interpolatedString, TextSpan span)
+        {
+            return null;
+        }
+    }
+
+    [DataContract]
+    internal class StringCopyPasteData
+    {
+        [DataMember(Order = 0)]
+        public readonly ImmutableArray<StringCopyPasteContent> Contents;
+
+        public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
+        {
+            Contents = contents;
+        }
+    }
+
+    internal enum StringCopyPasteContentKind
+    {
+        Text,
+        InterpolationCode, // When an interpolation is copied.
+    }
+
+    [DataContract]
+    internal readonly struct StringCopyPasteContent
+    {
+        [DataMember(Order = 0)]
+        public readonly StringCopyPasteContentKind Kind;
+
+        [DataMember(Order = 1)]
+        public readonly string Data;
+
+        public StringCopyPasteContent(StringCopyPasteContentKind kind, string data)
+        {
+            Kind = kind;
+            Data = data;
         }
     }
 }
diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index eb8438a664aba..2dce350c3d7a6 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -13,8 +13,7 @@ namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
     [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Host), Shared]
     internal class WpfStringCopyPasteService : IStringCopyPasteService
     {
-        private const string RoslynCopyPasteSequenceNumber = nameof(RoslynCopyPasteSequenceNumber);
-        private const int FailureValue = -1;
+        private const string RoslynFormat = nameof(RoslynFormat);
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
@@ -22,13 +21,16 @@ public WpfStringCopyPasteService()
         {
         }
 
-        public bool TrySetClipboardSequenceNumber(int sequenceNumber)
+        private static string GetFormat(string key)
+            => $"{RoslynFormat}-{key}";
+
+        public bool TrySetClipboardData(string key, string data)
         {
             try
             {
                 var dataObject = Clipboard.GetDataObject();
 
-                var copy = new DataObject(RoslynCopyPasteSequenceNumber, sequenceNumber);
+                var copy = new DataObject(GetFormat(key), data);
 
                 foreach (var format in dataObject.GetFormats())
                 {
@@ -46,27 +48,22 @@ public bool TrySetClipboardSequenceNumber(int sequenceNumber)
             return false;
         }
 
-        public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
+        public string? TryGetClipboardData(string key)
         {
             try
             {
                 var dataObject = Clipboard.GetDataObject();
-                if (dataObject.GetDataPresent(RoslynCopyPasteSequenceNumber))
+                var format = GetFormat(key);
+                if (dataObject.GetDataPresent(format))
                 {
-                    var value = dataObject.GetData(RoslynCopyPasteSequenceNumber);
-                    if (value is int intVal && intVal != FailureValue)
-                    {
-                        sequenceNumber = intVal;
-                        return true;
-                    }
+                    return dataObject.GetData(format) as string;
                 }
             }
             catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
             {
             }
 
-            sequenceNumber = 0;
-            return false;
+            return null;
         }
     }
 }
diff --git a/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
index f9fbd04d462d7..b9655fc00f97a 100644
--- a/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core/StringCopyPaste/IStringCopyPasteService.cs
@@ -11,8 +11,8 @@ namespace Microsoft.CodeAnalysis.Editor.StringCopyPaste
 {
     internal interface IStringCopyPasteService : IWorkspaceService
     {
-        bool TrySetClipboardSequenceNumber(int sequenceNumber);
-        bool TryGetClipboardSequenceNumber(out int sequenceNumber);
+        bool TrySetClipboardData(string key, string data);
+        string? TryGetClipboardData(string key);
     }
 
     [ExportWorkspaceService(typeof(IStringCopyPasteService)), Shared]
@@ -29,13 +29,10 @@ public DefaultStringCopyPasteService()
         // had been validly associated with latest clipboard operation and had not been affected by things outside our
         // awareness.
 
-        public bool TrySetClipboardSequenceNumber(int sequenceNumber)
+        public bool TrySetClipboardData(string key, string data)
             => false;
 
-        public bool TryGetClipboardSequenceNumber(out int sequenceNumber)
-        {
-            sequenceNumber = 0;
-            return false;
-        }
+        public string? TryGetClipboardData(string key)
+            => null;
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.cs
index 6e518e7041533..7d2a33b62242e 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.cs
@@ -103,6 +103,29 @@ public int IndexOf(VirtualChar @char)
             return -1;
         }
 
+        public VirtualChar? FirstOrNull(Func<VirtualChar, bool> predicate)
+        {
+            foreach (var ch in this)
+            {
+                if (predicate(ch))
+                    return ch;
+            }
+
+            return null;
+        }
+
+        public VirtualChar? LastOrNull(Func<VirtualChar, bool> predicate)
+        {
+            for (var i = this.Length - 1; i >= 0; i--)
+            {
+                var ch = this[i];
+                if (predicate(ch))
+                    return ch;
+            }
+
+            return null;
+        }
+
         public bool Any(Func<VirtualChar, bool> predicate)
         {
             foreach (var ch in this)

From 55c71da7d096021c88e97e9f07971416ac222d31 Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Thu, 5 May 2022 14:51:56 -0700
Subject: [PATCH 244/413] [LSP] Reuse workspace solutions for requests when LSP
 contents match (#61139)

* Reuse workspace solutions instead of building an incremental LSP snapshot

* Make LSP document/solution retrieval async

* Modify retrieval slightly so we only compute the LSP solutions once per request

* add lots of comments
---
 .../AbstractLanguageServerProtocolTests.cs    |   7 +-
 .../Protocol/Handler/RequestContext.cs        |  33 +-
 ...stExecutionQueue.RequestTelemetryLogger.cs |  18 +
 .../Protocol/Handler/RequestExecutionQueue.cs |   9 +-
 .../SemanticTokensRangeHandler.cs             |  16 +-
 .../Protocol/LanguageServerTarget.cs          |   1 -
 .../Workspaces/LspWorkspaceManager.cs         | 505 +++++++-----------
 .../LspWorkspaceRegistrationService.cs        |  35 +-
 .../DocumentChangesTests.LinkedDocuments.cs   |   8 +-
 .../LspMiscellaneousFilesWorkspaceTests.cs    |  72 +--
 .../Ordering/RequestOrderingTests.cs          |   2 +-
 .../SpellCheck/SpellCheckTests.cs             |   6 +-
 .../Workspaces/LspWorkspaceManagerTests.cs    | 210 +++-----
 .../Compiler/Core/Log/FunctionId.cs           |   2 +
 14 files changed, 382 insertions(+), 542 deletions(-)

diff --git a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
index 95015934d3234..3afeea0bb9836 100644
--- a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
+++ b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
@@ -335,6 +335,9 @@ private static async Task<TestLspServer> CreateTestLspServerAsync(TestWorkspace
                     continue;
 
                 solution = solution.WithDocumentFilePath(document.Id, GetDocumentFilePathFromName(document.Name));
+
+                var documentText = await solution.GetRequiredDocument(document.Id).GetTextAsync(CancellationToken.None);
+                solution = solution.WithDocumentText(document.Id, SourceText.From(documentText.ToString(), System.Text.Encoding.UTF8));
             }
 
             workspace.ChangeSolution(solution);
@@ -516,10 +519,6 @@ private void InitializeClientRpc()
 
                 var workspaceWaiter = GetWorkspaceWaiter(TestWorkspace);
                 Assert.False(workspaceWaiter.HasPendingWork);
-
-                // Clear any LSP solutions that were created when the workspace was initialized.
-                // This ensures that the workspace manager starts with a clean slate.
-                GetManagerAccessor().ResetLspSolutions();
             }
 
             private static JsonMessageFormatter CreateJsonMessageFormatter()
diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestContext.cs b/src/Features/LanguageServer/Protocol/Handler/RequestContext.cs
index f183774e0f004..f2173207a33d6 100644
--- a/src/Features/LanguageServer/Protocol/Handler/RequestContext.cs
+++ b/src/Features/LanguageServer/Protocol/Handler/RequestContext.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -60,7 +61,6 @@ internal readonly struct RequestContext
 
         public readonly IGlobalOptionService GlobalOptions;
 
-        public readonly LspWorkspaceManager LspWorkspaceManager;
         public readonly ILanguageServerNotificationManager NotificationManager;
         public readonly CancellationToken QueueCancellationToken;
 
@@ -79,7 +79,6 @@ public RequestContext(
             ImmutableDictionary<Uri, SourceText> trackedDocuments,
             ImmutableArray<string> supportedLanguages,
             IGlobalOptionService globalOptions,
-            LspWorkspaceManager lspWorkspaceManager,
             ILanguageServerNotificationManager notificationManager,
             CancellationToken queueCancellationToken)
         {
@@ -92,12 +91,11 @@ public RequestContext(
             _documentChangeTracker = documentChangeTracker;
             _logger = logger;
             _trackedDocuments = trackedDocuments;
-            LspWorkspaceManager = lspWorkspaceManager;
             NotificationManager = notificationManager;
             QueueCancellationToken = queueCancellationToken;
         }
 
-        public static RequestContext? Create(
+        public static async Task<RequestContext?> CreateAsync(
             bool requiresLSPSolution,
             TextDocumentIdentifier? textDocument,
             WellKnownLspServerKinds serverKind,
@@ -108,7 +106,8 @@ public RequestContext(
             IDocumentChangeTracker documentChangeTracker,
             ImmutableArray<string> supportedLanguages,
             IGlobalOptionService globalOptions,
-            CancellationToken queueCancellationToken)
+            CancellationToken queueCancellationToken,
+            CancellationToken requestCancellationToken)
         {
             // Retrieve the current LSP tracked text as of this request.
             // This is safe as all creation of request contexts cannot happen concurrently.
@@ -121,26 +120,23 @@ public RequestContext(
             if (!requiresLSPSolution)
             {
                 return new RequestContext(
-                    solution: null, logger, clientCapabilities, serverKind, document: null,
-                    documentChangeTracker, trackedDocuments, supportedLanguages, globalOptions,
-                    lspWorkspaceManager, notificationManager, queueCancellationToken);
+                    solution: null, logger: logger, clientCapabilities: clientCapabilities, serverKind: serverKind, document: null,
+                    documentChangeTracker: documentChangeTracker, trackedDocuments: trackedDocuments, supportedLanguages: supportedLanguages, globalOptions: globalOptions,
+                    notificationManager: notificationManager, queueCancellationToken: queueCancellationToken);
             }
 
-            // Go through each registered workspace, find the solution that contains the document that
-            // this request is for, and then updates it based on the state of the world as we know it, based on the
-            // text content in the document change tracker.
-
+            Solution? workspaceSolution;
             Document? document = null;
-            var workspaceSolution = lspWorkspaceManager.TryGetHostLspSolution();
             if (textDocument is not null)
             {
-                // we were given a request associated with a document.  Find the corresponding roslyn
-                // document for this.  If we can't, we cannot proceed.
-                document = lspWorkspaceManager.GetLspDocument(textDocument);
-                if (document != null)
-                    workspaceSolution = document.Project.Solution;
+                // we were given a request associated with a document.  Find the corresponding roslyn document for this. 
+                // There are certain cases where we may be asked for a document that does not exist (for example a document is removed)
+                // For example, document pull diagnostics can ask us after removal to clear diagnostics for a document.
+                document = await lspWorkspaceManager.GetLspDocumentAsync(textDocument, requestCancellationToken).ConfigureAwait(false);
             }
 
+            workspaceSolution = document?.Project.Solution ?? await lspWorkspaceManager.TryGetHostLspSolutionAsync(requestCancellationToken).ConfigureAwait(false);
+
             if (workspaceSolution == null)
             {
                 logger.TraceError("Could not find appropriate solution for operation");
@@ -157,7 +153,6 @@ public RequestContext(
                 trackedDocuments,
                 supportedLanguages,
                 globalOptions,
-                lspWorkspaceManager,
                 notificationManager,
                 queueCancellationToken);
             return context;
diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.RequestTelemetryLogger.cs b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.RequestTelemetryLogger.cs
index cce10a8aebd40..f28f6fdff17d6 100644
--- a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.RequestTelemetryLogger.cs
+++ b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.RequestTelemetryLogger.cs
@@ -44,6 +44,8 @@ internal sealed class RequestTelemetryLogger : IDisposable
 
             private readonly LogAggregator _findDocumentResults;
 
+            private readonly LogAggregator _usedForkedSolutionCounter;
+
             private int _disposed;
 
             public RequestTelemetryLogger(string serverTypeName)
@@ -51,6 +53,7 @@ public RequestTelemetryLogger(string serverTypeName)
                 _serverTypeName = serverTypeName;
                 _requestCounters = new();
                 _findDocumentResults = new();
+                _usedForkedSolutionCounter = new();
 
                 // Buckets queued duration into 10ms buckets with the last bucket starting at 1000ms.
                 // Queue times are relatively short and fall under 50ms, so tracking past 1000ms is not useful.
@@ -71,6 +74,11 @@ public void UpdateFindDocumentTelemetryData(bool success, string? workspaceKind)
                 }
             }
 
+            public void UpdateUsedForkedSolutionCounter(bool usedForkedSolution)
+            {
+                _usedForkedSolutionCounter.IncreaseCount(usedForkedSolution);
+            }
+
             public void UpdateTelemetryData(
                 string methodName,
                 TimeSpan queuedDuration,
@@ -154,6 +162,16 @@ public void Dispose()
                     }
                 }));
 
+                Logger.Log(FunctionId.LSP_UsedForkedSolution, KeyValueLogMessage.Create(LogType.Trace, m =>
+                {
+                    m["server"] = _serverTypeName;
+                    foreach (var kvp in _usedForkedSolutionCounter)
+                    {
+                        var info = kvp.Key.ToString()!;
+                        m[info] = kvp.Value.GetCount();
+                    }
+                }));
+
                 _requestCounters.Clear();
             }
 
diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
index 64500d08e003f..089ab8466f34b 100644
--- a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
+++ b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs
@@ -213,7 +213,7 @@ private async Task ProcessQueueAsync()
 
                         // Restore our activity id so that logging/tracking works across asynchronous calls.
                         Trace.CorrelationManager.ActivityId = work.ActivityId;
-                        var context = CreateRequestContext(work);
+                        var context = await CreateRequestContextAsync(work, cancellationToken).ConfigureAwait(false);
 
                         if (work.MutatesSolutionState)
                         {
@@ -257,13 +257,13 @@ private void OnRequestServerShutdown(string message)
             Shutdown();
         }
 
-        private RequestContext? CreateRequestContext(IQueueItem queueItem)
+        private Task<RequestContext?> CreateRequestContextAsync(IQueueItem queueItem, CancellationToken cancellationToken)
         {
             var trackerToUse = queueItem.MutatesSolutionState
                 ? (IDocumentChangeTracker)_lspWorkspaceManager
                 : new NonMutatingDocumentChangeTracker();
 
-            return RequestContext.Create(
+            return RequestContext.CreateAsync(
                 queueItem.RequiresLSPSolution,
                 queueItem.TextDocument,
                 _serverKind,
@@ -274,7 +274,8 @@ private void OnRequestServerShutdown(string message)
                 trackerToUse,
                 _supportedLanguages,
                 _globalOptions,
-                queueCancellationToken: this.CancellationToken);
+                queueCancellationToken: this.CancellationToken,
+                requestCancellationToken: cancellationToken);
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensRangeHandler.cs b/src/Features/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensRangeHandler.cs
index 55bf81fe95324..db440f8323e07 100644
--- a/src/Features/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensRangeHandler.cs
+++ b/src/Features/LanguageServer/Protocol/Handler/SemanticTokens/SemanticTokensRangeHandler.cs
@@ -53,6 +53,8 @@ internal class SemanticTokensRangeHandler : AbstractStatelessRequestHandler<LSP.
         /// </summary>
         private readonly Dictionary<ProjectId, Checksum> _projectIdToLastComputedChecksum = new();
 
+        private readonly LspWorkspaceRegistrationService _lspWorkspaceRegistrationService;
+
         // initialized when first request comes in.
 
         /// <summary>
@@ -61,8 +63,6 @@ internal class SemanticTokensRangeHandler : AbstractStatelessRequestHandler<LSP.
         /// </summary>
         private bool? _supportsRefresh;
 
-        private LspWorkspaceManager? _lspWorkspaceManager;
-
         /// <summary>
         /// Debouncing queue so that we don't attempt to issue a semantic tokens refresh notification too often.
         /// </summary>
@@ -74,10 +74,14 @@ internal class SemanticTokensRangeHandler : AbstractStatelessRequestHandler<LSP.
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public SemanticTokensRangeHandler(
             IGlobalOptionService globalOptions,
-            IAsynchronousOperationListenerProvider asynchronousOperationListenerProvider)
+            IAsynchronousOperationListenerProvider asynchronousOperationListenerProvider,
+            LspWorkspaceRegistrationService lspWorkspaceRegistrationService)
         {
             _globalOptions = globalOptions;
             _asyncListener = asynchronousOperationListenerProvider.GetListener(FeatureAttribute.Classification);
+
+            _lspWorkspaceRegistrationService = lspWorkspaceRegistrationService;
+            _lspWorkspaceRegistrationService.LspSolutionChanged += OnLspSolutionChanged;
         }
 
         public override LSP.TextDocumentIdentifier? GetTextDocumentIdentifier(LSP.SemanticTokensRangeParams request)
@@ -94,8 +98,7 @@ public void Dispose()
                 eventSources = _projectIdToEventSource.Values.ToImmutableArray();
                 _projectIdToEventSource.Clear();
 
-                if (_lspWorkspaceManager != null)
-                    _lspWorkspaceManager.LspSolutionChanged -= OnLspSolutionChanged;
+                _lspWorkspaceRegistrationService.LspSolutionChanged -= OnLspSolutionChanged;
             }
 
             foreach (var eventSource in eventSources)
@@ -124,9 +127,6 @@ private bool InitializeIfFirstRequest(RequestContext context)
                             processBatchAsync: c => context.NotificationManager.SendNotificationAsync(Methods.WorkspaceSemanticTokensRefreshName, c),
                             asyncListener: _asyncListener,
                             context.QueueCancellationToken);
-
-                        _lspWorkspaceManager = context.LspWorkspaceManager;
-                        _lspWorkspaceManager.LspSolutionChanged += OnLspSolutionChanged;
                     }
                 }
 
diff --git a/src/Features/LanguageServer/Protocol/LanguageServerTarget.cs b/src/Features/LanguageServer/Protocol/LanguageServerTarget.cs
index ff2b5fa7fd0d3..548cc77d7eb00 100644
--- a/src/Features/LanguageServer/Protocol/LanguageServerTarget.cs
+++ b/src/Features/LanguageServer/Protocol/LanguageServerTarget.cs
@@ -248,7 +248,6 @@ private void ShutdownRequestQueue()
             _queue.Shutdown();
 
             _requestTelemetryLogger.Dispose();
-            _lspWorkspaceManager.Dispose();
         }
 
         private void RequestExecutionQueue_Errored(object? sender, RequestShutdownEventArgs e)
diff --git a/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceManager.cs b/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceManager.cs
index 5c1e71bd16d6a..c6085cb737dfe 100644
--- a/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceManager.cs
+++ b/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceManager.cs
@@ -8,7 +8,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.LanguageServer.Handler;
 using Microsoft.CodeAnalysis.LanguageServer.Handler.DocumentChanges;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Collections;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
@@ -23,46 +26,34 @@ namespace Microsoft.CodeAnalysis.LanguageServer;
 /// This type is tied to a particular server.
 /// </summary>
 /// <remarks>
-/// This is built to store incremental solutions that we update based on LSP text changes. This solution is <b>eventually consistent</b> with the workspace:
+/// This type provides an LSP view of the registered workspace solutions so that all LSP requests operate
+/// on the state of the world that matches the LSP requests we've recieved.  
+/// 
+/// This is done by storing the LSP text as provided by client didOpen/didClose/didChange requests.  When asked for a document we provide either
 /// <list type="bullet">
-///   <item> When LSP text changes come in, we only fork the relevant document. </item>
-///   <item> We listen to workspace events. When we receive an event that is not for an LSP open document,
-///          we delete our incremental LSP solution so that we can fork the workspace with all open LSP documents. </item>
+///     <item> The exact workspace solution instance if all the LSP text matches what is currently in the workspace.</item>
+///     <item> A fork from the workspace current solution with the LSP text applied if the LSP text does not match.  This can happen since
+///     LSP text sync is asynchronous and not guaranteed to match the text in the workspace (though the majority of the time in VS it does).</item>
 /// </list>
-///
-/// Doing incremental forking like this is more complex, but has a few nice properties:
+/// 
+/// Doing the forking like this has a few nice properties.
 /// <list type="bullet">
-///   <item>LSP didChange events only cause us to update the document that changed, not all open documents.</item>
-///   <item>Since we incrementally update our LSP documents, we only have to re-parse the document that changed.</item>
-///   <item>Since we incrementally update our LSP documents, project versions for other open documents remain unchanged.</item>
-///   <item>We are not reliant on the workspace being updated frequently (which it is not in VSCode) to do checksum diffing between LSP and the workspace.</item>
+///   <item>99% of the time the VS workspace matches the LSP text.  In those cases we do 0 re-parsing, share compilations, versions, checksum calcs, etc.</item>
+///   <item>In the 1% of the time that we do not match, we can simply and easily compute a fork.</item>
+///   <item>The code is relatively straightforward</item>
 /// </list>
 /// </remarks>
-internal class LspWorkspaceManager : IDocumentChangeTracker, IDisposable
+internal class LspWorkspaceManager : IDocumentChangeTracker
 {
     /// <summary>
-    /// Indicates whether the LSP solution has changed in a non-tracked document context.
+    /// A cache from workspace to the last solution we returned for LSP.
     /// 
-    /// <b>IMPORTANT:</b> Implementations of this event handler should do as little synchronous work as possible since this will block.
-    /// </summary>
-    public EventHandler<WorkspaceChangeEventArgs>? LspSolutionChanged;
-
-    /// <summary>
-    /// Lock to gate access to the <see cref="_workspaceToLspSolution"/> and <see cref="_trackedDocuments"/>
-    /// Access from the LSP server is serial as the LSP queue is processed serially until
-    /// after we give the solution to the request handlers.  However workspace events can interleave
-    /// so we must protect against concurrent access here.
-    /// </summary>
-    private readonly object _gate = new();
-
-    /// <summary>
-    /// A map from the registered workspace to the running lsp solution with incremental changes from LSP
-    /// text sync applied to it.
-    /// All workspaces registered by the <see cref="LspWorkspaceRegistrationService"/> are added as keys to this dictionary
-    /// with a null value (solution) initially.  As LSP text changes come in, we create the incremental solution from the workspace and update it with changes.
-    /// When we detect a change that requires us to re-fork the LSP solution from the workspace we null out the solution for the key.
+    /// The forkedFromVersion is not null when the solution was created from a fork of the workspace with LSP text applied on top.
+    /// It is null when LSP reuses the workspace solution (the LSP text matches the contents of the workspace).
+    /// 
+    /// Access to this is gauranteed to be serial by the <see cref="RequestExecutionQueue"/>
     /// </summary>
-    private readonly Dictionary<Workspace, Solution?> _workspaceToLspSolution = new();
+    private readonly Dictionary<Workspace, (int? forkedFromVersion, Solution solution)> _cachedLspSolutions = new();
 
     /// <summary>
     /// Stores the current source text for each URI that is being tracked by LSP.
@@ -71,6 +62,8 @@ internal class LspWorkspaceManager : IDocumentChangeTracker, IDisposable
     /// 
     /// Note that the text here is tracked regardless of whether or not we found a matching roslyn document
     /// for the URI.
+    /// 
+    /// Access to this is gauranteed to be serial by the <see cref="RequestExecutionQueue"/>
     /// </summary>
     private ImmutableDictionary<Uri, SourceText> _trackedDocuments = ImmutableDictionary<Uri, SourceText>.Empty;
 
@@ -93,202 +86,59 @@ public LspWorkspaceManager(
         _requestTelemetryLogger = requestTelemetryLogger;
 
         _lspWorkspaceRegistrationService = lspWorkspaceRegistrationService;
-        // This server may have been started after workspaces were registered, we need to ensure we know about them.
-        foreach (var workspace in lspWorkspaceRegistrationService.GetAllRegistrations())
-        {
-            OnWorkspaceRegistered(this, new LspWorkspaceRegisteredEventArgs(workspace));
-        }
-
-        lspWorkspaceRegistrationService.WorkspaceRegistered += OnWorkspaceRegistered;
-    }
-
-    public void Dispose()
-    {
-        // Workspace events can come in while we're disposing of an LSP server (e.g. restart).
-        lock (_gate)
-        {
-            _lspWorkspaceRegistrationService.WorkspaceRegistered -= OnWorkspaceRegistered;
-            foreach (var registeredWorkspace in _workspaceToLspSolution.Keys)
-            {
-                registeredWorkspace.WorkspaceChanged -= OnWorkspaceChanged;
-            }
-
-            _workspaceToLspSolution.Clear();
-        }
-    }
-
-    #region Workspace Updates
-
-    /// <summary>
-    /// Handles cases where a new workspace is registered after an LSP server is already started.
-    /// For example, in VS the metadata as source workspace is not created until a metadata files is opened.
-    /// </summary>
-    private void OnWorkspaceRegistered(object? sender, LspWorkspaceRegisteredEventArgs e)
-    {
-        lock (_gate)
-        {
-            // Set the LSP solution for the workspace to null so that when asked we fork from the workspace.
-            _workspaceToLspSolution.Add(e.Workspace, null);
-            e.Workspace.WorkspaceChanged += OnWorkspaceChanged;
-
-            _logger.TraceInformation($"Registered workspace {e.Workspace.Kind}");
-        }
     }
 
-    /// <summary>
-    /// Subscribed to the <see cref="Workspace.WorkspaceChanged"/> event for registered workspaces.
-    /// If the workspace change is a change to an open LSP document, we ignore the change event as LSP will update us.
-    /// If the workspace change is a change to a non-open document / project change, we trigger a fork from the workspace.
-    /// </summary>
-    private void OnWorkspaceChanged(object? sender, WorkspaceChangeEventArgs e)
-    {
-        var workspace = e.NewSolution.Workspace;
-        if (e.Kind is WorkspaceChangeKind.DocumentChanged)
-        {
-            Contract.ThrowIfNull(e.DocumentId, $"DocumentId missing for document change event {e.Kind}");
-
-            // Retrieve the current state of documents owned by LSP.  It is not necessarily
-            // consistent with the workspace, but if the documents owned by LSP change we fork from the workspace
-            // and will eventually become consistent.
-            ImmutableDictionary<Uri, SourceText> trackedDocuments;
-            lock (_gate)
-            {
-                trackedDocuments = _trackedDocuments;
-            }
-
-            if (IsDocumentTrackedByLsp(e.DocumentId, e.NewSolution, trackedDocuments))
-            {
-                // We're tracking the document already, no need to fork the workspace to get the changes, LSP will have sent them to us.
-                return;
-            }
-        }
-
-        lock (_gate)
-        {
-            // Documents added/removed, changes to additional docs, closed document changes, any changes to the project, or any changes to the solution
-            // mean we need to re-fork from the workspace to ensure that the lsp solution contains these updates.
-            _workspaceToLspSolution[workspace] = null;
-        }
-
-        // Send a solution changed notification to anyone subscribed. For example, this is important for semantic tokens refresh.
-        LspSolutionChanged?.Invoke(sender, e);
-
-        static bool IsDocumentTrackedByLsp(DocumentId changedDocumentId, Solution newWorkspaceSolution, ImmutableDictionary<Uri, SourceText> trackedDocuments)
-        {
-            var changedDocument = newWorkspaceSolution.GetRequiredDocument(changedDocumentId);
-            var documentUri = changedDocument.TryGetURI();
-            return documentUri != null && trackedDocuments.ContainsKey(documentUri);
-        }
-    }
-
-    #endregion
-
     #region Implementation of IDocumentChangeTracker
 
     /// <summary>
     /// Called by the <see cref="DidOpenHandler"/> when a document is opened in LSP.
+    /// 
+    /// <see cref="DidOpenHandler.MutatesSolutionState"/> is true which means this runs serially in the <see cref="RequestExecutionQueue"/>
     /// </summary>
     public void StartTracking(Uri uri, SourceText documentText)
     {
-        lock (_gate)
-        {
-            // First, store the LSP view of the text as the uri is now owned by the LSP client.
-            Contract.ThrowIfTrue(_trackedDocuments.ContainsKey(uri), $"didOpen received for {uri} which is already open.");
-            _trackedDocuments = _trackedDocuments.Add(uri, documentText);
-
-            // Make sure we reset/update our LSP incremental solutions now that we potentially have a new document.
-            ResetIncrementalLspSolutions_CalledUnderLock();
-            var updatedSolutions = ComputeIncrementalLspSolutions_CalledUnderLock();
-            if (updatedSolutions.Any(solution => solution.GetDocuments(uri).Any()))
-            {
-                return;
-            }
+        // First, store the LSP view of the text as the uri is now owned by the LSP client.
+        Contract.ThrowIfTrue(_trackedDocuments.ContainsKey(uri), $"didOpen received for {uri} which is already open.");
+        _trackedDocuments = _trackedDocuments.Add(uri, documentText);
 
-            // If we can't find the document in any of the registered workspaces, add it to our loose files workspace.
-            var miscDocument = _lspMiscellaneousFilesWorkspace?.AddMiscellaneousDocument(uri, documentText);
-            if (miscDocument != null)
-            {
-                _workspaceToLspSolution[miscDocument.Project.Solution.Workspace] = miscDocument.Project.Solution;
-            }
-        }
+        // If LSP changed, we need to compare against the workspace again to get the updated solution.
+        _cachedLspSolutions.Clear();
     }
 
     /// <summary>
     /// Called by the <see cref="DidCloseHandler"/> when a document is closed in LSP.
+    /// 
+    /// <see cref="DidCloseHandler.MutatesSolutionState"/> is true which means this runs serially in the <see cref="RequestExecutionQueue"/>
     /// </summary>
     public void StopTracking(Uri uri)
     {
-        lock (_gate)
-        {
-            // First, stop tracking this URI and source text as it is no longer owned by LSP.
-            Contract.ThrowIfFalse(_trackedDocuments.ContainsKey(uri), $"didClose received for {uri} which is not open.");
-            _trackedDocuments = _trackedDocuments.Remove(uri);
+        // First, stop tracking this URI and source text as it is no longer owned by LSP.
+        Contract.ThrowIfFalse(_trackedDocuments.ContainsKey(uri), $"didClose received for {uri} which is not open.");
+        _trackedDocuments = _trackedDocuments.Remove(uri);
 
-            // Trigger a fork of all workspaces, the LSP document text may not match the workspace and this document
-            // may have been removed / moved to a different workspace.
-            ResetIncrementalLspSolutions_CalledUnderLock();
+        // If LSP changed, we need to compare against the workspace again to get the updated solution.
+        _cachedLspSolutions.Clear();
 
-            // If the file was added to the LSP misc files workspace, it needs to be removed as we no longer care about it once closed.
-            // If the misc document ended up being added to an actual workspace, we may have already removed it from LSP misc in UpdateLspDocument.
-            _lspMiscellaneousFilesWorkspace?.TryRemoveMiscellaneousDocument(uri);
-        }
+        // Also remove it from our loose files workspace if it is still there.
+        _lspMiscellaneousFilesWorkspace?.TryRemoveMiscellaneousDocument(uri);
     }
 
     /// <summary>
     /// Called by the <see cref="DidChangeHandler"/> when a document's text is updated in LSP.
+    /// 
+    /// <see cref="DidChangeHandler.MutatesSolutionState"/> is true which means this runs serially in the <see cref="RequestExecutionQueue"/>
     /// </summary>
     public void UpdateTrackedDocument(Uri uri, SourceText newSourceText)
     {
-        lock (_gate)
-        {
-            // Store the updated LSP view of the source text.
-            Contract.ThrowIfFalse(_trackedDocuments.ContainsKey(uri), $"didChange received for {uri} which is not open.");
-            _trackedDocuments = _trackedDocuments.SetItem(uri, newSourceText);
-
-            // Get our current solutions and re-fork from the workspace as needed.
-            var updatedSolutions = ComputeIncrementalLspSolutions_CalledUnderLock();
+        // Store the updated LSP view of the source text.
+        Contract.ThrowIfFalse(_trackedDocuments.ContainsKey(uri), $"didChange received for {uri} which is not open.");
+        _trackedDocuments = _trackedDocuments.SetItem(uri, newSourceText);
 
-            var findDocumentResult = FindDocuments(uri, updatedSolutions, _requestTelemetryLogger, _logger);
-            if (findDocumentResult.IsEmpty)
-            {
-                // We didn't find this document in a registered workspace or in the misc workspace.
-                // This can happen when workspace event processing is behind LSP and a new document was added that has not been reflected in the incremental LSP solution yet.
-                //
-                // This means that the LSP solution will be stale until the event is processed and will not be able to answer requests on this URI.
-                // When the workspace event is processed, we will fork from the workspace and apply all missed incremental LSP text (stored in IDocumentChangeTracker)
-                // to bring the incremental LSP solution up to date.
-                //
-                // TODO - Once we always create the misc files workspace we should never hit this path (when workspace events are behind the doc will go into misc).
-                // Remove as part of https://github.com/dotnet/roslyn/issues/57243
-                return;
-            }
-
-            // Update all the documents that have a matching uri with the new source text and store as our new incremental solution.
-            // We can have multiple documents with the same URI (e.g. linked documents).
-            var solution = GetSolutionWithReplacedDocuments(findDocumentResult.First().Project.Solution, ImmutableArray.Create((uri, newSourceText)));
-            _workspaceToLspSolution[solution.Workspace] = solution;
-
-            if (solution.Workspace is not LspMiscellaneousFilesWorkspace && _lspMiscellaneousFilesWorkspace != null)
-            {
-                // If we found the uri in a workspace that isn't LSP misc files, we can remove it from the lsp misc files if it is there.
-                //
-                // Example: In VSCode, the server is started and file opened before the user has chosen which project/sln in the folder they want to open,
-                // and therefore on didOpen the file gets put into LSP misc files.
-                //
-                // Once the workspace is updated with the document however, we proactively cleanup the lsp misc files workspace here
-                // so that we don't keep lingering references around.
-                _lspMiscellaneousFilesWorkspace.TryRemoveMiscellaneousDocument(uri);
-            }
-        }
+        // If LSP changed, we need to compare against the workspace again to get the updated solution.
+        _cachedLspSolutions.Clear();
     }
 
-    public ImmutableDictionary<Uri, SourceText> GetTrackedLspText()
-    {
-        lock (_gate)
-        {
-            return _trackedDocuments;
-        }
-    }
+    public ImmutableDictionary<Uri, SourceText> GetTrackedLspText() => _trackedDocuments;
 
     #endregion
 
@@ -297,164 +147,184 @@ public ImmutableDictionary<Uri, SourceText> GetTrackedLspText()
     /// <summary>
     /// Returns the LSP solution associated with the workspace with the specified <see cref="_hostWorkspaceKind"/>.
     /// This is the solution used for LSP requests that pertain to the entire workspace, for example code search or workspace diagnostics.
+    /// 
+    /// This is always called serially in the <see cref="RequestExecutionQueue"/> when creating the <see cref="RequestContext"/>.
     /// </summary>
-    public Solution? TryGetHostLspSolution()
+    public async Task<Solution?> TryGetHostLspSolutionAsync(CancellationToken cancellationToken)
     {
-        lock (_gate)
-        {
-            // Ensure we have the latest lsp solutions
-            var updatedSolutions = ComputeIncrementalLspSolutions_CalledUnderLock();
+        // Ensure we have the latest lsp solutions
+        var updatedSolutions = await GetLspSolutionsAsync(cancellationToken).ConfigureAwait(false);
 
-            var hostWorkspaceSolution = updatedSolutions.FirstOrDefault(s => s.Workspace.Kind == _hostWorkspaceKind);
-            return hostWorkspaceSolution;
-        }
+        var (hostWorkspaceSolution, isForked) = updatedSolutions.FirstOrDefault(lspSolution => lspSolution.Solution.Workspace.Kind == _hostWorkspaceKind);
+        _requestTelemetryLogger.UpdateUsedForkedSolutionCounter(isForked);
+
+        return hostWorkspaceSolution;
     }
 
     /// <summary>
     /// Returns a document with the LSP tracked text forked from the appropriate workspace solution.
+    /// 
+    /// This is always called serially in the <see cref="RequestExecutionQueue"/> when creating the <see cref="RequestContext"/>.
     /// </summary>
-    public Document? GetLspDocument(TextDocumentIdentifier textDocumentIdentifier)
+    public async Task<Document?> GetLspDocumentAsync(TextDocumentIdentifier textDocumentIdentifier, CancellationToken cancellationToken)
     {
-        lock (_gate)
-        {
-            // Ensure we have the latest lsp solutions
-            var currentLspSolutions = ComputeIncrementalLspSolutions_CalledUnderLock();
+        var uri = textDocumentIdentifier.Uri;
+
+        // Get the LSP view of all the workspace solutions.
+        var lspSolutions = await GetLspSolutionsAsync(cancellationToken).ConfigureAwait(false);
 
-            // Search through the latest lsp solutions to find the document with matching uri and client name.
-            var findDocumentResult = FindDocuments(textDocumentIdentifier.Uri, currentLspSolutions, _requestTelemetryLogger, _logger);
-            if (findDocumentResult.IsEmpty)
+        // Find the matching document from the LSP solutions.
+        foreach (var (lspSolution, isForked) in lspSolutions)
+        {
+            var documents = lspSolution.GetDocuments(uri);
+            if (documents.Any())
             {
-                return null;
-            }
+                var document = documents.FindDocumentInProjectContext(textDocumentIdentifier);
 
-            // Filter the matching documents by project context.
-            var documentInProjectContext = findDocumentResult.FindDocumentInProjectContext(textDocumentIdentifier);
-            return documentInProjectContext;
+                // Record metadata on how we got this document.
+                var workspaceKind = document.Project.Solution.Workspace.Kind;
+                _requestTelemetryLogger.UpdateFindDocumentTelemetryData(success: true, workspaceKind);
+                _requestTelemetryLogger.UpdateUsedForkedSolutionCounter(isForked);
+                _logger.TraceInformation($"{document.FilePath} found in workspace {workspaceKind}");
+
+                return document;
+            }
         }
-    }
 
-    #endregion
+        // We didn't find the document in any workspace, record a telemetry notification that we did not find it.
+        var searchedWorkspaceKinds = string.Join(";", lspSolutions.SelectAsArray(lspSolution => lspSolution.Solution.Workspace.Kind));
+        _logger.TraceError($"Could not find '{uri}'.  Searched {searchedWorkspaceKinds}");
+        _requestTelemetryLogger.UpdateFindDocumentTelemetryData(success: false, workspaceKind: null);
+
+        // Add the document to our loose files workspace if its open.
+        var miscDocument = _trackedDocuments.ContainsKey(uri) ? _lspMiscellaneousFilesWorkspace?.AddMiscellaneousDocument(uri, _trackedDocuments[uri]) : null;
+        return miscDocument;
+    }
 
     /// <summary>
-    /// Helper to clear out the LSP incremental solution for all registered workspaces.
-    /// Should be called under <see cref="_gate"/>
+    /// Gets the LSP view of all the registered workspaces' current solutions.
     /// </summary>
-    private void ResetIncrementalLspSolutions_CalledUnderLock()
+    private async Task<ImmutableArray<(Solution Solution, bool IsForked)>> GetLspSolutionsAsync(CancellationToken cancellationToken)
     {
-        Contract.ThrowIfFalse(Monitor.IsEntered(_gate));
-
-        var workspaces = _workspaceToLspSolution.Keys.ToImmutableArray();
-        foreach (var workspace in workspaces)
+        // Ensure that the loose files workspace is searched last.
+        var registeredWorkspaces = _lspWorkspaceRegistrationService.GetAllRegistrations();
+        registeredWorkspaces = registeredWorkspaces
+            .Where(workspace => workspace is not LspMiscellaneousFilesWorkspace)
+            .Concat(registeredWorkspaces.Where(workspace => workspace is LspMiscellaneousFilesWorkspace)).ToImmutableArray();
+
+        using var _ = ArrayBuilder<(Solution, bool)>.GetInstance(out var solutions);
+        foreach (var workspace in registeredWorkspaces)
         {
-            _workspaceToLspSolution[workspace] = null;
+            // Retrieve the workspace's current view of the world at the time the request comes in.
+            // If this is changing underneath, it is either the job of the LSP client to poll us (diagnostics) or we send refresh notifications (semantic tokens) to the client
+            // letting them know that our workspace has changed and they need to re-query us.
+            var workspaceCurrentSolution = workspace.CurrentSolution;
+            var lspSolution = await GetLspSolutionForWorkspaceAsync(workspaceCurrentSolution, cancellationToken).ConfigureAwait(false);
+            solutions.Add(lspSolution);
         }
-    }
 
-    /// <summary>
-    /// Helper to get LSP solutions for all the registered workspaces.
-    /// If the incremental lsp solution is missing, this will re-fork from the workspace.
-    /// Should be called under <see cref="_gate"/>
-    /// </summary>
-    private ImmutableArray<Solution> ComputeIncrementalLspSolutions_CalledUnderLock()
-    {
-        Contract.ThrowIfFalse(Monitor.IsEntered(_gate));
+        return solutions.ToImmutable();
 
-        var workspacePairs = _workspaceToLspSolution.ToImmutableArray();
-        using var updatedSolutions = TemporaryArray<Solution>.Empty;
-        foreach (var (workspace, incrementalSolution) in workspacePairs)
+        async Task<(Solution Solution, bool IsForked)> GetLspSolutionForWorkspaceAsync(Solution workspaceCurrentSolution, CancellationToken cancellationToken)
         {
-            if (incrementalSolution == null)
+            // At a high level these are the steps we take to compute what the desired LSP solution should be.
+            //
+            //   1.  First we want to check if our workspace current solution is the same as the last workspace current solution that we verified matches the LSP text.
+            //       If so, we can skip comparing the LSP text against the workspace text and just return the cached one since absolutely nothing has changed.
+            //       Importantly, we do not return a cached forked solution - we do not want to re-use a forked solution if the LSP text has changed and now matches the workspace.
+            //
+            //   2.  If the cached solution isn't a match, we compare the LSP text to the workspace's text and return the workspace text if all LSP text matches.
+            //       This check is performant as checksums will be computed for these documents in order to make requests OOP.  So these are already computed or will be later in this request.
+            //
+            //   3.  Third, we check to see if we have cached a forked LSP solution for the current set of LSP texts against the current workspace version.
+            //       If so, we can just reuse that instead of re-forking and blowing away the trees / source generated docs / etc. that we created for the fork.
+            //       
+            //   4.  We have nothing cached for this combination of LSP texts and workspace version.  We have exhausted our options and must create an LSP fork
+            //       from the current workspace solution with the current LSP text.
+            //
+            //   We propogate the IsForked value back up so that we only report telemetry on forking if the forked solution is actually requested.
+
+            // Step 1: Check if nothing has changed and we already verified that the workspace text matches our LSP text.
+            if (_cachedLspSolutions.TryGetValue(workspaceCurrentSolution.Workspace, out var cachedSolution) && cachedSolution.solution == workspaceCurrentSolution)
             {
-                // We have no incremental lsp solution, create a new one forked from the workspace with LSP tracked documents.
-                var newIncrementalSolution = GetSolutionWithReplacedDocuments(workspace.CurrentSolution, _trackedDocuments.Select(k => (k.Key, k.Value)).ToImmutableArray());
-                _workspaceToLspSolution[workspace] = newIncrementalSolution;
-                updatedSolutions.Add(newIncrementalSolution);
+                return (workspaceCurrentSolution, IsForked: false);
             }
-            else
+
+            // Step 2: Check to see if the LSP text matches the workspace text.
+            var documentsInWorkspace = GetDocumentsForUris(_trackedDocuments.Keys.ToImmutableArray(), workspaceCurrentSolution);
+            if (await DoesAllTextMatchWorkspaceSolutionAsync(documentsInWorkspace, cancellationToken).ConfigureAwait(false))
             {
-                updatedSolutions.Add(incrementalSolution);
+                // Remember that the current LSP text matches the text in this workspace solution.
+                _cachedLspSolutions[workspaceCurrentSolution.Workspace] = (forkedFromVersion: null, workspaceCurrentSolution);
+                return (workspaceCurrentSolution, IsForked: false);
+            }
+
+            // Step 3: See if we can reuse a previously forked solution.
+            if (cachedSolution != default && cachedSolution.forkedFromVersion == workspaceCurrentSolution.WorkspaceVersion)
+            {
+                return (cachedSolution.solution, IsForked: true);
+            }
+
+            // Step 4: Fork a new solution from the workspace with the LSP text applied.
+            var lspSolution = workspaceCurrentSolution;
+            foreach (var (uri, workspaceDocuments) in documentsInWorkspace)
+            {
+                lspSolution = lspSolution.WithDocumentText(workspaceDocuments.Select(d => d.Id), _trackedDocuments[uri]);
             }
-        }
 
-        return updatedSolutions.ToImmutableAndClear();
+            // Remember this forked solution and the workspace version it was forked from.
+            _cachedLspSolutions[workspaceCurrentSolution.Workspace] = (workspaceCurrentSolution.WorkspaceVersion, lspSolution);
+            return (lspSolution, IsForked: true);
+        }
     }
 
     /// <summary>
-    /// Looks for document(s - e.g. linked docs) from a single solution matching the input URI in the set of passed in solutions.
-    /// 
-    /// Client name is used in razor cases to filter out non-razor documents.  However once we switch fully over to pull
-    /// diagnostics, the client should only ever ask the razor server about razor documents, so we may be able to remove it here.
+    /// Given a set of documents from the workspace current solution, verify that the LSP text is the same as the document contents.
     /// </summary>
-    private static ImmutableArray<Document> FindDocuments(
-        Uri uri,
-        ImmutableArray<Solution> registeredSolutions,
-        RequestTelemetryLogger telemetryLogger,
-        ILspLogger logger)
+    private async Task<bool> DoesAllTextMatchWorkspaceSolutionAsync(ImmutableDictionary<Uri, ImmutableArray<Document>> documentsInWorkspace, CancellationToken cancellationToken)
     {
-        logger.TraceInformation($"Finding document corresponding to {uri}");
-
-        // Ensure we search the lsp misc files solution last if it is present.
-        registeredSolutions = registeredSolutions
-            .Where(solution => solution.Workspace is not LspMiscellaneousFilesWorkspace)
-            .Concat(registeredSolutions.Where(solution => solution.Workspace is LspMiscellaneousFilesWorkspace)).ToImmutableArray();
-
-        // First search the registered workspaces for documents with a matching URI.
-        if (TryGetDocumentsForUri(uri, registeredSolutions, out var documents, out var solution))
+        foreach (var (uriInWorkspace, documentsForUri) in documentsInWorkspace)
         {
-            telemetryLogger.UpdateFindDocumentTelemetryData(success: true, solution.Workspace.Kind);
-            logger.TraceInformation($"{documents.Value.First().FilePath} found in workspace {solution.Workspace.Kind}");
+            // We're comparing text, so we can take any of the linked documents.
+            var firstDocument = documentsForUri.First();
+            var isTextEquivalent = await AreChecksumsEqualAsync(firstDocument, _trackedDocuments[uriInWorkspace], cancellationToken).ConfigureAwait(false);
 
-            return documents.Value;
-        }
-
-        // We didn't find the document in any workspace, record a telemetry notification that we did not find it.
-        var searchedWorkspaceKinds = string.Join(";", registeredSolutions.SelectAsArray(s => s.Workspace.Kind));
-        logger.TraceError($"Could not find '{uri}'.  Searched {searchedWorkspaceKinds}");
-        telemetryLogger.UpdateFindDocumentTelemetryData(success: false, workspaceKind: null);
-        return ImmutableArray<Document>.Empty;
-
-        static bool TryGetDocumentsForUri(
-            Uri uri,
-            ImmutableArray<Solution> registeredSolutions,
-            [NotNullWhen(true)] out ImmutableArray<Document>? documents,
-            [NotNullWhen(true)] out Solution? solution)
-        {
-            foreach (var registeredSolution in registeredSolutions)
+            if (!isTextEquivalent)
             {
-                var matchingDocuments = registeredSolution.GetDocuments(uri);
-                if (matchingDocuments.Any())
-                {
-                    documents = matchingDocuments;
-                    solution = registeredSolution;
-                    return true;
-                }
+                _logger.TraceWarning($"Text for {uriInWorkspace} did not match document text {firstDocument.Id} in workspace's {firstDocument.Project.Solution.Workspace.Kind} current solution");
+                return false;
             }
-
-            documents = null;
-            solution = null;
-            return false;
         }
+
+        return true;
+    }
+
+    private static async Task<bool> AreChecksumsEqualAsync(Document document, SourceText lspText, CancellationToken cancellationToken)
+    {
+        var documentText = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+        var documentTextChecksum = documentText.GetChecksum();
+        var lspTextChecksum = lspText.GetChecksum();
+        return lspTextChecksum.SequenceEqual(documentTextChecksum);
     }
 
+    #endregion
+
     /// <summary>
-    /// Gets a solution that represents the workspace view of the world (as passed in via the solution parameter)
-    /// but with document text for any open documents updated to match the LSP view of the world. This makes
-    /// the LSP server the source of truth for all document text, but all other changes come from the workspace
+    /// Using the workspace's current solutions, find the matching documents in for each URI.
     /// </summary>
-    private static Solution GetSolutionWithReplacedDocuments(Solution solution, ImmutableArray<(Uri DocumentUri, SourceText Text)> documentsToReplace)
+    private static ImmutableDictionary<Uri, ImmutableArray<Document>> GetDocumentsForUris(ImmutableArray<Uri> trackedDocuments, Solution workspaceCurrentSolution)
     {
-        foreach (var (uri, text) in documentsToReplace)
+        using var _ = PooledDictionary<Uri, ImmutableArray<Document>>.GetInstance(out var documentsInSolution);
+        foreach (var trackedDoc in trackedDocuments)
         {
-            var documentIds = solution.GetDocumentIds(uri);
-
-            // The tracked document might not be a part of this solution.
-            if (documentIds.Any())
+            var documents = workspaceCurrentSolution.GetDocuments(trackedDoc);
+            if (documents.Any())
             {
-                solution = solution.WithDocumentText(documentIds, text);
+                documentsInSolution[trackedDoc] = documents;
             }
         }
 
-        return solution;
+        return documentsInSolution.ToImmutableDictionary();
     }
 
     internal TestAccessor GetTestAccessor()
@@ -470,24 +340,9 @@ public TestAccessor(LspWorkspaceManager manager)
         public LspMiscellaneousFilesWorkspace? GetLspMiscellaneousFilesWorkspace()
             => _manager._lspMiscellaneousFilesWorkspace;
 
-        public ImmutableDictionary<Workspace, Solution?> GetWorkspaceState()
+        public bool IsWorkspaceRegistered(Workspace workspace)
         {
-            lock (_manager._gate)
-            {
-                return _manager._workspaceToLspSolution.ToImmutableDictionary();
-            }
-        }
-
-        /// <summary>
-        /// Used to ensure that tests start with a consistent state in the LSP manager
-        /// no matter what workspace events were triggered during creation.
-        /// </summary>
-        public void ResetLspSolutions()
-        {
-            lock (_manager._gate)
-            {
-                _manager.ResetIncrementalLspSolutions_CalledUnderLock();
-            }
+            return _manager._lspWorkspaceRegistrationService.GetAllRegistrations().Contains(workspace);
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceRegistrationService.cs b/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceRegistrationService.cs
index 13cd713ccb676..4fcddcd1ef579 100644
--- a/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceRegistrationService.cs
+++ b/src/Features/LanguageServer/Protocol/Workspaces/LspWorkspaceRegistrationService.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer;
 
-internal abstract class LspWorkspaceRegistrationService
+internal abstract class LspWorkspaceRegistrationService : IDisposable
 {
     private readonly object _gate = new();
     private ImmutableArray<Workspace> _registrations = ImmutableArray.Create<Workspace>();
@@ -17,7 +17,12 @@ internal abstract class LspWorkspaceRegistrationService
     public abstract string GetHostWorkspaceKind();
 
     public ImmutableArray<Workspace> GetAllRegistrations()
-        => _registrations;
+    {
+        lock (_gate)
+        {
+            return _registrations;
+        }
+    }
 
     public virtual void Register(Workspace workspace)
     {
@@ -34,10 +39,32 @@ public virtual void Register(Workspace workspace)
             _registrations = _registrations.Add(workspace);
         }
 
-        WorkspaceRegistered?.Invoke(this, new LspWorkspaceRegisteredEventArgs(workspace));
+        // Forward workspace change events for all registered LSP workspaces.
+        workspace.WorkspaceChanged += OnLspWorkspaceChanged;
+    }
+
+    private void OnLspWorkspaceChanged(object? sender, WorkspaceChangeEventArgs e)
+    {
+        LspSolutionChanged?.Invoke(this, e);
+    }
+
+    public void Dispose()
+    {
+        lock (_gate)
+        {
+            foreach (var workspace in _registrations)
+            {
+                workspace.WorkspaceChanged -= OnLspWorkspaceChanged;
+            }
+        }
     }
 
-    public event EventHandler<LspWorkspaceRegisteredEventArgs>? WorkspaceRegistered;
+    /// <summary>
+    /// Indicates whether the LSP solution has changed in a non-tracked document context.
+    /// 
+    /// <b>IMPORTANT:</b> Implementations of this event handler should do as little synchronous work as possible since this will block.
+    /// </summary>
+    public EventHandler<WorkspaceChangeEventArgs>? LspSolutionChanged;
 }
 
 internal class LspWorkspaceRegisteredEventArgs : EventArgs
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/DocumentChanges/DocumentChangesTests.LinkedDocuments.cs b/src/Features/LanguageServer/ProtocolUnitTests/DocumentChanges/DocumentChangesTests.LinkedDocuments.cs
index f66fb9664be95..ec2535a62fcaa 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/DocumentChanges/DocumentChangesTests.LinkedDocuments.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/DocumentChanges/DocumentChangesTests.LinkedDocuments.cs
@@ -36,7 +36,7 @@ public async Task LinkedDocuments_AllTracked()
             var trackedDocuments = testLspServer.GetQueueAccessor().GetTrackedTexts();
             Assert.Equal(1, trackedDocuments.Length);
 
-            var solution = GetLSPSolution(testLspServer, caretLocation.Uri);
+            var solution = await GetLSPSolutionAsync(testLspServer, caretLocation.Uri).ConfigureAwait(false);
 
             foreach (var document in solution.Projects.First().Documents)
             {
@@ -87,7 +87,7 @@ void M()
 
             await DidChange(testLspServer, caretLocation.Uri, (4, 8, "// hi there"));
 
-            var solution = GetLSPSolution(testLspServer, caretLocation.Uri);
+            var solution = await GetLSPSolutionAsync(testLspServer, caretLocation.Uri).ConfigureAwait(false);
 
             foreach (var document in solution.Projects.First().Documents)
             {
@@ -99,9 +99,9 @@ void M()
             Assert.Empty(testLspServer.GetQueueAccessor().GetTrackedTexts());
         }
 
-        private static Solution GetLSPSolution(TestLspServer testLspServer, Uri uri)
+        private static async Task<Solution> GetLSPSolutionAsync(TestLspServer testLspServer, Uri uri)
         {
-            var lspDocument = testLspServer.GetManager().GetLspDocument(new TextDocumentIdentifier { Uri = uri });
+            var lspDocument = await testLspServer.GetManager().GetLspDocumentAsync(new TextDocumentIdentifier { Uri = uri }, CancellationToken.None).ConfigureAwait(false);
             Contract.ThrowIfNull(lspDocument);
             return lspDocument.Project.Solution;
         }
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Miscellaneous/LspMiscellaneousFilesWorkspaceTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Miscellaneous/LspMiscellaneousFilesWorkspaceTests.cs
index 9eb067f713948..5c7f08c636cb1 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/Miscellaneous/LspMiscellaneousFilesWorkspaceTests.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/Miscellaneous/LspMiscellaneousFilesWorkspaceTests.cs
@@ -32,19 +32,12 @@ void M()
         using var testLspServer = await CreateTestLspServerAsync(string.Empty);
         Assert.Null(GetMiscellaneousDocument(testLspServer));
 
-        // Open a loose file and verify it gets added to the misc workspace.
+        // Open an empty loose file and make a request to verify it gets added to the misc workspace.
         var looseFileUri = new Uri(@"C:\SomeFile.cs");
         await testLspServer.OpenDocumentAsync(looseFileUri, source).ConfigureAwait(false);
-        Assert.Equal(looseFileUri.AbsolutePath, GetMiscellaneousDocument(testLspServer)!.FilePath);
-
-        // Verify requests succeed against the loose file.
-        var caret = new LSP.Location
-        {
-            Range = new LSP.Range { Start = new LSP.Position { Character = 6, Line = 0 }, End = new LSP.Position { Character = 7, Line = 0 } },
-            Uri = looseFileUri,
-        };
-        var hover = await RunGetHoverAsync(testLspServer, caret).ConfigureAwait(false);
-        Assert.Contains("class A", hover.Contents.Third.Value);
+
+        // Verify file is added to the misc file workspace.
+        await AssertFileInMiscWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
     }
 
     [Fact]
@@ -63,20 +56,16 @@ void M()
 
         var looseFileUri = new Uri(@"C:\SomeFile.cs");
 
-        // Open an empty loose file and verify it gets added to the misc workspace.
+        // Open an empty loose file and make a request to verify it gets added to the misc workspace.
         await testLspServer.OpenDocumentAsync(looseFileUri, string.Empty).ConfigureAwait(false);
-        var docText = await GetMiscellaneousDocument(testLspServer)!.GetTextAsync(CancellationToken.None).ConfigureAwait(false);
-        Assert.Equal(string.Empty, docText.ToString());
+        await AssertFileInMiscWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
 
         // Make a text change to the loose file and verify requests appropriately reflect the changes.
         await testLspServer.InsertTextAsync(looseFileUri, (0, 0, source)).ConfigureAwait(false);
-        var caret = new LSP.Location
-        {
-            Range = new LSP.Range { Start = new LSP.Position { Character = 6, Line = 0 }, End = new LSP.Position { Character = 7, Line = 0 } },
-            Uri = looseFileUri,
-        };
+        var caret = new LSP.Location { Range = new() { Start = new(0, 6), End = new(0, 7) }, Uri = looseFileUri };
         var hover = await RunGetHoverAsync(testLspServer, caret).ConfigureAwait(false);
         Assert.Contains("class A", hover.Contents.Third.Value);
+        await AssertFileInMiscWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
     }
 
     [Fact]
@@ -94,10 +83,10 @@ void M()
         using var testLspServer = await CreateTestLspServerAsync(string.Empty);
         Assert.Null(GetMiscellaneousDocument(testLspServer));
 
-        // Open a loose file and verify it gets added to the misc workspace.
+        // Open an empty loose file and make a request to verify it gets added to the misc workspace.
         var looseFileUri = new Uri(@"C:\SomeFile.cs");
         await testLspServer.OpenDocumentAsync(looseFileUri, source).ConfigureAwait(false);
-        Assert.Equal(looseFileUri.AbsolutePath, GetMiscellaneousDocument(testLspServer)!.FilePath);
+        await AssertFileInMiscWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
 
         // Verify the loose file is removed from the misc workspace on close.
         await testLspServer.CloseDocumentAsync(looseFileUri).ConfigureAwait(false);
@@ -140,19 +129,13 @@ void M()
         using var testLspServer = await CreateTestLspServerAsync(string.Empty);
         Assert.Null(GetMiscellaneousDocument(testLspServer));
 
-        // Open a loose file and verify it gets added to the misc workspace.
+        // Open an empty loose file and make a request to verify it gets added to the misc workspace.
         var looseFileUri = new Uri(@"C:\SomeFile.cs");
+        var looseFileTextDocumentIdentifier = new LSP.TextDocumentIdentifier { Uri = looseFileUri };
         await testLspServer.OpenDocumentAsync(looseFileUri, source).ConfigureAwait(false);
-        Assert.Equal(looseFileUri.AbsolutePath, GetMiscellaneousDocument(testLspServer)!.FilePath);
-
-        // Verify requests succeed against the loose file.
-        var caret = new LSP.Location
-        {
-            Range = new LSP.Range { Start = new LSP.Position { Character = 6, Line = 0 }, End = new LSP.Position { Character = 7, Line = 0 } },
-            Uri = looseFileUri,
-        };
-        var hover = await RunGetHoverAsync(testLspServer, caret).ConfigureAwait(false);
-        Assert.Contains("class A", hover.Contents.Third.Value);
+
+        // Verify that the file returned by the manager is in the lsp misc files workspace.
+        await AssertFileInMiscWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
 
         // Update the workspace to contain the loose file.
         var project = testLspServer.GetCurrentSolution().Projects.Single();
@@ -167,18 +150,21 @@ void M()
 
         Assert.Contains(looseFileUri.AbsolutePath, testLspServer.GetCurrentSolution().Projects.Single().Documents.Select(d => d.FilePath));
 
-        // Make a change and verify that the file is no longer present in the misc workspace.
-        await testLspServer.InsertTextAsync(looseFileUri, (0, 6, "B")).ConfigureAwait(false);
-        Assert.Null(GetMiscellaneousDocument(testLspServer));
+        // Verify that the manager returns the file that has been added to the main workspace.
+        await AssertFileInMainWorkspaceAsync(testLspServer, looseFileUri).ConfigureAwait(false);
+    }
+
+    private static async Task AssertFileInMiscWorkspaceAsync(TestLspServer testLspServer, Uri fileUri)
+    {
+        var lspDocument = await testLspServer.GetManager().GetLspDocumentAsync(new LSP.TextDocumentIdentifier { Uri = fileUri }, CancellationToken.None);
+        Assert.Equal(testLspServer.GetManagerAccessor().GetLspMiscellaneousFilesWorkspace(), lspDocument!.Project.Solution.Workspace);
+    }
+
+    private static async Task AssertFileInMainWorkspaceAsync(TestLspServer testLspServer, Uri fileUri)
+    {
+        var lspDocument = await testLspServer.GetManager().GetLspDocumentAsync(new LSP.TextDocumentIdentifier { Uri = fileUri }, CancellationToken.None).ConfigureAwait(false);
+        Assert.Equal(testLspServer.TestWorkspace, lspDocument!.Project.Solution.Workspace);
 
-        // Verify the change is reflected in subsequent requests.
-        caret = new LSP.Location
-        {
-            Range = new LSP.Range { Start = new LSP.Position { Character = 6, Line = 0 }, End = new LSP.Position { Character = 8, Line = 0 } },
-            Uri = looseFileUri,
-        };
-        hover = await RunGetHoverAsync(testLspServer, caret).ConfigureAwait(false);
-        Assert.Contains("class BA", hover.Contents.Third.Value);
     }
 
     private static Document? GetMiscellaneousDocument(TestLspServer testLspServer)
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Ordering/RequestOrderingTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Ordering/RequestOrderingTests.cs
index d62499f04d08a..4bf617fc97983 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/Ordering/RequestOrderingTests.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/Ordering/RequestOrderingTests.cs
@@ -256,7 +256,7 @@ private static async Task ExecuteDidOpen(TestLspServer testLspServer, Uri docume
             Contract.ThrowIfNull(response);
             if (response.ContextHasSolution)
             {
-                var solution = testLspServer.GetManager().TryGetHostLspSolution();
+                var solution = await testLspServer.GetManager().TryGetHostLspSolutionAsync(CancellationToken.None).ConfigureAwait(false);
                 Contract.ThrowIfNull(solution);
                 return solution;
             }
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/SpellCheck/SpellCheckTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/SpellCheck/SpellCheckTests.cs
index 58647c6fbdca8..5601ec7df2dd9 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/SpellCheck/SpellCheckTests.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/SpellCheck/SpellCheckTests.cs
@@ -168,7 +168,8 @@ public async Task TestDocumentResultChangedAfterEntityAdded()
 
             await InsertTextAsync(testLspServer, document, buffer.CurrentSnapshot.Length, "// comment");
 
-            document = testLspServer.GetManager().TryGetHostLspSolution()!.Projects.Single().Documents.Single();
+            var lspSolution = await testLspServer.GetManager().TryGetHostLspSolutionAsync(CancellationToken.None).ConfigureAwait(false);
+            document = lspSolution!.Projects.Single().Documents.Single();
             results = await RunGetDocumentSpellCheckSpansAsync(testLspServer, document.GetURI(), results.Single().ResultId);
 
             MarkupTestFile.GetSpans(
@@ -463,7 +464,8 @@ public async Task TestWorkspaceResultUpdatedAfterEdit()
             var results2 = await RunGetWorkspaceSpellCheckSpansAsync(testLspServer, previousResults: CreateParamsFromPreviousReports(results));
 
             Assert.Equal(2, results2.Length);
-            document = testLspServer.GetManager().TryGetHostLspSolution()!.Projects.Single().Documents.First();
+            var lspSolution = await testLspServer.GetManager().TryGetHostLspSolutionAsync(CancellationToken.None).ConfigureAwait(false);
+            document = lspSolution!.Projects.Single().Documents.First();
             sourceText = await document.GetTextAsync();
 
             MarkupTestFile.GetSpans(
diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Workspaces/LspWorkspaceManagerTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Workspaces/LspWorkspaceManagerTests.cs
index 7210807fce5b3..4a609e39edd11 100644
--- a/src/Features/LanguageServer/ProtocolUnitTests/Workspaces/LspWorkspaceManagerTests.cs
+++ b/src/Features/LanguageServer/ProtocolUnitTests/Workspaces/LspWorkspaceManagerTests.cs
@@ -21,42 +21,33 @@ namespace Microsoft.CodeAnalysis.LanguageServer.UnitTests.Workspaces;
 public class LspWorkspaceManagerTests : AbstractLanguageServerProtocolTests
 {
     [Fact]
-    public async Task TestForksOnDidOpenAndDidCloseAsync()
+    public async Task TestUsesLspTextOnOpenCloseAsync()
     {
         var markup = "";
         using var testLspServer = await CreateTestLspServerAsync(markup);
         var documentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.First().GetURI();
 
-        // Verify that the workspace is registered with no lsp solution.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-
         await testLspServer.OpenDocumentAsync(documentUri, "LSP text");
 
-        // Assert that the solution is forked with the new text on open.
-        var forkedSolution = GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer);
-        AssertEx.NotNull(forkedSolution);
-        Assert.NotEqual(testLspServer.TestWorkspace.CurrentSolution, forkedSolution);
-
-        var lspDocument = GetLspDocument(documentUri, testLspServer);
+        var lspDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(lspDocument);
         Assert.Equal("LSP text", (await lspDocument.GetTextAsync(CancellationToken.None)).ToString());
 
         // Verify LSP text changes are reflected in the opened document.
         await testLspServer.InsertTextAsync(documentUri, (0, 0, "More text"));
-        lspDocument = GetLspDocument(documentUri, testLspServer);
+        lspDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(lspDocument);
         Assert.Equal("More textLSP text", (await lspDocument.GetTextAsync(CancellationToken.None)).ToString());
 
         // Close the document in LSP and verify all LSP tracked changes are now gone.
         // The document should be reset to the workspace's state.
         await testLspServer.CloseDocumentAsync(documentUri);
-        var newSolution = GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer);
-        Assert.Null(newSolution);
-        Assert.Equal(testLspServer.GetCurrentSolution(), GetLspDocument(documentUri, testLspServer)!.Project.Solution);
+        var closedDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
+        Assert.Equal(testLspServer.GetCurrentSolution(), closedDocument!.Project.Solution);
     }
 
     [Fact]
-    public async Task TestDoesNotForkAllOpenDocumentsOnDidChangeAsync()
+    public async Task TestLspUsesWorkspaceInstanceOnChangesAsync()
     {
         var markupOne = "One";
         var markupTwo = "Two";
@@ -64,29 +55,38 @@ public async Task TestDoesNotForkAllOpenDocumentsOnDidChangeAsync()
         var firstDocumentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test1")).GetURI();
         var secondDocumentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test2")).GetURI();
 
-        var firstDocument = await OpenDocumentAndVerifyLspTextAsync(firstDocumentUri, testLspServer);
-        var secondDocument = await OpenDocumentAndVerifyLspTextAsync(secondDocumentUri, testLspServer);
+        var firstDocument = await OpenDocumentAndVerifyLspTextAsync(firstDocumentUri, testLspServer, markupOne);
+        var secondDocument = await OpenDocumentAndVerifyLspTextAsync(secondDocumentUri, testLspServer, markupTwo);
         var firstDocumentInitialVersion = await firstDocument.GetSyntaxVersionAsync(CancellationToken.None);
         var secondDocumentInitialVersion = await secondDocument.GetSyntaxVersionAsync(CancellationToken.None);
 
-        // Make a text change in one of the opened documents.
+        // Verify the LSP documents are the same instance as the workspaces documents.
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution.GetDocument(firstDocument.Id), firstDocument);
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution.GetDocument(secondDocument.Id), secondDocument);
+
+        // Make a text change in one of the opened documents in both LSP and the workspace.
         await testLspServer.InsertTextAsync(firstDocumentUri, (0, 0, "Some more text"));
+        await testLspServer.TestWorkspace.ChangeDocumentAsync(firstDocument.Id, SourceText.From($"Some more text{markupOne}", System.Text.Encoding.UTF8));
 
-        var firstDocumentWithChange = GetLspDocument(firstDocumentUri, testLspServer);
-        var secondDocumentUnchanged = GetLspDocument(secondDocumentUri, testLspServer);
+        var firstDocumentWithChange = await GetLspDocumentAsync(firstDocumentUri, testLspServer).ConfigureAwait(false);
+        var secondDocumentUnchanged = await GetLspDocumentAsync(secondDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(firstDocumentWithChange);
         AssertEx.NotNull(secondDocumentUnchanged);
 
         // Verify that the document that we inserted text into had a version change.
         Assert.NotEqual(firstDocumentInitialVersion, await firstDocumentWithChange.GetSyntaxVersionAsync(CancellationToken.None));
-        Assert.Equal("Some more textLSP text", (await firstDocumentWithChange.GetTextAsync(CancellationToken.None)).ToString());
+        Assert.Equal($"Some more text{markupOne}", (await firstDocumentWithChange.GetTextAsync(CancellationToken.None)).ToString());
 
         // Verify that the document that we did not change still has the same version.
         Assert.Equal(secondDocumentInitialVersion, await secondDocumentUnchanged.GetSyntaxVersionAsync(CancellationToken.None));
+
+        // Verify the LSP documents are the same instance as the workspaces documents.
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution.GetDocument(firstDocumentWithChange.Id), firstDocumentWithChange);
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution.GetDocument(secondDocumentUnchanged.Id), secondDocumentUnchanged);
     }
 
     [Fact]
-    public async Task TestForksOnClosedDocumentChangesChangesAsync()
+    public async Task TestLspHasClosedDocumentChangesAsync()
     {
         var markupOne = "One";
         var markupTwo = "Two";
@@ -100,124 +100,93 @@ public async Task TestForksOnClosedDocumentChangesChangesAsync()
         await OpenDocumentAndVerifyLspTextAsync(firstDocumentUri, testLspServer);
 
         // Modify a closed document via the workspace.
-        await testLspServer.TestWorkspace.ChangeDocumentAsync(secondDocument.Id, SourceText.From("Two is now three!"));
-
-        // Assert that the LSP incremental solution is cleared.
-        var changedSolution = GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer);
-        Assert.Null(changedSolution);
+        await testLspServer.TestWorkspace.ChangeDocumentAsync(secondDocument.Id, SourceText.From("Two is now three!", System.Text.Encoding.UTF8));
 
         // Verify that the LSP solution has the LSP text from the open document.
-        var openedDocument = GetLspDocument(firstDocumentUri, testLspServer);
+        var openedDocument = await GetLspDocumentAsync(firstDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(openedDocument);
         Assert.Equal("LSP text", (await openedDocument.GetTextAsync(CancellationToken.None)).ToString());
 
         // Verify that the LSP solution has the workspace text in the closed document.
-        secondDocument = GetLspDocument(secondDocumentUri, testLspServer);
+        secondDocument = await GetLspDocumentAsync(secondDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(secondDocument);
         Assert.Equal("Two is now three!", (await secondDocument.GetTextAsync()).ToString());
+        Assert.NotEqual(testLspServer.TestWorkspace.CurrentSolution.GetDocument(secondDocument.Id), secondDocument);
     }
 
     [Fact]
-    public async Task TestForksOnProjectChangesAsync()
+    public async Task TestLspHasProjectChangesAsync()
     {
         var markup = "One";
         using var testLspServer = await CreateTestLspServerAsync(markup);
         var documentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test1")).GetURI();
 
         // Open the document via LSP and verify the initial project name.
-        var openedDocument = await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer);
+        var openedDocument = await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer, markup);
         Assert.Equal("Test", openedDocument?.Project.AssemblyName);
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution, openedDocument!.Project.Solution);
 
         // Modify the project via the workspace.
         var newProject = testLspServer.TestWorkspace.CurrentSolution.Projects.First().WithAssemblyName("NewCSProj1");
         await testLspServer.TestWorkspace.ChangeProjectAsync(newProject.Id, newProject.Solution);
 
-        // Assert that the LSP incremental solution is cleared.
-        var changedSolution = GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer);
-        Assert.Null(changedSolution);
-
         // Verify that the new LSP solution has the updated project info.
-        openedDocument = GetLspDocument(documentUri, testLspServer);
+        openedDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(openedDocument);
-        Assert.Equal("LSP text", (await openedDocument.GetTextAsync(CancellationToken.None)).ToString());
+        Assert.Equal(markup, (await openedDocument.GetTextAsync(CancellationToken.None)).ToString());
         Assert.Equal("NewCSProj1", openedDocument.Project.AssemblyName);
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution, openedDocument.Project.Solution);
     }
 
     [Fact]
-    public async Task TestDoesNotForkOnOpenDocumentWorkspaceEventAsync()
-    {
-        var markup = "One";
-        using var testLspServer = await CreateTestLspServerAsync(markup);
-        var firstDocumentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test1")).GetURI();
-
-        // Open the document via LSP to create the initial LSP solution.
-        var openedDocument = await OpenDocumentAndVerifyLspTextAsync(firstDocumentUri, testLspServer);
-
-        // Modify the currently open LSP document via the workspace.
-        await testLspServer.TestWorkspace.ChangeDocumentAsync(openedDocument.Id, SourceText.From("New One"));
-
-        // Assert that the LSP incremental solution is unchanged (with the original LSP text and not workspace text).
-        var lspDocument = GetLspDocument(firstDocumentUri, testLspServer);
-        Assert.Equal(openedDocument, lspDocument);
-    }
-
-    [Fact]
-    public async Task TestForksEventuallyWithDelayedWorkspaceEventAsync()
+    public async Task TestLspHasProjectChangesWithForkedTextAsync()
     {
         var markup = "One";
         using var testLspServer = await CreateTestLspServerAsync(markup);
         var documentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test1")).GetURI();
 
-        // Open the document via LSP and ensure it has the original assembly name.
-        var lspDocument = await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer);
-        Assert.Equal("Test", lspDocument?.Project.AssemblyName);
+        // Open the document via LSP with different text from the workspace and verify the initial project name.
+        var openedDocument = await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer);
+        Assert.Equal("Test", openedDocument?.Project.AssemblyName);
+        Assert.NotEqual(testLspServer.TestWorkspace.CurrentSolution, openedDocument!.Project.Solution);
 
         // Modify the project via the workspace.
         var newProject = testLspServer.TestWorkspace.CurrentSolution.Projects.First().WithAssemblyName("NewCSProj1");
-        testLspServer.TestWorkspace.TryApplyChanges(newProject.Solution);
-
-        // Assert that the LSP incremental solution is still present since we have not heard the workspace event.
-        lspDocument = GetLspDocument(documentUri, testLspServer);
-        AssertEx.NotNull(lspDocument);
-        Assert.Equal("Test", lspDocument.Project.AssemblyName);
-
-        // Actually send the project changed event.
         await testLspServer.TestWorkspace.ChangeProjectAsync(newProject.Id, newProject.Solution);
 
-        // Assert that the LSP incremental solution is cleared.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-
-        // Verify that the project change event is reflected in LSP.
-        lspDocument = GetLspDocument(documentUri, testLspServer);
-        AssertEx.NotNull(lspDocument);
-        Assert.Equal("NewCSProj1", lspDocument.Project.AssemblyName);
+        // Verify that the new LSP solution has the updated project info.
+        openedDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
+        AssertEx.NotNull(openedDocument);
+        Assert.Equal("LSP text", (await openedDocument.GetTextAsync(CancellationToken.None)).ToString());
+        Assert.Equal("NewCSProj1", openedDocument.Project.AssemblyName);
+        Assert.NotEqual(testLspServer.TestWorkspace.CurrentSolution, openedDocument.Project.Solution);
     }
 
     [Fact]
-    public async Task TestDidOpenFindsAddedWorkspaceDocumentAsync()
+    public async Task TestLspFindsNewDocumentAsync()
     {
         var markup = "One";
         using var testLspServer = await CreateTestLspServerAsync(markup);
         var documentUri = testLspServer.GetCurrentSolution().Projects.First().Documents.Single(d => d.FilePath!.Contains("test1")).GetURI();
 
         // Open the document via LSP to create the initial LSP solution.
-        await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer);
+        await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServer, markup);
 
-        // Add a new document to the workspace, but do not send document added event.
+        // Add a new document to the workspace
         var newDocumentId = DocumentId.CreateNewId(testLspServer.TestWorkspace.CurrentSolution.ProjectIds[0]);
-        var newSolution = testLspServer.TestWorkspace.CurrentSolution.AddDocument(newDocumentId, "NewDoc.cs", SourceText.From("New Doc"), filePath: @"C:\NewDoc.cs");
+        var newSolution = testLspServer.TestWorkspace.CurrentSolution.AddDocument(newDocumentId, "NewDoc.cs", SourceText.From("New Doc", System.Text.Encoding.UTF8), filePath: @"C:\NewDoc.cs");
         var newDocumentUri = newSolution.GetRequiredDocument(newDocumentId).GetURI();
-        testLspServer.TestWorkspace.TryApplyChanges(newSolution);
+        await testLspServer.TestWorkspace.ChangeSolutionAsync(newSolution);
 
-        // Verify that the lsp server forks again from the workspace and picks up the new document in the correct workspace on document open.
+        // Verify that the lsp server sees the workspace change and picks up the document in the correct workspace.
         await testLspServer.OpenDocumentAsync(newDocumentUri);
-        var lspDocument = GetLspDocument(newDocumentUri, testLspServer);
+        var lspDocument = await GetLspDocumentAsync(newDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(lspDocument);
-        Assert.Equal(testLspServer.TestWorkspace, lspDocument.Project.Solution.Workspace);
+        Assert.Equal(testLspServer.TestWorkspace.CurrentSolution, lspDocument.Project.Solution);
     }
 
     [Fact]
-    public async Task TestDocumentOpenedBeforeAddedToWorkspaceAsync()
+    public async Task TestLspTransfersDocumentToNewWorkspaceAsync()
     {
         var markup = "One";
         using var testLspServer = await CreateTestLspServerAsync(markup);
@@ -232,14 +201,14 @@ public async Task TestDocumentOpenedBeforeAddedToWorkspaceAsync()
         await testLspServer.OpenDocumentAsync(newDocumentUri, "LSP text");
 
         // Verify it is in the lsp misc workspace.
-        var miscDocument = GetLspDocument(newDocumentUri, testLspServer);
+        var miscDocument = await GetLspDocumentAsync(newDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(miscDocument);
         Assert.Equal(testLspServer.GetManagerAccessor().GetLspMiscellaneousFilesWorkspace(), miscDocument.Project.Solution.Workspace);
         Assert.Equal("LSP text", (await miscDocument.GetTextAsync(CancellationToken.None)).ToString());
 
         // Make a change and verify the misc document is updated.
         await testLspServer.InsertTextAsync(newDocumentUri, (0, 0, "More LSP text"));
-        miscDocument = GetLspDocument(newDocumentUri, testLspServer);
+        miscDocument = await GetLspDocumentAsync(newDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(miscDocument);
         var miscText = await miscDocument.GetTextAsync(CancellationToken.None);
         Assert.Equal("More LSP textLSP text", miscText.ToString());
@@ -247,11 +216,8 @@ public async Task TestDocumentOpenedBeforeAddedToWorkspaceAsync()
         // Update the registered workspace with the new document.
         await testLspServer.TestWorkspace.AddDocumentAsync(newDocumentInfo);
 
-        // Verify a fork was triggered.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-
         // Verify that the newly added document in the registered workspace is returned.
-        var document = GetLspDocument(newDocumentUri, testLspServer);
+        var document = await GetLspDocumentAsync(newDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(document);
         Assert.Equal(testLspServer.TestWorkspace, document.Project.Solution.Workspace);
         Assert.Equal(newDocumentId, document.Id);
@@ -279,7 +245,7 @@ public async Task TestUsesRegisteredHostWorkspace()
 
         using var testLspServer = await CreateXmlTestLspServerAsync(firstWorkspaceXml);
         // Verify 1 workspace registered to start with.
-        Assert.Equal(1, testLspServer.GetManagerAccessor().GetWorkspaceState().Count);
+        Assert.True(IsWorkspaceRegistered(testLspServer.TestWorkspace, testLspServer));
 
         var exportProvider = testLspServer.TestWorkspace.ExportProvider;
 
@@ -296,11 +262,11 @@ public async Task TestUsesRegisteredHostWorkspace()
         workspaceRegistrationService.Value.Register(testWorkspaceTwo);
 
         // Verify both workspaces registered.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-        Assert.Null(GetManagerWorkspaceState(testWorkspaceTwo, testLspServer));
+        Assert.True(IsWorkspaceRegistered(testLspServer.TestWorkspace, testLspServer));
+        Assert.True(IsWorkspaceRegistered(testWorkspaceTwo, testLspServer));
 
         // Verify the host workspace returned is the workspace with kind host.
-        var hostSolution = GetLspHostSolution(testLspServer);
+        var hostSolution = await GetLspHostSolutionAsync(testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(hostSolution);
         Assert.Equal("FirstWorkspaceProject", hostSolution.Projects.First().Name);
     }
@@ -322,10 +288,10 @@ public async Task TestWorkspaceRequestFailsWhenHostWorkspaceMissing()
         Assert.Equal(WorkspaceKind.Host, workspaceRegistrationService.Value.GetHostWorkspaceKind());
 
         // Verify the workspace is registered.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
+        Assert.True(IsWorkspaceRegistered(testLspServer.TestWorkspace, testLspServer));
 
         // Verify there is not workspace matching the host workspace kind.
-        Assert.Null(GetLspHostSolution(testLspServer));
+        Assert.Null(await GetLspHostSolutionAsync(testLspServer).ConfigureAwait(false));
     }
 
     [Fact]
@@ -357,24 +323,20 @@ public async Task TestLspUpdatesCorrectWorkspaceWithMultipleWorkspacesAsync()
         await WaitForWorkspaceOperationsAsync(testWorkspaceTwo);
 
         // Verify both workspaces registered.
-        Assert.Null(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-        Assert.Null(GetManagerWorkspaceState(testWorkspaceTwo, testLspServer));
+        Assert.True(IsWorkspaceRegistered(testLspServer.TestWorkspace, testLspServer));
+        Assert.True(IsWorkspaceRegistered(testWorkspaceTwo, testLspServer));
 
         var firstWorkspaceDocumentUri = ProtocolConversions.GetUriFromFilePath(@"C:\FirstWorkspace.cs");
         var secondWorkspaceDocumentUri = ProtocolConversions.GetUriFromFilePath(@"C:\SecondWorkspace.cs");
         await testLspServer.OpenDocumentAsync(firstWorkspaceDocumentUri);
 
-        // Verify both workspaces forked on document open.
-        Assert.NotNull(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-        Assert.NotNull(GetManagerWorkspaceState(testWorkspaceTwo, testLspServer));
-
         // Verify we can get both documents from their respective workspaces.
-        var firstDocument = GetLspDocument(firstWorkspaceDocumentUri, testLspServer);
+        var firstDocument = await GetLspDocumentAsync(firstWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(firstDocument);
         Assert.Equal(firstWorkspaceDocumentUri, firstDocument.GetURI());
         Assert.Equal(testLspServer.TestWorkspace, firstDocument.Project.Solution.Workspace);
 
-        var secondDocument = GetLspDocument(secondWorkspaceDocumentUri, testLspServer);
+        var secondDocument = await GetLspDocumentAsync(secondWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(secondDocument);
         Assert.Equal(secondWorkspaceDocumentUri, secondDocument.GetURI());
         Assert.Equal(testWorkspaceTwo, secondDocument.Project.Solution.Workspace);
@@ -383,14 +345,14 @@ public async Task TestLspUpdatesCorrectWorkspaceWithMultipleWorkspacesAsync()
         await testLspServer.InsertTextAsync(firstWorkspaceDocumentUri, (0, 0, "Change in first workspace"));
 
         // The first document should now different text.
-        var changedFirstDocument = GetLspDocument(firstWorkspaceDocumentUri, testLspServer);
+        var changedFirstDocument = await GetLspDocumentAsync(firstWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(changedFirstDocument);
         var changedFirstDocumentText = await changedFirstDocument.GetTextAsync(CancellationToken.None);
         var firstDocumentText = await firstDocument.GetTextAsync(CancellationToken.None);
         Assert.NotEqual(firstDocumentText, changedFirstDocumentText);
 
         // The second document should return the same document instance since it was not changed.
-        var unchangedSecondDocument = GetLspDocument(secondWorkspaceDocumentUri, testLspServer);
+        var unchangedSecondDocument = await GetLspDocumentAsync(secondWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         Assert.Equal(secondDocument, unchangedSecondDocument);
     }
 
@@ -428,12 +390,12 @@ public async Task TestWorkspaceEventUpdatesCorrectWorkspaceWithMultipleWorkspace
         await testLspServer.OpenDocumentAsync(firstWorkspaceDocumentUri);
 
         // Verify we can get both documents from their respective workspaces.
-        var firstDocument = GetLspDocument(firstWorkspaceDocumentUri, testLspServer);
+        var firstDocument = await GetLspDocumentAsync(firstWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(firstDocument);
         Assert.Equal(firstWorkspaceDocumentUri, firstDocument.GetURI());
         Assert.Equal(testLspServer.TestWorkspace, firstDocument.Project.Solution.Workspace);
 
-        var secondDocument = GetLspDocument(secondWorkspaceDocumentUri, testLspServer);
+        var secondDocument = await GetLspDocumentAsync(secondWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(secondDocument);
         Assert.Equal(secondWorkspaceDocumentUri, secondDocument.GetURI());
         Assert.Equal(testWorkspaceTwo, secondDocument.Project.Solution.Workspace);
@@ -443,13 +405,13 @@ public async Task TestWorkspaceEventUpdatesCorrectWorkspaceWithMultipleWorkspace
         await testWorkspaceTwo.ChangeProjectAsync(newProjectWorkspaceTwo.Id, newProjectWorkspaceTwo.Solution);
 
         // The second document should have an updated project assembly name.
-        var secondDocumentChangedProject = GetLspDocument(secondWorkspaceDocumentUri, testLspServer);
+        var secondDocumentChangedProject = await GetLspDocumentAsync(secondWorkspaceDocumentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(secondDocumentChangedProject);
         Assert.Equal("NewCSProj1", secondDocumentChangedProject.Project.AssemblyName);
         Assert.NotEqual(secondDocument, secondDocumentChangedProject);
 
         // The first document should be the same document as the last one since that workspace was not changed.
-        Assert.Equal(firstDocument, GetLspDocument(firstWorkspaceDocumentUri, testLspServer));
+        Assert.Equal(firstDocument, await GetLspDocumentAsync(firstWorkspaceDocumentUri, testLspServer).ConfigureAwait(false));
     }
 
     [Fact]
@@ -475,13 +437,13 @@ public async Task TestSeparateWorkspaceManagerPerServerAsync()
         Assert.NotEqual(testLspServerOne.GetManager(), testLspServerTwo.GetManager());
 
         // Verify workspace is registered with both servers.
-        Assert.Null(GetManagerWorkspaceState(testWorkspace, testLspServerOne));
-        Assert.Null(GetManagerWorkspaceState(testWorkspace, testLspServerTwo));
+        Assert.True(IsWorkspaceRegistered(testWorkspace, testLspServerOne));
+        Assert.True(IsWorkspaceRegistered(testWorkspace, testLspServerTwo));
 
         // Verify that the LSP solution uses the correct text for each server.
         var documentServerOne = await OpenDocumentAndVerifyLspTextAsync(documentUri, testLspServerOne, "Server one text");
 
-        var documentServerTwo = GetLspDocument(documentUri, testLspServerTwo);
+        var documentServerTwo = await GetLspDocumentAsync(documentUri, testLspServerTwo).ConfigureAwait(false);
         AssertEx.NotNull(documentServerTwo);
         Assert.Equal("Original text", (await documentServerTwo.GetTextAsync(CancellationToken.None)).ToString());
 
@@ -489,15 +451,12 @@ public async Task TestSeparateWorkspaceManagerPerServerAsync()
         var newAssemblyName = "NewCSProj1";
         var newProject = testWorkspace.CurrentSolution.Projects.First().WithAssemblyName(newAssemblyName);
         await testWorkspace.ChangeProjectAsync(newProject.Id, newProject.Solution);
-        // Verify lsp incremental solution cleared.
-        Assert.Null(GetManagerWorkspaceState(testWorkspace, testLspServerOne));
-        Assert.Null(GetManagerWorkspaceState(testWorkspace, testLspServerTwo));
 
         // Verify LSP solution has the project changes.
-        documentServerOne = GetLspDocument(documentUri, testLspServerOne);
+        documentServerOne = await GetLspDocumentAsync(documentUri, testLspServerOne).ConfigureAwait(false);
         AssertEx.NotNull(documentServerOne);
         Assert.Equal(newAssemblyName, documentServerOne.Project.AssemblyName);
-        documentServerTwo = GetLspDocument(documentUri, testLspServerTwo);
+        documentServerTwo = await GetLspDocumentAsync(documentUri, testLspServerTwo).ConfigureAwait(false);
         AssertEx.NotNull(documentServerTwo);
         Assert.Equal(newAssemblyName, documentServerTwo.Project.AssemblyName);
     }
@@ -506,28 +465,25 @@ private static async Task<Document> OpenDocumentAndVerifyLspTextAsync(Uri docume
     {
         await testLspServer.OpenDocumentAsync(documentUri, openText);
 
-        // Verify doc open created an LSP solution from the workspace.
-        Assert.NotNull(GetManagerWorkspaceState(testLspServer.TestWorkspace, testLspServer));
-
         // Verify we can find the document with correct text in the new LSP solution.
-        var lspDocument = GetLspDocument(documentUri, testLspServer);
+        var lspDocument = await GetLspDocumentAsync(documentUri, testLspServer).ConfigureAwait(false);
         AssertEx.NotNull(lspDocument);
         Assert.Equal(openText, (await lspDocument.GetTextAsync(CancellationToken.None)).ToString());
         return lspDocument;
     }
 
-    private static Solution? GetManagerWorkspaceState(Workspace workspace, TestLspServer testLspServer)
+    private static bool IsWorkspaceRegistered(Workspace workspace, TestLspServer testLspServer)
     {
-        return testLspServer.GetManagerAccessor().GetWorkspaceState()[workspace];
+        return testLspServer.GetManagerAccessor().IsWorkspaceRegistered(workspace);
     }
 
-    private static Document? GetLspDocument(Uri uri, TestLspServer testLspServer)
+    private static Task<Document?> GetLspDocumentAsync(Uri uri, TestLspServer testLspServer)
     {
-        return testLspServer.GetManager().GetLspDocument(CreateTextDocumentIdentifier(uri));
+        return testLspServer.GetManager().GetLspDocumentAsync(CreateTextDocumentIdentifier(uri), CancellationToken.None);
     }
 
-    private static Solution? GetLspHostSolution(TestLspServer testLspServer)
+    private static Task<Solution?> GetLspHostSolutionAsync(TestLspServer testLspServer)
     {
-        return testLspServer.GetManager().TryGetHostLspSolution();
+        return testLspServer.GetManager().TryGetHostLspSolutionAsync(CancellationToken.None);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Log/FunctionId.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Log/FunctionId.cs
index 6b927dfa17943..b488968f7bbe9 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Log/FunctionId.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Log/FunctionId.cs
@@ -546,5 +546,7 @@ internal enum FunctionId
         Refactoring_FixAllOccurrencesContext = 561,
         Refactoring_FixAllOccurrencesComputation = 562,
         Refactoring_FixAllOccurrencesPreviewChanges = 563,
+
+        LSP_UsedForkedSolution = 571,
     }
 }

From 32262aa488ca5fa5957b82d8a14625c3b15f43b3 Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Thu, 5 May 2022 15:01:38 -0700
Subject: [PATCH 245/413] break

---
 .../GenerateVariable/GenerateVariableTests.cs | 52 +++++++++++++++++++
 .../AbstractGenerateVariableService.cs        |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
index 12603becc5ad2..5f4df70641768 100644
--- a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9906,6 +9906,58 @@ public static int Method(this CancellationToken cancellationToken, int test)
     {
         return test;
     }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeAssortmentOfExceptions()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+public static class TestClass
+{
+    public static int Method(this CancellationToken cancellationToken, out int x, params bool[] z)
+    {
+        return [|test|];
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+public static class TestClass
+{
+    public static int Method(this CancellationToken cancellationToken, int test, out int x, params bool[] z)
+    {
+        return test;
+    }
+}", index: 4);
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeMultipleExceptions_BetweenOutParams()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(out int x, int y, out int z, params double[] x)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(out int x, int y, System.TimeSpan time, out int z, params double[] x)
+    {
+        await Task.Delay(time);
+    }
 }", index: 4);
         }
     }
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 525c0b1e5ec64..4536d92a44216 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -223,11 +223,15 @@ private static async Task AddParameterCodeActionsAsync(
                         if ((parameter.HasExplicitDefaultValue
                             || Equals(parameter.Type, compilation.CancellationTokenType())
                             || parameter.IsParams
-                            || parameter.IsRefOrOut())
+                            || parameter.RefKind is RefKind.Out)
                             && !(containingMethod.IsExtensionMethod && i == 0))
                         {
                             parameterIndex--;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                 }
 

From 61a9b78831570cc27077a52fc0f4f5ce1eafc22a Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Thu, 5 May 2022 15:07:16 -0700
Subject: [PATCH 246/413] Backport signed build fix from #59140

---
 azure-pipelines-official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index d8769d839667f..f023e4b097941 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -133,7 +133,7 @@ stages:
     # Authenticate with service connections to be able to publish packages to external nuget feeds.
     - task: NuGetAuthenticate@0
       inputs:
-        nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk, devdiv/engineering
+        nuGetServiceConnections: azure-public/vs-impl, azure-public/vssdk, devdiv/engineering, devdiv/dotnet-core-internal-tooling
 
     # Needed because the build fails the NuGet Tools restore without it
     - task: UseDotNet@2

From 8e0d4d4ef3e858a3f6742b8bf604c6ffc10e2698 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 15:38:28 -0700
Subject: [PATCH 247/413] Make the virtualcharservice produce the right virtual
 chars for raw strings

---
 .../CSharpVirtualCharServiceTests.cs          | 166 ++++++++++++++++--
 .../VirtualChars/CSharpVirtualCharService.cs  |  67 ++++++-
 .../Core/CompilerExtensions.projitems         |   3 +
 .../AbstractVirtualCharService.ITextInfo.cs   |  15 ++
 ...ctVirtualCharService.SourceTextTextInfo.cs |  17 ++
 ...stractVirtualCharService.StringTextInfo.cs |  15 ++
 .../AbstractVirtualCharService.cs             |  42 +++--
 7 files changed, 301 insertions(+), 24 deletions(-)
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index d07ec968d5455..667b5370db64d 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -2,13 +2,12 @@
 // 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.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.PooledObjects;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.CSharp.UnitTests.EmbeddedLanguages.VirtualChars
@@ -21,7 +20,7 @@ private static SyntaxToken GetStringToken(string text, bool allowFailure)
         {
             var statement = _statementPrefix + text;
             var parsedStatement = (LocalDeclarationStatementSyntax)SyntaxFactory.ParseStatement(statement);
-            var expression = parsedStatement.Declaration.Variables[0].Initializer.Value;
+            var expression = parsedStatement.Declaration.Variables[0].Initializer!.Value;
 
             if (expression is LiteralExpressionSyntax literal)
             {
@@ -52,7 +51,7 @@ private static void Test(string stringText, string expected)
             }
 
             var actual = ConvertToString(virtualChars);
-            Assert.Equal(expected, actual);
+            AssertEx.Equal(expected, actual);
         }
 
         private static void TestFailure(string stringText)
@@ -269,15 +268,162 @@ public void TestMixedSurrogate2()
         public void TestEscapedQuoteInVerbatimString()
             => Test("@\"a\"\"a\"", @"['a',[2,3]]['\u0022',[3,5]]['a',[5,6]]");
 
+        [Fact]
+        public void TestSingleLineRawString()
+            => Test(@"""""""goo""""""", @"['g',[3,4]]['o',[4,5]]['o',[5,6]]");
+
+        [Fact]
+        public void TestMultiLineRawString1()
+            => Test(@"""""""
+    goo
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]");
+
+        [Fact]
+        public void TestMultiLineRawString2()
+            => Test(@"""""""
+    goo
+    bar
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['b',[18,19]]['a',[19,20]]['r',[20,21]]");
+
+        [Fact]
+        public void TestMultiLineRawString3()
+            => Test(@"""""""
+    goo
+        bar
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[18,19]]['\u0020',[19,20]]['\u0020',[20,21]]['\u0020',[21,22]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineRawString4()
+            => Test(@"""""""
+        goo
+    bar
+    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]['\u0020',[11,12]]['\u0020',[12,13]]['g',[13,14]]['o',[14,15]]['o',[15,16]]['\u000D',[16,17]]['\u000A',[17,18]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineRawString5()
+            => Test(@"""""""
+    goo
+
+    bar
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]");
+
+        [Fact]
+        public void TestMultiLineRawString6()
+            => Test(@"""""""
+    goo
+    
+    bar
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[18,19]]['\u000A',[19,20]]['b',[24,25]]['a',[25,26]]['r',[26,27]]");
+
+        [Fact]
+        public void TestMultiLineRawString7()
+            => Test(@"""""""
+    goo
+      
+    bar
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[18,19]]['\u0020',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['b',[26,27]]['a',[27,28]]['r',[28,29]]");
+
+        [Fact]
+        public void TestMultiLineRawString8()
+            => Test(@"""""""
+    goo
+
+    bar
+
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineRawString9()
+            => Test(@"""""""
+    goo
+
+    bar
+    
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineRawString10()
+            => Test(@"""""""
+    goo
+
+    bar
+      
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['\u0020',[29,30]]['\u0020',[30,31]]");
+
+        [Fact]
+        public void TestMultiLineRawString11()
+            => Test(@"""""""
+goo
+
+bar
+""""""", @"['g',[5,6]]['o',[6,7]]['o',[7,8]]['\u000D',[8,9]]['\u000A',[9,10]]['\u000D',[10,11]]['\u000A',[11,12]]['b',[12,13]]['a',[13,14]]['r',[14,15]]");
+
+        [Fact]
+        public void TestMultiLineRawString12()
+            => Test(@"""""""
+  goo
+
+  bar
+""""""", @"['\u0020',[5,6]]['\u0020',[6,7]]['g',[7,8]]['o',[8,9]]['o',[9,10]]['\u000D',[10,11]]['\u000A',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[14,15]]['\u0020',[15,16]]['b',[16,17]]['a',[17,18]]['r',[18,19]]");
+
+        [Fact]
+        public void TestMultiLineRawString13()
+            => Test(@"""""""
+
+    goo
+
+    bar
+    """"""", @"['\u000D',[5,6]]['\u000A',[6,7]]['g',[11,12]]['o',[12,13]]['o',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['\u000D',[16,17]]['\u000A',[17,18]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineRawString14()
+            => Test(@"""""""
+    
+    goo
+
+    bar
+    """"""", @"['\u000D',[9,10]]['\u000A',[10,11]]['g',[15,16]]['o',[16,17]]['o',[17,18]]['\u000D',[18,19]]['\u000A',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['b',[26,27]]['a',[27,28]]['r',[28,29]]");
+
+        [Fact]
+        public void TestMultiLineRawString15()
+            => Test(@"""""""
+      
+    goo
+
+    bar
+    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['g',[17,18]]['o',[18,19]]['o',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['\u000D',[22,23]]['\u000A',[23,24]]['b',[28,29]]['a',[29,30]]['r',[30,31]]");
+
+        [Fact]
+        public void TestMultiLineRawString16()
+            => Test(@"""""""
+
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineRawString17()
+            => Test(@"""""""
+    
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineRawString18()
+            => Test(@"""""""
+      
+    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]");
+
+        [Fact]
+        public void TestMultiLineRawString19()
+            => Test(@"""""""  
+    goo
+    """"""", @"['g',[11,12]]['o',[12,13]]['o',[13,14]]");
+
         private static string ConvertToString(VirtualCharSequence virtualChars)
         {
-            var strings = ArrayBuilder<string>.GetInstance();
+            using var _ = ArrayBuilder<string>.GetInstance(out var strings);
             foreach (var ch in virtualChars)
-            {
                 strings.Add(ConvertToString(ch));
-            }
 
-            return string.Join("", strings.ToImmutableAndFree());
+            return string.Join("", strings);
         }
 
         private static string ConvertToString(VirtualChar vc)
@@ -291,14 +437,10 @@ private static string ConvertRuneToString(VirtualChar c)
         private static bool PrintAsUnicodeEscape(VirtualChar c)
         {
             if (c < (char)127 && char.IsLetterOrDigit((char)c.Value))
-            {
                 return false;
-            }
 
             if (c == '{' || c == '}')
-            {
                 return false;
-            }
 
             return true;
         }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index b3d83ada47339..2cbeb6c43947a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Utilities;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.VirtualChars
@@ -139,8 +140,70 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(SyntaxToken
                 }
             }
 
-            for (var index = startIndexInclusive; index < endIndexExclusive;)
-                index += ConvertTextAtIndexToRune(tokenText, index, result, offset);
+            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.UTF8SingleLineRawStringLiteralToken)
+            {
+                for (var index = startIndexInclusive; index < endIndexExclusive;)
+                    index += ConvertTextAtIndexToRune(tokenText, index, result, offset);
+            }
+            else
+            {
+                var sourceText = SourceText.From(tokenText);
+
+                // safe to index because we know the multiline literal is well formed.
+                var lastLine = sourceText.Lines[^1];
+                var indentationLength = lastLine.GetFirstNonWhitespaceOffset() ?? 0;
+
+                for (var lineNumber = 1; lineNumber < sourceText.Lines.Count - 1; lineNumber++)
+                {
+                    var currentLine = sourceText.Lines[lineNumber];
+                    var lineSpan = currentLine.Span;
+                    var isLastLine = lineNumber == sourceText.Lines.Count - 2;
+
+                    var start = lineSpan.Length > indentationLength
+                        ? lineSpan.Start + indentationLength
+                        : lineSpan.End;
+
+                    var end = isLastLine ? currentLine.End : currentLine.EndIncludingLineBreak;
+
+                    for (var i = start; i < end; )
+                        i += ConvertTextAtIndexToRune(sourceText, i, result, offset);
+                }
+
+#if false
+
+                while (CSharp.SyntaxFacts.IsWhitespace(tokenText[startIndexInclusive]))
+                    startIndexInclusive++;
+
+                Contract.ThrowIfFalse(CSharp.SyntaxFacts.IsNewLine(tokenText[startIndexInclusive]));
+
+                // indexing at +1 is safe because we only get here if the raw literal is well formed, which means it has
+                // to have at least two new lines in it.
+                if (tokenText[startIndexInclusive] is '\r' && tokenText[startIndexInclusive + 1] is '\n')
+                    startIndexInclusive += 2;
+                else
+                    startIndexInclusive++;
+
+                var beforeEndDelimeterPosition = endIndexExclusive;
+                while (CSharp.SyntaxFacts.IsWhitespace(tokenText[endIndexExclusive - 1]))
+                    endIndexExclusive--;
+
+                Contract.ThrowIfFalse(CSharp.SyntaxFacts.IsNewLine(tokenText[endIndexExclusive - 1]));
+
+                var indentationToSkip = beforeEndDelimeterPosition - endIndexExclusive;
+
+                if (tokenText[endIndexExclusive - 1] is '\n' && tokenText[endIndexExclusive - 2] is '\r')
+                    endIndexExclusive -= 2;
+                else
+                    endIndexExclusive--;
+
+                var index = startIndexInclusive;
+                while (index < endIndexExclusive)
+                {
+                    // first, skip the leading whitespace on a line.
+                    index += indentationToSkip;
+                }
+#endif
+            }
 
             return CreateVirtualCharSequence(tokenText, offset, startIndexInclusive, endIndexExclusive, result);
         }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
index 53a4405df7ffb..c1863339a13ad 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
@@ -220,6 +220,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\Common\EmbeddedSyntaxTree.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\Common\EmbeddedSyntaxTrivia.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.ITextInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.SourceTextTextInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.StringTextInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\IVirtualCharService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualChar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualCharSequence.Chunks.cs" />
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
new file mode 100644
index 0000000000000..0313d2f104288
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
@@ -0,0 +1,15 @@
+// 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.EmbeddedLanguages.VirtualChars
+{
+    internal abstract partial class AbstractVirtualCharService
+    {
+        private interface ITextInfo<T>
+        {
+            char Get(T text, int index);
+            int Length(T text);
+        }
+    }
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
new file mode 100644
index 0000000000000..1777ca3b8ed7a
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
@@ -0,0 +1,17 @@
+// 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.Text;
+
+namespace Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars
+{
+    internal abstract partial class AbstractVirtualCharService
+    {
+        private struct SourceTextTextInfo : ITextInfo<SourceText>
+        {
+            public char Get(SourceText text, int index) => text[index];
+            public int Length(SourceText text) => text.Length;
+        }
+    }
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs
new file mode 100644
index 0000000000000..d35f6965955e9
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs
@@ -0,0 +1,15 @@
+// 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.EmbeddedLanguages.VirtualChars
+{
+    internal abstract partial class AbstractVirtualCharService
+    {
+        private struct StringTextInfo : ITextInfo<string>
+        {
+            public char Get(string text, int index) => text[index];
+            public int Length(string text) => text.Length;
+        }
+    }
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
index a5d1a5eb90623..6119e594fcca5 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars
 {
-    internal abstract class AbstractVirtualCharService : IVirtualCharService
+    internal abstract partial class AbstractVirtualCharService : IVirtualCharService
     {
         public abstract bool TryGetEscapeCharacter(VirtualChar ch, out char escapedChar);
 
@@ -94,11 +94,23 @@ private void CheckInvariants(SyntaxToken token, VirtualCharSequence result)
                         Debug.Assert(currentVC.Span.Start == token.SpanStart, "First span should start on the first char of the string.");
                     }
 
-                    for (var i = 1; i < result.Length; i++)
+                    if (token.RawKind == syntaxKinds.MultiLineRawStringLiteralToken || token.RawKind == syntaxKinds.UTF8MultiLineRawStringLiteralToken)
                     {
-                        var nextVC = result[i];
-                        Debug.Assert(currentVC.Span.End == nextVC.Span.Start, "Virtual character spans have to be touching.");
-                        currentVC = nextVC;
+                        for (var i = 1; i < result.Length; i++)
+                        {
+                            var nextVC = result[i];
+                            Debug.Assert(currentVC.Span.End <= nextVC.Span.Start, "Virtual character spans have to be ordered.");
+                            currentVC = nextVC;
+                        }
+                    }
+                    else
+                    {
+                        for (var i = 1; i < result.Length; i++)
+                        {
+                            var nextVC = result[i];
+                            Debug.Assert(currentVC.Span.End == nextVC.Span.Start, "Virtual character spans have to be touching.");
+                            currentVC = nextVC;
+                        }
                     }
 
                     var lastVC = result.Last();
@@ -185,15 +197,25 @@ protected static VirtualCharSequence TryConvertSimpleDoubleQuoteString(
         /// Returns the number of characters to jump forward (either 1 or 2);
         /// </summary>
         protected static int ConvertTextAtIndexToRune(string tokenText, int index, ImmutableSegmentedList<VirtualChar>.Builder result, int offset)
+            => ConvertTextAtIndexToRune(tokenText, index, new StringTextInfo(), result, offset);
+
+        protected static int ConvertTextAtIndexToRune(SourceText tokenText, int index, ImmutableSegmentedList<VirtualChar>.Builder result, int offset)
+            => ConvertTextAtIndexToRune(tokenText, index, new SourceTextTextInfo(), result, offset);
+
+        private static int ConvertTextAtIndexToRune<T, TTextInfo>(
+            T tokenText, int index, TTextInfo info, ImmutableSegmentedList<VirtualChar>.Builder result, int offset)
+            where TTextInfo : struct, ITextInfo<T>
         {
-            if (Rune.TryCreate(tokenText[index], out var rune))
+            var ch = info.Get(tokenText, index);
+
+            if (Rune.TryCreate(ch, out var rune))
             {
                 // First, see if this was a single char that can become a rune (the common case).
                 result.Add(VirtualChar.Create(rune, new TextSpan(offset + index, 1)));
                 return 1;
             }
-            else if (index + 1 < tokenText.Length &&
-                     Rune.TryCreate(tokenText[index], tokenText[index + 1], out rune))
+            else if (index + 1 < info.Length(tokenText) &&
+                     Rune.TryCreate(ch, info.Get(tokenText, index + 1), out rune))
             {
                 // Otherwise, see if we have a surrogate pair (less common, but possible).
                 result.Add(VirtualChar.Create(rune, new TextSpan(offset + index, 2)));
@@ -202,8 +224,8 @@ protected static int ConvertTextAtIndexToRune(string tokenText, int index, Immut
             else
             {
                 // Something that couldn't be encoded as runes.
-                Debug.Assert(char.IsSurrogate(tokenText[index]));
-                result.Add(VirtualChar.Create(tokenText[index], new TextSpan(offset + index, 1)));
+                Debug.Assert(char.IsSurrogate(ch));
+                result.Add(VirtualChar.Create(ch, new TextSpan(offset + index, 1)));
                 return 1;
             }
         }

From 0cdaf0c975ef45346b01c45aa508cab63b5fbd13 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 15:45:00 -0700
Subject: [PATCH 248/413] Simplify tests

---
 .../CSharpVirtualCharServiceTests.cs          | 152 ++++++++----------
 1 file changed, 65 insertions(+), 87 deletions(-)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index 667b5370db64d..d05ec4bdba055 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -3,11 +3,15 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Test.Utilities;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.CSharp.UnitTests.EmbeddedLanguages.VirtualChars
@@ -16,7 +20,7 @@ public class CSharpVirtualCharServiceTests
     {
         private const string _statementPrefix = "var v = ";
 
-        private static SyntaxToken GetStringToken(string text, bool allowFailure)
+        private static IEnumerable<SyntaxToken>? GetStringTokens(string text, bool allowFailure)
         {
             var statement = _statementPrefix + text;
             var parsedStatement = (LocalDeclarationStatementSyntax)SyntaxFactory.ParseStatement(statement);
@@ -24,15 +28,15 @@ private static SyntaxToken GetStringToken(string text, bool allowFailure)
 
             if (expression is LiteralExpressionSyntax literal)
             {
-                return literal.Token;
+                return SpecializedCollections.SingletonEnumerable(literal.Token);
             }
             else if (expression is InterpolatedStringExpressionSyntax interpolation)
             {
-                return ((InterpolatedStringTextSyntax)interpolation.Contents[0]).TextToken;
+                return interpolation.Contents.OfType<InterpolatedStringTextSyntax>().Select(t => t.TextToken);
             }
             else if (allowFailure)
             {
-                return default;
+                return null;
             }
             else
             {
@@ -42,26 +46,64 @@ private static SyntaxToken GetStringToken(string text, bool allowFailure)
 
         private static void Test(string stringText, string expected)
         {
-            var token = GetStringToken(stringText, allowFailure: false);
-            var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(token);
-            foreach (var ch in virtualChars)
+            var tokens = GetStringTokens(stringText, allowFailure: false);
+            Contract.ThrowIfNull(tokens);
+            foreach (var token in tokens)
+                Assert.False(token.ContainsDiagnostics);
+
+            var virtualCharsArray = tokens.Select(CSharpVirtualCharService.Instance.TryConvertToVirtualChars);
+            foreach (var virtualChars in virtualCharsArray)
             {
-                for (var i = ch.Span.Start; i < ch.Span.End; i++)
-                    Assert.Equal(ch, virtualChars.Find(i));
+                foreach (var ch in virtualChars)
+                {
+                    for (var i = ch.Span.Start; i < ch.Span.End; i++)
+                        Assert.Equal(ch, virtualChars.Find(i));
+                }
             }
 
-            var actual = ConvertToString(virtualChars);
+            var actual = string.Join("", virtualCharsArray.Select(ConvertToString));
             AssertEx.Equal(expected, actual);
         }
 
         private static void TestFailure(string stringText)
         {
-            var token = GetStringToken(stringText, allowFailure: true);
-            if (token == default)
+            var tokens = GetStringTokens(stringText, allowFailure: true);
+            if (tokens == null)
                 return;
 
-            var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(token);
-            Assert.True(virtualChars.IsDefault);
+            foreach (var token in tokens)
+            {
+                var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(token);
+                Assert.True(virtualChars.IsDefault);
+            }
+        }
+
+        private static string ConvertToString(VirtualCharSequence virtualChars)
+        {
+            using var _ = ArrayBuilder<string>.GetInstance(out var strings);
+            foreach (var ch in virtualChars)
+                strings.Add(ConvertToString(ch));
+
+            return string.Join("", strings);
+        }
+
+        private static string ConvertToString(VirtualChar vc)
+            => $"[{ConvertRuneToString(vc)},[{vc.Span.Start - _statementPrefix.Length},{vc.Span.End - _statementPrefix.Length}]]";
+
+        private static string ConvertRuneToString(VirtualChar c)
+            => PrintAsUnicodeEscape(c)
+                ? c <= char.MaxValue ? $"'\\u{c.Value:X4}'" : $"'\\U{c.Value:X8}'"
+                : $"'{(char)c.Value}'";
+
+        private static bool PrintAsUnicodeEscape(VirtualChar c)
+        {
+            if (c < (char)127 && char.IsLetterOrDigit((char)c.Value))
+                return false;
+
+            if (c == '{' || c == '}')
+                return false;
+
+            return true;
         }
 
         [Fact]
@@ -194,75 +236,39 @@ public void TestValidLongEscape3_InCharRange()
 
         [Fact]
         public void TestValidLongEscape1_NotInCharRange()
-        {
-            var token = GetStringToken(@"""\U00010000""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\U00010000""", @"['\U00010000',[1,11]]");
-        }
+            => Test(@"""\U00010000""", @"['\U00010000',[1,11]]");
 
         [Fact]
         public void TestValidLongEscape2_NotInCharRange()
-        {
-            var token = GetStringToken(@"""\U0002A6A5𪚥""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\U0002A6A5𪚥""", @"['\U0002A6A5',[1,11]]['\U0002A6A5',[11,13]]");
-        }
+            => Test(@"""\U0002A6A5𪚥""", @"['\U0002A6A5',[1,11]]['\U0002A6A5',[11,13]]");
 
         [Fact]
         public void TestSurrogate1()
-        {
-            var token = GetStringToken(@"""😊""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""😊""", @"['\U0001F60A',[1,3]]");
-        }
+            => Test(@"""😊""", @"['\U0001F60A',[1,3]]");
 
         [Fact]
         public void TestSurrogate2()
-        {
-            var token = GetStringToken(@"""\U0001F60A""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\U0001F60A""", @"['\U0001F60A',[1,11]]");
-        }
+            => Test(@"""\U0001F60A""", @"['\U0001F60A',[1,11]]");
 
         [Fact]
         public void TestSurrogate3()
-        {
-            var token = GetStringToken(@"""\ud83d\ude0a""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\ud83d\ude0a""", @"['\U0001F60A',[1,13]]");
-        }
+            => Test(@"""\ud83d\ude0a""", @"['\U0001F60A',[1,13]]");
 
         [Fact]
         public void TestHighSurrogate()
-        {
-            var token = GetStringToken(@"""\ud83d""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\ud83d""", @"['\uD83D',[1,7]]");
-        }
+            => Test(@"""\ud83d""", @"['\uD83D',[1,7]]");
 
         [Fact]
         public void TestLowSurrogate()
-        {
-            var token = GetStringToken(@"""\ude0a""", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test(@"""\ude0a""", @"['\uDE0A',[1,7]]");
-        }
+            => Test(@"""\ude0a""", @"['\uDE0A',[1,7]]");
 
         [Fact]
         public void TestMixedSurrogate1()
-        {
-            var token = GetStringToken("\"\ud83d\\ude0a\"", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test("\"\ud83d\\ude0a\"", @"['\U0001F60A',[1,8]]");
-        }
+            => Test("\"\ud83d\\ude0a\"", @"['\U0001F60A',[1,8]]");
 
         [Fact]
         public void TestMixedSurrogate2()
-        {
-            var token = GetStringToken("\"\\ud83d\ude0a\"", allowFailure: false);
-            Assert.False(token.ContainsDiagnostics);
-            Test("\"\\ud83d\ude0a\"", @"['\U0001F60A',[1,8]]");
-        }
+            => Test("\"\\ud83d\ude0a\"", @"['\U0001F60A',[1,8]]");
 
         [Fact]
         public void TestEscapedQuoteInVerbatimString()
@@ -416,33 +422,5 @@ public void TestMultiLineRawString19()
             => Test(@"""""""  
     goo
     """"""", @"['g',[11,12]]['o',[12,13]]['o',[13,14]]");
-
-        private static string ConvertToString(VirtualCharSequence virtualChars)
-        {
-            using var _ = ArrayBuilder<string>.GetInstance(out var strings);
-            foreach (var ch in virtualChars)
-                strings.Add(ConvertToString(ch));
-
-            return string.Join("", strings);
-        }
-
-        private static string ConvertToString(VirtualChar vc)
-            => $"[{ConvertRuneToString(vc)},[{vc.Span.Start - _statementPrefix.Length},{vc.Span.End - _statementPrefix.Length}]]";
-
-        private static string ConvertRuneToString(VirtualChar c)
-            => PrintAsUnicodeEscape(c)
-                ? c <= char.MaxValue ? $"'\\u{(int)c.Value:X4}'" : $"'\\U{(int)c.Value:X8}'"
-                : $"'{(char)c.Value}'";
-
-        private static bool PrintAsUnicodeEscape(VirtualChar c)
-        {
-            if (c < (char)127 && char.IsLetterOrDigit((char)c.Value))
-                return false;
-
-            if (c == '{' || c == '}')
-                return false;
-
-            return true;
-        }
     }
 }

From 0b6c22e7b9c1a0a7a5bdab9f28d6d40776b982c2 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Thu, 5 May 2022 15:45:38 -0700
Subject: [PATCH 249/413] Bump NuGet version to match pinned SDK

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 2fb14f5a3a88d..6fbbc95b36ac6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -208,7 +208,7 @@
       is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
       as our configured SDK, we must set the version to be the same.
      -->
-    <NuGetCommonVersion>6.0.0</NuGetCommonVersion>
+    <NuGetCommonVersion>6.2.0-preview.2.80</NuGetCommonVersion>
     <NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
     <NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
     <NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>

From 7a50a1cb507afd7c56e96e14afbda6a0d107c445 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 16:10:36 -0700
Subject: [PATCH 250/413] Simplify

---
 .../VirtualChars/CSharpVirtualCharService.cs  | 133 ++++++++----------
 1 file changed, 61 insertions(+), 72 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index 2cbeb6c43947a..4d9ba420f9b60 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis.Collections;
 using Microsoft.CodeAnalysis.CSharp.LanguageServices;
@@ -62,13 +63,17 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
             if (token.Kind() == SyntaxKind.CharacterLiteralToken)
                 return TryConvertStringToVirtualChars(token, "'", "'", escapeBraces: false);
 
-            if (IsAnyRawStringLiteralToken(token))
-                return TryConvertRawStringToVirtualChars(token);
+            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.UTF8SingleLineRawStringLiteralToken)
+                return TryConvertSingleLineRawStringToVirtualChars(token);
+
+            if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
+                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), isFirstChunk: true, isLastChunk: true);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
                 var parent = token.GetRequiredParent();
-                if (parent is InterpolationFormatClauseSyntax)
+                var isFormatClause = parent is InterpolationFormatClauseSyntax;
+                if (isFormatClause)
                     parent = parent.GetRequiredParent();
 
                 if (parent.Parent is InterpolatedStringExpressionSyntax interpolatedString)
@@ -79,8 +84,20 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                             => TryConvertStringToVirtualChars(token, "", "", escapeBraces: true),
                         SyntaxKind.InterpolatedVerbatimStringStartToken
                             => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
-                        SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedMultiLineRawStringStartToken
-                            => TryConvertRawStringToVirtualChars(token),
+                        SyntaxKind.InterpolatedSingleLineRawStringStartToken
+                            // Format clauses must be single line
+                            => isFormatClause
+                                ? TryConvertSingleLineRawStringToVirtualChars(token)
+                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString,
+                                    isFirstChunk: token.Parent == interpolatedString.Contents.First(),
+                                    isLastChunk: token.Parent == interpolatedString.Contents.Last()),
+                        SyntaxKind.InterpolatedMultiLineRawStringStartToken
+                            // Format clauses must be single line
+                            => isFormatClause
+                                ? TryConvertSingleLineRawStringToVirtualChars(token)
+                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString,
+                                    isFirstChunk: token.Parent == interpolatedString.Contents.First(),
+                                    isLastChunk: token.Parent == interpolatedString.Contents.Last()),
                         _ => default,
                     };
                 }
@@ -89,12 +106,6 @@ SyntaxKind.InterpolatedSingleLineRawStringStartToken or SyntaxKind.InterpolatedM
             return default;
         }
 
-        private static bool IsAnyRawStringLiteralToken(SyntaxToken token)
-            => token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or
-                               SyntaxKind.MultiLineRawStringLiteralToken or
-                               SyntaxKind.UTF8SingleLineRawStringLiteralToken or
-                               SyntaxKind.UTF8MultiLineRawStringLiteralToken;
-
         private static bool IsInDirective(SyntaxNode? node)
         {
             while (node != null)
@@ -111,7 +122,7 @@ private static bool IsInDirective(SyntaxNode? node)
         private static VirtualCharSequence TryConvertVerbatimStringToVirtualChars(SyntaxToken token, string startDelimiter, string endDelimiter, bool escapeBraces)
             => TryConvertSimpleDoubleQuoteString(token, startDelimiter, endDelimiter, escapeBraces);
 
-        private static VirtualCharSequence TryConvertRawStringToVirtualChars(SyntaxToken token)
+        private static VirtualCharSequence TryConvertSingleLineRawStringToVirtualChars(SyntaxToken token)
         {
             var tokenText = token.Text;
             var offset = token.SpanStart;
@@ -121,15 +132,15 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(SyntaxToken
             var startIndexInclusive = 0;
             var endIndexExclusive = tokenText.Length;
 
-            if (IsAnyRawStringLiteralToken(token))
+            if (token.Kind() is SyntaxKind.UTF8SingleLineRawStringLiteralToken)
             {
-                Contract.ThrowIfFalse(tokenText[0] == '"');
+                Contract.ThrowIfFalse(tokenText is [.., 'u' or 'U', '8']);
+                endIndexExclusive -= "u8".Length;
+            }
 
-                if (token.Kind() is SyntaxKind.UTF8SingleLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                {
-                    Contract.ThrowIfFalse(tokenText is [.., 'u' or 'U', '8']);
-                    endIndexExclusive -= "u8".Length;
-                }
+            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.UTF8SingleLineRawStringLiteralToken)
+            {
+                Contract.ThrowIfFalse(tokenText[0] == '"');
 
                 while (tokenText[startIndexInclusive] == '"')
                 {
@@ -140,72 +151,50 @@ private static VirtualCharSequence TryConvertRawStringToVirtualChars(SyntaxToken
                 }
             }
 
-            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.UTF8SingleLineRawStringLiteralToken)
-            {
-                for (var index = startIndexInclusive; index < endIndexExclusive;)
-                    index += ConvertTextAtIndexToRune(tokenText, index, result, offset);
-            }
-            else
-            {
-                var sourceText = SourceText.From(tokenText);
-
-                // safe to index because we know the multiline literal is well formed.
-                var lastLine = sourceText.Lines[^1];
-                var indentationLength = lastLine.GetFirstNonWhitespaceOffset() ?? 0;
-
-                for (var lineNumber = 1; lineNumber < sourceText.Lines.Count - 1; lineNumber++)
-                {
-                    var currentLine = sourceText.Lines[lineNumber];
-                    var lineSpan = currentLine.Span;
-                    var isLastLine = lineNumber == sourceText.Lines.Count - 2;
-
-                    var start = lineSpan.Length > indentationLength
-                        ? lineSpan.Start + indentationLength
-                        : lineSpan.End;
+            for (var index = startIndexInclusive; index < endIndexExclusive;)
+                index += ConvertTextAtIndexToRune(tokenText, index, result, offset);
 
-                    var end = isLastLine ? currentLine.End : currentLine.EndIncludingLineBreak;
+            return CreateVirtualCharSequence(tokenText, offset, startIndexInclusive, endIndexExclusive, result);
+        }
 
-                    for (var i = start; i < end; )
-                        i += ConvertTextAtIndexToRune(sourceText, i, result, offset);
-                }
+        private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
+            SyntaxToken token, ExpressionSyntax parentExpression, bool isFirstChunk, bool isLastChunk)
+        {
+            if (parentExpression.GetDiagnostics().Any(d => d.Severity == DiagnosticSeverity.Error))
+                return default;
 
-#if false
+            var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
 
-                while (CSharp.SyntaxFacts.IsWhitespace(tokenText[startIndexInclusive]))
-                    startIndexInclusive++;
+            var parentSourceText = parentExpression.SyntaxTree.GetText();
+            var indentationLength = parentSourceText.Lines.GetLineFromPosition(parentExpression.Span.End).GetFirstNonWhitespaceOffset() ?? 0;
 
-                Contract.ThrowIfFalse(CSharp.SyntaxFacts.IsNewLine(tokenText[startIndexInclusive]));
+            var sourceText = SourceText.From(token.Text);
 
-                // indexing at +1 is safe because we only get here if the raw literal is well formed, which means it has
-                // to have at least two new lines in it.
-                if (tokenText[startIndexInclusive] is '\r' && tokenText[startIndexInclusive + 1] is '\n')
-                    startIndexInclusive += 2;
-                else
-                    startIndexInclusive++;
+            // If we're on the very first chunk of the multi-line raw string, then we want to start on line 1 so we skip
+            // the space and newline that follow the initial `"""`.
+            var startLineInclusive = isFirstChunk ? 1 : 0;
 
-                var beforeEndDelimeterPosition = endIndexExclusive;
-                while (CSharp.SyntaxFacts.IsWhitespace(tokenText[endIndexExclusive - 1]))
-                    endIndexExclusive--;
+            // Similarly, if we're on the very last chunk of hte multi-line string, then we don't want to include the
+            // line contents for the line that has the final `    """` on it.
+            var lastLineExclusive = isLastChunk ? sourceText.Lines.Count - 1 : sourceText.Lines.Count;
 
-                Contract.ThrowIfFalse(CSharp.SyntaxFacts.IsNewLine(tokenText[endIndexExclusive - 1]));
+            for (var lineNumber = startLineInclusive; lineNumber < lastLineExclusive; lineNumber++)
+            {
+                var currentLine = sourceText.Lines[lineNumber];
+                var lineSpan = currentLine.Span;
 
-                var indentationToSkip = beforeEndDelimeterPosition - endIndexExclusive;
+                var lineStart = lineSpan.Length > indentationLength
+                    ? lineSpan.Start + indentationLength
+                    : lineSpan.End;
 
-                if (tokenText[endIndexExclusive - 1] is '\n' && tokenText[endIndexExclusive - 2] is '\r')
-                    endIndexExclusive -= 2;
-                else
-                    endIndexExclusive--;
+                // The last line of the last chunk does not include the final newline on the line.
+                var lineEnd = isLastChunk && lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;
 
-                var index = startIndexInclusive;
-                while (index < endIndexExclusive)
-                {
-                    // first, skip the leading whitespace on a line.
-                    index += indentationToSkip;
-                }
-#endif
+                for (var i = lineStart; i < lineEnd;)
+                    i += ConvertTextAtIndexToRune(sourceText, i, result, token.SpanStart);
             }
 
-            return CreateVirtualCharSequence(tokenText, offset, startIndexInclusive, endIndexExclusive, result);
+            return VirtualCharSequence.Create(result.ToImmutable());
         }
 
         private static VirtualCharSequence TryConvertStringToVirtualChars(

From 01d38b098f3fa7f564fa0904f055f8fcf6751b0b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 16:52:27 -0700
Subject: [PATCH 251/413] Work on interpolations

---
 .../CSharpVirtualCharServiceTests.cs          | 40 +++++++++++++++++++
 .../VirtualChars/CSharpVirtualCharService.cs  |  9 +----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index d05ec4bdba055..7810d7cad381e 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -422,5 +422,45 @@ public void TestMultiLineRawString19()
             => Test(@"""""""  
     goo
     """"""", @"['g',[11,12]]['o',[12,13]]['o',[13,14]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString1()
+            => Test(@"$""""""goo""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString2()
+            => Test(@"$""""""goo{0}""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString3()
+            => Test(@"$""""""{0}goo""""""", @"['g',[7,8]]['o',[8,9]]['o',[9,10]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString4()
+            => Test(@"$""""""{0}goo{1}""""""", @"['g',[7,8]]['o',[8,9]]['o',[9,10]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString5()
+            => Test(@"$""""""goo{0}{1}""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString6()
+            => Test(@"$""""""{0}{1}goo""""""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString7()
+            => Test(@"$""""""goo{0}bar{1}""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]['b',[10,11]]['a',[11,12]]['r',[12,13]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString8()
+            => Test(@"$""""""{0}goo{1}bar""""""", @"['g',[7,8]]['o',[8,9]]['o',[9,10]]['b',[13,14]]['a',[14,15]]['r',[15,16]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString9()
+            => Test(@"$""""""goo{0}{1}bar""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]['b',[13,14]]['a',[14,15]]['r',[15,16]]");
+
+        [Fact]
+        public void TestSingleLineInterpolatedRawString10()
+            => Test(@"$""""""goo{0}bar{1}baz""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]['b',[10,11]]['a',[11,12]]['r',[12,13]]['b',[16,17]]['a',[17,18]]['z',[18,19]]");
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index 4d9ba420f9b60..bb6e6c912879e 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -85,14 +85,9 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                         SyntaxKind.InterpolatedVerbatimStringStartToken
                             => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
                         SyntaxKind.InterpolatedSingleLineRawStringStartToken
-                            // Format clauses must be single line
-                            => isFormatClause
-                                ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString,
-                                    isFirstChunk: token.Parent == interpolatedString.Contents.First(),
-                                    isLastChunk: token.Parent == interpolatedString.Contents.Last()),
+                            => TryConvertSingleLineRawStringToVirtualChars(token),
                         SyntaxKind.InterpolatedMultiLineRawStringStartToken
-                            // Format clauses must be single line
+                            // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause
                                 ? TryConvertSingleLineRawStringToVirtualChars(token)
                                 : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString,

From bdf9659947faf8089459a398ded21b943e9c6429 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:10:47 -0700
Subject: [PATCH 252/413] Work on interpolations

---
 .../CSharpVirtualCharServiceTests.cs          | 145 ++++++++++++++++++
 .../VirtualChars/CSharpVirtualCharService.cs  |  25 ++-
 .../AbstractVirtualCharService.cs             |  15 +-
 .../VisualBasicVirtualCharService.vb          |   4 +
 4 files changed, 170 insertions(+), 19 deletions(-)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index 7810d7cad381e..3b45eb1d48d04 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -462,5 +462,150 @@ public void TestSingleLineInterpolatedRawString9()
         [Fact]
         public void TestSingleLineInterpolatedRawString10()
             => Test(@"$""""""goo{0}bar{1}baz""""""", @"['g',[4,5]]['o',[5,6]]['o',[6,7]]['b',[10,11]]['a',[11,12]]['r',[12,13]]['b',[16,17]]['a',[17,18]]['z',[18,19]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString1()
+            => Test(@"$""""""
+    goo
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString2()
+            => Test(@"$""""""
+    goo
+    bar
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['b',[19,20]]['a',[20,21]]['r',[21,22]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString3()
+            => Test(@"$""""""
+    goo
+        bar
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u0020',[21,22]]['\u0020',[22,23]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString4()
+            => Test(@"$""""""
+        goo
+    bar
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u0020',[12,13]]['\u0020',[13,14]]['g',[14,15]]['o',[15,16]]['o',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString5()
+            => Test(@"$""""""
+    goo
+
+    bar
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString6()
+            => Test(@"$""""""
+    goo
+    
+    bar
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[19,20]]['\u000A',[20,21]]['b',[25,26]]['a',[26,27]]['r',[27,28]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString7()
+            => Test(@"$""""""
+    goo
+      
+    bar
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['b',[27,28]]['a',[28,29]]['r',[29,30]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString8()
+            => Test(@"$""""""
+    goo
+
+    bar
+
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]['\u000D',[24,25]]['\u000A',[25,26]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString9()
+            => Test(@"$""""""
+    goo
+
+    bar
+    
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]['\u000D',[24,25]]['\u000A',[25,26]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString10()
+            => Test(@"$""""""
+    goo
+
+    bar
+      
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]['\u000D',[24,25]]['\u000A',[25,26]]['\u0020',[30,31]]['\u0020',[31,32]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString11()
+            => Test(@"$""""""
+goo
+
+bar
+""""""", @"['g',[6,7]]['o',[7,8]]['o',[8,9]]['\u000D',[9,10]]['\u000A',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['b',[13,14]]['a',[14,15]]['r',[15,16]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString12()
+            => Test(@"$""""""
+  goo
+
+  bar
+""""""", @"['\u0020',[6,7]]['\u0020',[7,8]]['g',[8,9]]['o',[9,10]]['o',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[15,16]]['\u0020',[16,17]]['b',[17,18]]['a',[18,19]]['r',[19,20]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString13()
+            => Test(@"$""""""
+
+    goo
+
+    bar
+    """"""", @"['\u000D',[6,7]]['\u000A',[7,8]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString14()
+            => Test(@"$""""""
+    
+    goo
+
+    bar
+    """"""", @"['\u000D',[10,11]]['\u000A',[11,12]]['g',[16,17]]['o',[17,18]]['o',[18,19]]['\u000D',[19,20]]['\u000A',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['b',[27,28]]['a',[28,29]]['r',[29,30]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString15()
+            => Test(@"$""""""
+      
+    goo
+
+    bar
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['b',[29,30]]['a',[30,31]]['r',[31,32]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString16()
+            => Test(@"$""""""
+
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString17()
+            => Test(@"$""""""
+    
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString18()
+            => Test(@"$""""""
+      
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString19()
+            => Test(@"$""""""  
+    goo
+    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]");
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index bb6e6c912879e..dddd6ff4f97a1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -29,6 +29,17 @@ protected CSharpVirtualCharService()
 
         protected override ISyntaxFacts SyntaxFacts => CSharpSyntaxFacts.Instance;
 
+        protected override bool IsMultiLineRawStringToken(SyntaxToken token)
+        {
+            if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
+                return true;
+
+            if (token.Parent?.Parent is InterpolatedStringExpressionSyntax { StringStartToken.RawKind: (int)SyntaxKind.InterpolatedMultiLineRawStringStartToken })
+                return true;
+
+            return false;
+        }
+
         protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToken token)
         {
             // C# preprocessor directives can contain string literals.  However, these string literals do not behave
@@ -67,7 +78,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                 return TryConvertSingleLineRawStringToVirtualChars(token);
 
             if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), isFirstChunk: true, isLastChunk: true);
+                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), hasDelimiters: true);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -90,9 +101,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                             // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause
                                 ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString,
-                                    isFirstChunk: token.Parent == interpolatedString.Contents.First(),
-                                    isLastChunk: token.Parent == interpolatedString.Contents.Last()),
+                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString, hasDelimiters: false),
                         _ => default,
                     };
                 }
@@ -153,7 +162,7 @@ private static VirtualCharSequence TryConvertSingleLineRawStringToVirtualChars(S
         }
 
         private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
-            SyntaxToken token, ExpressionSyntax parentExpression, bool isFirstChunk, bool isLastChunk)
+            SyntaxToken token, ExpressionSyntax parentExpression, bool hasDelimiters)
         {
             if (parentExpression.GetDiagnostics().Any(d => d.Severity == DiagnosticSeverity.Error))
                 return default;
@@ -167,11 +176,11 @@ private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
 
             // If we're on the very first chunk of the multi-line raw string, then we want to start on line 1 so we skip
             // the space and newline that follow the initial `"""`.
-            var startLineInclusive = isFirstChunk ? 1 : 0;
+            var startLineInclusive = hasDelimiters ? 1 : 0;
 
             // Similarly, if we're on the very last chunk of hte multi-line string, then we don't want to include the
             // line contents for the line that has the final `    """` on it.
-            var lastLineExclusive = isLastChunk ? sourceText.Lines.Count - 1 : sourceText.Lines.Count;
+            var lastLineExclusive = hasDelimiters ? sourceText.Lines.Count - 1 : sourceText.Lines.Count;
 
             for (var lineNumber = startLineInclusive; lineNumber < lastLineExclusive; lineNumber++)
             {
@@ -183,7 +192,7 @@ private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
                     : lineSpan.End;
 
                 // The last line of the last chunk does not include the final newline on the line.
-                var lineEnd = isLastChunk && lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;
+                var lineEnd = hasDelimiters && lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;
 
                 for (var i = lineStart; i < lineEnd;)
                     i += ConvertTextAtIndexToRune(sourceText, i, result, token.SpanStart);
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
index 6119e594fcca5..9b1b18bee340a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.cs
@@ -16,10 +16,11 @@ internal abstract partial class AbstractVirtualCharService : IVirtualCharService
     {
         public abstract bool TryGetEscapeCharacter(VirtualChar ch, out char escapedChar);
 
-        protected abstract VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToken token);
-
         protected abstract ISyntaxFacts SyntaxFacts { get; }
 
+        protected abstract VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToken token);
+        protected abstract bool IsMultiLineRawStringToken(SyntaxToken token);
+
         /// <summary>
         /// Returns <see langword="true"/> if the next two characters at <c>tokenText[index]</c> are <c>{{</c> or
         /// <c>}}</c>.  If so, <paramref name="span"/> will contain the span of those two characters (based on <paramref
@@ -89,12 +90,8 @@ private void CheckInvariants(SyntaxToken token, VirtualCharSequence result)
                         Debug.Assert(currentVC.Span.Start == token.SpanStart + 1 ||
                                      currentVC.Span.Start == token.SpanStart + 2, "First span should start on the second or third char of the string.");
                     }
-                    else if (token.RawKind == syntaxKinds.InterpolatedStringTextToken)
-                    {
-                        Debug.Assert(currentVC.Span.Start == token.SpanStart, "First span should start on the first char of the string.");
-                    }
 
-                    if (token.RawKind == syntaxKinds.MultiLineRawStringLiteralToken || token.RawKind == syntaxKinds.UTF8MultiLineRawStringLiteralToken)
+                    if (IsMultiLineRawStringToken(token))
                     {
                         for (var i = 1; i < result.Length; i++)
                         {
@@ -124,10 +121,6 @@ private void CheckInvariants(SyntaxToken token, VirtualCharSequence result)
                     {
                         Debug.Assert(lastVC.Span.End == token.Span.End - "\"u8".Length, "Last span has to end right before the end of the string token.");
                     }
-                    else if (token.RawKind == syntaxKinds.InterpolatedStringTextToken)
-                    {
-                        Debug.Assert(lastVC.Span.End == token.Span.End, "Last span has to end right before the end of the string token.");
-                    }
                 }
             }
         }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb
index 20641af02edf4..462558fd384ad 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb
@@ -27,6 +27,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EmbeddedLanguages.VirtualChars
             End Get
         End Property
 
+        Protected Overrides Function IsMultiLineRawStringToken(token As SyntaxToken) As Boolean
+            Return False
+        End Function
+
         Protected Overrides Function TryConvertToVirtualCharsWorker(token As SyntaxToken) As VirtualCharSequence
             Debug.Assert(Not token.ContainsDiagnostics)
 

From 482ad8792baefc1afa60c50c90f06f1d8ca5dba3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:18:27 -0700
Subject: [PATCH 253/413] Add tests

---
 .../CSharpVirtualCharServiceTests.cs          | 314 ++++++++++++++++++
 1 file changed, 314 insertions(+)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index 3b45eb1d48d04..f104429da9428 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -607,5 +607,319 @@ public void TestMultiLineInterpolatedRawString19()
             => Test(@"$""""""  
     goo
     """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString20()
+            => Test(@"$""""""
+    goo
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString21()
+            => Test(@"$""""""
+    goo{1}
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString22()
+            => Test(@"$""""""
+    {1}goo
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString23()
+            => Test(@"$""""""
+    {1}
+    goo
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString24()
+            => Test(@"$""""""
+      goo
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString25()
+            => Test(@"$""""""
+    goo
+      {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString26()
+            => Test(@"$""""""
+      goo
+      {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString27()
+            => Test(@"$""""""
+
+    goo
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString28()
+            => Test(@"$""""""
+    
+    goo
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString29()
+            => Test(@"$""""""
+      
+    goo
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString30()
+            => Test(@"$""""""
+    goo
+
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString31()
+            => Test(@"$""""""
+    goo
+    
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString32()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString33()
+            => Test(@"$""""""
+    goo
+    {1}
+
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString34()
+            => Test(@"$""""""
+    goo
+    {1}
+    
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString35()
+            => Test(@"$""""""
+    goo
+    {1}
+      
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString36()
+            => Test(@"$""""""
+      
+    goo
+    {1}
+      
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString37()
+            => Test(@"$""""""
+      
+    goo
+      
+    {1}
+      
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString38()
+            => Test(@"$""""""  
+      
+    goo
+      
+    {1}
+      
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString39()
+            => Test(@"$""""""
+    goo{1}bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString40()
+            => Test(@"$""""""
+    goo
+    {1}bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString41()
+            => Test(@"$""""""
+    goo{1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString42()
+            => Test(@"$""""""
+    goo
+    {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString43()
+            => Test(@"$""""""
+      goo
+    {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString44()
+            => Test(@"$""""""
+    goo
+      {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString45()
+            => Test(@"$""""""
+    goo
+    {1}
+      bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString46()
+            => Test(@"$""""""
+    goo
+
+    {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString47()
+            => Test(@"$""""""
+    goo
+    
+    {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString48()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString49()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString50()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+    
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString51()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+      
+    bar
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString52()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+      
+    bar
+
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString53()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+      
+    bar
+    
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString54()
+            => Test(@"$""""""
+    goo
+      
+    {1}
+      
+    bar
+      
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString55()
+            => Test(@"$""""""
+    goo{1}bar{2}baz
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString56()
+            => Test(@"$""""""  
+    goo{1}bar{2}baz
+    """"""", @"");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString57()
+            => Test(@"$""""""  
+    goo
+
+    {1}
+    
+      bar{2}
+        
+            baz
+    """"""", @"");
     }
 }

From 1d60e9dea49e4d27ef9dc3311dcdae73b3175f94 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:38:20 -0700
Subject: [PATCH 254/413] Add tests

---
 .../CSharpVirtualCharServiceTests.cs          | 86 +++++++++++--------
 .../VirtualChars/CSharpVirtualCharService.cs  | 20 +++--
 2 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index f104429da9428..1ff690c2b21ca 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -613,7 +613,7 @@ public void TestMultiLineInterpolatedRawString20()
             => Test(@"$""""""
     goo
     {1}
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString21()
@@ -625,35 +625,35 @@ public void TestMultiLineInterpolatedRawString21()
         public void TestMultiLineInterpolatedRawString22()
             => Test(@"$""""""
     {1}goo
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+    """"""", @"['g',[13,14]]['o',[14,15]]['o',[15,16]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString23()
             => Test(@"$""""""
     {1}
     goo
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]");
+    """"""", @"['\u000D',[13,14]]['\u000A',[14,15]]['g',[19,20]]['o',[20,21]]['o',[21,22]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString24()
             => Test(@"$""""""
       goo
     {1}
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString25()
             => Test(@"$""""""
     goo
       {1}
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString26()
             => Test(@"$""""""
       goo
       {1}
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u0020',[21,22]]['\u0020',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString27()
@@ -661,7 +661,7 @@ public void TestMultiLineInterpolatedRawString27()
 
     goo
     {1}
-    """"""", @"");
+    """"""", @"['\u000D',[6,7]]['\u000A',[7,8]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString28()
@@ -669,7 +669,7 @@ public void TestMultiLineInterpolatedRawString28()
     
     goo
     {1}
-    """"""", @"");
+    """"""", @"['\u000D',[10,11]]['\u000A',[11,12]]['g',[16,17]]['o',[17,18]]['o',[18,19]]['\u000D',[19,20]]['\u000A',[20,21]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString29()
@@ -677,7 +677,7 @@ public void TestMultiLineInterpolatedRawString29()
       
     goo
     {1}
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString30()
@@ -685,7 +685,7 @@ public void TestMultiLineInterpolatedRawString30()
     goo
 
     {1}
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString31()
@@ -693,7 +693,7 @@ public void TestMultiLineInterpolatedRawString31()
     goo
     
     {1}
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[19,20]]['\u000A',[20,21]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString32()
@@ -701,7 +701,7 @@ public void TestMultiLineInterpolatedRawString32()
     goo
       
     {1}
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString33()
@@ -709,7 +709,7 @@ public void TestMultiLineInterpolatedRawString33()
     goo
     {1}
 
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString34()
@@ -717,7 +717,7 @@ public void TestMultiLineInterpolatedRawString34()
     goo
     {1}
     
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString35()
@@ -725,7 +725,7 @@ public void TestMultiLineInterpolatedRawString35()
     goo
     {1}
       
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]['\u0020',[28,29]]['\u0020',[29,30]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString36()
@@ -734,7 +734,7 @@ public void TestMultiLineInterpolatedRawString36()
     goo
     {1}
       
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString37()
@@ -744,7 +744,7 @@ public void TestMultiLineInterpolatedRawString37()
       
     {1}
       
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u0020',[27,28]]['\u0020',[28,29]]['\u000D',[29,30]]['\u000A',[30,31]]['\u000D',[38,39]]['\u000A',[39,40]]['\u0020',[44,45]]['\u0020',[45,46]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString38()
@@ -754,27 +754,33 @@ public void TestMultiLineInterpolatedRawString38()
       
     {1}
       
-    """"""", @"");
+    """"""", @"['\u0020',[12,13]]['\u0020',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['g',[20,21]]['o',[21,22]]['o',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['\u0020',[29,30]]['\u0020',[30,31]]['\u000D',[31,32]]['\u000A',[32,33]]['\u000D',[40,41]]['\u000A',[41,42]]['\u0020',[46,47]]['\u0020',[47,48]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString39()
             => Test(@"$""""""
     goo{1}bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['b',[16,17]]['a',[17,18]]['r',[18,19]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString39_b()
+            => Test(@"$$""""""
+    goo{{1}}bar
+    """"""", @"['g',[11,12]]['o',[12,13]]['o',[13,14]]['b',[19,20]]['a',[20,21]]['r',[21,22]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString40()
             => Test(@"$""""""
     goo
     {1}bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString41()
             => Test(@"$""""""
     goo{1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[16,17]]['\u000A',[17,18]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString42()
@@ -782,7 +788,7 @@ public void TestMultiLineInterpolatedRawString42()
     goo
     {1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]['b',[28,29]]['a',[29,30]]['r',[30,31]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString43()
@@ -790,7 +796,7 @@ public void TestMultiLineInterpolatedRawString43()
       goo
     {1}
     bar
-    """"""", @"");
+    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString44()
@@ -798,7 +804,7 @@ public void TestMultiLineInterpolatedRawString44()
     goo
       {1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString45()
@@ -806,7 +812,7 @@ public void TestMultiLineInterpolatedRawString45()
     goo
     {1}
       bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]['\u0020',[28,29]]['\u0020',[29,30]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString46()
@@ -815,7 +821,7 @@ public void TestMultiLineInterpolatedRawString46()
 
     {1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString47()
@@ -824,7 +830,7 @@ public void TestMultiLineInterpolatedRawString47()
     
     {1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[19,20]]['\u000A',[20,21]]['\u000D',[28,29]]['\u000A',[29,30]]['b',[34,35]]['a',[35,36]]['r',[36,37]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString48()
@@ -833,7 +839,7 @@ public void TestMultiLineInterpolatedRawString48()
       
     {1}
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['b',[36,37]]['a',[37,38]]['r',[38,39]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString49()
@@ -843,7 +849,7 @@ public void TestMultiLineInterpolatedRawString49()
     {1}
 
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[32,33]]['\u000A',[33,34]]['b',[38,39]]['a',[39,40]]['r',[40,41]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString50()
@@ -853,7 +859,7 @@ public void TestMultiLineInterpolatedRawString50()
     {1}
     
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[36,37]]['\u000A',[37,38]]['b',[42,43]]['a',[43,44]]['r',[44,45]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString51()
@@ -863,7 +869,7 @@ public void TestMultiLineInterpolatedRawString51()
     {1}
       
     bar
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString52()
@@ -874,7 +880,7 @@ public void TestMultiLineInterpolatedRawString52()
       
     bar
 
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString53()
@@ -885,7 +891,7 @@ public void TestMultiLineInterpolatedRawString53()
       
     bar
     
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString54()
@@ -896,19 +902,25 @@ public void TestMultiLineInterpolatedRawString54()
       
     bar
       
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]['\u0020',[53,54]]['\u0020',[54,55]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString55()
             => Test(@"$""""""
     goo{1}bar{2}baz
-    """"""", @"");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['b',[16,17]]['a',[17,18]]['r',[18,19]]['b',[22,23]]['a',[23,24]]['z',[24,25]]");
+
+        [Fact]
+        public void TestMultiLineInterpolatedRawString55_b()
+            => Test(@"$$$""""""
+    goo{{{1}}}bar{{{2}}}baz
+    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]['b',[22,23]]['a',[23,24]]['r',[24,25]]['b',[32,33]]['a',[33,34]]['z',[34,35]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString56()
             => Test(@"$""""""  
     goo{1}bar{2}baz
-    """"""", @"");
+    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]['b',[18,19]]['a',[19,20]]['r',[20,21]]['b',[24,25]]['a',[25,26]]['z',[26,27]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString57()
@@ -920,6 +932,6 @@ public void TestMultiLineInterpolatedRawString57()
       bar{2}
         
             baz
-    """"""", @"");
+    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['\u000D',[26,27]]['\u000A',[27,28]]['\u000D',[32,33]]['\u000A',[33,34]]['\u0020',[38,39]]['\u0020',[39,40]]['b',[40,41]]['a',[41,42]]['r',[42,43]]['\u000D',[46,47]]['\u000A',[47,48]]['\u0020',[52,53]]['\u0020',[53,54]]['\u0020',[54,55]]['\u0020',[55,56]]['\u000D',[56,57]]['\u000A',[57,58]]['\u0020',[62,63]]['\u0020',[63,64]]['\u0020',[64,65]]['\u0020',[65,66]]['\u0020',[66,67]]['\u0020',[67,68]]['\u0020',[68,69]]['\u0020',[69,70]]['b',[70,71]]['a',[71,72]]['z',[72,73]]");
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index dddd6ff4f97a1..e76c602cdea52 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -78,7 +78,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                 return TryConvertSingleLineRawStringToVirtualChars(token);
 
             if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), hasDelimiters: true);
+                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), hasDelimiters: true, isFirstChunk: true);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -101,7 +101,9 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                             // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause
                                 ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString, hasDelimiters: false),
+                                : TryConvertMultiLineRawStringToVirtualChars(
+                                    token, interpolatedString, hasDelimiters: false,
+                                    isFirstChunk: interpolatedString.Contents.First() == parent),
                         _ => default,
                     };
                 }
@@ -162,7 +164,7 @@ private static VirtualCharSequence TryConvertSingleLineRawStringToVirtualChars(S
         }
 
         private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
-            SyntaxToken token, ExpressionSyntax parentExpression, bool hasDelimiters)
+            SyntaxToken token, ExpressionSyntax parentExpression, bool hasDelimiters, bool isFirstChunk)
         {
             if (parentExpression.GetDiagnostics().Any(d => d.Severity == DiagnosticSeverity.Error))
                 return default;
@@ -186,10 +188,16 @@ private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
             {
                 var currentLine = sourceText.Lines[lineNumber];
                 var lineSpan = currentLine.Span;
+                var lineStart = lineSpan.Start;
 
-                var lineStart = lineSpan.Length > indentationLength
-                    ? lineSpan.Start + indentationLength
-                    : lineSpan.End;
+                // If we're on the second line onwards, we want to trim the indentation if we have it.  We also always
+                // do this for the first line of the first chunk as that will contain the initial leading whitespace.
+                if (isFirstChunk || lineNumber > startLineInclusive)
+                {
+                    lineStart = lineSpan.Length > indentationLength
+                        ? lineSpan.Start + indentationLength
+                        : lineSpan.End;
+                }
 
                 // The last line of the last chunk does not include the final newline on the line.
                 var lineEnd = hasDelimiters && lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;

From 026fa17e57e812f5730005b4167015bfea9a7f00 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:40:12 -0700
Subject: [PATCH 255/413] Simplify testws

---
 .../CSharpVirtualCharServiceTests.cs          | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index 1ff690c2b21ca..1ccc396e41439 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -100,7 +100,7 @@ private static bool PrintAsUnicodeEscape(VirtualChar c)
             if (c < (char)127 && char.IsLetterOrDigit((char)c.Value))
                 return false;
 
-            if (c == '{' || c == '}')
+            if (c.Value is '{' or '}' or ' ')
                 return false;
 
             return true;
@@ -296,14 +296,14 @@ public void TestMultiLineRawString3()
             => Test(@"""""""
     goo
         bar
-    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[18,19]]['\u0020',[19,20]]['\u0020',[20,21]]['\u0020',[21,22]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]][' ',[18,19]][' ',[19,20]][' ',[20,21]][' ',[21,22]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
 
         [Fact]
         public void TestMultiLineRawString4()
             => Test(@"""""""
         goo
     bar
-    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]['\u0020',[11,12]]['\u0020',[12,13]]['g',[13,14]]['o',[14,15]]['o',[15,16]]['\u000D',[16,17]]['\u000A',[17,18]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
+    """"""", @"[' ',[9,10]][' ',[10,11]][' ',[11,12]][' ',[12,13]]['g',[13,14]]['o',[14,15]]['o',[15,16]]['\u000D',[16,17]]['\u000A',[17,18]]['b',[22,23]]['a',[23,24]]['r',[24,25]]");
 
         [Fact]
         public void TestMultiLineRawString5()
@@ -327,7 +327,7 @@ public void TestMultiLineRawString7()
     goo
       
     bar
-    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[18,19]]['\u0020',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['b',[26,27]]['a',[27,28]]['r',[28,29]]");
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]][' ',[18,19]][' ',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['b',[26,27]]['a',[27,28]]['r',[28,29]]");
 
         [Fact]
         public void TestMultiLineRawString8()
@@ -354,7 +354,7 @@ public void TestMultiLineRawString10()
 
     bar
       
-    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['\u0020',[29,30]]['\u0020',[30,31]]");
+    """"""", @"['g',[9,10]]['o',[10,11]]['o',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['b',[20,21]]['a',[21,22]]['r',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]][' ',[29,30]][' ',[30,31]]");
 
         [Fact]
         public void TestMultiLineRawString11()
@@ -370,7 +370,7 @@ public void TestMultiLineRawString12()
   goo
 
   bar
-""""""", @"['\u0020',[5,6]]['\u0020',[6,7]]['g',[7,8]]['o',[8,9]]['o',[9,10]]['\u000D',[10,11]]['\u000A',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['\u0020',[14,15]]['\u0020',[15,16]]['b',[16,17]]['a',[17,18]]['r',[18,19]]");
+""""""", @"[' ',[5,6]][' ',[6,7]]['g',[7,8]]['o',[8,9]]['o',[9,10]]['\u000D',[10,11]]['\u000A',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]][' ',[14,15]][' ',[15,16]]['b',[16,17]]['a',[17,18]]['r',[18,19]]");
 
         [Fact]
         public void TestMultiLineRawString13()
@@ -397,7 +397,7 @@ public void TestMultiLineRawString15()
     goo
 
     bar
-    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['g',[17,18]]['o',[18,19]]['o',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['\u000D',[22,23]]['\u000A',[23,24]]['b',[28,29]]['a',[29,30]]['r',[30,31]]");
+    """"""", @"[' ',[9,10]][' ',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['g',[17,18]]['o',[18,19]]['o',[19,20]]['\u000D',[20,21]]['\u000A',[21,22]]['\u000D',[22,23]]['\u000A',[23,24]]['b',[28,29]]['a',[29,30]]['r',[30,31]]");
 
         [Fact]
         public void TestMultiLineRawString16()
@@ -415,7 +415,7 @@ public void TestMultiLineRawString17()
         public void TestMultiLineRawString18()
             => Test(@"""""""
       
-    """"""", @"['\u0020',[9,10]]['\u0020',[10,11]]");
+    """"""", @"[' ',[9,10]][' ',[10,11]]");
 
         [Fact]
         public void TestMultiLineRawString19()
@@ -481,14 +481,14 @@ public void TestMultiLineInterpolatedRawString3()
             => Test(@"$""""""
     goo
         bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u0020',[21,22]]['\u0020',[22,23]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]][' ',[21,22]][' ',[22,23]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString4()
             => Test(@"$""""""
         goo
     bar
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u0020',[12,13]]['\u0020',[13,14]]['g',[14,15]]['o',[15,16]]['o',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]][' ',[12,13]][' ',[13,14]]['g',[14,15]]['o',[15,16]]['o',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['b',[23,24]]['a',[24,25]]['r',[25,26]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString5()
@@ -512,7 +512,7 @@ public void TestMultiLineInterpolatedRawString7()
     goo
       
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['b',[27,28]]['a',[28,29]]['r',[29,30]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['b',[27,28]]['a',[28,29]]['r',[29,30]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString8()
@@ -539,7 +539,7 @@ public void TestMultiLineInterpolatedRawString10()
 
     bar
       
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]['\u000D',[24,25]]['\u000A',[25,26]]['\u0020',[30,31]]['\u0020',[31,32]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['b',[21,22]]['a',[22,23]]['r',[23,24]]['\u000D',[24,25]]['\u000A',[25,26]][' ',[30,31]][' ',[31,32]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString11()
@@ -555,7 +555,7 @@ public void TestMultiLineInterpolatedRawString12()
   goo
 
   bar
-""""""", @"['\u0020',[6,7]]['\u0020',[7,8]]['g',[8,9]]['o',[9,10]]['o',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[15,16]]['\u0020',[16,17]]['b',[17,18]]['a',[18,19]]['r',[19,20]]");
+""""""", @"[' ',[6,7]][' ',[7,8]]['g',[8,9]]['o',[9,10]]['o',[10,11]]['\u000D',[11,12]]['\u000A',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[15,16]][' ',[16,17]]['b',[17,18]]['a',[18,19]]['r',[19,20]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString13()
@@ -582,7 +582,7 @@ public void TestMultiLineInterpolatedRawString15()
     goo
 
     bar
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['b',[29,30]]['a',[30,31]]['r',[31,32]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['b',[29,30]]['a',[30,31]]['r',[31,32]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString16()
@@ -600,7 +600,7 @@ public void TestMultiLineInterpolatedRawString17()
         public void TestMultiLineInterpolatedRawString18()
             => Test(@"$""""""
       
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString19()
@@ -639,21 +639,21 @@ public void TestMultiLineInterpolatedRawString24()
             => Test(@"$""""""
       goo
     {1}
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString25()
             => Test(@"$""""""
     goo
       {1}
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString26()
             => Test(@"$""""""
       goo
       {1}
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u0020',[21,22]]['\u0020',[22,23]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]][' ',[21,22]][' ',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString27()
@@ -677,7 +677,7 @@ public void TestMultiLineInterpolatedRawString29()
       
     goo
     {1}
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString30()
@@ -701,7 +701,7 @@ public void TestMultiLineInterpolatedRawString32()
     goo
       
     {1}
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString33()
@@ -725,7 +725,7 @@ public void TestMultiLineInterpolatedRawString35()
     goo
     {1}
       
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]['\u0020',[28,29]]['\u0020',[29,30]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]][' ',[28,29]][' ',[29,30]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString36()
@@ -734,7 +734,7 @@ public void TestMultiLineInterpolatedRawString36()
     goo
     {1}
       
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]][' ',[36,37]][' ',[37,38]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString37()
@@ -744,7 +744,7 @@ public void TestMultiLineInterpolatedRawString37()
       
     {1}
       
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u0020',[27,28]]['\u0020',[28,29]]['\u000D',[29,30]]['\u000A',[30,31]]['\u000D',[38,39]]['\u000A',[39,40]]['\u0020',[44,45]]['\u0020',[45,46]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['\u000D',[12,13]]['\u000A',[13,14]]['g',[18,19]]['o',[19,20]]['o',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]][' ',[27,28]][' ',[28,29]]['\u000D',[29,30]]['\u000A',[30,31]]['\u000D',[38,39]]['\u000A',[39,40]][' ',[44,45]][' ',[45,46]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString38()
@@ -754,7 +754,7 @@ public void TestMultiLineInterpolatedRawString38()
       
     {1}
       
-    """"""", @"['\u0020',[12,13]]['\u0020',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['g',[20,21]]['o',[21,22]]['o',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]]['\u0020',[29,30]]['\u0020',[30,31]]['\u000D',[31,32]]['\u000A',[32,33]]['\u000D',[40,41]]['\u000A',[41,42]]['\u0020',[46,47]]['\u0020',[47,48]]");
+    """"""", @"[' ',[12,13]][' ',[13,14]]['\u000D',[14,15]]['\u000A',[15,16]]['g',[20,21]]['o',[21,22]]['o',[22,23]]['\u000D',[23,24]]['\u000A',[24,25]][' ',[29,30]][' ',[30,31]]['\u000D',[31,32]]['\u000A',[32,33]]['\u000D',[40,41]]['\u000A',[41,42]][' ',[46,47]][' ',[47,48]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString39()
@@ -796,7 +796,7 @@ public void TestMultiLineInterpolatedRawString43()
       goo
     {1}
     bar
-    """"""", @"['\u0020',[10,11]]['\u0020',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
+    """"""", @"[' ',[10,11]][' ',[11,12]]['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString44()
@@ -804,7 +804,7 @@ public void TestMultiLineInterpolatedRawString44()
     goo
       {1}
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[24,25]]['\u000A',[25,26]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString45()
@@ -812,7 +812,7 @@ public void TestMultiLineInterpolatedRawString45()
     goo
     {1}
       bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]]['\u0020',[28,29]]['\u0020',[29,30]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u000D',[22,23]]['\u000A',[23,24]][' ',[28,29]][' ',[29,30]]['b',[30,31]]['a',[31,32]]['r',[32,33]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString46()
@@ -839,7 +839,7 @@ public void TestMultiLineInterpolatedRawString48()
       
     {1}
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['b',[36,37]]['a',[37,38]]['r',[38,39]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['b',[36,37]]['a',[37,38]]['r',[38,39]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString49()
@@ -849,7 +849,7 @@ public void TestMultiLineInterpolatedRawString49()
     {1}
 
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[32,33]]['\u000A',[33,34]]['b',[38,39]]['a',[39,40]]['r',[40,41]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[32,33]]['\u000A',[33,34]]['b',[38,39]]['a',[39,40]]['r',[40,41]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString50()
@@ -859,7 +859,7 @@ public void TestMultiLineInterpolatedRawString50()
     {1}
     
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[36,37]]['\u000A',[37,38]]['b',[42,43]]['a',[43,44]]['r',[44,45]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u000D',[36,37]]['\u000A',[37,38]]['b',[42,43]]['a',[43,44]]['r',[44,45]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString51()
@@ -869,7 +869,7 @@ public void TestMultiLineInterpolatedRawString51()
     {1}
       
     bar
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]][' ',[36,37]][' ',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString52()
@@ -880,7 +880,7 @@ public void TestMultiLineInterpolatedRawString52()
       
     bar
 
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]][' ',[36,37]][' ',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString53()
@@ -891,7 +891,7 @@ public void TestMultiLineInterpolatedRawString53()
       
     bar
     
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]][' ',[36,37]][' ',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString54()
@@ -902,7 +902,7 @@ public void TestMultiLineInterpolatedRawString54()
       
     bar
       
-    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]]['\u0020',[19,20]]['\u0020',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]]['\u0020',[36,37]]['\u0020',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]]['\u0020',[53,54]]['\u0020',[54,55]]");
+    """"""", @"['g',[10,11]]['o',[11,12]]['o',[12,13]]['\u000D',[13,14]]['\u000A',[14,15]][' ',[19,20]][' ',[20,21]]['\u000D',[21,22]]['\u000A',[22,23]]['\u000D',[30,31]]['\u000A',[31,32]][' ',[36,37]][' ',[37,38]]['\u000D',[38,39]]['\u000A',[39,40]]['b',[44,45]]['a',[45,46]]['r',[46,47]]['\u000D',[47,48]]['\u000A',[48,49]][' ',[53,54]][' ',[54,55]]");
 
         [Fact]
         public void TestMultiLineInterpolatedRawString55()
@@ -932,6 +932,6 @@ public void TestMultiLineInterpolatedRawString57()
       bar{2}
         
             baz
-    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['\u000D',[26,27]]['\u000A',[27,28]]['\u000D',[32,33]]['\u000A',[33,34]]['\u0020',[38,39]]['\u0020',[39,40]]['b',[40,41]]['a',[41,42]]['r',[42,43]]['\u000D',[46,47]]['\u000A',[47,48]]['\u0020',[52,53]]['\u0020',[53,54]]['\u0020',[54,55]]['\u0020',[55,56]]['\u000D',[56,57]]['\u000A',[57,58]]['\u0020',[62,63]]['\u0020',[63,64]]['\u0020',[64,65]]['\u0020',[65,66]]['\u0020',[66,67]]['\u0020',[67,68]]['\u0020',[68,69]]['\u0020',[69,70]]['b',[70,71]]['a',[71,72]]['z',[72,73]]");
+    """"""", @"['g',[12,13]]['o',[13,14]]['o',[14,15]]['\u000D',[15,16]]['\u000A',[16,17]]['\u000D',[17,18]]['\u000A',[18,19]]['\u000D',[26,27]]['\u000A',[27,28]]['\u000D',[32,33]]['\u000A',[33,34]][' ',[38,39]][' ',[39,40]]['b',[40,41]]['a',[41,42]]['r',[42,43]]['\u000D',[46,47]]['\u000A',[47,48]][' ',[52,53]][' ',[53,54]][' ',[54,55]][' ',[55,56]]['\u000D',[56,57]]['\u000A',[57,58]][' ',[62,63]][' ',[63,64]][' ',[64,65]][' ',[65,66]][' ',[66,67]][' ',[67,68]][' ',[68,69]][' ',[69,70]]['b',[70,71]]['a',[71,72]]['z',[72,73]]");
     }
 }

From a657133e9c0e3f89177c5a513f74ee04a4c5bab7 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:52:09 -0700
Subject: [PATCH 256/413] Add docs

---
 .../VirtualChars/CSharpVirtualCharService.cs  | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index e76c602cdea52..e6367938279b3 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -78,7 +78,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                 return TryConvertSingleLineRawStringToVirtualChars(token);
 
             if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                return TryConvertMultiLineRawStringToVirtualChars(token, (ExpressionSyntax)token.GetRequiredParent(), hasDelimiters: true, isFirstChunk: true);
+                return TryConvertMultiLineRawStringToVirtualChars(token);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -101,9 +101,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                             // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause
                                 ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(
-                                    token, interpolatedString, hasDelimiters: false,
-                                    isFirstChunk: interpolatedString.Contents.First() == parent),
+                                : TryConvertMultiLineRawStringToVirtualChars(token),
                         _ => default,
                     };
                 }
@@ -163,30 +161,48 @@ private static VirtualCharSequence TryConvertSingleLineRawStringToVirtualChars(S
             return CreateVirtualCharSequence(tokenText, offset, startIndexInclusive, endIndexExclusive, result);
         }
 
-        private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
-            SyntaxToken token, ExpressionSyntax parentExpression, bool hasDelimiters, bool isFirstChunk)
+        private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(SyntaxToken token)
         {
+            // The containing expression for this token.  This is needed so that we can determine the indentation
+            // whitespace based on the last line of the containing multiline literal.
+            ExpressionSyntax parentExpression = token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken
+                ? (LiteralExpressionSyntax)token.GetRequiredParent()
+                : (InterpolatedStringExpressionSyntax)token.GetRequiredParent().GetRequiredParent();
+
+            // Whether or not the token contains the delimiters, or if the parent owns them.  This will affect if we
+            // need to skip looking at the start/end line of the token.
+            var hasDelimiters = parentExpression is LiteralExpressionSyntax;
+
+            // if this is the first text content chunk of the multi-line literal.  The first chunk contains the leading
+            // indentation of the line it's on (which thus must be trimmed), while all subsequent chunks do not (because
+            // they start right after some `{...}` interpolation
+            var isFirstChunk =
+                parentExpression is LiteralExpressionSyntax ||
+                (parentExpression is InterpolatedStringExpressionSyntax { Contents: var contents } && contents.First() == token.GetRequiredParent());
+
             if (parentExpression.GetDiagnostics().Any(d => d.Severity == DiagnosticSeverity.Error))
                 return default;
 
-            var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
-
+            // Use the parent multi-line expression to determine what whitespace to remove from the start of each line.
             var parentSourceText = parentExpression.SyntaxTree.GetText();
             var indentationLength = parentSourceText.Lines.GetLineFromPosition(parentExpression.Span.End).GetFirstNonWhitespaceOffset() ?? 0;
 
-            var sourceText = SourceText.From(token.Text);
+            // Create a source-text view over the token.  This makes it very easy to treat the token as a set of lines
+            // that can be processed sensibly.
+            var tokenSourceText = SourceText.From(token.Text);
 
-            // If we're on the very first chunk of the multi-line raw string, then we want to start on line 1 so we skip
-            // the space and newline that follow the initial `"""`.
+            // If we're on the very first chunk of the multi-line raw string literal, then we want to start on line 1 so
+            // we skip the space and newline that follow the initial `"""`.
             var startLineInclusive = hasDelimiters ? 1 : 0;
 
-            // Similarly, if we're on the very last chunk of hte multi-line string, then we don't want to include the
-            // line contents for the line that has the final `    """` on it.
-            var lastLineExclusive = hasDelimiters ? sourceText.Lines.Count - 1 : sourceText.Lines.Count;
+            // Similarly, if we're on the very last chunk of hte multi-line raw string literal, then we don't want to
+            // include the line contents for the line that has the final `    """` on it.
+            var lastLineExclusive = hasDelimiters ? tokenSourceText.Lines.Count - 1 : tokenSourceText.Lines.Count;
 
+            var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
             for (var lineNumber = startLineInclusive; lineNumber < lastLineExclusive; lineNumber++)
             {
-                var currentLine = sourceText.Lines[lineNumber];
+                var currentLine = tokenSourceText.Lines[lineNumber];
                 var lineSpan = currentLine.Span;
                 var lineStart = lineSpan.Start;
 
@@ -200,10 +216,12 @@ private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
                 }
 
                 // The last line of the last chunk does not include the final newline on the line.
-                var lineEnd = hasDelimiters && lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;
+                var lineEnd = lineNumber == lastLineExclusive - 1 ? currentLine.End : currentLine.EndIncludingLineBreak;
 
+                // Now that we've found the start and end portions of that line, convert all the characters within to
+                // virtual chars and return.
                 for (var i = lineStart; i < lineEnd;)
-                    i += ConvertTextAtIndexToRune(sourceText, i, result, token.SpanStart);
+                    i += ConvertTextAtIndexToRune(tokenSourceText, i, result, token.SpanStart);
             }
 
             return VirtualCharSequence.Create(result.ToImmutable());

From 7a357984d6e871ad8d5d5969c4d64224b404d53c Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 5 May 2022 17:53:18 -0700
Subject: [PATCH 257/413] Doc

---
 .../AbstractVirtualCharService.ITextInfo.cs    | 18 ++++++++++++++++++
 ...actVirtualCharService.SourceTextTextInfo.cs | 17 -----------------
 ...bstractVirtualCharService.StringTextInfo.cs | 15 ---------------
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
 delete mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
index 0313d2f104288..9e0d6e381d627 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.ITextInfo.cs
@@ -2,14 +2,32 @@
 // 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.Text;
+
 namespace Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars
 {
     internal abstract partial class AbstractVirtualCharService
     {
+        /// <summary>
+        /// Abstraction to allow generic algorithms to run over a string or <see cref="SourceText"/> without any
+        /// overhead.
+        /// </summary>
         private interface ITextInfo<T>
         {
             char Get(T text, int index);
             int Length(T text);
         }
+
+        private struct SourceTextTextInfo : ITextInfo<SourceText>
+        {
+            public char Get(SourceText text, int index) => text[index];
+            public int Length(SourceText text) => text.Length;
+        }
+
+        private struct StringTextInfo : ITextInfo<string>
+        {
+            public char Get(string text, int index) => text[index];
+            public int Length(string text) => text.Length;
+        }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
deleted file mode 100644
index 1777ca3b8ed7a..0000000000000
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.SourceTextTextInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.Text;
-
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars
-{
-    internal abstract partial class AbstractVirtualCharService
-    {
-        private struct SourceTextTextInfo : ITextInfo<SourceText>
-        {
-            public char Get(SourceText text, int index) => text[index];
-            public int Length(SourceText text) => text.Length;
-        }
-    }
-}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs
deleted file mode 100644
index d35f6965955e9..0000000000000
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/AbstractVirtualCharService.StringTextInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.EmbeddedLanguages.VirtualChars
-{
-    internal abstract partial class AbstractVirtualCharService
-    {
-        private struct StringTextInfo : ITextInfo<string>
-        {
-            public char Get(string text, int index) => text[index];
-            public int Length(string text) => text.Length;
-        }
-    }
-}

From f4f3a2b7a9ea7cf3280e72d09aa4bde4ac8cbe88 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Fri, 6 May 2022 19:23:46 +0300
Subject: [PATCH 258/413] Do not report IDE0052 for properties when using
 increment operator

---
 .../RemoveUnusedMembersTests.cs               | 21 ++++++++++++-------
 ...ctRemoveUnusedMembersDiagnosticAnalyzer.cs |  6 +++++-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index 9be849a27443f..34e43141a5795 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -4,6 +4,7 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
@@ -1482,16 +1483,17 @@ public async Task PropertyIsIncrementedAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task PropertyIsIncrementedAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int {|IDE0052:P|} { get; set; }
+    private int P { get; set; }
     public void M1() { ++P; }
 }";
 
-            await VerifyCS.VerifyCodeFixAsync(code, code);
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1506,16 +1508,17 @@ public async Task IndexerIsIncrementedAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsIncrementedAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int {|IDE0052:this|}[int x] { get { return 0; } set { } }
+    private int this[int x] { get { return 0; } set { } }
     public void M1(int x) => ++this[x];
 }";
 
-            await VerifyCS.VerifyCodeFixAsync(code, code);
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1578,16 +1581,17 @@ public async Task PropertyIsTargetOfCompoundAssignmentAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int {|IDE0052:P|} { get; set; }
+    private int P { get; set; }
     public void M1(int x) { P += x; }
 }";
 
-            await VerifyCS.VerifyCodeFixAsync(code, code);
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1602,16 +1606,17 @@ public async Task IndexerIsTargetOfCompoundAssignmentAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int {|IDE0052:this|}[int x] { get { return 0; } set { } }
+    private int this[int x] { get { return 0; } set { } }
     public void M1(int x, int y) => this[x] += y;
 }";
 
-            await VerifyCS.VerifyCodeFixAsync(code, code);
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index 791c62728bf4a..d0ce9c286dbd0 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -297,8 +297,12 @@ memberReference.Parent is IIncrementOrDecrementOperation ||
                         // Note that the increment operation '_f1++' is child of an expression statement, which drops the result of the increment.
                         // while the increment operation '_f2++' is child of a return statement, which uses the result of the increment.
                         // For the above test, '_f1' can be safely removed without affecting the semantics of the program, while '_f2' cannot be removed.
+                        //
+                        // This behaviour should not apply to properties because otherwise analyzer will report 'get' accessor as unused, which is not true.
+                        // See https://github.com/dotnet/roslyn/issues/43191.
 
-                        if (memberReference.Parent.Parent is IExpressionStatementOperation)
+                        if (memberReference.Parent.Parent is IExpressionStatementOperation &&
+                            memberSymbol is not IPropertySymbol)
                         {
                             valueUsageInfo = ValueUsageInfo.Write;
                         }

From ad6e8751343d445cfe3109833fc9b9ad536ffd8f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 09:58:42 -0700
Subject: [PATCH 259/413] fix

---
 .../Compiler/Core/CompilerExtensions.projitems                  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
index c1863339a13ad..b3c2638f021c2 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
@@ -221,8 +221,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\Common\EmbeddedSyntaxTrivia.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.ITextInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.SourceTextTextInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\AbstractVirtualCharService.StringTextInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\IVirtualCharService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualChar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualCharSequence.Chunks.cs" />

From e8dcb028d6f085238df15cbcd4da768d7acf2632 Mon Sep 17 00:00:00 2001
From: Andrew Boyarshin <andrew.boyarshin@gmail.com>
Date: Sat, 7 May 2022 00:13:56 +0700
Subject: [PATCH 260/413] Fix XmlTextAttribute space normalization (#61012)

* Fix XmlTextAttribute space normalization
---
 .../Portable/Syntax/SyntaxNormalizer.cs       | 15 +++++
 .../Syntax/Syntax/SyntaxNormalizerTests.cs    | 61 +++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs b/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs
index c38a56fce2aef..9eaf92b8334d0 100644
--- a/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs
+++ b/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs
@@ -1265,5 +1265,20 @@ node is QueryExpressionSyntax ||
 
             return base.VisitInterpolatedStringExpression(node);
         }
+
+        public override SyntaxNode? VisitXmlTextAttribute(XmlTextAttributeSyntax node)
+        {
+            var attribute = (XmlTextAttributeSyntax?)base.VisitXmlTextAttribute(node);
+
+            if (attribute is null or { HasTrailingTrivia: true })
+            {
+                return attribute;
+            }
+
+            SyntaxKind nextTokenKind = GetNextRelevantToken(node.EndQuoteToken).Kind();
+            return nextTokenKind != SyntaxKind.GreaterThanToken && nextTokenKind != SyntaxKind.SlashGreaterThanToken
+                ? attribute.WithTrailingTrivia(GetSpace())
+                : attribute;
+        }
     }
 }
diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs
index f2b63f3899ef0..e1354dbe02d40 100644
--- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs
+++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs
@@ -1245,5 +1245,66 @@ private void TestNormalize(SyntaxTriviaList trivia, string expected)
             var actual = trivia.NormalizeWhitespace("    ").ToFullString().NormalizeLineEndings();
             Assert.Equal(expected.NormalizeLineEndings(), actual);
         }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment1()
+        {
+            const string Expected = @"/// Prefix <b a=""x"" b=""y"">S_OK</b> suffix";
+            const string Text = @"/// Prefix <b    a=""x""  b=""y"" >S_OK</b> suffix";
+            TestNormalizeDeclaration(Text, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment2()
+        {
+            const string Expected = @"/// Prefix <b a=""x"" b=""y"">S_OK</b> suffix";
+            TestNormalizeDeclaration(Expected, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment3()
+        {
+            const string Expected = @"/// Prefix <b a=""x"" b=""y""/> suffix";
+            const string Text = @"/// Prefix <b a=""x"" b=""y"" /> suffix";
+            TestNormalizeDeclaration(Text, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment4()
+        {
+            const string Expected = @"/// Prefix <b a=""x"">S_OK</b> suffix";
+            const string Text = @"/// Prefix <b    a=""x""	>S_OK</b> suffix";
+            TestNormalizeDeclaration(Text, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment5()
+        {
+            const string Expected = @"/// Prefix <b a=""x"" b=""y""/> suffix";
+            TestNormalizeDeclaration(Expected, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment6()
+        {
+            const string Expected = @"/// Prefix <b a=""x"" b=""y""/> suffix";
+            const string Text = @"/// Prefix <b a=""x""b=""y""/> suffix";
+            TestNormalizeDeclaration(Text, Expected);
+        }
+
+        [Fact]
+        [WorkItem(60884, "https://github.com/dotnet/roslyn/issues/60884")]
+        public void TestNormalizeXmlArgumentsInDocComment7()
+        {
+            const string Expected = @"/// Prefix <b b=""y"" a=""x"">S_OK</b> suffix";
+            const string Text = @"/// Prefix <b    b=""y""a=""x""	>S_OK</b> suffix";
+            TestNormalizeDeclaration(Text, Expected);
+        }
     }
 }

From 10a2abc1f99ca75a159fbfbd70a4f18d01f09e27 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Fri, 6 May 2022 19:28:02 +0200
Subject: [PATCH 261/413] Fix assertion failure for optional VB attribute with
 invalid type (#60924)

* Add test for optional VB attribute with invalid type


Co-authored-by: AlekseyTs <AlekseyTs@users.noreply.github.com>
---
 .../Portable/Binding/Binder_Attributes.vb     |  3 ++-
 .../Test/Emit/Attributes/AttributeTests.vb    | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_Attributes.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_Attributes.vb
index b16b931021117..199f9eb9d0591 100644
--- a/src/Compilers/VisualBasic/Portable/Binding/Binder_Attributes.vb
+++ b/src/Compilers/VisualBasic/Portable/Binding/Binder_Attributes.vb
@@ -794,7 +794,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                                    Not _binder.IsValidTypeForAttributeArgument(conv.Operand.Type) Then
 
                                     If Not conv.HasErrors Then
-                                        ReportDiagnostic(diagBag, conv.Operand.Syntax, ERRID.ERR_RequiredAttributeConstConversion2, conv.Operand.Type, conv.Type)
+                                        ' BC30934: Conversion from '{0}' to '{1}' cannot occur in a constant expression used as an argument to an attribute.
+                                        ReportDiagnostic(diagBag, conv.Operand.Syntax, ERRID.ERR_RequiredAttributeConstConversion2, If(conv.Operand.Type, _binder.Compilation.GetSpecialType(SpecialType.System_Object)), conv.Type)
                                     End If
                                     Return CreateErrorTypedConstant(node.Type)
                                 Else
diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests.vb
index f616883363e51..f2e3df8ea507b 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests.vb
@@ -4654,5 +4654,28 @@ End Namespace
                 Diagnostic(ERRID.ERR_BadAttributeConstructor1, "Command").WithArguments("a.Class1.CommandAttribute.FxCommand").WithLocation(20, 10),
                 Diagnostic(ERRID.ERR_RequiredConstExpr, "AddressOf UserInfo").WithLocation(20, 18))
         End Sub
+
+        <Fact>
+        Public Sub AttributeWithOptionalNullableParameter_NullIsPassed()
+            Dim code = "
+Imports System
+
+Class MyAttribute
+    Inherits Attribute
+    Public Sub New(Optional x As Integer? = 0)
+    End Sub
+End Class
+
+<My(Nothing)>
+Class C
+End Class
+"
+            CreateCompilation(code).AssertTheseDiagnostics(
+<expected><![CDATA[
+BC30045: Attribute constructor has a parameter of type 'Integer?', which is not an integral, floating-point or Enum type or one of Object, Char, String, Boolean, System.Type or 1-dimensional array of these types.
+<My(Nothing)>
+ ~~
+]]></expected>)
+        End Sub
     End Class
 End Namespace

From 2d03da02aae06755b598bf9e3059e20c1e622d35 Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Fri, 6 May 2022 10:28:56 -0700
Subject: [PATCH 262/413] pr

---
 .../GenerateVariable/GenerateVariableTests.vb | 25 ++++++++++++++++
 .../AbstractGenerateVariableService.cs        | 30 +++++++++++++++----
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
index 3a69547f1e1ec..1fbca00e3ef39 100644
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -3118,5 +3118,30 @@ Class Test
     End Function
 End Class", index:=4)
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterExtensionMethod() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Runtime.CompilerServices
+Imports System.Threading
+Imports System.Threading.Tasks
+
+Module Test
+    <Extension()>
+    Private Async Function Test(ByVal cancellationToken As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Module",
+"Imports System.Runtime.CompilerServices
+Imports System.Threading
+Imports System.Threading.Tasks
+
+Module Test
+    <Extension()>
+    Private Async Function Test(ByVal cancellationToken As CancellationToken, time As System.TimeSpan) As Task
+        Await Task.Delay(time)
+    End Function
+End Module", index:=4)
+        End Function
     End Class
 End Namespace
diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 4536d92a44216..35e7008c136e1 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -216,15 +216,28 @@ private static async Task AddParameterCodeActionsAsync(
                 if (containingMethod.Parameters.Length > 0)
                 {
                     var compilation = await document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
+                    var cancellationTokenType = compilation.CancellationTokenType();
 
                     for (var i = containingMethod.Parameters.Length - 1; i >= 0; i--)
                     {
                         var parameter = containingMethod.Parameters[i];
-                        if ((parameter.HasExplicitDefaultValue
-                            || Equals(parameter.Type, compilation.CancellationTokenType())
-                            || parameter.IsParams
-                            || parameter.RefKind is RefKind.Out)
-                            && !(containingMethod.IsExtensionMethod && i == 0))
+
+                        // Keep moving the insertion position for the generated parameter backwards
+                        // until we get to a parameter that does not need to be at the end of the
+                        // parameter list.
+                        if (parameter.HasExplicitDefaultValue)
+                        {
+                            parameterIndex--;
+                        }
+                        else if (parameter.IsParams)
+                        {
+                            parameterIndex--;
+                        }
+                        else if (parameter.RefKind is RefKind.Out)
+                        {
+                            parameterIndex--;
+                        }
+                        else if (Equals(parameter.Type, cancellationTokenType))
                         {
                             parameterIndex--;
                         }
@@ -233,6 +246,13 @@ private static async Task AddParameterCodeActionsAsync(
                             break;
                         }
                     }
+
+                    // If we are in an extension method, then we want to make sure to insert after
+                    // the first parameter.
+                    if (containingMethod.IsExtensionMethod && parameterIndex == 0)
+                    {
+                        parameterIndex++;
+                    }
                 }
 
                 result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false, parameterIndex));

From 67b6a1f27ea6794ac6c7bc4ca1bf2d3b8dd633b9 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Fri, 6 May 2022 20:51:54 +0300
Subject: [PATCH 263/413] Change logic

---
 .../RemoveUnusedMembersTests.cs               | 23 +++++++--------
 .../AbstractCodeQualityDiagnosticAnalyzer.cs  |  5 +---
 ...ctRemoveUnusedMembersDiagnosticAnalyzer.cs | 29 ++++++++++++++-----
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index 34e43141a5795..8c193aaeaba0c 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -4,12 +4,13 @@
 
 #nullable disable
 
-using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.RemoveUnusedMembers;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
+using Microsoft.CodeAnalysis.RemoveUnusedMembers;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Testing;
@@ -1483,17 +1484,16 @@ public async Task PropertyIsIncrementedAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
-        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task PropertyIsIncrementedAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int P { get; set; }
+    private int {|IDE0052:P|} { get; set; }
     public void M1() { ++P; }
 }";
 
-            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+            await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1508,17 +1508,16 @@ public async Task IndexerIsIncrementedAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
-        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsIncrementedAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int this[int x] { get { return 0; } set { } }
+    private int {|IDE0052:this|}[int x] { get { return 0; } set { } }
     public void M1(int x) => ++this[x];
 }";
 
-            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+            await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1581,17 +1580,16 @@ public async Task PropertyIsTargetOfCompoundAssignmentAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
-        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int P { get; set; }
+    private int {|IDE0052:P|} { get; set; }
     public void M1(int x) { P += x; }
 }";
 
-            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+            await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
@@ -1606,17 +1604,16 @@ public async Task IndexerIsTargetOfCompoundAssignmentAndValueUsed()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
-        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped()
         {
             var code = @"class MyClass
 {
-    private int this[int x] { get { return 0; } set { } }
+    private int {|IDE0052:this|}[int x] { get { return 0; } set { } }
     public void M1(int x, int y) => this[x] += y;
 }";
 
-            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+            await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
diff --git a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
index f6c079556a321..792758531ba93 100644
--- a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
@@ -48,9 +48,7 @@ protected static DiagnosticDescriptor CreateDescriptor(
             bool isUnnecessary,
             bool isEnabledByDefault = true,
             bool isConfigurable = true,
-            LocalizableString? description = null)
-#pragma warning disable RS0030 // Do not used banned APIs
-            => new(
+            LocalizableString? description = null) => new(
                     id, title, messageFormat,
                     DiagnosticCategory.CodeQuality,
                     DiagnosticSeverity.Info,
@@ -58,6 +56,5 @@ protected static DiagnosticDescriptor CreateDescriptor(
                     description,
                     helpLinkUri: DiagnosticHelper.GetHelpLinkForDiagnosticId(id),
                     customTags: DiagnosticCustomTags.Create(isUnnecessary, isConfigurable, enforceOnBuild));
-#pragma warning disable RS0030 // Do not used banned APIs
     }
 }
diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index d0ce9c286dbd0..c13469903ed40 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -68,6 +68,7 @@ private sealed class CompilationAnalyzer
         {
             private readonly object _gate;
             private readonly Dictionary<ISymbol, ValueUsageInfo> _symbolValueUsageStateMap;
+            private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages;
             private readonly INamedTypeSymbol _taskType, _genericTaskType, _debuggerDisplayAttributeType, _structLayoutAttributeType;
             private readonly INamedTypeSymbol _eventArgsType;
             private readonly DeserializationConstructorCheck _deserializationConstructorCheck;
@@ -82,7 +83,9 @@ private CompilationAnalyzer(
                 _analyzer = analyzer;
 
                 // State map for candidate member symbols, with the value indicating how each symbol is used in executable code.
-                _symbolValueUsageStateMap = new Dictionary<ISymbol, ValueUsageInfo>();
+                _symbolValueUsageStateMap = new();
+                // List of properies, which has a 'get' accessor usage, while the property itself is not used.
+                _propertiesWithShadowGetAccessorUsages = new();
 
                 _taskType = compilation.TaskType();
                 _genericTaskType = compilation.TaskOfTType();
@@ -297,14 +300,21 @@ memberReference.Parent is IIncrementOrDecrementOperation ||
                         // Note that the increment operation '_f1++' is child of an expression statement, which drops the result of the increment.
                         // while the increment operation '_f2++' is child of a return statement, which uses the result of the increment.
                         // For the above test, '_f1' can be safely removed without affecting the semantics of the program, while '_f2' cannot be removed.
-                        //
-                        // This behaviour should not apply to properties because otherwise analyzer will report 'get' accessor as unused, which is not true.
-                        // See https://github.com/dotnet/roslyn/issues/43191.
 
-                        if (memberReference.Parent.Parent is IExpressionStatementOperation &&
-                            memberSymbol is not IPropertySymbol)
+                        if (memberReference.Parent.Parent is IExpressionStatementOperation)
                         {
                             valueUsageInfo = ValueUsageInfo.Write;
+
+                            // If the symbol is a property, than mark it as having shadow 'get' accessor usages.
+                            // Later we will produce message "Private member X can be removed as the value assigned to it is never read"
+                            // rather than "Private property X can be converted to a method as its get accessor is never invoked" depending on this information.
+                            if (memberSymbol is IPropertySymbol propertySymbol)
+                            {
+                                lock (_gate)
+                                {
+                                    _propertiesWithShadowGetAccessorUsages.Add(propertySymbol);
+                                }
+                            }
                         }
                     }
 
@@ -475,7 +485,7 @@ member is IPropertySymbol property &&
                 return;
             }
 
-            private static LocalizableString GetMessage(
+            private LocalizableString GetMessage(
                DiagnosticDescriptor rule,
                ISymbol member)
             {
@@ -490,7 +500,10 @@ private static LocalizableString GetMessage(
                             break;
 
                         case IPropertySymbol property:
-                            if (property.GetMethod != null && property.SetMethod != null)
+                            if (property.GetMethod != null && property.SetMethod != null &&
+                                // We change the message only if there are no shadow 'get' accessor usages.
+                                // Otherwise the message will be confusing
+                                !_propertiesWithShadowGetAccessorUsages.Contains(property))
                             {
                                 messageFormat = AnalyzersResources.Private_property_0_can_be_converted_to_a_method_as_its_get_accessor_is_never_invoked;
                             }

From 6cf8fbc0b845b34a9a2e3238db7f94d89e2cff54 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 11:11:17 -0700
Subject: [PATCH 264/413] Fix tests

---
 .../Classification/SemanticClassifierTests.cs        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
index 2496df34f144d..b60ac54d1bf98 100644
--- a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
+++ b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
@@ -3571,14 +3571,10 @@ void Goo()
 Namespace("Text"),
 Namespace("RegularExpressions"),
 Keyword("var"),
-Regex.Text(@"
-            "),
 Regex.Anchor("$"),
 Regex.OtherEscape("\\"),
 Regex.OtherEscape("a"),
-Regex.Comment("(?#comment)"),
-Regex.Text(@"
-            "));
+Regex.Comment("(?#comment)"));
         }
 
         [Theory]
@@ -3602,14 +3598,10 @@ void Goo()
 Namespace("Text"),
 Namespace("RegularExpressions"),
 Keyword("var"),
-Regex.Text(@"
-            "),
 Regex.Anchor("$"),
 Regex.OtherEscape("\\"),
 Regex.OtherEscape("a"),
-Regex.Comment("(?#comment)"),
-Regex.Text(@"
-            "));
+Regex.Comment("(?#comment)"));
         }
 
         [Theory, WorkItem(47079, "https://github.com/dotnet/roslyn/issues/47079")]

From 4e508fb5b38fe335254bffb8430e7d77d81a3b5f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 11:20:07 -0700
Subject: [PATCH 265/413] Cleanup

---
 .../VirtualChars/CSharpVirtualCharService.cs  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index e6367938279b3..c83782399f2be 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -78,7 +78,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                 return TryConvertSingleLineRawStringToVirtualChars(token);
 
             if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                return TryConvertMultiLineRawStringToVirtualChars(token);
+                return TryConvertMultiLineRawStringToVirtualChars(token, (LiteralExpressionSyntax)token.GetRequiredParent(), tokenIncludeDelimiters: true);
 
             if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
             {
@@ -101,7 +101,7 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                             // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause
                                 ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(token),
+                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString, tokenIncludeDelimiters: false),
                         _ => default,
                     };
                 }
@@ -161,18 +161,18 @@ private static VirtualCharSequence TryConvertSingleLineRawStringToVirtualChars(S
             return CreateVirtualCharSequence(tokenText, offset, startIndexInclusive, endIndexExclusive, result);
         }
 
-        private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(SyntaxToken token)
+        /// <summary>
+        /// Creates the sequence for the <b>content</b> characters in this <paramref name="token"/>.  This will not
+        /// include indentation whitespace that the language specifies is not part of the content.
+        /// </summary>
+        /// <param name="parentExpression">The containing expression for this token.  This is needed so that we can
+        /// determine the indentation whitespace based on the last line of the containing multiline literal.</param>
+        /// <param name="tokenIncludeDelimiters">If this token includes the quote (<c>"</c>) characters for the
+        /// delimiters inside of it or not.  If so, then those quotes will need to be skipped when determining the
+        /// content</param>
+        private static VirtualCharSequence TryConvertMultiLineRawStringToVirtualChars(
+            SyntaxToken token, ExpressionSyntax parentExpression, bool tokenIncludeDelimiters)
         {
-            // The containing expression for this token.  This is needed so that we can determine the indentation
-            // whitespace based on the last line of the containing multiline literal.
-            ExpressionSyntax parentExpression = token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken
-                ? (LiteralExpressionSyntax)token.GetRequiredParent()
-                : (InterpolatedStringExpressionSyntax)token.GetRequiredParent().GetRequiredParent();
-
-            // Whether or not the token contains the delimiters, or if the parent owns them.  This will affect if we
-            // need to skip looking at the start/end line of the token.
-            var hasDelimiters = parentExpression is LiteralExpressionSyntax;
-
             // if this is the first text content chunk of the multi-line literal.  The first chunk contains the leading
             // indentation of the line it's on (which thus must be trimmed), while all subsequent chunks do not (because
             // they start right after some `{...}` interpolation
@@ -193,11 +193,11 @@ parentExpression is LiteralExpressionSyntax ||
 
             // If we're on the very first chunk of the multi-line raw string literal, then we want to start on line 1 so
             // we skip the space and newline that follow the initial `"""`.
-            var startLineInclusive = hasDelimiters ? 1 : 0;
+            var startLineInclusive = tokenIncludeDelimiters ? 1 : 0;
 
             // Similarly, if we're on the very last chunk of hte multi-line raw string literal, then we don't want to
             // include the line contents for the line that has the final `    """` on it.
-            var lastLineExclusive = hasDelimiters ? tokenSourceText.Lines.Count - 1 : tokenSourceText.Lines.Count;
+            var lastLineExclusive = tokenIncludeDelimiters ? tokenSourceText.Lines.Count - 1 : tokenSourceText.Lines.Count;
 
             var result = ImmutableSegmentedList.CreateBuilder<VirtualChar>();
             for (var lineNumber = startLineInclusive; lineNumber < lastLineExclusive; lineNumber++)

From 5cb11a98d036eb06de1e88551ed4d7835138c02a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 11:20:28 -0700
Subject: [PATCH 266/413] Simplify

---
 .../VirtualChars/CSharpVirtualCharService.cs             | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index c83782399f2be..f0fccda1236e2 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -91,12 +91,9 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
                 {
                     return interpolatedString.StringStartToken.Kind() switch
                     {
-                        SyntaxKind.InterpolatedStringStartToken
-                            => TryConvertStringToVirtualChars(token, "", "", escapeBraces: true),
-                        SyntaxKind.InterpolatedVerbatimStringStartToken
-                            => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
-                        SyntaxKind.InterpolatedSingleLineRawStringStartToken
-                            => TryConvertSingleLineRawStringToVirtualChars(token),
+                        SyntaxKind.InterpolatedStringStartToken => TryConvertStringToVirtualChars(token, "", "", escapeBraces: true),
+                        SyntaxKind.InterpolatedVerbatimStringStartToken => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
+                        SyntaxKind.InterpolatedSingleLineRawStringStartToken => TryConvertSingleLineRawStringToVirtualChars(token),
                         SyntaxKind.InterpolatedMultiLineRawStringStartToken
                             // Format clauses must be single line, even when in a multi-line interpolation.
                             => isFormatClause

From d4ebb3acb3c99aaa0979fc08ccf62acadcae0c76 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 11:31:00 -0700
Subject: [PATCH 267/413] Simplify

---
 .../VirtualChars/CSharpVirtualCharService.cs  | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index f0fccda1236e2..cb8d9cbb76bc0 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -57,51 +57,51 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
 
             Debug.Assert(!token.ContainsDiagnostics);
 
-            if (token.Kind() == SyntaxKind.StringLiteralToken)
+            switch (token.Kind())
             {
-                return token.IsVerbatimStringLiteral()
-                    ? TryConvertVerbatimStringToVirtualChars(token, "@\"", "\"", escapeBraces: false)
-                    : TryConvertStringToVirtualChars(token, "\"", "\"", escapeBraces: false);
-            }
+                case SyntaxKind.CharacterLiteralToken:
+                    return TryConvertStringToVirtualChars(token, "'", "'", escapeBraces: false);
 
-            if (token.Kind() == SyntaxKind.UTF8StringLiteralToken)
-            {
-                return token.IsVerbatimStringLiteral()
-                    ? TryConvertVerbatimStringToVirtualChars(token, "@\"", "\"u8", escapeBraces: false)
-                    : TryConvertStringToVirtualChars(token, "\"", "\"u8", escapeBraces: false);
-            }
+                case SyntaxKind.StringLiteralToken:
+                    return token.IsVerbatimStringLiteral()
+                        ? TryConvertVerbatimStringToVirtualChars(token, "@\"", "\"", escapeBraces: false)
+                        : TryConvertStringToVirtualChars(token, "\"", "\"", escapeBraces: false);
 
-            if (token.Kind() == SyntaxKind.CharacterLiteralToken)
-                return TryConvertStringToVirtualChars(token, "'", "'", escapeBraces: false);
-
-            if (token.Kind() is SyntaxKind.SingleLineRawStringLiteralToken or SyntaxKind.UTF8SingleLineRawStringLiteralToken)
-                return TryConvertSingleLineRawStringToVirtualChars(token);
+                case SyntaxKind.UTF8StringLiteralToken:
+                    return token.IsVerbatimStringLiteral()
+                        ? TryConvertVerbatimStringToVirtualChars(token, "@\"", "\"u8", escapeBraces: false)
+                        : TryConvertStringToVirtualChars(token, "\"", "\"u8", escapeBraces: false);
 
-            if (token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken or SyntaxKind.UTF8MultiLineRawStringLiteralToken)
-                return TryConvertMultiLineRawStringToVirtualChars(token, (LiteralExpressionSyntax)token.GetRequiredParent(), tokenIncludeDelimiters: true);
+                case SyntaxKind.SingleLineRawStringLiteralToken:
+                case SyntaxKind.UTF8SingleLineRawStringLiteralToken:
+                    return TryConvertSingleLineRawStringToVirtualChars(token);
 
-            if (token.Kind() == SyntaxKind.InterpolatedStringTextToken)
-            {
-                var parent = token.GetRequiredParent();
-                var isFormatClause = parent is InterpolationFormatClauseSyntax;
-                if (isFormatClause)
-                    parent = parent.GetRequiredParent();
+                case SyntaxKind.MultiLineRawStringLiteralToken:
+                case SyntaxKind.UTF8MultiLineRawStringLiteralToken:
+                    return TryConvertMultiLineRawStringToVirtualChars(token, (LiteralExpressionSyntax)token.GetRequiredParent(), tokenIncludeDelimiters: true);
 
-                if (parent.Parent is InterpolatedStringExpressionSyntax interpolatedString)
-                {
-                    return interpolatedString.StringStartToken.Kind() switch
+                case SyntaxKind.InterpolatedStringTextToken:
                     {
-                        SyntaxKind.InterpolatedStringStartToken => TryConvertStringToVirtualChars(token, "", "", escapeBraces: true),
-                        SyntaxKind.InterpolatedVerbatimStringStartToken => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
-                        SyntaxKind.InterpolatedSingleLineRawStringStartToken => TryConvertSingleLineRawStringToVirtualChars(token),
-                        SyntaxKind.InterpolatedMultiLineRawStringStartToken
-                            // Format clauses must be single line, even when in a multi-line interpolation.
-                            => isFormatClause
-                                ? TryConvertSingleLineRawStringToVirtualChars(token)
-                                : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString, tokenIncludeDelimiters: false),
-                        _ => default,
-                    };
-                }
+                        var parent = token.GetRequiredParent();
+                        var isFormatClause = parent is InterpolationFormatClauseSyntax;
+                        if (isFormatClause)
+                            parent = parent.GetRequiredParent();
+
+                        var interpolatedString = (InterpolatedStringExpressionSyntax)parent.GetRequiredParent();
+
+                        return interpolatedString.StringStartToken.Kind() switch
+                        {
+                            SyntaxKind.InterpolatedStringStartToken => TryConvertStringToVirtualChars(token, "", "", escapeBraces: true),
+                            SyntaxKind.InterpolatedVerbatimStringStartToken => TryConvertVerbatimStringToVirtualChars(token, "", "", escapeBraces: true),
+                            SyntaxKind.InterpolatedSingleLineRawStringStartToken => TryConvertSingleLineRawStringToVirtualChars(token),
+                            SyntaxKind.InterpolatedMultiLineRawStringStartToken
+                                // Format clauses must be single line, even when in a multi-line interpolation.
+                                => isFormatClause
+                                    ? TryConvertSingleLineRawStringToVirtualChars(token)
+                                    : TryConvertMultiLineRawStringToVirtualChars(token, interpolatedString, tokenIncludeDelimiters: false),
+                            _ => default,
+                        };
+                    }
             }
 
             return default;

From 8f35002534dad29c0f37bdd6cc410cac4300c8b7 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Fri, 6 May 2022 21:43:17 +0300
Subject: [PATCH 268/413] PF feedback and tests

---
 .../RemoveUnusedMembersTests.cs               | 64 +++++++++++++++++++
 ...ctRemoveUnusedMembersDiagnosticAnalyzer.cs | 26 +++++---
 2 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index 8c193aaeaba0c..d309b35fc5a0f 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -1496,6 +1496,22 @@ public async Task PropertyIsIncrementedAndValueDropped()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task PropertyIsIncrementedAndValueDropped_VerifyAnalizerMessage()
+        {
+            var code = @"class MyClass
+{
+    private int P { get; set; }
+    public void M1() { ++P; }
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, new DiagnosticResult(
+                CSharpRemoveUnusedMembersDiagnosticAnalyzer.s_removeUnreadMembersRule)
+                .WithSpan(3, 17, 3, 18)
+                .WithArguments("MyClass.P"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsIncrementedAndValueUsed()
         {
@@ -1520,6 +1536,22 @@ public async Task IndexerIsIncrementedAndValueDropped()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task IndexerIsIncrementedAndValueDropped_VerifyAnalizerMessage()
+        {
+            var code = @"class MyClass
+{
+    private int this[int x] { get { return 0; } set { } }
+    public void M1(int x) => ++this[x];
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, new DiagnosticResult(
+                CSharpRemoveUnusedMembersDiagnosticAnalyzer.s_removeUnreadMembersRule)
+                .WithSpan(3, 17, 3, 21)
+                .WithArguments("MyClass.this[]"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task FieldIsTargetOfCompoundAssignmentAndValueUsed()
         {
@@ -1592,6 +1624,22 @@ public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnalizerMessage()
+        {
+            var code = @"class MyClass
+{
+    private int P { get; set; }
+    public void M1(int x) { P += x; }
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, new DiagnosticResult(
+                CSharpRemoveUnusedMembersDiagnosticAnalyzer.s_removeUnreadMembersRule)
+                .WithSpan(3, 17, 3, 18)
+                .WithArguments("MyClass.P"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsTargetOfCompoundAssignmentAndValueUsed()
         {
@@ -1616,6 +1664,22 @@ public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped()
             await VerifyCS.VerifyCodeFixAsync(code, code);
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnalizerMessage()
+        {
+            var code = @"class MyClass
+{
+    private int this[int x] { get { return 0; } set { } }
+    public void M1(int x, int y) => this[x] += y;
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, new DiagnosticResult(
+                CSharpRemoveUnusedMembersDiagnosticAnalyzer.s_removeUnreadMembersRule)
+                .WithSpan(3, 17, 3, 21)
+                .WithArguments("MyClass.this[]"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task FieldIsTargetOfAssignmentAndParenthesized()
         {
diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index c13469903ed40..7c378c6546c5d 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -33,7 +33,8 @@ internal abstract class AbstractRemoveUnusedMembersDiagnosticAnalyzer<TDocumenta
             isUnnecessary: true);
 
         // IDE0052: "Remove unread members" (Value is written and/or symbol is referenced, but the assigned value is never read)
-        private static readonly DiagnosticDescriptor s_removeUnreadMembersRule = CreateDescriptor(
+        // Internal for testing
+        internal static readonly DiagnosticDescriptor s_removeUnreadMembersRule = CreateDescriptor(
             IDEDiagnosticIds.RemoveUnreadMembersDiagnosticId,
             EnforceOnBuildValues.RemoveUnreadMembers,
             new LocalizableResourceString(nameof(AnalyzersResources.Remove_unread_private_members), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)),
@@ -67,8 +68,18 @@ protected virtual void HandleNamedTypeSymbolStart(SymbolStartAnalysisContext con
         private sealed class CompilationAnalyzer
         {
             private readonly object _gate;
-            private readonly Dictionary<ISymbol, ValueUsageInfo> _symbolValueUsageStateMap;
-            private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages;
+            // State map for candidate member symbols, with the value indicating how each symbol is used in executable code.
+            private readonly Dictionary<ISymbol, ValueUsageInfo> _symbolValueUsageStateMap = new();
+            // List of properies, which has a 'get' accessor usage, while the property itself is not used, e.g.:
+            //
+            // class C
+            // {
+            //     private int P { get; set; }
+            //     public void M() { P++; }
+            // }
+            //
+            // Here 'get' accessor is used in increment operation, but 'P' itself is not used anywhere else, so it can be safely removed
+            private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages = new();
             private readonly INamedTypeSymbol _taskType, _genericTaskType, _debuggerDisplayAttributeType, _structLayoutAttributeType;
             private readonly INamedTypeSymbol _eventArgsType;
             private readonly DeserializationConstructorCheck _deserializationConstructorCheck;
@@ -82,11 +93,6 @@ private CompilationAnalyzer(
                 _gate = new object();
                 _analyzer = analyzer;
 
-                // State map for candidate member symbols, with the value indicating how each symbol is used in executable code.
-                _symbolValueUsageStateMap = new();
-                // List of properies, which has a 'get' accessor usage, while the property itself is not used.
-                _propertiesWithShadowGetAccessorUsages = new();
-
                 _taskType = compilation.TaskType();
                 _genericTaskType = compilation.TaskOfTType();
                 _debuggerDisplayAttributeType = compilation.DebuggerDisplayAttributeType();
@@ -500,9 +506,9 @@ private LocalizableString GetMessage(
                             break;
 
                         case IPropertySymbol property:
+                            // We change the message only if both 'get' and 'set' accessors are present and
+                            // there are no shadow 'get' accessor usages. Otherwise the message will be confusing
                             if (property.GetMethod != null && property.SetMethod != null &&
-                                // We change the message only if there are no shadow 'get' accessor usages.
-                                // Otherwise the message will be confusing
                                 !_propertiesWithShadowGetAccessorUsages.Contains(property))
                             {
                                 messageFormat = AnalyzersResources.Private_property_0_can_be_converted_to_a_method_as_its_get_accessor_is_never_invoked;

From 0f0207013185da27af717d2f1b14663c7c861172 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 13:18:42 -0700
Subject: [PATCH 269/413] In progress

---
 .../KnownSourcePasteProcessor.cs              |  6 +-
 .../StringCopyPasteCommandHandler.cs          |  3 +
 .../StringCopyPasteCommandHandler_CutCopy.cs  | 78 +++++++++++++------
 .../CSharp/StringCopyPaste/StringInfo.cs      |  8 +-
 4 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 7bf3d9b6f5411..2c0265ed81bac 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -67,8 +67,8 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
 
             // Smart Pasting into raw string not supported yet.  
             if (IsAnyRawStringExpression(StringExpressionBeforePaste))
-                // return default;
-                return GetEditsForRawString(cancellationToken);
+                return default;
+                // return GetEditsForRawString(cancellationToken);
 
             return GetEditsForNonRawString();
         }
@@ -333,6 +333,8 @@ private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(Array
         }
 #endif
 
+#if false
+
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
         {
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 8d5247c1e46ec..04edeb7dddc59 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -208,6 +208,8 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
             {
                 // See if we can determine the information about the code the user copied from.
                 var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
+
+#if false
                 if (service != null &&
                     _lastSelectedSpans?.Count > 0 &&
                     _lastClipboardSequenceNumber != null &&
@@ -233,6 +235,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                         }
                     }
                 }
+#endif
 
                 return default;
             }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 4b1fa1e152b8e..dcaab3cba6f85 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -7,13 +7,12 @@
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
-using System.Text;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp.ConvertCast;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Commanding;
@@ -54,7 +53,7 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
                 copyPasteService.TrySetClipboardData(KeyAndVersion, dataToStore);
         }
 
-        private (string dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(
+        private static (string dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(
             ITextView textView, ITextBuffer subjectBuffer, CancellationToken cancellationToken)
         {
             var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
@@ -65,8 +64,6 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
             if (copyPasteService == null)
                 return default;
 
-            //var editorOptions = textView.Options;
-            //var  editorOptions.GetOptionValue<bool>(DefaultTextViewOptions.CutOrCopyBlankLineIfNoSelectionId);
             var spans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
             if (spans.Count != 1)
                 return default;
@@ -86,7 +83,7 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
                 return default;
 
             var virtualCharService = document.GetRequiredLanguageService<IVirtualCharLanguageService>();
-            var stringData = TryGetStringCopyPasteData(virtualCharService, snapshot.AsText(), stringExpression, span.Span.ToTextSpan());
+            var stringData = TryGetStringCopyPasteData(virtualCharService, stringExpression, span.Span.ToTextSpan());
             if (stringData is null)
                 return default;
 
@@ -99,38 +96,75 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
             using var reader = new StreamReader(stream);
             var json = reader.ReadToEnd();
 
-            copyPasteService.TrySetClipboardData(KeyAndVersion, json);
+            return (json, copyPasteService);
         }
 
-        private StringCopyPasteData? TryGetStringCopyPasteData(IVirtualCharLanguageService virtualCharService, SourceText text, ExpressionSyntax stringExpression, TextSpan span)
+        private static StringCopyPasteData? TryGetStringCopyPasteData(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan span)
             => stringExpression switch
             {
-                LiteralExpressionSyntax literal => TryGetStringCopyPasteDataForLiteral(virtualCharService, text, literal, span),
-                InterpolatedStringExpressionSyntax interpolatedString => TryGetStringCopyPasteDataForInterpolatedString(text, interpolatedString, span),
+                LiteralExpressionSyntax literal => TryGetStringCopyPasteDataForLiteral(virtualCharService, literal, span),
+                InterpolatedStringExpressionSyntax interpolatedString => TryGetStringCopyPasteDataForInterpolatedString(virtualCharService, interpolatedString, span),
                 _ => throw ExceptionUtilities.UnexpectedValue(stringExpression.Kind()),
             };
 
-        private StringCopyPasteData? TryGetStringCopyPasteDataForLiteral(
-            IVirtualCharLanguageService virtualCharService, SourceText text, LiteralExpressionSyntax literal, TextSpan span)
+        private static StringCopyPasteData? TryGetStringCopyPasteDataForLiteral(
+            IVirtualCharLanguageService virtualCharService, LiteralExpressionSyntax literal, TextSpan span)
         {
-            var virtualChars = virtualCharService.TryConvertToVirtualChars(literal.Token);
-            if (virtualChars.IsDefaultOrEmpty)
+            if (!TryGetContentForSpan(virtualCharService, literal.Token, span, out var content))
                 return null;
 
-            var firstChar = virtualChars.FirstOrNull(vc => vc.Span.Start == span.Start);
-            var lastChar = virtualChars.LastOrNull(vc => vc.Span.End == span.End);
+            return new StringCopyPasteData(ImmutableArray.Create(content));
+        }
 
-            if (firstChar is null || lastChar is null)
-                return null;
+        private static bool TryGetContentForSpan(
+            IVirtualCharLanguageService virtualCharService,
+            SyntaxToken token,
+            TextSpan span,
+            out StringCopyPasteContent content)
+        {
+            content = default;
+            var virtualChars = virtualCharService.TryConvertToVirtualChars(token);
+            if (virtualChars.IsDefaultOrEmpty)
+                return false;
+
+            var firstOverlappingChar = virtualChars.FirstOrNull(vc => vc.Span.OverlapsWith(span));
+            var lastOverlappingChar = virtualChars.LastOrNull(vc => vc.Span.OverlapsWith(span));
 
-            var firstCharIndex = virtualChars.IndexOf(firstChar.Value);
-            var lastCharIndex = virtualChars.IndexOf(lastChar.Value);
+            if (firstOverlappingChar is null || lastOverlappingChar is null)
+                return false;
 
+            var firstCharIndexInclusive = virtualChars.IndexOf(firstOverlappingChar.Value);
+            var lastCharIndexInclusive = virtualChars.IndexOf(lastOverlappingChar.Value);
+
+            var subsequence = virtualChars.GetSubSequence(TextSpan.FromBounds(firstCharIndexInclusive, lastCharIndexInclusive + 1));
+            content = new StringCopyPasteContent(StringCopyPasteContentKind.Text, subsequence.CreateString());
+            return true;
         }
 
-        private StringCopyPasteData? TryGetStringCopyPasteDataForInterpolatedString(SourceText text, InterpolatedStringExpressionSyntax interpolatedString, TextSpan span)
+        private static StringCopyPasteData? TryGetStringCopyPasteDataForInterpolatedString(
+            IVirtualCharLanguageService virtualCharService, InterpolatedStringExpressionSyntax interpolatedString, TextSpan span)
         {
-            return null;
+            using var _ = ArrayBuilder<StringCopyPasteContent>.GetInstance(out var result);
+
+            foreach (var interpolatedContent in interpolatedString.Contents)
+            {
+                if (interpolatedContent.Span.OverlapsWith(span))
+                {
+                    if (interpolatedContent is InterpolationSyntax interpolation)
+                    {
+                        result.Add(new StringCopyPasteContent(StringCopyPasteContentKind.InterpolationCode, interpolation.ToString()));
+                    }
+                    else if (interpolatedContent is InterpolatedStringTextSyntax stringText)
+                    {
+                        if (!TryGetContentForSpan(virtualCharService, stringText.TextToken, span, out var content))
+                            return null;
+
+                        result.Add(content);
+                    }
+                }
+            }
+
+            return new StringCopyPasteData(result.ToImmutable());
         }
     }
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
index 862c4fcb98623..0234d4da7ad79 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
@@ -244,9 +244,8 @@ private static StringInfo GetInterpolatedStringInfo(
             start++;
         var delimiterQuoteCount = start - position;
 
-        var end = interpolatedString.Span.End;
-
-        end = SkipU8Suffix(text, end);
+        var end = SkipU8Suffix(text, interpolatedString.Span.End);
+        var endBeforeU8Suffix = end;
         while (end > interpolatedString.StringEndToken.Span.Start && text[end - 1] == '"')
             end--;
 
@@ -264,6 +263,7 @@ private static StringInfo GetInterpolatedStringInfo(
 
         var startDelimiterSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
         var endDelimiterSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
+        var endDelimiterSpanWithoutSuffix = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, endBeforeU8Suffix);
 
         // Then, once through the body, add a final span from the end of the last interpolation to the end delimiter.
         result.Add(TextSpan.FromBounds(currentPosition, end));
@@ -272,6 +272,6 @@ private static StringInfo GetInterpolatedStringInfo(
         // todo: implement withoutIndentationSpans properly
         var withoutIndentationSpans = contentSpans;
 
-        return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, contentSpans, withoutIndentationSpans);
+        return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, endDelimiterSpanWithoutSuffix, contentSpans, withoutIndentationSpans);
     }
 }

From 91dd83ad960814d4ce136ac16e816f287f586f26 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 14:18:47 -0700
Subject: [PATCH 270/413] new logic

---
 .../KnownSourcePasteProcessor.cs              | 110 +++++++++++++--
 .../StringCopyPasteCommandHandler.cs          |  51 +++----
 .../StringCopyPasteCommandHandler_CutCopy.cs  |  98 +++++++-------
 .../StringCopyPaste/StringCopyPasteData.cs    | 127 ++++++++++++++++++
 4 files changed, 289 insertions(+), 97 deletions(-)
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 2c0265ed81bac..9236ddad5731b 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -30,15 +30,8 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// </summary>
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
-        /// <summary>
-        /// The original string expression in some document that we were cut/copying text from.
-        /// </summary>
-        private readonly ExpressionSyntax _stringExpressionCopiedFrom;
-
-        /// <summary>
-        /// The text snapshot of the document the original text was cut/copied from.
-        /// </summary>
-        private readonly ITextSnapshot _snapshotCopiedFrom;
+        private readonly SnapshotSpan _selectionBeforePaste;
+        private readonly StringCopyPasteData _copyPasteData;
         private readonly ITextBufferFactoryService3 _textBufferFactoryService;
 
         public KnownSourcePasteProcessor(
@@ -49,13 +42,13 @@ public KnownSourcePasteProcessor(
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
-            ExpressionSyntax stringExpressionCopiedFrom,
-            ITextSnapshot snapshotCopiedFrom,
+            SnapshotSpan selectionBeforePaste,
+            StringCopyPasteData copyPasteData,
             ITextBufferFactoryService3 textBufferFactoryService)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
-            _stringExpressionCopiedFrom = stringExpressionCopiedFrom;
-            _snapshotCopiedFrom = snapshotCopiedFrom;
+            _selectionBeforePaste = selectionBeforePaste;
+            _copyPasteData = copyPasteData;
             _textBufferFactoryService = textBufferFactoryService;
         }
 
@@ -75,6 +68,91 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
 
         private ImmutableArray<TextChange> GetEditsForNonRawString()
         {
+            using var _ = PooledStringBuilder.GetInstance(out var builder);
+
+            if (StringExpressionBeforePaste is LiteralExpressionSyntax literal)
+            {
+                var isVerbatim = literal.Token.IsVerbatimStringLiteral();
+                foreach (var content in _copyPasteData.Contents)
+                {
+                    if (content.IsText)
+                    {
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.TextValue));
+                    }
+                    else if (content.IsInterpolation)
+                    {
+                        // we're copying an interpolation from an interpolated string to a string literal. For example,
+                        // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in
+                        // the future is split the literal into `"goo" + $"{x + y}" + "bar"`, or just making the
+                        // containing literal into an interpolation itself.  However, for now, we do the simple thing
+                        // and just treat the interpolation as raw text that should just be escaped as appropriate into
+                        // the destination.
+                        builder.Append('{');
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationExpression));
+
+                        if (content.InterpolationAlignmentClause != null)
+                            builder.Append(content.InterpolationAlignmentClause);
+
+                        if (content.InterpolationFormatClause != null)
+                        {
+                            builder.Append(':');
+                            builder.Append(EscapeForNonRawStringLiteral(
+                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationFormatClause));
+                        }
+
+                        builder.Append('}');
+                    }
+                    else
+                    {
+                        throw ExceptionUtilities.UnexpectedValue(content.Kind);
+                    }
+                }
+            }
+            else if (StringExpressionBeforePaste is InterpolatedStringExpressionSyntax interpolatedString)
+            {
+                var isVerbatim = interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken;
+                foreach (var content in _copyPasteData.Contents)
+                {
+                    if (content.IsText)
+                    {
+                        builder.Append(EscapeForNonRawStringLiteral(
+                            isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.TextValue));
+                    }
+                    else if (content.IsInterpolation)
+                    {
+                        // we're moving an interpolation from one interpolation to another.  This can just be copied
+                        // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                        // for the destination type.
+                        builder.Append('{');
+                        builder.Append(content.InterpolationExpression);
+
+                        if (content.InterpolationAlignmentClause != null)
+                            builder.Append(content.InterpolationAlignmentClause);
+
+                        if (content.InterpolationFormatClause != null)
+                        {
+                            builder.Append(':');
+                            builder.Append(EscapeForNonRawStringLiteral(
+                                isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.InterpolationFormatClause));
+                        }
+
+                        builder.Append('}');
+                    }
+                    else
+                    {
+                        throw ExceptionUtilities.UnexpectedValue(content.Kind);
+                    }
+                }
+            }
+            else
+            {
+                throw ExceptionUtilities.Unreachable;
+            }
+
+            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
+#if false
             using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
 
             foreach (var change in Changes)
@@ -185,8 +263,12 @@ string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpress
                     return builder.ToString();
                 }
             }
+
+#endif
         }
 
+#if false
+
         /// <summary>
         /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
         /// string it came from.  With this we can determine how to interpret things like the escapes in their original
@@ -249,6 +331,8 @@ private string WrapChangeWithOriginalQuotes(string pastedText)
             return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
 
+#endif
+
 #if false
 
         private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 04edeb7dddc59..1eadc99f0f5a3 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
+using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
@@ -51,8 +52,6 @@ internal partial class StringCopyPasteCommandHandler :
     {
         private const string CopyId = "RoslynStringCopyPasteId";
 
-        private static int s_sequenceNumber = 1;
-
         private readonly IThreadingContext _threadingContext;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
         private readonly ITextBufferFactoryService3 _textBufferFactoryService;
@@ -206,38 +205,28 @@ ImmutableArray<TextChange> GetEdits(string newLine, IndentationOptions indentati
 
             ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
             {
+                // For simplicity, we only support smart copy/paste when we are pasting into a single contiguous region.
+                if (selectionsBeforePaste.Count != 1)
+                    return default;
+
                 // See if we can determine the information about the code the user copied from.
                 var service = documentBeforePaste.Project.Solution.Workspace.Services.GetService<IStringCopyPasteService>();
 
-#if false
-                if (service != null &&
-                    _lastSelectedSpans?.Count > 0 &&
-                    _lastClipboardSequenceNumber != null &&
-                    service.TryGetClipboardSequenceNumber(out var sequenceNumber) &&
-                    _lastClipboardSequenceNumber == sequenceNumber)
-                {
-                    var lastSelectedSnapshot = _lastSelectedSpans[0].Snapshot;
-                    var lastSelectedDocument = lastSelectedSnapshot.GetOpenDocumentInCurrentContextWithChanges();
-                    if (lastSelectedDocument != null)
-                    {
-                        var stringExpressionCopiedFrom = TryGetCompatibleContainingStringExpression(
-                            lastSelectedDocument, _lastSelectedSpans, cancellationToken);
-                        if (stringExpressionCopiedFrom != null)
-                        {
-                            var knownProcessor = new KnownSourcePasteProcessor(
-                                newLine, indentationOptions,
-                                snapshotBeforePaste, snapshotAfterPaste,
-                                documentBeforePaste, documentAfterPaste,
-                                stringExpressionBeforePaste, stringExpressionCopiedFrom,
-                                _lastSelectedSpans[0].Snapshot,
-                                _textBufferFactoryService);
-                            return knownProcessor.GetEdits(cancellationToken);
-                        }
-                    }
-                }
-#endif
-
-                return default;
+                var clipboardData = service?.TryGetClipboardData(KeyAndVersion);
+                var copyPasteData = StringCopyPasteData.FromJson(clipboardData);
+
+                if (copyPasteData == null)
+                    return default;
+
+                var knownProcessor = new KnownSourcePasteProcessor(
+                    newLine, indentationOptions,
+                    snapshotBeforePaste, snapshotAfterPaste,
+                    documentBeforePaste, documentAfterPaste,
+                    stringExpressionBeforePaste,
+                    selectionsBeforePaste[0],
+                    copyPasteData,
+                    _textBufferFactoryService);
+                return knownProcessor.GetEdits(cancellationToken);
             }
         }
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index dcaab3cba6f85..51c6628c7255c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -4,14 +4,17 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
+using System.Text;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
@@ -53,7 +56,7 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
                 copyPasteService.TrySetClipboardData(KeyAndVersion, dataToStore);
         }
 
-        private static (string dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(
+        private static (string? dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(
             ITextView textView, ITextBuffer subjectBuffer, CancellationToken cancellationToken)
         {
             var document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
@@ -84,19 +87,8 @@ private static (string dataToStore, IStringCopyPasteService service) CaptureCutC
 
             var virtualCharService = document.GetRequiredLanguageService<IVirtualCharLanguageService>();
             var stringData = TryGetStringCopyPasteData(virtualCharService, stringExpression, span.Span.ToTextSpan());
-            if (stringData is null)
-                return default;
-
-            using var stream = new MemoryStream();
-            var serializer = new DataContractJsonSerializer(
-                typeof(StringCopyPasteData), new[] { typeof(StringCopyPasteContent) });
-            serializer.WriteObject(stream, stringData);
-
-            stream.Position = 0;
-            using var reader = new StreamReader(stream);
-            var json = reader.ReadToEnd();
 
-            return (json, copyPasteService);
+            return (stringData?.ToJson(), copyPasteService);
         }
 
         private static StringCopyPasteData? TryGetStringCopyPasteData(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan span)
@@ -116,13 +108,13 @@ private static (string dataToStore, IStringCopyPasteService service) CaptureCutC
             return new StringCopyPasteData(ImmutableArray.Create(content));
         }
 
-        private static bool TryGetContentForSpan(
+        private static bool TryGetNormalizedStringForSpan(
             IVirtualCharLanguageService virtualCharService,
             SyntaxToken token,
             TextSpan span,
-            out StringCopyPasteContent content)
+            [NotNullWhen(true)] out string? normalizedText)
         {
-            content = default;
+            normalizedText = null;
             var virtualChars = virtualCharService.TryConvertToVirtualChars(token);
             if (virtualChars.IsDefaultOrEmpty)
                 return false;
@@ -137,12 +129,32 @@ private static bool TryGetContentForSpan(
             var lastCharIndexInclusive = virtualChars.IndexOf(lastOverlappingChar.Value);
 
             var subsequence = virtualChars.GetSubSequence(TextSpan.FromBounds(firstCharIndexInclusive, lastCharIndexInclusive + 1));
-            content = new StringCopyPasteContent(StringCopyPasteContentKind.Text, subsequence.CreateString());
+            normalizedText = subsequence.CreateString();
             return true;
         }
 
+        private static bool TryGetContentForSpan(
+            IVirtualCharLanguageService virtualCharService,
+            SyntaxToken token,
+            TextSpan span,
+            out StringCopyPasteContent content)
+        {
+            if (!TryGetNormalizedStringForSpan(virtualCharService, token, span, out var text))
+            {
+                content = default;
+                return false;
+            }
+            else
+            {
+                content = StringCopyPasteContent.ForText(text);
+                return true;
+            }
+        }
+
         private static StringCopyPasteData? TryGetStringCopyPasteDataForInterpolatedString(
-            IVirtualCharLanguageService virtualCharService, InterpolatedStringExpressionSyntax interpolatedString, TextSpan span)
+            IVirtualCharLanguageService virtualCharService,
+            InterpolatedStringExpressionSyntax interpolatedString,
+            TextSpan span)
         {
             using var _ = ArrayBuilder<StringCopyPasteContent>.GetInstance(out var result);
 
@@ -152,7 +164,21 @@ private static bool TryGetContentForSpan(
                 {
                     if (interpolatedContent is InterpolationSyntax interpolation)
                     {
-                        result.Add(new StringCopyPasteContent(StringCopyPasteContentKind.InterpolationCode, interpolation.ToString()));
+                        // If the user copies a portion of an interpolation, just treat this as a non-smart copy paste for simplicity.
+                        if (!span.Contains(interpolation.Span))
+                            return null;
+
+                        var formatClause = (string?)null;
+                        if (interpolation.FormatClause != null &&
+                            !TryGetNormalizedStringForSpan(virtualCharService, interpolation.FormatClause.FormatStringToken, span, out formatClause))
+                        {
+                            return null;
+                        }
+
+                        result.Add(StringCopyPasteContent.ForInterpolation(
+                            interpolation.Expression.ToFullString(),
+                            interpolation.AlignmentClause?.ToFullString(),
+                            formatClause));
                     }
                     else if (interpolatedContent is InterpolatedStringTextSyntax stringText)
                     {
@@ -167,38 +193,4 @@ private static bool TryGetContentForSpan(
             return new StringCopyPasteData(result.ToImmutable());
         }
     }
-
-    [DataContract]
-    internal class StringCopyPasteData
-    {
-        [DataMember(Order = 0)]
-        public readonly ImmutableArray<StringCopyPasteContent> Contents;
-
-        public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
-        {
-            Contents = contents;
-        }
-    }
-
-    internal enum StringCopyPasteContentKind
-    {
-        Text,
-        InterpolationCode, // When an interpolation is copied.
-    }
-
-    [DataContract]
-    internal readonly struct StringCopyPasteContent
-    {
-        [DataMember(Order = 0)]
-        public readonly StringCopyPasteContentKind Kind;
-
-        [DataMember(Order = 1)]
-        public readonly string Data;
-
-        public StringCopyPasteContent(StringCopyPasteContentKind kind, string data)
-        {
-            Kind = kind;
-            Data = data;
-        }
-    }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
new file mode 100644
index 0000000000000..d66702965a553
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
@@ -0,0 +1,127 @@
+// 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.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
+{
+    [DataContract]
+    internal class StringCopyPasteData
+    {
+        private static readonly DataContractJsonSerializer s_serializer = new(typeof(StringCopyPasteData), new[] { typeof(StringCopyPasteContent) });
+
+        [DataMember(Order = 0)]
+        public readonly ImmutableArray<StringCopyPasteContent> Contents;
+
+        public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
+        {
+            Contents = contents;
+        }
+
+        public string ToJson()
+        {
+            using var stream = new MemoryStream();
+            s_serializer.WriteObject(stream, this);
+
+            stream.Position = 0;
+            using var reader = new StreamReader(stream);
+            return reader.ReadToEnd();
+        }
+
+        public static StringCopyPasteData? FromJson(string? json)
+        {
+            if (json == null)
+                return null;
+
+            using var stringStream = new MemoryStream(Encoding.UTF8.GetBytes(json));
+            try
+            {
+                return (StringCopyPasteData)s_serializer.ReadObject(stringStream);
+            }
+            catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
+            {
+            }
+
+            return null;
+        }
+    }
+
+    internal enum StringCopyPasteContentKind
+    {
+        Text,           // When text content is copied.
+        Interpolation,  // When an interpolation is copied.
+    }
+
+    [DataContract]
+    internal readonly struct StringCopyPasteContent
+    {
+        [DataMember(Order = 0)]
+        public readonly StringCopyPasteContentKind Kind;
+
+        /// <summary>
+        /// The actual string value for <see cref="StringCopyPasteContentKind.Text"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.
+        /// </summary>
+        [DataMember(Order = 1)]
+        public readonly string? TextValue;
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.Expression"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        [DataMember(Order = 2)]
+        public readonly string? InterpolationExpression;
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.AlignmentClause"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        [DataMember(Order = 3)]
+        public readonly string? InterpolationAlignmentClause;
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.FormatClause"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        [DataMember(Order = 4)]
+        public readonly string? InterpolationFormatClause;
+
+        public StringCopyPasteContent(
+            StringCopyPasteContentKind kind,
+            string? textValue,
+            string? interpolationExpression,
+            string? interpolationAlignmentClause,
+            string? interpolationFormatClause)
+        {
+            Kind = kind;
+            TextValue = textValue;
+            InterpolationExpression = interpolationExpression;
+            InterpolationAlignmentClause = interpolationAlignmentClause;
+            InterpolationFormatClause = interpolationFormatClause;
+        }
+
+        [MemberNotNullWhen(true, nameof(TextValue))]
+        public bool IsText => Kind == StringCopyPasteContentKind.Text;
+
+        [MemberNotNullWhen(true, nameof(InterpolationExpression))]
+        public bool IsInterpolation => Kind == StringCopyPasteContentKind.Interpolation;
+
+        public static StringCopyPasteContent ForText(string text)
+            => new(StringCopyPasteContentKind.Text, text, null, null, null);
+
+        public static StringCopyPasteContent ForInterpolation(string expression, string? alignmentClause, string? formatClause)
+            => new(StringCopyPasteContentKind.Interpolation, null, expression, alignmentClause, formatClause);
+    }
+}

From c738280845bc28681fa67308f8940da1e85daa72 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 14:57:00 -0700
Subject: [PATCH 271/413] In progress

---
 .../StringCopyPasteCommandHandler_CutCopy.cs  |  2 +-
 .../StringCopyPaste/StringCopyPasteData.cs    | 52 ++++++++++---------
 .../StringCopyPasteCommandHandlerTests.cs     |  9 +++-
 .../WpfStringCopyPasteService.cs              |  6 ++-
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 51c6628c7255c..1e6a232d7efcc 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -30,7 +30,7 @@ internal partial class StringCopyPasteCommandHandler :
         IChainedCommandHandler<CutCommandArgs>,
         IChainedCommandHandler<CopyCommandArgs>
     {
-        private const string KeyAndVersion = nameof(StringCopyPasteCommandHandler) + "V1";
+        public const string KeyAndVersion = nameof(StringCopyPasteCommandHandler) + "V1";
 
         public CommandState GetCommandState(CutCommandArgs args, Func<CommandState> nextCommandHandler)
             => nextCommandHandler();
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
index d66702965a553..3fa13e49ecf9a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
@@ -11,41 +11,46 @@
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
-    [DataContract]
     internal class StringCopyPasteData
     {
-        private static readonly DataContractJsonSerializer s_serializer = new(typeof(StringCopyPasteData), new[] { typeof(StringCopyPasteContent) });
-
-        [DataMember(Order = 0)]
-        public readonly ImmutableArray<StringCopyPasteContent> Contents;
+        public ImmutableArray<StringCopyPasteContent> Contents { get; }
 
+        [JsonConstructor]
         public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
         {
             Contents = contents;
         }
 
-        public string ToJson()
+        public string? ToJson()
         {
-            using var stream = new MemoryStream();
-            s_serializer.WriteObject(stream, this);
+            try
+            {
+                return JsonSerializer.Serialize(this, typeof(StringCopyPasteData));
+            }
+            catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
+            {
+            }
 
-            stream.Position = 0;
-            using var reader = new StreamReader(stream);
-            return reader.ReadToEnd();
+            return null;
         }
 
         public static StringCopyPasteData? FromJson(string? json)
         {
-            if (json == null)
+            if (string.IsNullOrWhiteSpace(json))
                 return null;
 
-            using var stringStream = new MemoryStream(Encoding.UTF8.GetBytes(json));
             try
             {
-                return (StringCopyPasteData)s_serializer.ReadObject(stringStream);
+                var value = JsonSerializer.Deserialize(JsonDocument.Parse(json), typeof(StringCopyPasteData));
+                if (value is null)
+                    return null;
+
+                return (StringCopyPasteData)value;
             }
             catch (Exception ex) when (FatalError.ReportAndCatch(ex, ErrorSeverity.Critical))
             {
@@ -61,43 +66,38 @@ internal enum StringCopyPasteContentKind
         Interpolation,  // When an interpolation is copied.
     }
 
-    [DataContract]
     internal readonly struct StringCopyPasteContent
     {
-        [DataMember(Order = 0)]
-        public readonly StringCopyPasteContentKind Kind;
+        public StringCopyPasteContentKind Kind { get; }
 
         /// <summary>
         /// The actual string value for <see cref="StringCopyPasteContentKind.Text"/>.  <see langword="null"/> for <see
         /// cref="StringCopyPasteContentKind.Interpolation"/>.
         /// </summary>
-        [DataMember(Order = 1)]
-        public readonly string? TextValue;
+        public string? TextValue { get; }
 
         /// <summary>
         /// The actual string value for <see cref="InterpolationSyntax.Expression"/> for <see
         /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
         /// cref="StringCopyPasteContentKind.Text"/>.
         /// </summary>
-        [DataMember(Order = 2)]
-        public readonly string? InterpolationExpression;
+        public string? InterpolationExpression { get; }
 
         /// <summary>
         /// The actual string value for <see cref="InterpolationSyntax.AlignmentClause"/> for <see
         /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
         /// cref="StringCopyPasteContentKind.Text"/>.
         /// </summary>
-        [DataMember(Order = 3)]
-        public readonly string? InterpolationAlignmentClause;
+        public string? InterpolationAlignmentClause { get; }
 
         /// <summary>
         /// The actual string value for <see cref="InterpolationSyntax.FormatClause"/> for <see
         /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
         /// cref="StringCopyPasteContentKind.Text"/>.
         /// </summary>
-        [DataMember(Order = 4)]
-        public readonly string? InterpolationFormatClause;
+        public string? InterpolationFormatClause { get; }
 
+        [JsonConstructor]
         public StringCopyPasteContent(
             StringCopyPasteContentKind kind,
             string? textValue,
@@ -112,9 +112,11 @@ public StringCopyPasteContent(
             InterpolationFormatClause = interpolationFormatClause;
         }
 
+        [JsonIgnore]
         [MemberNotNullWhen(true, nameof(TextValue))]
         public bool IsText => Kind == StringCopyPasteContentKind.Text;
 
+        [JsonIgnore]
         [MemberNotNullWhen(true, nameof(InterpolationExpression))]
         public bool IsInterpolation => Kind == StringCopyPasteContentKind.Interpolation;
 
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 7638a5e2cfd67..4966bfa722940 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste;
+using Microsoft.CodeAnalysis.Editor.StringCopyPaste;
 using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
@@ -30,9 +31,9 @@ internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
             private static readonly TestComposition s_compositionWithUnknownCopy =
                 EditorTestCompositions.EditorFeaturesWpf
                     .AddParts(typeof(StringCopyPasteCommandHandler));
-            // .AddExcludedPartTypes(typeof(WpfStringCopyPasteService));
+
             private static readonly TestComposition s_compositionWithKnownCopy =
-                s_compositionWithUnknownCopy;//.AddParts(typeof(MockStringCopyPasteService));
+                s_compositionWithUnknownCopy;
 
             private readonly StringCopyPasteCommandHandler _commandHandler;
 
@@ -97,6 +98,10 @@ public void TestCopyPaste(string expectedMarkup, string? pasteText, string after
                 {
                     // If we don't have a file to copy text from, then the paste text must be explicitly provided.");
                     Assert.NotNull(pasteText);
+
+                    // Ensure we clear out the clipboard so that a prior copy/paste doesn't corrupt the test.
+                    var service = workspace.Services.GetRequiredService<IStringCopyPasteService>();
+                    service.TrySetClipboardData(StringCopyPasteCommandHandler.KeyAndVersion, "");
                 }
 
                 if (pasteText == null)
diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index 2dce350c3d7a6..81fd8f3d0216d 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -30,10 +30,14 @@ public bool TrySetClipboardData(string key, string data)
             {
                 var dataObject = Clipboard.GetDataObject();
 
-                var copy = new DataObject(GetFormat(key), data);
+                var storedFormat = GetFormat(key);
+                var copy = new DataObject(storedFormat, data);
 
                 foreach (var format in dataObject.GetFormats())
                 {
+                    if (format == storedFormat)
+                        continue;
+
                     if (dataObject.GetDataPresent(format))
                         copy.SetData(format, dataObject.GetData(format));
                 }

From ccfeb9e0cc63d58f586146fdaa057c42cd8b321f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:00:05 -0700
Subject: [PATCH 272/413] Working!

---
 .../Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
index 81fd8f3d0216d..5c75eb36b76a5 100644
--- a/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
+++ b/src/EditorFeatures/Core.Wpf/StringCopyPaste/WpfStringCopyPasteService.cs
@@ -30,18 +30,16 @@ public bool TrySetClipboardData(string key, string data)
             {
                 var dataObject = Clipboard.GetDataObject();
 
-                var storedFormat = GetFormat(key);
-                var copy = new DataObject(storedFormat, data);
+                var copy = new DataObject();
 
                 foreach (var format in dataObject.GetFormats())
                 {
-                    if (format == storedFormat)
-                        continue;
-
                     if (dataObject.GetDataPresent(format))
                         copy.SetData(format, dataObject.GetData(format));
                 }
 
+                copy.SetData(GetFormat(key), data);
+
                 Clipboard.SetDataObject(copy);
                 return true;
             }

From a12f7d27a64935adb3d17c7bf6632b33228917ff Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:04:24 -0700
Subject: [PATCH 273/413] Fix

---
 .../StringCopyPasteCommandHandler_CutCopy.cs               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 1e6a232d7efcc..ad47f1c252344 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -125,6 +125,13 @@ private static bool TryGetNormalizedStringForSpan(
             if (firstOverlappingChar is null || lastOverlappingChar is null)
                 return false;
 
+            // Don't allow partial selection of an escaped character.  e.g. if they select 'n' in '\n'
+            if (span.Start > firstOverlappingChar.Value.Span.Start)
+                return false;
+
+            if (span.End < lastOverlappingChar.Value.Span.End)
+                return false;
+
             var firstCharIndexInclusive = virtualChars.IndexOf(firstOverlappingChar.Value);
             var lastCharIndexInclusive = virtualChars.IndexOf(lastOverlappingChar.Value);
 

From 4e01c92bec91609ae38178ff5087a7d0d2762e35 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:18:11 -0700
Subject: [PATCH 274/413] Almost there

---
 .../PasteKnownSourceIntoNormalStringTests.cs                | 6 +++---
 .../PasteKnownSourceIntoVerbatimStringTests.cs              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index eb03ced423261..d70293bad7d71 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -299,10 +299,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     ""[||]"";",
 @"
 var dest =
-    ""{0:\\\""X\\\""}[||]"";",
+    ""{0:\""X\""}[||]"";",
 @"
 var dest =
-    ""{0:\""X\""}[||]"";");
+    ""[||]"";");
         }
 
         [WpfFact]
@@ -411,7 +411,7 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     ""[||]"";",
 @"
 var dest =
-    ""{0:\""\""X\""\""}[||]"";",
+    ""{0:\""X\""}[||]"";",
 @"
 var dest =
     ""{0:""""X""""}[||]"";");
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
index d5996c5886f14..1cf454d0af24f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -304,7 +304,7 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     @""[||]"";",
 @"
 var dest =
-    @""{0:\""""X\""""}[||]"";",
+    @""{0:""""X""""}[||]"";",
 @"
 var dest =
     @""{0:\""X\""}[||]"";");
@@ -416,10 +416,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     @""[||]"";",
 @"
 var dest =
-    @""{0:""""""""X""""""""}[||]"";",
+    @""{0:""""X""""}[||]"";",
 @"
 var dest =
-    @""{0:""""X""""}[||]"";");
+    @""[||]"";");
         }
 
         [WpfFact]

From a338d6bc1e8fc11a3412c77df46e45523ecb6d5e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:25:11 -0700
Subject: [PATCH 275/413] Simplify

---
 .../StringCopyPasteCommandHandlerTests.cs     | 21 +++++-----
 .../TestStringCopyPasteService.cs             | 38 +++++++++++++++++++
 2 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/TestStringCopyPasteService.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 4966bfa722940..85134d056be39 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -28,24 +28,23 @@ public abstract class StringCopyPasteCommandHandlerTests
     {
         internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
         {
-            private static readonly TestComposition s_compositionWithUnknownCopy =
+            private static readonly TestComposition s_composition =
                 EditorTestCompositions.EditorFeaturesWpf
+                    .RemoveExcludedPartTypes(typeof(WpfStringCopyPasteService))
+                    .AddParts(typeof(TestStringCopyPasteService))
                     .AddParts(typeof(StringCopyPasteCommandHandler));
 
-            private static readonly TestComposition s_compositionWithKnownCopy =
-                s_compositionWithUnknownCopy;
-
             private readonly StringCopyPasteCommandHandler _commandHandler;
 
-            public StringCopyPasteTestState(XElement workspaceElement, bool unknownCopy)
-                : base(workspaceElement, unknownCopy ? s_compositionWithUnknownCopy : s_compositionWithKnownCopy)
+            public StringCopyPasteTestState(XElement workspaceElement)
+                : base(workspaceElement, s_composition)
             {
                 _commandHandler = (StringCopyPasteCommandHandler)GetExportedValues<ICommandHandler>().
                     Single(c => c is StringCopyPasteCommandHandler);
             }
 
             public static StringCopyPasteTestState CreateTestState(string? copyFileMarkup, string pasteFileMarkup)
-                => new(GetWorkspaceXml(copyFileMarkup, pasteFileMarkup), unknownCopy: copyFileMarkup == null);
+                => new(GetWorkspaceXml(copyFileMarkup, pasteFileMarkup));
 
             public static XElement GetWorkspaceXml(string? copyFileMarkup, string pasteFileMarkup)
                 => XElement.Parse(($@"
@@ -79,6 +78,10 @@ public void TestCopyPaste(string expectedMarkup, string? pasteText, string after
             {
                 var workspace = this.Workspace;
 
+                // Ensure we clear out the clipboard so that a prior copy/paste doesn't corrupt the test.
+                var service = workspace.Services.GetRequiredService<IStringCopyPasteService>();
+                service.TrySetClipboardData(StringCopyPasteCommandHandler.KeyAndVersion, "");
+
                 var copyDocument = this.Workspace.Documents.FirstOrDefault(d => d.AnnotatedSpans.ContainsKey("Copy"));
                 if (copyDocument != null)
                 {
@@ -98,10 +101,6 @@ public void TestCopyPaste(string expectedMarkup, string? pasteText, string after
                 {
                     // If we don't have a file to copy text from, then the paste text must be explicitly provided.");
                     Assert.NotNull(pasteText);
-
-                    // Ensure we clear out the clipboard so that a prior copy/paste doesn't corrupt the test.
-                    var service = workspace.Services.GetRequiredService<IStringCopyPasteService>();
-                    service.TrySetClipboardData(StringCopyPasteCommandHandler.KeyAndVersion, "");
                 }
 
                 if (pasteText == null)
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/TestStringCopyPasteService.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/TestStringCopyPasteService.cs
new file mode 100644
index 0000000000000..6349751835ebe
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/TestStringCopyPasteService.cs
@@ -0,0 +1,38 @@
+// 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.Editor.StringCopyPaste;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    /// <summary>
+    /// Special implementation of the copy paste service for testing.  This one avoids going through the actual
+    /// clipboard, avoiding complexity of interacting with that during testing.
+    /// </summary>
+    [ExportWorkspaceService(typeof(IStringCopyPasteService), ServiceLayer.Test), Shared, PartNotDiscoverable]
+    public class TestStringCopyPasteService : IStringCopyPasteService
+    {
+        private string? _key;
+        private string? _data;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public TestStringCopyPasteService()
+        {
+        }
+
+        public bool TrySetClipboardData(string key, string data)
+        {
+            _key = key;
+            _data = data;
+            return true;
+        }
+
+        public string? TryGetClipboardData(string key)
+            => _key == key ? _data : null;
+    }
+}

From 51aa84dc2482705f91b3929bfb2ce55236a0d64a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:29:07 -0700
Subject: [PATCH 276/413] Relax types

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs      | 8 ++++----
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs   | 4 ++--
 .../StringCopyPaste/StringCopyPasteCommandHandler.cs      | 8 ++------
 .../CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs | 4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 53af0c8503089..1f2f121c7ed41 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -28,13 +28,13 @@ internal abstract class AbstractPasteProcessor
         /// <summary>
         /// The buffer's snapshot prior to the paste application.
         /// </summary>
-        protected readonly ITextSnapshot2 SnapshotBeforePaste;
+        protected readonly ITextSnapshot SnapshotBeforePaste;
 
         /// <summary>
         /// The buffer's snapshot right after the paste application.  Guaranteed to be exactly one version ahead of <see
         /// cref="SnapshotBeforePaste"/>.
         /// </summary>
-        protected readonly ITextSnapshot2 SnapshotAfterPaste;
+        protected readonly ITextSnapshot SnapshotAfterPaste;
 
         /// <summary>
         /// Roslyn SourceText corresponding to <see cref="SnapshotBeforePaste"/>.
@@ -91,8 +91,8 @@ internal abstract class AbstractPasteProcessor
         protected AbstractPasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 9236ddad5731b..6057561ed7850 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -37,8 +37,8 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
         public KnownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 1eadc99f0f5a3..cb35385d108b7 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -87,15 +87,12 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var subjectBuffer = args.SubjectBuffer;
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
+            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot;
 
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
-            if (snapshotBeforePaste is null)
-                return;
-
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;
@@ -108,8 +105,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             if (selectionsBeforePaste.Count == 0)
                 return;
 
-            if (subjectBuffer.CurrentSnapshot is not ITextSnapshot2 snapshotAfterPaste)
-                return;
+            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot;
 
             // If there were multiple changes that already happened, then don't make any changes.  Some other component
             // already did something advanced.
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 5f73c94955deb..eec90dbaeb300 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -38,8 +38,8 @@ internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
         public UnknownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,

From 7f973666c08f4bb68f46297abab1dc5ab39fe9d3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:32:34 -0700
Subject: [PATCH 277/413] simplify

---
 .../CSharp/StringCopyPaste/StringInfo.cs      | 62 +++----------------
 1 file changed, 10 insertions(+), 52 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
index 0234d4da7ad79..7f0d31601049e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringInfo.cs
@@ -54,20 +54,13 @@ internal readonly struct StringInfo
     /// </summary>
     public readonly ImmutableArray<TextSpan> ContentSpans;
 
-    /// <summary>
-    /// Similar to <see cref="ContentSpans"/> except that whitespace in a raw-string-literal that is not considered part
-    /// of the final content will not be included.
-    /// </summary>
-    public readonly ImmutableArray<TextSpan> WithoutIndentationContentSpans;
-
     public StringInfo(
         int delimiterQuoteCount,
         int delimiterDollarCount,
         TextSpan startDelimiterSpan,
         TextSpan endDelimiterSpan,
         TextSpan endDelimiterSpanWithoutSuffix,
-        ImmutableArray<TextSpan> contentSpans,
-        ImmutableArray<TextSpan> withoutIndentationContentSpans)
+        ImmutableArray<TextSpan> contentSpans)
     {
         DelimiterQuoteCount = delimiterQuoteCount;
         DelimiterDollarCount = delimiterDollarCount;
@@ -75,7 +68,6 @@ public StringInfo(
         EndDelimiterSpan = endDelimiterSpan;
         EndDelimiterSpanWithoutSuffix = endDelimiterSpanWithoutSuffix;
         ContentSpans = contentSpans;
-        WithoutIndentationContentSpans = withoutIndentationContentSpans;
     }
 
     public static StringInfo GetStringInfo(SourceText text, ExpressionSyntax stringExpression)
@@ -123,8 +115,7 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
                 startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
                 endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
                 endDelimiterSpanWithoutSuffix: TextSpan.FromBounds(end, endBeforeU8Suffix),
-                contentSpans,
-                withoutIndentationContentSpans: contentSpans);
+                contentSpans);
         }
         else if (literal.Token.Kind() is SyntaxKind.MultiLineRawStringLiteralToken)
         {
@@ -149,8 +140,6 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
             while (SyntaxFacts.IsWhitespace(SafeCharAt(text, rawEnd - 1)))
                 rawEnd--;
 
-            var indentationLength = end - rawEnd;
-
             if (SafeCharAt(text, rawEnd - 2) == '\r' && SafeCharAt(text, rawEnd - 1) == '\n')
             {
                 rawEnd -= 2;
@@ -161,38 +150,13 @@ private static StringInfo GetRawStringLiteralInfo(SourceText text, LiteralExpres
                 rawEnd--;
             }
 
-            using var _ = ArrayBuilder<TextSpan>.GetInstance(out var withoutIndentationBuilder);
-
-            var contentLineStart = text.Lines.GetLineFromPosition(rawStart).LineNumber;
-            var contentLineEnd = text.Lines.GetLineFromPosition(rawEnd).LineNumber;
-
-            for (var currentLineNumber = contentLineStart; currentLineNumber <= contentLineEnd; currentLineNumber++)
-            {
-                var currentLine = text.Lines[currentLineNumber];
-                if (currentLine.Span.Length < indentationLength)
-                {
-                    // this is a blank line.  Don't include any of it in the content spans except its newline.
-                    withoutIndentationBuilder.Add(TextSpan.FromBounds(currentLine.Span.End, currentLine.SpanIncludingLineBreak.End));
-                }
-                else
-                {
-                    // Normal line, include the contents after the indentation whitespace.  If this is not the last
-                    // line, include the linebreak as well, otherwise ignore it (it's not part of a raw string's
-                    // content).
-                    withoutIndentationBuilder.Add(TextSpan.FromBounds(
-                        start: currentLine.Start + indentationLength,
-                        end: currentLineNumber == contentLineEnd ? currentLine.Span.End : currentLine.SpanIncludingLineBreak.End));
-                }
-            }
-
             return new StringInfo(
                 delimiterQuoteCount,
                 delimiterDollarCount: 0,
                 TextSpan.FromBounds(literal.SpanStart, rawStart),
                 TextSpan.FromBounds(rawEnd, literal.Span.End),
                 TextSpan.FromBounds(rawEnd, endBeforeU8Suffix),
-                contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)),
-                withoutIndentationContentSpans: withoutIndentationBuilder.ToImmutable());
+                contentSpans: ImmutableArray.Create(TextSpan.FromBounds(start, end)));
         }
         else
         {
@@ -216,16 +180,13 @@ private static StringInfo GetNormalStringLiteralStringInfo(SourceText text, Lite
         if (end > start && text[end - 1] == '"')
             end--;
 
-        var contentSpans = ImmutableArray.Create(TextSpan.FromBounds(start, end));
-
         return new StringInfo(
             delimiterQuoteCount,
             delimiterDollarCount: 0,
             startDelimiterSpan: TextSpan.FromBounds(literal.SpanStart, start),
             endDelimiterSpan: TextSpan.FromBounds(end, literal.Span.End),
             endDelimiterSpanWithoutSuffix: TextSpan.FromBounds(end, endBeforeU8Suffix),
-            contentSpans,
-            contentSpans);
+            ImmutableArray.Create(TextSpan.FromBounds(start, end)));
     }
 
     private static StringInfo GetInterpolatedStringInfo(
@@ -261,17 +222,14 @@ private static StringInfo GetInterpolatedStringInfo(
             }
         }
 
-        var startDelimiterSpan = TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End);
-        var endDelimiterSpan = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End);
-        var endDelimiterSpanWithoutSuffix = TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, endBeforeU8Suffix);
-
         // Then, once through the body, add a final span from the end of the last interpolation to the end delimiter.
         result.Add(TextSpan.FromBounds(currentPosition, end));
-        var contentSpans = result.ToImmutableAndClear();
-
-        // todo: implement withoutIndentationSpans properly
-        var withoutIndentationSpans = contentSpans;
 
-        return new StringInfo(delimiterQuoteCount, delimiterDollarCount, startDelimiterSpan, endDelimiterSpan, endDelimiterSpanWithoutSuffix, contentSpans, withoutIndentationSpans);
+        return new StringInfo(
+            delimiterQuoteCount, delimiterDollarCount,
+            startDelimiterSpan: TextSpan.FromBounds(interpolatedString.SpanStart, interpolatedString.StringStartToken.Span.End),
+            endDelimiterSpan: TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, interpolatedString.Span.End),
+            endDelimiterSpanWithoutSuffix: TextSpan.FromBounds(interpolatedString.StringEndToken.SpanStart, endBeforeU8Suffix),
+            contentSpans: result.ToImmutableAndClear());
     }
 }

From 0c237df8ac6ef04ba530310b583eaa21b7a40a68 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:34:36 -0700
Subject: [PATCH 278/413] Delete dead code

---
 .../KnownSourcePasteProcessor.cs              | 362 +-----------------
 .../StringCopyPasteCommandHandler.cs          |   6 +-
 2 files changed, 9 insertions(+), 359 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 6057561ed7850..6a90a22e651e8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -30,9 +30,15 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// </summary>
     internal class KnownSourcePasteProcessor : AbstractPasteProcessor
     {
+        /// <summary>
+        /// The selection in the document prior to the paste happening.
+        /// </summary>
         private readonly SnapshotSpan _selectionBeforePaste;
+
+        /// <summary>
+        /// Information stored to the clipboard about the original cut/copy.
+        /// </summary>
         private readonly StringCopyPasteData _copyPasteData;
-        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
 
         public KnownSourcePasteProcessor(
             string newLine,
@@ -43,13 +49,11 @@ public KnownSourcePasteProcessor(
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             SnapshotSpan selectionBeforePaste,
-            StringCopyPasteData copyPasteData,
-            ITextBufferFactoryService3 textBufferFactoryService)
+            StringCopyPasteData copyPasteData)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _selectionBeforePaste = selectionBeforePaste;
             _copyPasteData = copyPasteData;
-            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
@@ -61,7 +65,6 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             // Smart Pasting into raw string not supported yet.  
             if (IsAnyRawStringExpression(StringExpressionBeforePaste))
                 return default;
-                // return GetEditsForRawString(cancellationToken);
 
             return GetEditsForNonRawString();
         }
@@ -152,355 +155,6 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             }
 
             return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
-#if false
-            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
-
-            foreach (var change in Changes)
-            {
-                var wrappedChange = WrapChangeWithOriginalQuotes(change.NewText);
-                var parsedChange = ParseExpression(wrappedChange);
-
-                // If for some reason we can't actually successfully parse this copied text, then bail out.
-                if (ContainsError(parsedChange))
-                    return default;
-
-                var modifiedText = TransformValueToDestinationKind(parsedChange);
-                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), modifiedText));
-            }
-
-            return edits.ToImmutable();
-
-            string TransformValueToDestinationKind(ExpressionSyntax parsedChange)
-            {
-                // we have a matrix of every string source type to every string destination type.
-                // 
-                // Normal string
-                // Interpolated string
-                // Verbatim string
-                // Verbatim interpolated string
-                var pastingIntoVerbatimString = IsVerbatimStringExpression(StringExpressionBeforePaste);
-
-                return (parsedChange, StringExpressionBeforePaste) switch
-                {
-                    (LiteralExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformLiteralToLiteral(pastedText),
-                    (LiteralExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformLiteralToInterpolatedString(pastedText),
-                    (InterpolatedStringExpressionSyntax pastedText, LiteralExpressionSyntax) => TransformInterpolatedStringToLiteral(pastedText),
-                    (InterpolatedStringExpressionSyntax pastedText, InterpolatedStringExpressionSyntax) => TransformInterpolatedStringToInterpolatedString(pastedText),
-                    _ => throw ExceptionUtilities.Unreachable,
-                };
-
-                string TransformLiteralToLiteral(LiteralExpressionSyntax pastedText)
-                {
-                    var textValue = pastedText.Token.ValueText;
-                    return EscapeForNonRawStringLiteral(
-                        isVerbatim: pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, textValue);
-                }
-
-                string TransformLiteralToInterpolatedString(LiteralExpressionSyntax pastedText)
-                {
-                    var textValue = pastedText.Token.ValueText;
-                    return EscapeForNonRawStringLiteral(
-                        isVerbatim: pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, textValue);
-                }
-
-                string TransformInterpolatedStringToLiteral(InterpolatedStringExpressionSyntax pastedText)
-                {
-                    using var _ = PooledStringBuilder.GetInstance(out var builder);
-                    foreach (var content in pastedText.Contents)
-                    {
-                        if (content is InterpolatedStringTextSyntax stringText)
-                        {
-                            builder.Append(EscapeForNonRawStringLiteral(
-                                pastingIntoVerbatimString, isInterpolated: true, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                        }
-                        else if (content is InterpolationSyntax interpolation)
-                        {
-                            // we're copying an interpolation from an interpolated string to a string literal. For example,
-                            // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in the
-                            // future is split the literal into `"goo" + $"{x + y}" + "bar"`.  However, it's unclear if that
-                            // would actually be desirable as `$"{x + x}"` may have no meaning in the destination location. So,
-                            // for now, we do the simple thing and just treat the interpolation as raw text that should just be
-                            // escaped as appropriate into the destination.
-                            builder.Append(EscapeForNonRawStringLiteral(
-                                pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, interpolation.ToString()));
-                        }
-                    }
-
-                    return builder.ToString();
-                }
-
-                string TransformInterpolatedStringToInterpolatedString(InterpolatedStringExpressionSyntax pastedText)
-                {
-                    using var _ = PooledStringBuilder.GetInstance(out var builder);
-                    foreach (var content in pastedText.Contents)
-                    {
-                        if (content is InterpolatedStringTextSyntax stringText)
-                        {
-                            builder.Append(EscapeForNonRawStringLiteral(
-                                pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, stringText.TextToken.ValueText));
-                        }
-                        else if (content is InterpolationSyntax interpolation)
-                        {
-                            // we're moving an interpolation from one interpolation to another.  This can just be copied
-                            // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                            // for the destination type.
-                            if (interpolation.FormatClause is not null)
-                            {
-                                var oldToken = interpolation.FormatClause.FormatStringToken;
-                                var newToken = Token(
-                                    oldToken.LeadingTrivia, oldToken.Kind(),
-                                    EscapeForNonRawStringLiteral(
-                                        pastingIntoVerbatimString, isInterpolated: false, trySkipExistingEscapes: false, oldToken.ValueText),
-                                    oldToken.ValueText, oldToken.TrailingTrivia);
-
-                                interpolation = interpolation.ReplaceToken(oldToken, newToken);
-                            }
-
-                            builder.Append(interpolation.ToString());
-                        }
-                    }
-
-                    return builder.ToString();
-                }
-            }
-
-#endif
-        }
-
-#if false
-
-        /// <summary>
-        /// Takes a chunk of pasted text and reparses it as if it was surrounded by the original quotes it had in the
-        /// string it came from.  With this we can determine how to interpret things like the escapes in their original
-        /// context.  We can also figure out how to deal with copied interpolations.
-        /// </summary>
-        private string WrapChangeWithOriginalQuotes(string pastedText)
-        {
-            var textCopiedFrom = _snapshotCopiedFrom.AsText();
-            var stringExpressionCopiedFromInfo = StringInfo.GetStringInfo(textCopiedFrom, _stringExpressionCopiedFrom);
-
-            var startQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.StartDelimiterSpan);
-            var endQuote = textCopiedFrom.ToString(stringExpressionCopiedFromInfo.EndDelimiterSpan);
-
-            if (!IsAnyMultiLineRawStringExpression(_stringExpressionCopiedFrom))
-                return $"{startQuote}{pastedText}{endQuote}";
-
-            // With a raw string we have the issue that the contents may need to be indented properly in order for the
-            // string to parsed successfully.  Because we're using the original start/end quote to wrap the text that
-            // was pasted this normally is not an issue.  However, it can be a problem in the following case:
-            //
-            //      var source = """
-            //              existing text
-            //              [|copy
-            //              this|]
-            //              existing text
-            //              """
-            //
-            // In this case, the first line of the text will not start with enough indentation and we will generate:
-            //
-            // """
-            // copy
-            //              this
-            //              """
-            //
-            // To address this.  We ensure that if the content starts with spaces to not be a problem.
-            var endLine = textCopiedFrom.Lines.GetLineFromPosition(_stringExpressionCopiedFrom.Span.End);
-            var rawStringIndentation = endLine.GetLeadingWhitespace();
-
-            var pastedTextWhitespace = pastedText.GetLeadingWhitespace();
-
-            // First, if we don't have enough indentation whitespace in the string, but we do have a portion of the
-            // necessary whitespace, then synthesize the remainder we need.
-            if (pastedTextWhitespace.Length < rawStringIndentation.Length)
-            {
-                if (rawStringIndentation.EndsWith(pastedTextWhitespace))
-                    return $"{startQuote}{rawStringIndentation[..^pastedTextWhitespace.Length]}{pastedText}{endQuote}";
-            }
-            else
-            {
-                // We have a lot of indentation whitespace.  Make sure it's legal though for this raw string.  If so,
-                // nothing to do.
-                if (pastedTextWhitespace.StartsWith(rawStringIndentation))
-                    return $"{startQuote}{pastedText}{endQuote}";
-            }
-
-            // We have something with whitespace incompatible with the raw string indentation.  Just add the required
-            // indentation we need to ensure this can parse.  Note: this is a heuristic, and it's possible we could
-            // figure out something better here (for example copying just enough indentation whitespace to make things
-            // successfully parse).
-            return $"{startQuote}{rawStringIndentation}{pastedText}{endQuote}";
         }
-
-#endif
-
-#if false
-
-        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
-        {
-            // Can't really figure anything out if the raw string is in error.
-            if (NodeOrTokenContainsError(StringExpressionBeforePaste))
-                return default;
-
-            // If all we're going to do is insert whitespace, then don't make any adjustments to the text. We don't want
-            // to end up inserting nothing and having the user very confused why their paste did nothing.
-            if (AllWhitespace(SnapshotBeforePaste.Version.Changes))
-                return default;
-
-            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
-
-            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
-            // quotes in it now).  Update the delimiters to make the content legal if necessary. if the content we're
-            // going to add itself contains quotes, then figure out how many start/end quotes the final string literal
-            // will need (which also gives us the number of quotes to add to the start/end).
-            var quotesToAdd = GetQuotesToAddToRawString();
-            var dollarSignsToAdd = GetDollarSignsToAddToRawString();
-
-            // First, add any extra dollar signs needed.
-            if (dollarSignsToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
-
-            // Then any quotes to your starting delimiter
-            if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
-
-            if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
-                AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(edits);
-            else
-                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits, cancellationToken);
-
-            // Then add any extra end quotes needed.
-            if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
-
-            foreach (var change in Changes)
-            {
-                var wrappedChange = WrapChangeWithOriginalQuotes(change.NewText);
-                var parsedChange = ParseExpression(wrappedChange);
-
-                // If for some reason we can't actually successfully parse this copied text, then bail out.
-                if (ContainsError(parsedChange))
-                    return default;
-
-                var modifiedText = TransformValueToDestinationKind(parsedChange);
-                edits.Add(new TextChange(change.OldSpan.ToTextSpan(), modifiedText));
-            }
-
-            return edits.ToImmutable();
-        }
-
-        private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(ArrayBuilder<TextChange> edits, CancellationToken cancellationToken)
-        {
-            // When pasting into a single-line raw literal we will keep it a single line if we can.  If the content
-            // we're pasting starts/ends with a quote, or contains a newline, then we have to convert to a multiline.
-            //
-            // Pasting any other content into a single-line raw literal is always legal and needs no extra work on our
-            // part.
-
-            var mustBeMultiLine = RawContentMustBeMultiLine(TextAfterPaste, TextContentsSpansAfterPaste);
-            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
-
-            // A newline and the indentation to start with.
-            if (mustBeMultiLine)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
-
-
-
-            // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
-            // final newline-space at the end because we will have already done that.
-            if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
-        }
-
-        private void AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(ArrayBuilder<TextChange> edits)
-        {
-            throw new NotImplementedException();
-        }
-#endif
-
-#if false
-
-        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
-        {
-
-            // Can't really figure anything out if the raw string is in error.
-            if (NodeOrTokenContainsError(StringExpressionBeforePaste))
-                return default;
-
-            // If all we're going to do is insert whitespace, then don't make any adjustments to the text. We don't want
-            // to end up inserting nothing and having the user very confused why their paste did nothing.
-            if (AllWhitespace(SnapshotBeforePaste.Version.Changes))
-                return default;
-
-            // Pasting into a raw string is complicated.  The code we are copying may have something like `"\"\"\""`
-            // (where the middle \"\"\" is what is being copied).  That means we're actually going to be inserting 3
-            // quotes into the raw string.  But we need to see that that's what's been inserted so that we can then
-            // count and figure out how many total quotes there are in a row to determine what to do with the start/end
-            // delimiter of the raw string.
-            //
-            // So, we do this work in two passes.  First, we take the pasted text, figure out what the actual
-            // interpreted characters were that it was adding (e.g. `\"\"\"` -> `"""`).  Then, from that, we can figure
-            // out what changes need to happen to happen to the raw literal itself, along with the actual content
-            // changes to make.
-
-            var internalContentChanges = GetRawStringContentChanges(cancellationToken);
-            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
-            var clonedSnapshotBeforeFakePaste = clonedBuffer.CurrentSnapshot;
-            var edit = clonedBuffer.CreateEdit();
-            foreach (var change in internalContentChanges)
-                edit.Replace(change.Span.ToSpan(), change.NewText);
-            edit.Apply();
-
-            var clonedSnapshotAfterFakePaste = clonedBuffer.CurrentSnapshot;
-            var clonedTextAfterFakePaste = clonedSnapshotAfterFakePaste.AsText();
-            var contentSpansAfterFakePaste = this.StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
-                ts => MapSpan(ts, clonedSnapshotBeforeFakePaste, clonedSnapshotAfterFakePaste));
-
-            // After we've inserted the text we may now have made the raw string illegal (for example, having too many
-            // quotes in it now).  Update the delimiters to make the content legal if necessary.
-            // if the content we're going to add itself contains quotes, then figure out how many start/end quotes the
-            // final string literal will need (which also gives us the number of quotes to add to the start/end).
-
-            var quotesToAdd = GetQuotesToAddToRawString(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
-            var dollarSignsToAdd = GetDollarSignsToAddToRawString(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
-            var mustBeMultiLine =
-                !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) &&
-                RawContentMustBeMultiLine(clonedTextAfterFakePaste, contentSpansAfterFakePaste);
-            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
-
-            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
-
-            // First, add any extra dollar signs needed.
-            if (dollarSignsToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
-
-            // Then any quotes to the starting delimiter
-            if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
-
-            // A newline and the indentation to start with if we're converting to multi-line
-            if (mustBeMultiLine)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
-
-            // Then add the actual changes in the content.
-            edits.AddRange(internalContentChanges);
-
-            // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
-            // final newline-space at the end because we will have already done that.
-            if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
-
-            // Then add any extra end quotes needed.
-            if (quotesToAdd != null)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
-
-            return edits.ToImmutable();
-        }
-
-        private ImmutableArray<TextChange> GetRawStringContentChanges(CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-#endif
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index cb35385d108b7..7adeccbaa349a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -54,7 +54,6 @@ internal partial class StringCopyPasteCommandHandler :
 
         private readonly IThreadingContext _threadingContext;
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
-        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
         private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
         private readonly IGlobalOptionService _globalOptions;
 
@@ -63,13 +62,11 @@ internal partial class StringCopyPasteCommandHandler :
         public StringCopyPasteCommandHandler(
             IThreadingContext threadingContext,
             ITextUndoHistoryRegistry undoHistoryRegistry,
-            ITextBufferFactoryService3 textBufferFactoryService,
             IEditorOperationsFactoryService editorOperationsFactoryService,
             IGlobalOptionService globalOptions)
         {
             _threadingContext = threadingContext;
             _undoHistoryRegistry = undoHistoryRegistry;
-            _textBufferFactoryService = textBufferFactoryService;
             _editorOperationsFactoryService = editorOperationsFactoryService;
             _globalOptions = globalOptions;
         }
@@ -220,8 +217,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste,
                     selectionsBeforePaste[0],
-                    copyPasteData,
-                    _textBufferFactoryService);
+                    copyPasteData);
                 return knownProcessor.GetEdits(cancellationToken);
             }
         }

From 22155b6f388ac597fd85b228b2de76f1bb3c7111 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:36:38 -0700
Subject: [PATCH 279/413] Simplify

---
 .../KnownSourcePasteProcessor.cs              | 144 +++++++++---------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 6a90a22e651e8..7a0b09e51fe7b 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -75,86 +76,91 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
 
             if (StringExpressionBeforePaste is LiteralExpressionSyntax literal)
             {
-                var isVerbatim = literal.Token.IsVerbatimStringLiteral();
-                foreach (var content in _copyPasteData.Contents)
+                AppendContentForLiteral(builder, literal);
+            }
+            else if (StringExpressionBeforePaste is InterpolatedStringExpressionSyntax interpolatedString)
+            {
+                AppendContentForInterpolatedString(builder, interpolatedString);
+            }
+            else
+            {
+                throw ExceptionUtilities.Unreachable;
+            }
+
+            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
+        }
+
+        private void AppendContentForLiteral(StringBuilder builder, LiteralExpressionSyntax literal)
+        {
+            var isVerbatim = literal.Token.IsVerbatimStringLiteral();
+            foreach (var content in _copyPasteData.Contents)
+            {
+                if (content.IsText)
                 {
-                    if (content.IsText)
-                    {
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.TextValue));
-                    }
-                    else if (content.IsInterpolation)
-                    {
-                        // we're copying an interpolation from an interpolated string to a string literal. For example,
-                        // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in
-                        // the future is split the literal into `"goo" + $"{x + y}" + "bar"`, or just making the
-                        // containing literal into an interpolation itself.  However, for now, we do the simple thing
-                        // and just treat the interpolation as raw text that should just be escaped as appropriate into
-                        // the destination.
-                        builder.Append('{');
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationExpression));
-
-                        if (content.InterpolationAlignmentClause != null)
-                            builder.Append(content.InterpolationAlignmentClause);
-
-                        if (content.InterpolationFormatClause != null)
-                        {
-                            builder.Append(':');
-                            builder.Append(EscapeForNonRawStringLiteral(
-                                isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationFormatClause));
-                        }
-
-                        builder.Append('}');
-                    }
-                    else
+                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.TextValue));
+                }
+                else if (content.IsInterpolation)
+                {
+                    // we're copying an interpolation from an interpolated string to a string literal. For example,
+                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in
+                    // the future is split the literal into `"goo" + $"{x + y}" + "bar"`, or just making the
+                    // containing literal into an interpolation itself.  However, for now, we do the simple thing
+                    // and just treat the interpolation as raw text that should just be escaped as appropriate into
+                    // the destination.
+                    builder.Append('{');
+                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationExpression));
+
+                    if (content.InterpolationAlignmentClause != null)
+                        builder.Append(content.InterpolationAlignmentClause);
+
+                    if (content.InterpolationFormatClause != null)
                     {
-                        throw ExceptionUtilities.UnexpectedValue(content.Kind);
+                        builder.Append(':');
+                        builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationFormatClause));
                     }
+
+                    builder.Append('}');
+                }
+                else
+                {
+                    throw ExceptionUtilities.UnexpectedValue(content.Kind);
                 }
             }
-            else if (StringExpressionBeforePaste is InterpolatedStringExpressionSyntax interpolatedString)
+        }
+
+        private void AppendContentForInterpolatedString(StringBuilder builder, InterpolatedStringExpressionSyntax interpolatedString)
+        {
+            var isVerbatim = interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken;
+            foreach (var content in _copyPasteData.Contents)
             {
-                var isVerbatim = interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken;
-                foreach (var content in _copyPasteData.Contents)
+                if (content.IsText)
                 {
-                    if (content.IsText)
-                    {
-                        builder.Append(EscapeForNonRawStringLiteral(
-                            isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.TextValue));
-                    }
-                    else if (content.IsInterpolation)
-                    {
-                        // we're moving an interpolation from one interpolation to another.  This can just be copied
-                        // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                        // for the destination type.
-                        builder.Append('{');
-                        builder.Append(content.InterpolationExpression);
-
-                        if (content.InterpolationAlignmentClause != null)
-                            builder.Append(content.InterpolationAlignmentClause);
-
-                        if (content.InterpolationFormatClause != null)
-                        {
-                            builder.Append(':');
-                            builder.Append(EscapeForNonRawStringLiteral(
-                                isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.InterpolationFormatClause));
-                        }
-
-                        builder.Append('}');
-                    }
-                    else
+                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.TextValue));
+                }
+                else if (content.IsInterpolation)
+                {
+                    // we're moving an interpolation from one interpolation to another.  This can just be copied
+                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
+                    // for the destination type.
+                    builder.Append('{');
+                    builder.Append(content.InterpolationExpression);
+
+                    if (content.InterpolationAlignmentClause != null)
+                        builder.Append(content.InterpolationAlignmentClause);
+
+                    if (content.InterpolationFormatClause != null)
                     {
-                        throw ExceptionUtilities.UnexpectedValue(content.Kind);
+                        builder.Append(':');
+                        builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.InterpolationFormatClause));
                     }
+
+                    builder.Append('}');
+                }
+                else
+                {
+                    throw ExceptionUtilities.UnexpectedValue(content.Kind);
                 }
             }
-            else
-            {
-                throw ExceptionUtilities.Unreachable;
-            }
-
-            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
         }
     }
 }

From 5fe78ee80cd1322c480cce2ecd08fc95907dec8b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:40:43 -0700
Subject: [PATCH 280/413] Cleanup

---
 .../StringCopyPasteCommandHandler_CutCopy.cs                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index ad47f1c252344..969927c90fad0 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -52,8 +52,10 @@ private void ExecuteCutOrCopyCommand(ITextView textView, ITextBuffer subjectBuff
             // Ensure that the copy always goes through all other handlers.
             nextCommandHandler();
 
-            if (dataToStore != null)
-                copyPasteService.TrySetClipboardData(KeyAndVersion, dataToStore);
+            // Always try to store our data to the clipboard (if we have access to the clipboard service).  Even if we
+            // didn't capture any useful data, we want to store that to blow away any prior stored data we have.
+            if (copyPasteService != null)
+                copyPasteService.TrySetClipboardData(KeyAndVersion, dataToStore ?? "");
         }
 
         private static (string? dataToStore, IStringCopyPasteService service) CaptureCutCopyInformation(

From 42903cdd67578885d3de0a0a2672bf836b4dde4f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:47:34 -0700
Subject: [PATCH 281/413] Add comment

---
 .../StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 969927c90fad0..0e89cb2e28818 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -70,6 +70,10 @@ private static (string? dataToStore, IStringCopyPasteService service) CaptureCut
                 return default;
 
             var spans = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
+
+            // We only support smart copy/paste when a single selection is copied (and a single selection is pasted
+            // over).  This vastly simplifies the logic we need, and it means we don't have to try to reimplement the 
+            // editor logic for what it means when you are copying X selections and pasting over Y selections.
             if (spans.Count != 1)
                 return default;
 

From e9667ce2e564f240a115b8abbcb04a8d51ad52d3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:53:51 -0700
Subject: [PATCH 282/413] Add comments

---
 .../StringCopyPasteCommandHandler_CutCopy.cs  | 109 ---------------
 .../StringCopyPaste/StringCopyPasteData.cs    | 125 ++++++++++++++++++
 2 files changed, 125 insertions(+), 109 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 0e89cb2e28818..9a6424457548d 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -96,114 +96,5 @@ private static (string? dataToStore, IStringCopyPasteService service) CaptureCut
 
             return (stringData?.ToJson(), copyPasteService);
         }
-
-        private static StringCopyPasteData? TryGetStringCopyPasteData(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan span)
-            => stringExpression switch
-            {
-                LiteralExpressionSyntax literal => TryGetStringCopyPasteDataForLiteral(virtualCharService, literal, span),
-                InterpolatedStringExpressionSyntax interpolatedString => TryGetStringCopyPasteDataForInterpolatedString(virtualCharService, interpolatedString, span),
-                _ => throw ExceptionUtilities.UnexpectedValue(stringExpression.Kind()),
-            };
-
-        private static StringCopyPasteData? TryGetStringCopyPasteDataForLiteral(
-            IVirtualCharLanguageService virtualCharService, LiteralExpressionSyntax literal, TextSpan span)
-        {
-            if (!TryGetContentForSpan(virtualCharService, literal.Token, span, out var content))
-                return null;
-
-            return new StringCopyPasteData(ImmutableArray.Create(content));
-        }
-
-        private static bool TryGetNormalizedStringForSpan(
-            IVirtualCharLanguageService virtualCharService,
-            SyntaxToken token,
-            TextSpan span,
-            [NotNullWhen(true)] out string? normalizedText)
-        {
-            normalizedText = null;
-            var virtualChars = virtualCharService.TryConvertToVirtualChars(token);
-            if (virtualChars.IsDefaultOrEmpty)
-                return false;
-
-            var firstOverlappingChar = virtualChars.FirstOrNull(vc => vc.Span.OverlapsWith(span));
-            var lastOverlappingChar = virtualChars.LastOrNull(vc => vc.Span.OverlapsWith(span));
-
-            if (firstOverlappingChar is null || lastOverlappingChar is null)
-                return false;
-
-            // Don't allow partial selection of an escaped character.  e.g. if they select 'n' in '\n'
-            if (span.Start > firstOverlappingChar.Value.Span.Start)
-                return false;
-
-            if (span.End < lastOverlappingChar.Value.Span.End)
-                return false;
-
-            var firstCharIndexInclusive = virtualChars.IndexOf(firstOverlappingChar.Value);
-            var lastCharIndexInclusive = virtualChars.IndexOf(lastOverlappingChar.Value);
-
-            var subsequence = virtualChars.GetSubSequence(TextSpan.FromBounds(firstCharIndexInclusive, lastCharIndexInclusive + 1));
-            normalizedText = subsequence.CreateString();
-            return true;
-        }
-
-        private static bool TryGetContentForSpan(
-            IVirtualCharLanguageService virtualCharService,
-            SyntaxToken token,
-            TextSpan span,
-            out StringCopyPasteContent content)
-        {
-            if (!TryGetNormalizedStringForSpan(virtualCharService, token, span, out var text))
-            {
-                content = default;
-                return false;
-            }
-            else
-            {
-                content = StringCopyPasteContent.ForText(text);
-                return true;
-            }
-        }
-
-        private static StringCopyPasteData? TryGetStringCopyPasteDataForInterpolatedString(
-            IVirtualCharLanguageService virtualCharService,
-            InterpolatedStringExpressionSyntax interpolatedString,
-            TextSpan span)
-        {
-            using var _ = ArrayBuilder<StringCopyPasteContent>.GetInstance(out var result);
-
-            foreach (var interpolatedContent in interpolatedString.Contents)
-            {
-                if (interpolatedContent.Span.OverlapsWith(span))
-                {
-                    if (interpolatedContent is InterpolationSyntax interpolation)
-                    {
-                        // If the user copies a portion of an interpolation, just treat this as a non-smart copy paste for simplicity.
-                        if (!span.Contains(interpolation.Span))
-                            return null;
-
-                        var formatClause = (string?)null;
-                        if (interpolation.FormatClause != null &&
-                            !TryGetNormalizedStringForSpan(virtualCharService, interpolation.FormatClause.FormatStringToken, span, out formatClause))
-                        {
-                            return null;
-                        }
-
-                        result.Add(StringCopyPasteContent.ForInterpolation(
-                            interpolation.Expression.ToFullString(),
-                            interpolation.AlignmentClause?.ToFullString(),
-                            formatClause));
-                    }
-                    else if (interpolatedContent is InterpolatedStringTextSyntax stringText)
-                    {
-                        if (!TryGetContentForSpan(virtualCharService, stringText.TextToken, span, out var content))
-                            return null;
-
-                        result.Add(content);
-                    }
-                }
-            }
-
-            return new StringCopyPasteData(result.ToImmutable());
-        }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
index 3fa13e49ecf9a..419fd2d6584ae 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
@@ -13,6 +13,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
@@ -58,6 +62,127 @@ public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
 
             return null;
         }
+
+        /// <summary>
+        /// Given a <paramref name="stringExpression"/> for a string literal or interpolated string, and the <paramref
+        /// name="span"/> the user has selected in it, tries to determine the interpreted content within that expression
+        /// that has been copied.  "interpreted" in this context means the actual value of the content that was selected,
+        /// with things like escape characters embedded as the actual characters they represent.
+        /// </summary>
+        public static StringCopyPasteData? TryCreate(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan span)
+            => stringExpression switch
+            {
+                LiteralExpressionSyntax literal => TryCreateForLiteral(virtualCharService, literal, span),
+                InterpolatedStringExpressionSyntax interpolatedString => TryCreateForInterpolatedString(virtualCharService, interpolatedString, span),
+                _ => throw ExceptionUtilities.UnexpectedValue(stringExpression.Kind()),
+            };
+
+        private static StringCopyPasteData? TryCreateForLiteral(IVirtualCharLanguageService virtualCharService, LiteralExpressionSyntax literal, TextSpan span)
+            => TryGetContentForSpan(virtualCharService, literal.Token, span, out var content)
+                ? new StringCopyPasteData(ImmutableArray.Create(content))
+                : null;
+
+        /// <summary>
+        /// Given a string <paramref name="token"/>, and the <paramref name="span"/> the user has selected that overlaps
+        /// with it, tries to determine the interpreted content within that token that has been copied. "interpreted" in
+        /// this context means the actual value of the content that was selected, with things like escape characters
+        /// embedded as the actual characters they represent.
+        /// </summary>
+        private static bool TryGetNormalizedStringForSpan(
+            IVirtualCharLanguageService virtualCharService,
+            SyntaxToken token,
+            TextSpan span,
+            [NotNullWhen(true)] out string? normalizedText)
+        {
+            normalizedText = null;
+
+            // First, try to convert this token to a sequence of virtual chars.
+            var virtualChars = virtualCharService.TryConvertToVirtualChars(token);
+            if (virtualChars.IsDefaultOrEmpty)
+                return false;
+
+            // Then find the start/end of the token's characters that overlap with the selection span.
+            var firstOverlappingChar = virtualChars.FirstOrNull(vc => vc.Span.OverlapsWith(span));
+            var lastOverlappingChar = virtualChars.LastOrNull(vc => vc.Span.OverlapsWith(span));
+
+            if (firstOverlappingChar is null || lastOverlappingChar is null)
+                return false;
+
+            // Don't allow partial selection of an escaped character.  e.g. if they select 'n' in '\n'
+            if (span.Start > firstOverlappingChar.Value.Span.Start)
+                return false;
+
+            if (span.End < lastOverlappingChar.Value.Span.End)
+                return false;
+
+            var firstCharIndexInclusive = virtualChars.IndexOf(firstOverlappingChar.Value);
+            var lastCharIndexInclusive = virtualChars.IndexOf(lastOverlappingChar.Value);
+
+            // Grab that subsequence of characters and get the final interpreted string for it.
+            var subsequence = virtualChars.GetSubSequence(TextSpan.FromBounds(firstCharIndexInclusive, lastCharIndexInclusive + 1));
+            normalizedText = subsequence.CreateString();
+            return true;
+        }
+
+        private static bool TryGetContentForSpan(
+            IVirtualCharLanguageService virtualCharService,
+            SyntaxToken token,
+            TextSpan span,
+            out StringCopyPasteContent content)
+        {
+            if (!TryGetNormalizedStringForSpan(virtualCharService, token, span, out var text))
+            {
+                content = default;
+                return false;
+            }
+            else
+            {
+                content = StringCopyPasteContent.ForText(text);
+                return true;
+            }
+        }
+
+        private static StringCopyPasteData? TryCreateForInterpolatedString(
+            IVirtualCharLanguageService virtualCharService,
+            InterpolatedStringExpressionSyntax interpolatedString,
+            TextSpan span)
+        {
+            using var _ = ArrayBuilder<StringCopyPasteContent>.GetInstance(out var result);
+
+            foreach (var interpolatedContent in interpolatedString.Contents)
+            {
+                if (interpolatedContent.Span.OverlapsWith(span))
+                {
+                    if (interpolatedContent is InterpolationSyntax interpolation)
+                    {
+                        // If the user copies a portion of an interpolation, just treat this as a non-smart copy paste for simplicity.
+                        if (!span.Contains(interpolation.Span))
+                            return null;
+
+                        var formatClause = (string?)null;
+                        if (interpolation.FormatClause != null &&
+                            !TryGetNormalizedStringForSpan(virtualCharService, interpolation.FormatClause.FormatStringToken, span, out formatClause))
+                        {
+                            return null;
+                        }
+
+                        result.Add(StringCopyPasteContent.ForInterpolation(
+                            interpolation.Expression.ToFullString(),
+                            interpolation.AlignmentClause?.ToFullString(),
+                            formatClause));
+                    }
+                    else if (interpolatedContent is InterpolatedStringTextSyntax stringText)
+                    {
+                        if (!TryGetContentForSpan(virtualCharService, stringText.TextToken, span, out var content))
+                            return null;
+
+                        result.Add(content);
+                    }
+                }
+            }
+
+            return new StringCopyPasteData(result.ToImmutable());
+        }
     }
 
     internal enum StringCopyPasteContentKind

From 60a965b8337e4b687ad7093ba2365c5ea906c17d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 15:59:28 -0700
Subject: [PATCH 283/413] Break out types

---
 .../StringCopyPaste/StringCopyPasteContent.cs |  74 +++++++++++
 .../StringCopyPasteContentKind.cs             |  19 +++
 .../StringCopyPaste/StringCopyPasteData.cs    | 120 +++++-------------
 3 files changed, 123 insertions(+), 90 deletions(-)
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContent.cs
 create mode 100644 src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContentKind.cs

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContent.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContent.cs
new file mode 100644
index 0000000000000..86a4e47af5d28
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContent.cs
@@ -0,0 +1,74 @@
+// 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.CSharp.Syntax;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
+{
+    /// <summary>
+    /// Content from a string literal or interpolated string that has been copied.
+    /// </summary>
+    internal readonly struct StringCopyPasteContent
+    {
+        public StringCopyPasteContentKind Kind { get; }
+
+        /// <summary>
+        /// The actual string value for <see cref="StringCopyPasteContentKind.Text"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.
+        /// </summary>
+        public string? TextValue { get; }
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.Expression"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        public string? InterpolationExpression { get; }
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.AlignmentClause"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        public string? InterpolationAlignmentClause { get; }
+
+        /// <summary>
+        /// The actual string value for <see cref="InterpolationSyntax.FormatClause"/> for <see
+        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
+        /// cref="StringCopyPasteContentKind.Text"/>.
+        /// </summary>
+        public string? InterpolationFormatClause { get; }
+
+        [JsonConstructor]
+        public StringCopyPasteContent(
+            StringCopyPasteContentKind kind,
+            string? textValue,
+            string? interpolationExpression,
+            string? interpolationAlignmentClause,
+            string? interpolationFormatClause)
+        {
+            Kind = kind;
+            TextValue = textValue;
+            InterpolationExpression = interpolationExpression;
+            InterpolationAlignmentClause = interpolationAlignmentClause;
+            InterpolationFormatClause = interpolationFormatClause;
+        }
+
+        [JsonIgnore]
+        [MemberNotNullWhen(true, nameof(TextValue))]
+        public bool IsText => Kind == StringCopyPasteContentKind.Text;
+
+        [JsonIgnore]
+        [MemberNotNullWhen(true, nameof(InterpolationExpression))]
+        public bool IsInterpolation => Kind == StringCopyPasteContentKind.Interpolation;
+
+        public static StringCopyPasteContent ForText(string text)
+            => new(StringCopyPasteContentKind.Text, text, null, null, null);
+
+        public static StringCopyPasteContent ForInterpolation(string expression, string? alignmentClause, string? formatClause)
+            => new(StringCopyPasteContentKind.Interpolation, null, expression, alignmentClause, formatClause);
+    }
+}
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContentKind.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContentKind.cs
new file mode 100644
index 0000000000000..ec5d3fc058f24
--- /dev/null
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteContentKind.cs
@@ -0,0 +1,19 @@
+// 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.Editor.CSharp.StringCopyPaste
+{
+    internal enum StringCopyPasteContentKind
+    {
+        /// <summary>
+        /// When text content is copied.
+        /// </summary>
+        Text,
+
+        /// <summary>
+        /// When an interpolation is copied.
+        /// </summary>
+        Interpolation,
+    }
+}
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
index 419fd2d6584ae..92e4965edcf7a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
@@ -65,15 +65,15 @@ public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
 
         /// <summary>
         /// Given a <paramref name="stringExpression"/> for a string literal or interpolated string, and the <paramref
-        /// name="span"/> the user has selected in it, tries to determine the interpreted content within that expression
-        /// that has been copied.  "interpreted" in this context means the actual value of the content that was selected,
-        /// with things like escape characters embedded as the actual characters they represent.
+        /// name="selectionSpan"/> the user has selected in it, tries to determine the interpreted content within that
+        /// expression that has been copied.  "interpreted" in this context means the actual value of the content that
+        /// was selected, with things like escape characters embedded as the actual characters they represent.
         /// </summary>
-        public static StringCopyPasteData? TryCreate(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan span)
+        public static StringCopyPasteData? TryCreate(IVirtualCharLanguageService virtualCharService, ExpressionSyntax stringExpression, TextSpan selectionSpan)
             => stringExpression switch
             {
-                LiteralExpressionSyntax literal => TryCreateForLiteral(virtualCharService, literal, span),
-                InterpolatedStringExpressionSyntax interpolatedString => TryCreateForInterpolatedString(virtualCharService, interpolatedString, span),
+                LiteralExpressionSyntax literal => TryCreateForLiteral(virtualCharService, literal, selectionSpan),
+                InterpolatedStringExpressionSyntax interpolatedString => TryCreateForInterpolatedString(virtualCharService, interpolatedString, selectionSpan),
                 _ => throw ExceptionUtilities.UnexpectedValue(stringExpression.Kind()),
             };
 
@@ -83,15 +83,15 @@ public StringCopyPasteData(ImmutableArray<StringCopyPasteContent> contents)
                 : null;
 
         /// <summary>
-        /// Given a string <paramref name="token"/>, and the <paramref name="span"/> the user has selected that overlaps
-        /// with it, tries to determine the interpreted content within that token that has been copied. "interpreted" in
-        /// this context means the actual value of the content that was selected, with things like escape characters
-        /// embedded as the actual characters they represent.
+        /// Given a string <paramref name="token"/>, and the <paramref name="selectionSpan"/> the user has selected that
+        /// overlaps with it, tries to determine the interpreted content within that token that has been copied.
+        /// "interpreted" in this context means the actual value of the content that was selected, with things like
+        /// escape characters embedded as the actual characters they represent.
         /// </summary>
         private static bool TryGetNormalizedStringForSpan(
             IVirtualCharLanguageService virtualCharService,
             SyntaxToken token,
-            TextSpan span,
+            TextSpan selectionSpan,
             [NotNullWhen(true)] out string? normalizedText)
         {
             normalizedText = null;
@@ -102,17 +102,17 @@ private static bool TryGetNormalizedStringForSpan(
                 return false;
 
             // Then find the start/end of the token's characters that overlap with the selection span.
-            var firstOverlappingChar = virtualChars.FirstOrNull(vc => vc.Span.OverlapsWith(span));
-            var lastOverlappingChar = virtualChars.LastOrNull(vc => vc.Span.OverlapsWith(span));
+            var firstOverlappingChar = virtualChars.FirstOrNull(vc => vc.Span.OverlapsWith(selectionSpan));
+            var lastOverlappingChar = virtualChars.LastOrNull(vc => vc.Span.OverlapsWith(selectionSpan));
 
             if (firstOverlappingChar is null || lastOverlappingChar is null)
                 return false;
 
             // Don't allow partial selection of an escaped character.  e.g. if they select 'n' in '\n'
-            if (span.Start > firstOverlappingChar.Value.Span.Start)
+            if (selectionSpan.Start > firstOverlappingChar.Value.Span.Start)
                 return false;
 
-            if (span.End < lastOverlappingChar.Value.Span.End)
+            if (selectionSpan.End < lastOverlappingChar.Value.Span.End)
                 return false;
 
             var firstCharIndexInclusive = virtualChars.IndexOf(firstOverlappingChar.Value);
@@ -127,10 +127,10 @@ private static bool TryGetNormalizedStringForSpan(
         private static bool TryGetContentForSpan(
             IVirtualCharLanguageService virtualCharService,
             SyntaxToken token,
-            TextSpan span,
+            TextSpan selectionSpan,
             out StringCopyPasteContent content)
         {
-            if (!TryGetNormalizedStringForSpan(virtualCharService, token, span, out var text))
+            if (!TryGetNormalizedStringForSpan(virtualCharService, token, selectionSpan, out var text))
             {
                 content = default;
                 return false;
@@ -145,27 +145,34 @@ private static bool TryGetContentForSpan(
         private static StringCopyPasteData? TryCreateForInterpolatedString(
             IVirtualCharLanguageService virtualCharService,
             InterpolatedStringExpressionSyntax interpolatedString,
-            TextSpan span)
+            TextSpan selectionSpan)
         {
             using var _ = ArrayBuilder<StringCopyPasteContent>.GetInstance(out var result);
 
             foreach (var interpolatedContent in interpolatedString.Contents)
             {
-                if (interpolatedContent.Span.OverlapsWith(span))
+                // Only consider portions of the interpolated string that overlap the selection.
+                if (interpolatedContent.Span.OverlapsWith(selectionSpan))
                 {
                     if (interpolatedContent is InterpolationSyntax interpolation)
                     {
-                        // If the user copies a portion of an interpolation, just treat this as a non-smart copy paste for simplicity.
-                        if (!span.Contains(interpolation.Span))
+                        // If the user copies a portion of an interpolation, just treat this as a non-smart copy paste
+                        // for simplicity.
+                        if (!selectionSpan.Contains(interpolation.Span))
                             return null;
 
+                        // The format clause needs to be written differently depending on what sort of interpolated
+                        // string we have (normal, verbatim, raw).  So grab the token for it and determine it's actual
+                        // interpreted value so we can paste it properly at the destination side.
                         var formatClause = (string?)null;
                         if (interpolation.FormatClause != null &&
-                            !TryGetNormalizedStringForSpan(virtualCharService, interpolation.FormatClause.FormatStringToken, span, out formatClause))
+                            !TryGetNormalizedStringForSpan(virtualCharService, interpolation.FormatClause.FormatStringToken, selectionSpan, out formatClause))
                         {
                             return null;
                         }
 
+                        // Can grab the expression and alignment-clause as is.  That's just normal C# code, and will
+                        // remain the same no matter what we past into.
                         result.Add(StringCopyPasteContent.ForInterpolation(
                             interpolation.Expression.ToFullString(),
                             interpolation.AlignmentClause?.ToFullString(),
@@ -173,7 +180,7 @@ private static bool TryGetContentForSpan(
                     }
                     else if (interpolatedContent is InterpolatedStringTextSyntax stringText)
                     {
-                        if (!TryGetContentForSpan(virtualCharService, stringText.TextToken, span, out var content))
+                        if (!TryGetContentForSpan(virtualCharService, stringText.TextToken, selectionSpan, out var content))
                             return null;
 
                         result.Add(content);
@@ -184,71 +191,4 @@ private static bool TryGetContentForSpan(
             return new StringCopyPasteData(result.ToImmutable());
         }
     }
-
-    internal enum StringCopyPasteContentKind
-    {
-        Text,           // When text content is copied.
-        Interpolation,  // When an interpolation is copied.
-    }
-
-    internal readonly struct StringCopyPasteContent
-    {
-        public StringCopyPasteContentKind Kind { get; }
-
-        /// <summary>
-        /// The actual string value for <see cref="StringCopyPasteContentKind.Text"/>.  <see langword="null"/> for <see
-        /// cref="StringCopyPasteContentKind.Interpolation"/>.
-        /// </summary>
-        public string? TextValue { get; }
-
-        /// <summary>
-        /// The actual string value for <see cref="InterpolationSyntax.Expression"/> for <see
-        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
-        /// cref="StringCopyPasteContentKind.Text"/>.
-        /// </summary>
-        public string? InterpolationExpression { get; }
-
-        /// <summary>
-        /// The actual string value for <see cref="InterpolationSyntax.AlignmentClause"/> for <see
-        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
-        /// cref="StringCopyPasteContentKind.Text"/>.
-        /// </summary>
-        public string? InterpolationAlignmentClause { get; }
-
-        /// <summary>
-        /// The actual string value for <see cref="InterpolationSyntax.FormatClause"/> for <see
-        /// cref="StringCopyPasteContentKind.Interpolation"/>.  <see langword="null"/> for <see
-        /// cref="StringCopyPasteContentKind.Text"/>.
-        /// </summary>
-        public string? InterpolationFormatClause { get; }
-
-        [JsonConstructor]
-        public StringCopyPasteContent(
-            StringCopyPasteContentKind kind,
-            string? textValue,
-            string? interpolationExpression,
-            string? interpolationAlignmentClause,
-            string? interpolationFormatClause)
-        {
-            Kind = kind;
-            TextValue = textValue;
-            InterpolationExpression = interpolationExpression;
-            InterpolationAlignmentClause = interpolationAlignmentClause;
-            InterpolationFormatClause = interpolationFormatClause;
-        }
-
-        [JsonIgnore]
-        [MemberNotNullWhen(true, nameof(TextValue))]
-        public bool IsText => Kind == StringCopyPasteContentKind.Text;
-
-        [JsonIgnore]
-        [MemberNotNullWhen(true, nameof(InterpolationExpression))]
-        public bool IsInterpolation => Kind == StringCopyPasteContentKind.Interpolation;
-
-        public static StringCopyPasteContent ForText(string text)
-            => new(StringCopyPasteContentKind.Text, text, null, null, null);
-
-        public static StringCopyPasteContent ForInterpolation(string expression, string? alignmentClause, string? formatClause)
-            => new(StringCopyPasteContentKind.Interpolation, null, expression, alignmentClause, formatClause);
-    }
 }

From 23cb8471d3b88b47a472a68f2161ea474e72fb34 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:00:13 -0700
Subject: [PATCH 284/413] Add comments

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 1f2f121c7ed41..f2df0f1ceb7a3 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -63,6 +63,10 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly ExpressionSyntax StringExpressionBeforePaste;
 
+        /// <summary>
+        /// Information about the relevant pieces of <see cref="StringExpressionBeforePaste"/> (like where its
+        /// delimiters are).
+        /// </summary>
         protected readonly StringInfo StringExpressionBeforePasteInfo;
 
         /// <summary>

From d14c8b71e85e5fdad1b223288db154121d819205 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:00:45 -0700
Subject: [PATCH 285/413] Add comments

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index f2df0f1ceb7a3..9c5e5331eb3bb 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -84,6 +84,10 @@ internal abstract class AbstractPasteProcessor
         /// </summary>
         protected readonly string NewLine;
 
+        /// <summary>
+        /// Users preferred indentation options.  Used when dealing with raw strings that we have to convert from
+        /// single-line to multiline.
+        /// </summary>
         protected readonly IndentationOptions IndentationOptions;
 
         /// <summary>

From e5122e663c7a8ec23974cd7e3b73aca34da8ab76 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:01:16 -0700
Subject: [PATCH 286/413] Add comments

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 9c5e5331eb3bb..0403118004fb5 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -124,6 +124,9 @@ protected AbstractPasteProcessor(
             Contract.ThrowIfTrue(StringExpressionBeforePasteInfo.ContentSpans.IsEmpty);
         }
 
+        /// <summary>
+        /// Determine the edits that should be made to smartly handle pasting hte data that is on the clipboard.
+        /// </summary>
         public abstract ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken);
 
         /// <summary>

From ea02aace03dca42cc35b54b36db8217ff37b9e6b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:03:48 -0700
Subject: [PATCH 287/413] Simplify

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs      | 2 +-
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs   | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 0403118004fb5..692621e8a2fbe 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -125,7 +125,7 @@ protected AbstractPasteProcessor(
         }
 
         /// <summary>
-        /// Determine the edits that should be made to smartly handle pasting hte data that is on the clipboard.
+        /// Determine the edits that should be made to smartly handle pasting hte data that is on the clipboard._selectionBeforePaste
         /// </summary>
         public abstract ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken);
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 7a0b09e51fe7b..6db9bc0ef1595 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -110,9 +110,7 @@ private void AppendContentForLiteral(StringBuilder builder, LiteralExpressionSyn
                     builder.Append('{');
                     builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationExpression));
 
-                    if (content.InterpolationAlignmentClause != null)
-                        builder.Append(content.InterpolationAlignmentClause);
-
+                    builder.Append(content.InterpolationAlignmentClause);
                     if (content.InterpolationFormatClause != null)
                     {
                         builder.Append(':');
@@ -145,9 +143,7 @@ private void AppendContentForInterpolatedString(StringBuilder builder, Interpola
                     builder.Append('{');
                     builder.Append(content.InterpolationExpression);
 
-                    if (content.InterpolationAlignmentClause != null)
-                        builder.Append(content.InterpolationAlignmentClause);
-
+                    builder.Append(content.InterpolationAlignmentClause);
                     if (content.InterpolationFormatClause != null)
                     {
                         builder.Append(':');

From 7ffbb7b3d2ff7e2b0f2d6566ed91b3b2ce8ca57e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:05:21 -0700
Subject: [PATCH 288/413] docs

---
 .../CSharp/StringCopyPaste/StringCopyPasteData.cs             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
index 92e4965edcf7a..379ef996445de 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs
@@ -20,6 +20,10 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
+    /// <summary>
+    /// Data about a string that a user has copied a subsection of. This will itself be placed on the clipboard so that
+    /// it can be retrieved later on if the user pastes.
+    /// </summary>
     internal class StringCopyPasteData
     {
         public ImmutableArray<StringCopyPasteContent> Contents { get; }

From dcd7823b2728d26570cf9d54bb75140a2743b6db Mon Sep 17 00:00:00 2001
From: akhera99 <ankitakhera@microsoft.com>
Date: Fri, 6 May 2022 16:08:58 -0700
Subject: [PATCH 289/413] fix

---
 .../AbstractGenerateVariableService.cs        | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
index 35e7008c136e1..378f0fe0b93a7 100644
--- a/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
+++ b/src/Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -225,33 +225,23 @@ private static async Task AddParameterCodeActionsAsync(
                         // Keep moving the insertion position for the generated parameter backwards
                         // until we get to a parameter that does not need to be at the end of the
                         // parameter list.
-                        if (parameter.HasExplicitDefaultValue)
+                        if (parameter.HasExplicitDefaultValue ||
+                           parameter.IsParams ||
+                           parameter.RefKind is RefKind.Out ||
+                           Equals(parameter.Type, cancellationTokenType))
                         {
-                            parameterIndex--;
-                        }
-                        else if (parameter.IsParams)
-                        {
-                            parameterIndex--;
-                        }
-                        else if (parameter.RefKind is RefKind.Out)
-                        {
-                            parameterIndex--;
-                        }
-                        else if (Equals(parameter.Type, cancellationTokenType))
-                        {
-                            parameterIndex--;
-                        }
-                        else
-                        {
-                            break;
+                            parameterIndex = i;
+                            continue;
                         }
+
+                        break;
                     }
 
                     // If we are in an extension method, then we want to make sure to insert after
                     // the first parameter.
                     if (containingMethod.IsExtensionMethod && parameterIndex == 0)
                     {
-                        parameterIndex++;
+                        parameterIndex = 1;
                     }
                 }
 

From d6cecfaf8fedaf457347d7a906b9f02da5264eeb Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 16:12:47 -0700
Subject: [PATCH 290/413] Simplify

---
 .../KnownSourcePasteProcessor.cs              | 29 ++++++++++++-------
 .../StringCopyPasteCommandHandler_CutCopy.cs  |  2 +-
 .../StringCopyPaste/StringCopyPasteHelpers.cs |  2 +-
 .../UnknownSourcePasteProcessor.cs            | 14 ++++++---
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 6db9bc0ef1595..37eb9c79b59f1 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -70,17 +70,26 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             return GetEditsForNonRawString();
         }
 
+        private string EscapeForNonRawStringLiteral(string value)
+            => EscapeForNonRawStringLiteral_DoNotCallDirectly(
+                IsVerbatimStringExpression(StringExpressionBeforePaste),
+                StringExpressionBeforePaste is InterpolatedStringExpressionSyntax,
+                // We do not want to try skipping escapes in the 'value'.  We know exactly what 'value' means and don't
+                // want it touched.
+                trySkipExistingEscapes: false,
+                value);
+
         private ImmutableArray<TextChange> GetEditsForNonRawString()
         {
             using var _ = PooledStringBuilder.GetInstance(out var builder);
 
             if (StringExpressionBeforePaste is LiteralExpressionSyntax literal)
             {
-                AppendContentForLiteral(builder, literal);
+                AppendContentForLiteral(builder);
             }
             else if (StringExpressionBeforePaste is InterpolatedStringExpressionSyntax interpolatedString)
             {
-                AppendContentForInterpolatedString(builder, interpolatedString);
+                AppendContentForInterpolatedString(builder);
             }
             else
             {
@@ -90,14 +99,13 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
         }
 
-        private void AppendContentForLiteral(StringBuilder builder, LiteralExpressionSyntax literal)
+        private void AppendContentForLiteral(StringBuilder builder)
         {
-            var isVerbatim = literal.Token.IsVerbatimStringLiteral();
             foreach (var content in _copyPasteData.Contents)
             {
                 if (content.IsText)
                 {
-                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.TextValue));
+                    builder.Append(EscapeForNonRawStringLiteral(content.TextValue));
                 }
                 else if (content.IsInterpolation)
                 {
@@ -108,13 +116,13 @@ private void AppendContentForLiteral(StringBuilder builder, LiteralExpressionSyn
                     // and just treat the interpolation as raw text that should just be escaped as appropriate into
                     // the destination.
                     builder.Append('{');
-                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationExpression));
+                    builder.Append(EscapeForNonRawStringLiteral(content.InterpolationExpression));
 
                     builder.Append(content.InterpolationAlignmentClause);
                     if (content.InterpolationFormatClause != null)
                     {
                         builder.Append(':');
-                        builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: false, trySkipExistingEscapes: false, content.InterpolationFormatClause));
+                        builder.Append(EscapeForNonRawStringLiteral(content.InterpolationFormatClause));
                     }
 
                     builder.Append('}');
@@ -126,14 +134,13 @@ private void AppendContentForLiteral(StringBuilder builder, LiteralExpressionSyn
             }
         }
 
-        private void AppendContentForInterpolatedString(StringBuilder builder, InterpolatedStringExpressionSyntax interpolatedString)
+        private void AppendContentForInterpolatedString(StringBuilder builder)
         {
-            var isVerbatim = interpolatedString.StringStartToken.Kind() is SyntaxKind.InterpolatedVerbatimStringStartToken;
             foreach (var content in _copyPasteData.Contents)
             {
                 if (content.IsText)
                 {
-                    builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.TextValue));
+                    builder.Append(EscapeForNonRawStringLiteral(content.TextValue));
                 }
                 else if (content.IsInterpolation)
                 {
@@ -147,7 +154,7 @@ private void AppendContentForInterpolatedString(StringBuilder builder, Interpola
                     if (content.InterpolationFormatClause != null)
                     {
                         builder.Append(':');
-                        builder.Append(EscapeForNonRawStringLiteral(isVerbatim, isInterpolated: true, trySkipExistingEscapes: false, content.InterpolationFormatClause));
+                        builder.Append(EscapeForNonRawStringLiteral(content.InterpolationFormatClause));
                     }
 
                     builder.Append('}');
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
index 9a6424457548d..eee60f8462d26 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler_CutCopy.cs
@@ -92,7 +92,7 @@ private static (string? dataToStore, IStringCopyPasteService service) CaptureCut
                 return default;
 
             var virtualCharService = document.GetRequiredLanguageService<IVirtualCharLanguageService>();
-            var stringData = TryGetStringCopyPasteData(virtualCharService, stringExpression, span.Span.ToTextSpan());
+            var stringData = StringCopyPasteData.TryCreate(virtualCharService, stringExpression, span.Span.ToTextSpan());
 
             return (stringData?.ToJson(), copyPasteService);
         }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
index 3769c7ca13c8b..9b434a5f8a6ca 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteHelpers.cs
@@ -288,7 +288,7 @@ public static bool IsSupportedStringExpression(ExpressionSyntax expression)
             return false;
         }
 
-        public static string EscapeForNonRawStringLiteral(bool isVerbatim, bool isInterpolated, bool trySkipExistingEscapes, string value)
+        public static string EscapeForNonRawStringLiteral_DoNotCallDirectly(bool isVerbatim, bool isInterpolated, bool trySkipExistingEscapes, string value)
         {
             if (isVerbatim)
                 return EscapeForNonRawVerbatimStringLiteral(isInterpolated, trySkipExistingEscapes, value);
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index eec90dbaeb300..f3f4efeb7dac8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -75,6 +75,15 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
                 : GetEditsForNonRawString();
         }
 
+        private string EscapeForNonRawStringLiteral(string value)
+            => EscapeForNonRawStringLiteral_DoNotCallDirectly(
+                IsVerbatimStringExpression(StringExpressionBeforePaste),
+                StringExpressionBeforePaste is InterpolatedStringExpressionSyntax,
+                // We do not want to try skipping escapes in the 'value'.  We don't know where it came from, and if it
+                // had some escapes in it, it's probably a good idea to remove to keep the final pasted text clean.
+                trySkipExistingEscapes: true,
+                value);
+
         private bool ShouldAlwaysEscapeTextForNonRawString()
         {
             // Pasting a control character into a normal string literal is normally not desired.  So even if this
@@ -84,9 +93,6 @@ private bool ShouldAlwaysEscapeTextForNonRawString()
 
         private ImmutableArray<TextChange> GetEditsForNonRawString()
         {
-            var isVerbatim = IsVerbatimStringExpression(StringExpressionBeforePaste);
-            var isInterpolated = StringExpressionBeforePaste is InterpolatedStringExpressionSyntax;
-
             using var textChanges = TemporaryArray<TextChange>.Empty;
 
             foreach (var change in Changes)
@@ -95,7 +101,7 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
                 // instead of escaping it one more time upon paste.
                 textChanges.Add(new TextChange(
                     change.OldSpan.ToTextSpan(),
-                    EscapeForNonRawStringLiteral(isVerbatim, isInterpolated, trySkipExistingEscapes: true, change.NewText)));
+                    EscapeForNonRawStringLiteral(change.NewText)));
             }
 
             return textChanges.ToImmutableAndClear();

From 641c027706a3b5cd91e1774df8124ac60f369567 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 6 May 2022 20:44:59 -0700
Subject: [PATCH 291/413] Simplify

---
 .../KnownSourcePasteProcessor.cs              | 72 +++++--------------
 1 file changed, 18 insertions(+), 54 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 37eb9c79b59f1..21421802173d6 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -83,24 +83,7 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
         {
             using var _ = PooledStringBuilder.GetInstance(out var builder);
 
-            if (StringExpressionBeforePaste is LiteralExpressionSyntax literal)
-            {
-                AppendContentForLiteral(builder);
-            }
-            else if (StringExpressionBeforePaste is InterpolatedStringExpressionSyntax interpolatedString)
-            {
-                AppendContentForInterpolatedString(builder);
-            }
-            else
-            {
-                throw ExceptionUtilities.Unreachable;
-            }
-
-            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
-        }
-
-        private void AppendContentForLiteral(StringBuilder builder)
-        {
+            var isLiteral = StringExpressionBeforePaste is LiteralExpressionSyntax;
             foreach (var content in _copyPasteData.Contents)
             {
                 if (content.IsText)
@@ -109,46 +92,25 @@ private void AppendContentForLiteral(StringBuilder builder)
                 }
                 else if (content.IsInterpolation)
                 {
-                    // we're copying an interpolation from an interpolated string to a string literal. For example,
-                    // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in
-                    // the future is split the literal into `"goo" + $"{x + y}" + "bar"`, or just making the
-                    // containing literal into an interpolation itself.  However, for now, we do the simple thing
-                    // and just treat the interpolation as raw text that should just be escaped as appropriate into
-                    // the destination.
                     builder.Append('{');
-                    builder.Append(EscapeForNonRawStringLiteral(content.InterpolationExpression));
 
-                    builder.Append(content.InterpolationAlignmentClause);
-                    if (content.InterpolationFormatClause != null)
+                    if (isLiteral)
                     {
-                        builder.Append(':');
-                        builder.Append(EscapeForNonRawStringLiteral(content.InterpolationFormatClause));
+                        // we're copying an interpolation from an interpolated string to a string literal. For example,
+                        // we're pasting `{x + y}` into the middle of `"goobar"`.  One thing we could potentially do in
+                        // the future is split the literal into `"goo" + $"{x + y}" + "bar"`, or just making the
+                        // containing literal into an interpolation itself.  However, for now, we do the simple thing
+                        // and just treat the interpolation as raw text that should just be escaped as appropriate into
+                        // the destination.
+                        builder.Append(EscapeForNonRawStringLiteral(content.InterpolationExpression));
+                    }
+                    else
+                    {
+                        // we're moving an interpolation from one interpolation to another.  This can just be copied
+                        // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be
+                        // updated for the destination type.
+                        builder.Append(content.InterpolationExpression);
                     }
-
-                    builder.Append('}');
-                }
-                else
-                {
-                    throw ExceptionUtilities.UnexpectedValue(content.Kind);
-                }
-            }
-        }
-
-        private void AppendContentForInterpolatedString(StringBuilder builder)
-        {
-            foreach (var content in _copyPasteData.Contents)
-            {
-                if (content.IsText)
-                {
-                    builder.Append(EscapeForNonRawStringLiteral(content.TextValue));
-                }
-                else if (content.IsInterpolation)
-                {
-                    // we're moving an interpolation from one interpolation to another.  This can just be copied
-                    // wholesale *except* for the format literal portion (e.g. `{...:XXXX}` which may have to be updated
-                    // for the destination type.
-                    builder.Append('{');
-                    builder.Append(content.InterpolationExpression);
 
                     builder.Append(content.InterpolationAlignmentClause);
                     if (content.InterpolationFormatClause != null)
@@ -164,6 +126,8 @@ private void AppendContentForInterpolatedString(StringBuilder builder)
                     throw ExceptionUtilities.UnexpectedValue(content.Kind);
                 }
             }
+
+            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
         }
     }
 }

From 4e31f20172aca17cda06f85e37eb3feb528b7d9b Mon Sep 17 00:00:00 2001
From: Julien Couvreur <jcouv@users.noreply.github.com>
Date: Sat, 7 May 2022 09:56:40 -0700
Subject: [PATCH 292/413] Treat some nint/nuint conversions as standard
 conversions (#61034)

---
 .../Semantics/Conversions/ConversionsBase.cs  | 126 +------
 .../Semantic/Semantics/NativeIntegerTests.cs  | 353 +++++++++++++++---
 2 files changed, 324 insertions(+), 155 deletions(-)

diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionsBase.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionsBase.cs
index 8324e9debf1d6..ef875b1288dce 100644
--- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionsBase.cs
+++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionsBase.cs
@@ -1918,132 +1918,40 @@ public static bool IsValidExtensionMethodThisArgConversion(Conversion conversion
             }
         }
 
-        private const bool F = false;
-        private const bool T = true;
-
-        // Notice that there is no implicit numeric conversion from a type to itself. That's an
-        // identity conversion.
-        private static readonly bool[,] s_implicitNumericConversions =
-        {
-            // to     sb  b  s  us i ui  l ul  c  f  d  m
-            // from
-            /* sb */
-         { F, F, T, F, T, F, T, F, F, T, T, T },
-            /*  b */
-         { F, F, T, T, T, T, T, T, F, T, T, T },
-            /*  s */
-         { F, F, F, F, T, F, T, F, F, T, T, T },
-            /* us */
-         { F, F, F, F, T, T, T, T, F, T, T, T },
-            /*  i */
-         { F, F, F, F, F, F, T, F, F, T, T, T },
-            /* ui */
-         { F, F, F, F, F, F, T, T, F, T, T, T },
-            /*  l */
-         { F, F, F, F, F, F, F, F, F, T, T, T },
-            /* ul */
-         { F, F, F, F, F, F, F, F, F, T, T, T },
-            /*  c */
-         { F, F, F, T, T, T, T, T, F, T, T, T },
-            /*  f */
-         { F, F, F, F, F, F, F, F, F, F, T, F },
-            /*  d */
-         { F, F, F, F, F, F, F, F, F, F, F, F },
-            /*  m */
-         { F, F, F, F, F, F, F, F, F, F, F, F }
-        };
-
-        private static readonly bool[,] s_explicitNumericConversions =
-        {
-            // to     sb  b  s us  i ui  l ul  c  f  d  m
-            // from
-            /* sb */
-         { F, T, F, T, F, T, F, T, T, F, F, F },
-            /*  b */
-         { T, F, F, F, F, F, F, F, T, F, F, F },
-            /*  s */
-         { T, T, F, T, F, T, F, T, T, F, F, F },
-            /* us */
-         { T, T, T, F, F, F, F, F, T, F, F, F },
-            /*  i */
-         { T, T, T, T, F, T, F, T, T, F, F, F },
-            /* ui */
-         { T, T, T, T, T, F, F, F, T, F, F, F },
-            /*  l */
-         { T, T, T, T, T, T, F, T, T, F, F, F },
-            /* ul */
-         { T, T, T, T, T, T, T, F, T, F, F, F },
-            /*  c */
-         { T, T, T, F, F, F, F, F, F, F, F, F },
-            /*  f */
-         { T, T, T, T, T, T, T, T, T, F, F, T },
-            /*  d */
-         { T, T, T, T, T, T, T, T, T, T, F, T },
-            /*  m */
-         { T, T, T, T, T, T, T, T, T, T, T, F }
-        };
-
-        private static int GetNumericTypeIndex(SpecialType specialType)
-        {
-            switch (specialType)
-            {
-                case SpecialType.System_SByte: return 0;
-                case SpecialType.System_Byte: return 1;
-                case SpecialType.System_Int16: return 2;
-                case SpecialType.System_UInt16: return 3;
-                case SpecialType.System_Int32: return 4;
-                case SpecialType.System_UInt32: return 5;
-                case SpecialType.System_Int64: return 6;
-                case SpecialType.System_UInt64: return 7;
-                case SpecialType.System_Char: return 8;
-                case SpecialType.System_Single: return 9;
-                case SpecialType.System_Double: return 10;
-                case SpecialType.System_Decimal: return 11;
-                default: return -1;
-            }
-        }
-
 #nullable enable
-        private static bool HasImplicitNumericConversion(TypeSymbol source, TypeSymbol destination)
+
+        private static ConversionKind GetNumericConversion(TypeSymbol source, TypeSymbol destination)
         {
             Debug.Assert((object)source != null);
             Debug.Assert((object)destination != null);
 
-            int sourceIndex = GetNumericTypeIndex(source.SpecialType);
-            if (sourceIndex < 0)
+            if (!IsNumericType(source) || !IsNumericType(destination))
             {
-                return false;
+                return ConversionKind.UnsetConversionKind;
             }
 
-            int destinationIndex = GetNumericTypeIndex(destination.SpecialType);
-            if (destinationIndex < 0)
+            if (source.SpecialType == destination.SpecialType)
             {
-                return false;
+                // Notice that there is no implicit numeric conversion from a type to itself. That's an
+                // identity conversion.
+                return ConversionKind.UnsetConversionKind;
             }
 
-            return s_implicitNumericConversions[sourceIndex, destinationIndex];
+            var conversionKind = ConversionEasyOut.ClassifyConversion(source, destination);
+            Debug.Assert(conversionKind is ConversionKind.ImplicitNumeric or ConversionKind.ExplicitNumeric);
+            return conversionKind;
+        }
+
+        private static bool HasImplicitNumericConversion(TypeSymbol source, TypeSymbol destination)
+        {
+            return GetNumericConversion(source, destination) == ConversionKind.ImplicitNumeric;
         }
 
         private static bool HasExplicitNumericConversion(TypeSymbol source, TypeSymbol destination)
         {
             // SPEC: The explicit numeric conversions are the conversions from a numeric-type to another 
             // SPEC: numeric-type for which an implicit numeric conversion does not already exist.
-            Debug.Assert((object)source != null);
-            Debug.Assert((object)destination != null);
-
-            int sourceIndex = GetNumericTypeIndex(source.SpecialType);
-            if (sourceIndex < 0)
-            {
-                return false;
-            }
-
-            int destinationIndex = GetNumericTypeIndex(destination.SpecialType);
-            if (destinationIndex < 0)
-            {
-                return false;
-            }
-
-            return s_explicitNumericConversions[sourceIndex, destinationIndex];
+            return GetNumericConversion(source, destination) == ConversionKind.ExplicitNumeric;
         }
 
         private static bool IsConstantNumericZero(ConstantValue value)
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NativeIntegerTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NativeIntegerTests.cs
index 2d50971114230..6b0f468c32fdc 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/NativeIntegerTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NativeIntegerTests.cs
@@ -9971,20 +9971,84 @@ .maxstack  1
 }");
         }
 
-        [Theory]
-        [InlineData("nint")]
-        [InlineData("nuint")]
-        [InlineData("nint?")]
-        [InlineData("nuint?")]
-        public void UnaryAndBinaryOperators_UserDefinedConversions(string type)
+        [Fact]
+        public void UnaryAndBinaryOperators_UserDefinedConversions()
         {
-            string sourceA =
+            verify("nint",
+                // (5,9): error CS0266: Cannot implicitly convert type 'long' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         ++x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "++x").WithArguments("long", "MyInt").WithLocation(5, 9),
+                // (6,9): error CS0266: Cannot implicitly convert type 'long' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x++;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x++").WithArguments("long", "MyInt").WithLocation(6, 9),
+                // (7,9): error CS0266: Cannot implicitly convert type 'long' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         --x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "--x").WithArguments("long", "MyInt").WithLocation(7, 9),
+                // (8,9): error CS0266: Cannot implicitly convert type 'long' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x--;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x--").WithArguments("long", "MyInt").WithLocation(8, 9)
+                );
+
+            verify("nint?",
+                // (5,9): error CS0266: Cannot implicitly convert type 'long?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         ++x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "++x").WithArguments("long?", "MyInt").WithLocation(5, 9),
+                // (6,9): error CS0266: Cannot implicitly convert type 'long?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x++;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x++").WithArguments("long?", "MyInt").WithLocation(6, 9),
+                // (7,9): error CS0266: Cannot implicitly convert type 'long?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         --x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "--x").WithArguments("long?", "MyInt").WithLocation(7, 9),
+                // (8,9): error CS0266: Cannot implicitly convert type 'long?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x--;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x--").WithArguments("long?", "MyInt").WithLocation(8, 9)
+                );
+
+            verify("nuint",
+                // (5,9): error CS0266: Cannot implicitly convert type 'ulong' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         ++x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "++x").WithArguments("ulong", "MyInt").WithLocation(5, 9),
+                // (6,9): error CS0266: Cannot implicitly convert type 'ulong' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x++;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x++").WithArguments("ulong", "MyInt").WithLocation(6, 9),
+                // (7,9): error CS0266: Cannot implicitly convert type 'ulong' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         --x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "--x").WithArguments("ulong", "MyInt").WithLocation(7, 9),
+                // (8,9): error CS0266: Cannot implicitly convert type 'ulong' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x--;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x--").WithArguments("ulong", "MyInt").WithLocation(8, 9),
+                // (10,13): error CS0035: Operator '-' is ambiguous on an operand of type 'MyInt'
+                //         _ = -x;
+                Diagnostic(ErrorCode.ERR_AmbigUnaryOp, "-x").WithArguments("-", "MyInt").WithLocation(10, 13)
+                );
+
+            verify("nuint?",
+                // (5,9): error CS0266: Cannot implicitly convert type 'ulong?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         ++x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "++x").WithArguments("ulong?", "MyInt").WithLocation(5, 9),
+                // (6,9): error CS0266: Cannot implicitly convert type 'ulong?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x++;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x++").WithArguments("ulong?", "MyInt").WithLocation(6, 9),
+                // (7,9): error CS0266: Cannot implicitly convert type 'ulong?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         --x;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "--x").WithArguments("ulong?", "MyInt").WithLocation(7, 9),
+                // (8,9): error CS0266: Cannot implicitly convert type 'ulong?' to 'MyInt'. An explicit conversion exists (are you missing a cast?)
+                //         x--;
+                Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x--").WithArguments("ulong?", "MyInt").WithLocation(8, 9),
+                // (10,13): error CS0035: Operator '-' is ambiguous on an operand of type 'MyInt'
+                //         _ = -x;
+                Diagnostic(ErrorCode.ERR_AmbigUnaryOp, "-x").WithArguments("-", "MyInt").WithLocation(10, 13)
+                );
+
+            void verify(string type, params DiagnosticDescription[] expected)
+            {
+                string sourceA =
 $@"class MyInt
 {{
     public static implicit operator {type}(MyInt i) => throw null;
     public static implicit operator MyInt({type} i) => throw null;
 }}";
-            string sourceB =
+                string sourceB =
 @"class Program
 {
     static void F(MyInt x, MyInt y)
@@ -10003,44 +10067,9 @@ static void F(MyInt x, MyInt y)
         _ = x << 1;
     }
 }";
-            var comp = CreateCompilation(new[] { sourceA, sourceB }, parseOptions: TestOptions.Regular9);
-            comp.VerifyDiagnostics(
-                // (5,9): error CS0023: Operator '++' cannot be applied to operand of type 'MyInt'
-                //         ++x;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "++x").WithArguments("++", "MyInt").WithLocation(5, 9),
-                // (6,9): error CS0023: Operator '++' cannot be applied to operand of type 'MyInt'
-                //         x++;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "x++").WithArguments("++", "MyInt").WithLocation(6, 9),
-                // (7,9): error CS0023: Operator '--' cannot be applied to operand of type 'MyInt'
-                //         --x;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "--x").WithArguments("--", "MyInt").WithLocation(7, 9),
-                // (8,9): error CS0023: Operator '--' cannot be applied to operand of type 'MyInt'
-                //         x--;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "x--").WithArguments("--", "MyInt").WithLocation(8, 9),
-                // (9,13): error CS0023: Operator '+' cannot be applied to operand of type 'MyInt'
-                //         _ = +x;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "+x").WithArguments("+", "MyInt").WithLocation(9, 13),
-                // (10,13): error CS0023: Operator '-' cannot be applied to operand of type 'MyInt'
-                //         _ = -x;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "-x").WithArguments("-", "MyInt").WithLocation(10, 13),
-                // (11,13): error CS0023: Operator '~' cannot be applied to operand of type 'MyInt'
-                //         _ = ~x;
-                Diagnostic(ErrorCode.ERR_BadUnaryOp, "~x").WithArguments("~", "MyInt").WithLocation(11, 13),
-                // (12,13): error CS0019: Operator '+' cannot be applied to operands of type 'MyInt' and 'MyInt'
-                //         _ = x + y;
-                Diagnostic(ErrorCode.ERR_BadBinaryOps, "x + y").WithArguments("+", "MyInt", "MyInt").WithLocation(12, 13),
-                // (13,13): error CS0019: Operator '*' cannot be applied to operands of type 'MyInt' and 'MyInt'
-                //         _ = x * y;
-                Diagnostic(ErrorCode.ERR_BadBinaryOps, "x * y").WithArguments("*", "MyInt", "MyInt").WithLocation(13, 13),
-                // (14,13): error CS0019: Operator '<' cannot be applied to operands of type 'MyInt' and 'MyInt'
-                //         _ = x < y;
-                Diagnostic(ErrorCode.ERR_BadBinaryOps, "x < y").WithArguments("<", "MyInt", "MyInt").WithLocation(14, 13),
-                // (15,13): error CS0019: Operator '&' cannot be applied to operands of type 'MyInt' and 'MyInt'
-                //         _ = x & y;
-                Diagnostic(ErrorCode.ERR_BadBinaryOps, "x & y").WithArguments("&", "MyInt", "MyInt").WithLocation(15, 13),
-                // (16,13): error CS0019: Operator '<<' cannot be applied to operands of type 'MyInt' and 'int'
-                //         _ = x << 1;
-                Diagnostic(ErrorCode.ERR_BadBinaryOps, "x << 1").WithArguments("<<", "MyInt", "int").WithLocation(16, 13));
+                var comp = CreateCompilation(new[] { sourceA, sourceB }, parseOptions: TestOptions.Regular9);
+                comp.VerifyDiagnostics(expected);
+            }
         }
 
         [Fact]
@@ -14366,5 +14395,237 @@ .maxstack  1
             verifier.VerifyIL("NativeInts.Checked4", expectedCheckedIL);
             verifier.VerifyIL("NativeInts.Checked5", expectedCheckedIL);
         }
+
+        [Fact]
+        public void StandardConversions()
+        {
+            // Note: A standard explicit conversion is derived from opposite standard implicit conversion
+
+            // type to nint
+            verify(sourceType: "object", destType: "nint", isExplicit: true);
+            verify(sourceType: "string", destType: "nint", noConversion: true);
+            verify(sourceType: "void*", destType: "nint", noConversion: true);
+            verify(sourceType: "delegate*<void>", destType: "nint", noConversion: true);
+            verify(sourceType: "E", destType: "nint", noConversion: true);
+            verify(sourceType: "bool", destType: "nint", noConversion: true);
+            verify(sourceType: "sbyte", destType: "nint");
+            verify(sourceType: "byte", destType: "nint");
+            verify(sourceType: "short", destType: "nint");
+            verify(sourceType: "ushort", destType: "nint");
+            verify(sourceType: "int", destType: "nint");
+            verify(sourceType: "uint", destType: "nint", noConversion: true);
+            verify(sourceType: "long", destType: "nint", isExplicit: true);
+            verify(sourceType: "ulong", destType: "nint", noConversion: true);
+            verify(sourceType: "char", destType: "nint");
+            verify(sourceType: "float", destType: "nint", isExplicit: true);
+            verify(sourceType: "double", destType: "nint", isExplicit: true);
+            verify(sourceType: "decimal", destType: "nint", isExplicit: true);
+            verify(sourceType: "nint", destType: "nint");
+            verify(sourceType: "nuint", destType: "nint", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "nint");
+            verify(sourceType: "System.UIntPtr", destType: "nint", noConversion: true);
+
+            // nint to type
+            verify(sourceType: "nint", destType: "string", noConversion: true);
+            verify(sourceType: "nint", destType: "void*", noConversion: true);
+            verify(sourceType: "nint", destType: "delegate*<void>", noConversion: true);
+            verify(sourceType: "nint", destType: "E", noConversion: true);
+            verify(sourceType: "nint", destType: "bool", noConversion: true);
+            verify(sourceType: "nint", destType: "sbyte", isExplicit: true);
+            verify(sourceType: "nint", destType: "byte", isExplicit: true);
+            verify(sourceType: "nint", destType: "short", isExplicit: true);
+            verify(sourceType: "nint", destType: "ushort", isExplicit: true);
+            verify(sourceType: "nint", destType: "int", isExplicit: true);
+            verify(sourceType: "nint", destType: "uint", noConversion: true);
+            verify(sourceType: "nint", destType: "long");
+            verify(sourceType: "nint", destType: "ulong", noConversion: true);
+            verify(sourceType: "nint", destType: "char", isExplicit: true);
+            verify(sourceType: "nint", destType: "float");
+            verify(sourceType: "nint", destType: "double");
+            verify(sourceType: "nint", destType: "decimal");
+            verify(sourceType: "nint", destType: "nint");
+            verify(sourceType: "nint", destType: "nuint", noConversion: true);
+            verify(sourceType: "nint", destType: "System.IntPtr");
+            verify(sourceType: "nint", destType: "System.UIntPtr", noConversion: true);
+
+            // type to nuint
+            verify(sourceType: "object", destType: "nuint", isExplicit: true);
+            verify(sourceType: "string", destType: "nuint", noConversion: true);
+            verify(sourceType: "void*", destType: "nuint", noConversion: true);
+            verify(sourceType: "delegate*<void>", destType: "nuint", noConversion: true);
+            verify(sourceType: "E", destType: "nuint", noConversion: true);
+            verify(sourceType: "bool", destType: "nuint", noConversion: true);
+            verify(sourceType: "sbyte", destType: "nuint", noConversion: true);
+            verify(sourceType: "byte", destType: "nuint");
+            verify(sourceType: "short", destType: "nuint", noConversion: true);
+            verify(sourceType: "ushort", destType: "nuint");
+            verify(sourceType: "int", destType: "nuint", noConversion: true);
+            verify(sourceType: "uint", destType: "nuint");
+            verify(sourceType: "long", destType: "nuint", noConversion: true);
+            verify(sourceType: "ulong", destType: "nuint", isExplicit: true);
+            verify(sourceType: "char", destType: "nuint");
+            verify(sourceType: "float", destType: "nuint", isExplicit: true);
+            verify(sourceType: "double", destType: "nuint", isExplicit: true);
+            verify(sourceType: "decimal", destType: "nuint", isExplicit: true);
+            verify(sourceType: "nint", destType: "nuint", noConversion: true);
+            verify(sourceType: "nuint", destType: "nuint");
+            verify(sourceType: "System.IntPtr", destType: "nuint", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "nuint");
+
+            // nuint to type
+            verify(sourceType: "nuint", destType: "string", noConversion: true);
+            verify(sourceType: "nuint", destType: "void*", noConversion: true);
+            verify(sourceType: "nuint", destType: "delegate*<void>", noConversion: true);
+            verify(sourceType: "nuint", destType: "E", noConversion: true);
+            verify(sourceType: "nuint", destType: "bool", noConversion: true);
+            verify(sourceType: "nuint", destType: "sbyte", noConversion: true);
+            verify(sourceType: "nuint", destType: "byte", isExplicit: true);
+            verify(sourceType: "nuint", destType: "short", noConversion: true);
+            verify(sourceType: "nuint", destType: "ushort", isExplicit: true);
+            verify(sourceType: "nuint", destType: "int", noConversion: true);
+            verify(sourceType: "nuint", destType: "uint", isExplicit: true);
+            verify(sourceType: "nuint", destType: "long", noConversion: true);
+            verify(sourceType: "nuint", destType: "ulong");
+            verify(sourceType: "nuint", destType: "char", isExplicit: true);
+            verify(sourceType: "nuint", destType: "float");
+            verify(sourceType: "nuint", destType: "double");
+            verify(sourceType: "nuint", destType: "decimal");
+            verify(sourceType: "nuint", destType: "nint", noConversion: true);
+            verify(sourceType: "nuint", destType: "nuint");
+            verify(sourceType: "nuint", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "nuint", destType: "System.UIntPtr");
+
+
+            // type to System.IntPtr
+            verify(sourceType: "object", destType: "System.IntPtr", isExplicit: true);
+            verify(sourceType: "string", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "void*", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "delegate*<void>", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "E", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "bool", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "sbyte", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "byte", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "short", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "ushort", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "int", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "uint", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "long", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "ulong", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "char", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "float", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "double", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "decimal", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "nint", destType: "System.IntPtr");
+            verify(sourceType: "nuint", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "System.IntPtr");
+            verify(sourceType: "System.UIntPtr", destType: "System.IntPtr", noConversion: true);
+
+            // System.IntPtr to type
+            verify(sourceType: "System.IntPtr", destType: "string", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "void*", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "delegate*<void>", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "E", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "bool", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "sbyte", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "byte", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "short", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "ushort", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "int", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "uint", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "long", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "ulong", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "char", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "float", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "double", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "decimal", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "nint");
+            verify(sourceType: "System.IntPtr", destType: "nuint", noConversion: true);
+            verify(sourceType: "System.IntPtr", destType: "System.IntPtr");
+            verify(sourceType: "System.IntPtr", destType: "System.UIntPtr", noConversion: true);
+
+            // type to System.UIntPtr
+            verify(sourceType: "object", destType: "System.UIntPtr", isExplicit: true);
+            verify(sourceType: "string", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "void*", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "delegate*<void>", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "E", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "bool", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "sbyte", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "byte", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "short", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "ushort", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "int", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "uint", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "long", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "ulong", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "char", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "float", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "double", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "decimal", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "nint", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "nuint", destType: "System.UIntPtr");
+            verify(sourceType: "System.IntPtr", destType: "System.UIntPtr", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "System.UIntPtr");
+
+            // System.UIntPtr to type
+            verify(sourceType: "System.UIntPtr", destType: "string", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "void*", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "delegate*<void>", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "E", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "bool", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "sbyte", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "byte", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "short", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "ushort", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "int", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "uint", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "long", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "ulong", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "char", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "float", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "double", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "decimal", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "nint", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "nuint");
+            verify(sourceType: "System.UIntPtr", destType: "System.IntPtr", noConversion: true);
+            verify(sourceType: "System.UIntPtr", destType: "System.UIntPtr");
+
+            void verify(string sourceType, string destType, bool noConversion = false, bool isExplicit = false)
+            {
+                var source = $$"""
+unsafe class FinalType
+{
+    FinalType M({{sourceType}} x) => x;
+    FinalType M2({{sourceType}} x) => (FinalType)x;
+    public static implicit operator FinalType({{destType}} i) => throw null;
+}
+enum E { }
+""";
+                var comp = CreateCompilation(source, options: TestOptions.UnsafeDebugDll);
+                if (noConversion)
+                {
+                    comp.VerifyDiagnostics(
+                        // (3,30): error CS0029: Cannot implicitly convert type 'sourceType' to 'FinalType'
+                        //     FinalType M(sourceType x) => x;
+                        Diagnostic(ErrorCode.ERR_NoImplicitConv, "x").WithArguments(sourceType, "FinalType"),
+                        // (4,31): error CS0030: Cannot convert type 'sourceType' to 'FinalType'
+                        //     FinalType M2(sourceType x) => (FinalType)x;
+                        Diagnostic(ErrorCode.ERR_NoExplicitConv, "(FinalType)x").WithArguments(sourceType, "FinalType")
+                        );
+                }
+                else if (isExplicit)
+                {
+                    comp.VerifyDiagnostics(
+                        // (3,30): error CS0266: Cannot implicitly convert type 'sourceType' to 'FinalType'. An explicit conversion exists (are you missing a cast?)
+                        //     FinalType M(sourceType x) => x;
+                        Diagnostic(ErrorCode.ERR_NoImplicitConvCast, "x").WithArguments(sourceType, "FinalType")
+                        );
+                }
+                else
+                {
+                    comp.VerifyDiagnostics();
+                }
+            }
+        }
     }
 }

From efcd2748ecb845905c3ace57e73bff5c8ac67f84 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 14:07:26 -0700
Subject: [PATCH 293/413] in progress

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |   8 +-
 .../KnownSourcePasteProcessor.cs              | 187 ++++++++++++++++--
 .../StringCopyPasteCommandHandler.cs          |  16 +-
 .../UnknownSourcePasteProcessor.cs            |   8 +-
 4 files changed, 194 insertions(+), 25 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 692621e8a2fbe..a650d0370973a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -28,13 +28,13 @@ internal abstract class AbstractPasteProcessor
         /// <summary>
         /// The buffer's snapshot prior to the paste application.
         /// </summary>
-        protected readonly ITextSnapshot SnapshotBeforePaste;
+        protected readonly ITextSnapshot2 SnapshotBeforePaste;
 
         /// <summary>
         /// The buffer's snapshot right after the paste application.  Guaranteed to be exactly one version ahead of <see
         /// cref="SnapshotBeforePaste"/>.
         /// </summary>
-        protected readonly ITextSnapshot SnapshotAfterPaste;
+        protected readonly ITextSnapshot2 SnapshotAfterPaste;
 
         /// <summary>
         /// Roslyn SourceText corresponding to <see cref="SnapshotBeforePaste"/>.
@@ -99,8 +99,8 @@ internal abstract class AbstractPasteProcessor
         protected AbstractPasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 21421802173d6..802519fb5051c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -21,7 +20,6 @@
 namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
 {
     using static StringCopyPasteHelpers;
-    using static SyntaxFactory;
 
     /// <summary>
     /// Implementation of <see cref="AbstractPasteProcessor"/> used when we know the original string literal expression
@@ -34,27 +32,31 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
         /// <summary>
         /// The selection in the document prior to the paste happening.
         /// </summary>
-        private readonly SnapshotSpan _selectionBeforePaste;
+        private readonly TextSpan _selectionSpanBeforePaste;
 
         /// <summary>
         /// Information stored to the clipboard about the original cut/copy.
         /// </summary>
         private readonly StringCopyPasteData _copyPasteData;
 
+        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
+
         public KnownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
-            SnapshotSpan selectionBeforePaste,
-            StringCopyPasteData copyPasteData)
+            TextSpan selectionSpanBeforePaste,
+            StringCopyPasteData copyPasteData,
+            ITextBufferFactoryService3 textBufferFactoryService)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
-            _selectionBeforePaste = selectionBeforePaste;
+            _selectionSpanBeforePaste = selectionSpanBeforePaste;
             _copyPasteData = copyPasteData;
+            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
@@ -64,10 +66,9 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             // deal with things like indentation and potentially adding newlines to make things legal.
 
             // Smart Pasting into raw string not supported yet.  
-            if (IsAnyRawStringExpression(StringExpressionBeforePaste))
-                return default;
-
-            return GetEditsForNonRawString();
+            return IsAnyRawStringExpression(StringExpressionBeforePaste)
+                ? GetEditsForRawString(cancellationToken)
+                : GetEditsForNonRawString();
         }
 
         private string EscapeForNonRawStringLiteral(string value)
@@ -127,7 +128,167 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
                 }
             }
 
-            return ImmutableArray.Create(new TextChange(_selectionBeforePaste.Span.ToTextSpan(), builder.ToString()));
+            return ImmutableArray.Create(new TextChange(_selectionSpanBeforePaste, builder.ToString()));
+        }
+
+        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
+        {
+            // To make a change to a raw string we have to go through several passes to determine what to do.
+            //
+            // First, just take the copied text and determine the most basic edit that would insert it into the
+            // destination string.  Importantly, do not insert interpolations in this step (instead just replace them
+            // with a dummy character).
+            //
+            // Second, after this text is inserted, look at the content regions of the string after the paste and look
+            // at the sequences of `"` and `{` in them to see if we need to update the delimiters of the raw string.
+            // Note: this is why it is critical that any interpolations are not inserted.  We don't want the content of
+            // the interpolation to affect the delimiters.  e.g. a interpolation containing `""""` *inside* of it
+            // doesn't require updating the delimiters of the outer expression.
+            //
+            // Also, after the text is inserted, look to see if we need to convert a single-line raw expression to
+            // multi-line.
+            //
+            // At this point, we will now have the information necessary to actually insert the content and do things 
+            // like give interpolations the proper number of braces for the final string we're making.
+
+            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1, indentationWhitespace: "");
+
+            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
+            var snapshotBeforeDummyPaste = clonedBuffer.CurrentSnapshot;
+
+            var edit = clonedBuffer.CreateEdit();
+            edit.Replace(_selectionSpanBeforePaste.ToSpan(), dummyContentEdit.NewText);
+
+            var snapshotAfterDummyPaste = edit.Apply();
+            var textAfterDummyPaste = snapshotAfterDummyPaste.AsText();
+
+            var contentSpansAfterDummyPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
+                ts => MapSpan(ts, snapshotBeforeDummyPaste, snapshotAfterDummyPaste));
+
+            var quotesToAdd = GetQuotesToAddToRawString(textAfterDummyPaste, contentSpansAfterDummyPaste);
+            var dollarSignsToAdd = GetDollarSignsToAddToRawString(textAfterDummyPaste, contentSpansAfterDummyPaste);
+            //var openBracesToAdd = dollarSignsToAdd == null ? null : new string('{', dollarSignsToAdd.Length);
+            //var closeBracesToAdd = dollarSignsToAdd == null ? null : new string('}', dollarSignsToAdd.Length);
+
+            var convertToMultiLine = !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) && RawContentMustBeMultiLine(textAfterDummyPaste, contentSpansAfterDummyPaste);
+            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
+
+            var finalDollarSignCount = StringExpressionBeforePasteInfo.DelimiterDollarCount +
+                (dollarSignsToAdd == null ? 0 : dollarSignsToAdd.Length);
+
+            using var _ = ArrayBuilder<TextChange>.GetInstance(out var edits);
+
+            // First, add any extra dollar signs needed.
+            if (dollarSignsToAdd != null)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
+
+            // Then any quotes to the start delimiter.
+            if (quotesToAdd != null)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
+
+            // A newline and the indentation to start with.  Note: adding the indentation hear means that existing
+            // content will start at the right location, as will any content we are pasting in.
+            if (convertToMultiLine)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
+
+            // If we need to add braces to existing interpolations, do so now for the interpolations before the selection.
+            if (dollarSignsToAdd != null)
+                UpdateExistingInterpolationBraces(edits, beforeSelection: true, dollarSignsToAdd.Length);
+
+            // Now determine the actual content to add again, this time properly emitting it with
+            // indentation/interpolations correctly.
+            edits.Add(GetContentEditForRawString(insertInterpolations: true, finalDollarSignCount, indentationWhitespace));
+
+            // If we need to add braces to existing interpolations, do so now for the interpolations before the selection.
+            if (dollarSignsToAdd != null)
+                UpdateExistingInterpolationBraces(edits, beforeSelection: false, dollarSignsToAdd.Length);
+
+            // A final new-line and indentation before the end delimiter.
+            if (convertToMultiLine)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
+
+            // Then  any extra quotes to the end delimiter.
+            if (quotesToAdd != null)
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
+
+            return edits.ToImmutable();
+        }
+
+        private void UpdateExistingInterpolationBraces(
+            ArrayBuilder<TextChange> edits, bool beforeSelection, int dollarSignsToAdd)
+        {
+            var interpolatedStringExpression = (InterpolatedStringExpressionSyntax)StringExpressionBeforePaste;
+
+            foreach (var content in interpolatedStringExpression.Contents)
+            {
+                if (content is InterpolationSyntax interpolation)
+                {
+                    if (beforeSelection && interpolation.Span.End > _selectionSpanBeforePaste.Start)
+                        continue;
+
+                    if (!beforeSelection && interpolation.Span.Start < _selectionSpanBeforePaste.End)
+                        continue;
+
+                    edits.Add(new TextChange(new TextSpan(interpolation.OpenBraceToken.Span.End, 0), new string('{', dollarSignsToAdd)));
+                    edits.Add(new TextChange(new TextSpan(interpolation.CloseBraceToken.Span.Start, 0), new string('}', dollarSignsToAdd)));
+                }
+            }
+        }
+
+        private TextChange GetContentEditForRawString(
+            bool insertInterpolations,
+            int dollarSignCount,
+            string indentationWhitespace)
+        {
+            dollarSignCount = Math.Max(1, dollarSignCount);
+            using var _ = PooledStringBuilder.GetInstance(out var builder);
+
+            var isLiteral = StringExpressionBeforePaste is LiteralExpressionSyntax;
+            foreach (var content in _copyPasteData.Contents)
+            {
+                if (content.IsText)
+                {
+                    // Convert the string to a source-text instance so we can easily process it one line at a time.
+                    var sourceText = SourceText.From(content.TextValue);
+
+                    for (var i = 0; i < sourceText.Lines.Count; i++)
+                    {
+                        if (i != 0)
+                            builder.Append(indentationWhitespace);
+
+                        builder.Append(sourceText.ToString(sourceText.Lines[i].SpanIncludingLineBreak));
+                    }
+                }
+                else if (content.IsInterpolation)
+                {
+                    if (!insertInterpolations)
+                    {
+                        // Just insert a basic string that represents the interpolation, but doesn't actually insert any
+                        // potential " or { characters that might screw up later computations.
+                        builder.Append('0');
+                    }
+                    else
+                    {
+                        builder.Append(new string('{', dollarSignCount));
+                        builder.Append(content.InterpolationExpression);
+                        builder.Append(content.InterpolationAlignmentClause);
+
+                        if (content.InterpolationFormatClause != null)
+                        {
+                            builder.Append(':');
+                            builder.Append(content.InterpolationFormatClause);
+                        }
+
+                        builder.Append(new string('}', dollarSignCount));
+                    }
+                }
+                else
+                {
+                    throw ExceptionUtilities.UnexpectedValue(content.Kind);
+                }
+            }
+
+            return new TextChange(_selectionSpanBeforePaste, builder.ToString());
         }
     }
 }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 7adeccbaa349a..ddac03d544443 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -56,6 +56,7 @@ internal partial class StringCopyPasteCommandHandler :
         private readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
         private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
         private readonly IGlobalOptionService _globalOptions;
+        private readonly ITextBufferFactoryService2 _textBufferFactoryService;
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
@@ -63,12 +64,14 @@ public StringCopyPasteCommandHandler(
             IThreadingContext threadingContext,
             ITextUndoHistoryRegistry undoHistoryRegistry,
             IEditorOperationsFactoryService editorOperationsFactoryService,
-            IGlobalOptionService globalOptions)
+            IGlobalOptionService globalOptions,
+            ITextBufferFactoryService2 textBufferFactoryService)
         {
             _threadingContext = threadingContext;
             _undoHistoryRegistry = undoHistoryRegistry;
             _editorOperationsFactoryService = editorOperationsFactoryService;
             _globalOptions = globalOptions;
+            _textBufferFactoryService = textBufferFactoryService;
         }
 
         public string DisplayName => nameof(StringCopyPasteCommandHandler);
@@ -84,12 +87,15 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var subjectBuffer = args.SubjectBuffer;
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot;
+            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
 
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
+            if (snapshotBeforePaste is null)
+                return;
+
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;
@@ -102,7 +108,9 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             if (selectionsBeforePaste.Count == 0)
                 return;
 
-            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot;
+            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
+            if (snapshotAfterPaste is null)
+                return;
 
             // If there were multiple changes that already happened, then don't make any changes.  Some other component
             // already did something advanced.
@@ -217,7 +225,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste,
                     selectionsBeforePaste[0],
-                    copyPasteData);
+                    copyPasteData, _textBufferFactoryService);
                 return knownProcessor.GetEdits(cancellationToken);
             }
         }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index f3f4efeb7dac8..53b849fc99d10 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -38,8 +38,8 @@ internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
         public UnknownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot snapshotBeforePaste,
-            ITextSnapshot snapshotAfterPaste,
+            ITextSnapshot2 snapshotBeforePaste,
+            ITextSnapshot2 snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
@@ -132,7 +132,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             if (dollarSignsToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePaste.Span.Start, 0), dollarSignsToAdd));
 
-            // Then any quotes to your starting delimiter
+            // Then any quotes to the start delimiter.
             if (quotesToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
@@ -143,7 +143,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             else
                 AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits, cancellationToken);
 
-            // Then add any extra end quotes needed.
+            // Then  any extra quotes to the end delimiter.
             if (quotesToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpanWithoutSuffix.End, 0), quotesToAdd));
 

From dc9ed2a16d17108203dd9eab354d12bfd171ec43 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 14:12:42 -0700
Subject: [PATCH 294/413] in progress

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs  |  8 ++++----
 .../StringCopyPaste/KnownSourcePasteProcessor.cs      | 11 ++++++-----
 .../StringCopyPaste/StringCopyPasteCommandHandler.cs  | 11 +++--------
 .../StringCopyPaste/UnknownSourcePasteProcessor.cs    |  4 ++--
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index a650d0370973a..692621e8a2fbe 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -28,13 +28,13 @@ internal abstract class AbstractPasteProcessor
         /// <summary>
         /// The buffer's snapshot prior to the paste application.
         /// </summary>
-        protected readonly ITextSnapshot2 SnapshotBeforePaste;
+        protected readonly ITextSnapshot SnapshotBeforePaste;
 
         /// <summary>
         /// The buffer's snapshot right after the paste application.  Guaranteed to be exactly one version ahead of <see
         /// cref="SnapshotBeforePaste"/>.
         /// </summary>
-        protected readonly ITextSnapshot2 SnapshotAfterPaste;
+        protected readonly ITextSnapshot SnapshotAfterPaste;
 
         /// <summary>
         /// Roslyn SourceText corresponding to <see cref="SnapshotBeforePaste"/>.
@@ -99,8 +99,8 @@ internal abstract class AbstractPasteProcessor
         protected AbstractPasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste)
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 802519fb5051c..da6d9647ea811 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -39,19 +39,19 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
         /// </summary>
         private readonly StringCopyPasteData _copyPasteData;
 
-        private readonly ITextBufferFactoryService3 _textBufferFactoryService;
+        private readonly ITextBufferFactoryService2 _textBufferFactoryService;
 
         public KnownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             TextSpan selectionSpanBeforePaste,
             StringCopyPasteData copyPasteData,
-            ITextBufferFactoryService3 textBufferFactoryService)
+            ITextBufferFactoryService2 textBufferFactoryService)
             : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _selectionSpanBeforePaste = selectionSpanBeforePaste;
@@ -153,7 +153,8 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
             var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1, indentationWhitespace: "");
 
-            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(SnapshotBeforePaste.TextImage, SnapshotBeforePaste.ContentType);
+            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
+                new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
             var snapshotBeforeDummyPaste = clonedBuffer.CurrentSnapshot;
 
             var edit = clonedBuffer.CreateEdit();
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index ddac03d544443..b73749ff57012 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -87,15 +87,12 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             var subjectBuffer = args.SubjectBuffer;
 
             var selectionsBeforePaste = textView.Selection.GetSnapshotSpansOnBuffer(subjectBuffer);
-            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
+            var snapshotBeforePaste = subjectBuffer.CurrentSnapshot;
 
             // Always let the real paste go through.  That way we always have a version of the document that doesn't
             // include our changes that we can undo back to.
             nextCommandHandler();
 
-            if (snapshotBeforePaste is null)
-                return;
-
             // If we don't even see any changes from the paste, there's nothing we can do.
             if (snapshotBeforePaste.Version.Changes is null)
                 return;
@@ -108,9 +105,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             if (selectionsBeforePaste.Count == 0)
                 return;
 
-            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot as ITextSnapshot2;
-            if (snapshotAfterPaste is null)
-                return;
+            var snapshotAfterPaste = subjectBuffer.CurrentSnapshot;
 
             // If there were multiple changes that already happened, then don't make any changes.  Some other component
             // already did something advanced.
@@ -224,7 +219,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                     snapshotBeforePaste, snapshotAfterPaste,
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste,
-                    selectionsBeforePaste[0],
+                    selectionsBeforePaste[0].Span.ToTextSpan(),
                     copyPasteData, _textBufferFactoryService);
                 return knownProcessor.GetEdits(cancellationToken);
             }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 53b849fc99d10..779c2a2329bae 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -38,8 +38,8 @@ internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
         public UnknownSourcePasteProcessor(
             string newLine,
             IndentationOptions indentationOptions,
-            ITextSnapshot2 snapshotBeforePaste,
-            ITextSnapshot2 snapshotAfterPaste,
+            ITextSnapshot snapshotBeforePaste,
+            ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,

From 9303de8319ccce4cd9580ba0b1959b709f1b0a89 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 15:46:23 -0700
Subject: [PATCH 295/413] Add tests

---
 ...KnownSourceIntoSingleLineRawStringTests.cs | 996 ++++++++++++++++++
 1 file changed, 996 insertions(+)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
new file mode 100644
index 0000000000000..07293162ee7b8
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -0,0 +1,996 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoSingleLineRawStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""goo[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" goo[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""o[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" o[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""n[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" n[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"\n[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    ""\n[||]"";",
+@"
+var dest =
+    ""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    """"""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    """""" ""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    """"""\""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    """""" \""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""goo[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent_2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" goo[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""o[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" o[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""\r\n[||]"";",
+"\r\nvar dest =\r\n    \"\r\n[||]\";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent2()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    ""\r\n[||]"";",
+"\r\nvar dest =\r\n    \"\r\n[||]\";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    """"""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    """"""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""goo[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" goo[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """""" """" [||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""  """" [||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""goo[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1b()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" goo[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    goo
+    bar[||] 
+    """""";",
+@"
+var dest =
+    """"""goo
+    bar[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2b()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     goo
+    bar
+    [||]"""""";",
+@"
+var dest =
+    """""" goo
+    bar[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    goo
+    bar[||] 
+    """""";",
+@"
+var dest =
+    """"""    goo
+    bar[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3b()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     goo
+    bar
+    [||]"""""";",
+@"
+var dest =
+    """"""     goo
+    bar[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromInterpolatedStringLiteralContentb()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0:X}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0:X}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0:""X""}[||] """""";",
+@"
+var dest =
+    """"""{0:\""X\""}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0:""X""}[||]"""""";",
+@"
+var dest =
+    """""" {0:\""X\""}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{""goo""}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {""goo""}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""X{""goo""}Y[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" X{""goo""}Y[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""X{""goo""}Y""[||] 
+    """""";",
+@"
+var dest =
+    """"""\""X{""goo""}Y\""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""X{""goo""}Y""
+    [||]"""""";",
+@"
+var dest =
+    """""" \""X{""goo""}Y\""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""X{@""goo""}Y""[||] 
+    """""";",
+@"
+var dest =
+    """"""\""X{@""goo""}Y\""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4b()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""X{@""goo""}Y""
+    [||]"""""";",
+@"
+var dest =
+    """""" \""X{@""goo""}Y\""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContentb()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0:X}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0:X}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{0:""X""}[||] """""";",
+@"
+var dest =
+    """"""{0:""""X""""}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {0:""X""}[||]"""""";",
+@"
+var dest =
+    """""" {0:""""X""""}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""{""goo""}[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" {""goo""}[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""X{""goo""}Y[||] """""";",
+@"
+var dest =
+    """"""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """""" X{""goo""}Y[||]"""""";",
+@"
+var dest =
+    """""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""X{""goo""}Y""[||] 
+    """""";",
+@"
+var dest =
+    """"""""""X{""goo""}Y""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""X{""goo""}Y""
+    [||]"""""";",
+@"
+var dest =
+    """""" """"X{""goo""}Y""""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
+@"
+var dest =
+    """"""[||] """""";",
+@"
+var dest =
+    """"""
+    ""X{@""goo""}Y""[||] 
+    """""";",
+@"
+var dest =
+    """"""""""X{@""goo""}Y""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4b()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
+@"
+var dest =
+    """""" [||]"""""";",
+@"
+var dest =
+    """"""
+     ""X{@""goo""}Y""
+    [||]"""""";",
+@"
+var dest =
+    """""" """"X{@""goo""}Y""""[||]"""""";");
+        }
+    }
+}

From a71bec936220592b3ab93a88997d4fe51c90828a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 15:58:26 -0700
Subject: [PATCH 296/413] Add tests

---
 ...KnownSourceIntoSingleLineRawStringTests.cs | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index 07293162ee7b8..6fb749b57b652 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -113,12 +113,8 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
 @"
 var dest =
     """"""[||] """""";",
-@"
-var dest =
-    """"\n[||]"";",
-@"
-var dest =
-    ""[||]"";");
+"\r\nvar dest =\r\n    \"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+"\r\nvar dest =\r\n    \"\"\"\\n[||] \"\"\";");
         }
 
         [WpfFact]
@@ -129,12 +125,8 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent_2()
 @"
 var dest =
     """""" [||]"""""";",
-@"
-var dest =
-    ""\n[||]"";",
-@"
-var dest =
-    ""[||]"";");
+"\r\nvar dest =\r\n    \"\"\"\r\n     \n    \r\n    [||]\"\"\";",
+"\r\nvar dest =\r\n    \"\"\" \\n[||]\"\"\";");
         }
 
         [WpfFact]
@@ -283,8 +275,11 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent()
     """"""[||] """""";",
 @"
 var dest =
-    """"""\r\n[||]"";",
-"\r\nvar dest =\r\n    \"\r\n[||]\";");
+    """"""
+    
+    [||] 
+    """""";",
+"\r\nvar dest =\r\n    \"\"\"\r\n[||] \"\"\";");
         }
 
         [WpfFact]
@@ -297,8 +292,11 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent2()
     """""" [||]"""""";",
 @"
 var dest =
-    ""\r\n[||]"";",
-"\r\nvar dest =\r\n    \"\r\n[||]\";");
+    """"""
+     
+    
+    [||]"""""";",
+"\r\nvar dest =\r\n    \"\"\" \r\n[||]\"\"\";");
         }
 
         [WpfFact]
@@ -334,7 +332,7 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
     [||]"""""";",
 @"
 var dest =
-    """"""[||]"";");
+    """""" """"[||]"""""";");
         }
 
         [WpfFact]

From 028c6b3d87c41c4cad54bcbfbb58049ad9411cb0 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 16:17:28 -0700
Subject: [PATCH 297/413] Add tests

---
 ...KnownSourceIntoSingleLineRawStringTests.cs | 619 ++++++++++++++++++
 ...CopyPasteCommandHandlerKnownSourceTests.cs |   9 +-
 .../StringCopyPasteCommandHandlerTests.cs     |  13 +-
 ...pyPasteCommandHandlerUnknownSourceTests.cs |   2 +-
 4 files changed, 640 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index 6fb749b57b652..492c158f528b3 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -990,5 +990,624 @@ public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLitera
 var dest =
     """""" """"X{@""goo""}Y""""[||]"""""";");
         }
+
+        #region Known Source tests
+
+        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
+        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineRawStringTests.cs
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = """"""[||] """"""",
+"var x = \"\"\"\r\n    \n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = \"\"\"\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = """""" [||]""""""",
+"var x = \"\"\"\r\n     \n    \r\n    [||]\"\"\"",
+                afterUndo:
+"var x = \"\"\" \n[||]\"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = """"""[||] """"""",
+"var x = \"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = \"\"\"\r\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = """""" [||]""""""",
+"var x = \"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                afterUndo:
+"var x = \"\"\" \r\n[||]\"\"\"");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = """"""[||] """"""",
+@"var x = """"""    [||] """"""",
+                afterUndo:
+@"var x = """"""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = """""" [||]""""""",
+@"var x = """"""     [||]""""""",
+                afterUndo:
+@"var x = """""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "    \r\n",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+        
+    [||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+        
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = """"""[||] """"""",
+@"var x = """"""'[||] """"""",
+                afterUndo:
+@"var x = """"""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = """""" [||]""""""",
+@"var x = """""" '[||]""""""",
+                afterUndo:
+@"var x = """""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+    ""[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = """""" [||]""""""",
+@"var x = """"""
+     ""
+    [||]""""""",
+                afterUndo:
+@"var x = """""" ""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""[||] """"""",
+@"var x = """"""""
+    """"""[||] 
+    """"""""",
+                afterUndo:
+@"var x = """"""""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """""" [||]""""""",
+@"var x = """"""""
+     """"""
+    [||]""""""""",
+                afterUndo:
+@"var x = """""" """"""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestTwoQuotesIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = """""" ""[||] """"""",
+@"var x = """""""" """"""[||] """"""""",
+                afterUndo:
+@"var x = """""" """"""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """""" ""[||] """"""",
+@"var x = """""""""" """"""""[||] """"""""""",
+                afterUndo:
+@"var x = """""" """"""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """""" ""[||]"" """"""",
+@"var x = """""""""""" """"""""[||]"" """"""""""""",
+                afterUndo:
+@"var x = """""" """"""""[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """""" [||]"" """"""",
+@"var x = """""""""" """"""[||]"" """"""""""",
+                afterUndo:
+@"var x = """""" """"""[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestQuadrupleQuoteIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"\"",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = """"""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestComplexStringIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "  \"\"  ",
+@"var x = """"""[||] """"""",
+@"var x = """"""  """"  [||] """"""",
+                afterUndo:
+@"var x = """"""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = """"""[||] """"""",
+@"var x = """"""abc[||] """"""",
+                afterUndo:
+@"var x = """"""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = """""" [||]""""""",
+@"var x = """""" abc[||]""""""",
+                afterUndo:
+@"var x = """""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+    abc
+    def[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""abc
+def[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """""" [||]""""""",
+@"var x = """"""
+     abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = """""" abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine4()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""goo[||]""""""",
+@"var x = """"""
+    gooabc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = """"""gooabc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine5()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""goo[||]bar""""""",
+@"var x = """"""
+    gooabc
+    def[||]bar
+    """"""",
+                afterUndo:
+@"var x = """"""gooabc
+def[||]bar""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine6()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = """"""goo[||]bar""""""",
+@"var x = """"""
+    gooabc
+    def
+    [||]bar
+    """"""",
+                afterUndo:
+@"var x = """"""gooabc
+def
+[||]bar""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+    abc
+        def
+    ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""abc
+    def
+ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = """""" [||]""""""",
+@"var x = """"""
+     abc
+        def
+    ghi
+    [||]""""""",
+                afterUndo:
+@"var x = """""" abc
+    def
+ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+    abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+    abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+        abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""    abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = """""" [||]""""""",
+@"var x = """"""
+         abc
+        def
+        ghi
+    [||]""""""",
+                afterUndo:
+@"var x = """"""     abc
+    def
+    ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = """"""[||] """"""",
+@"var x = """"""
+            abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = """"""        abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = """""" [||]""""""",
+@"var x = """"""
+             abc
+        def
+        ghi
+    [||]""""""",
+                afterUndo:
+@"var x = """"""         abc
+    def
+    ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""[||]{|Selection:    |}""""""",
+@"var x = """"""
+    abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = """"""abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""  [||]{|Selection:    |}  """"""",
+@"var x = """"""
+      abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = """"""  abc
+def[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = """"""[||]{|Selection:    |}""""""",
+@"var x = """"""
+    abc
+    def
+    
+    [||]""""""",
+                afterUndo:
+@"var x = """"""abc
+def
+[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = """"""  [||]{|Selection:    |}  """"""",
+@"var x = """"""
+      abc
+    def
+    [||]  
+    """"""",
+                afterUndo:
+@"var x = """"""  abc
+def
+[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""[||]{|Selection:    |}  """"""",
+@"var x = """"""
+    abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = """"""abc
+def[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""  [||]{|Selection:    |}""""""",
+@"var x = """"""
+      abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = """"""  abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"bar",
+@"var x = """"""[||]goo""""""",
+@"var x = """"""
+    ""bar[||]goo
+    """"""",
+                afterUndo:
+@"var x = """"""""bar[||]goo""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "bar\"",
+@"var x = """"""goo[||]""""""",
+@"var x = """"""
+    goobar""
+    [||]""""""",
+                afterUndo:
+@"var x = """"""goobar""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = """"""[||]{|Selection:    |}""""""",
+@"var x = """"""
+    """"
+    [||]""""""",
+                afterUndo:
+@"var x = """"""""""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""[||]{|Selection:    |}""""""",
+@"var x = """"""""
+    """"""
+    [||]""""""""",
+                afterUndo:
+@"var x = """"""""""""[||]""""""");
+        }
+
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs
index 74b57bd4a3994..f9c5478d9cc00 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerKnownSourceTests.cs
@@ -14,7 +14,14 @@ protected static void TestCopyPaste(string copyFileMarkup, string pasteFileMarku
             using var state = StringCopyPasteTestState.CreateTestState(
                 copyFileMarkup, pasteFileMarkup);
 
-            state.TestCopyPaste(expectedMarkup, pasteText: null, afterUndo);
+            state.TestCopyPaste(expectedMarkup, pasteText: null, pasteTextIsKnown: false, afterUndo);
+        }
+
+        protected static void TestPasteKnownSource(string pasteText, string markup, string expectedMarkup, string afterUndo)
+        {
+            using var state = StringCopyPasteTestState.CreateTestState(copyFileMarkup: null, pasteFileMarkup: markup);
+
+            state.TestCopyPaste(expectedMarkup, pasteText, pasteTextIsKnown: true, afterUndo);
         }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
index 85134d056be39..b0987f1c874ad 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs
@@ -19,6 +19,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Text.Operations;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
@@ -74,7 +75,7 @@ internal void AssertCodeIs(string expectedCode)
                 }
             }
 
-            public void TestCopyPaste(string expectedMarkup, string? pasteText, string afterUndoMarkup)
+            public void TestCopyPaste(string expectedMarkup, string? pasteText, bool pasteTextIsKnown, string afterUndoMarkup)
             {
                 var workspace = this.Workspace;
 
@@ -112,6 +113,16 @@ public void TestCopyPaste(string expectedMarkup, string? pasteText, string after
                 else
                 {
                     // otherwise, this is a test of text coming in from another source.  Do the edit manually.
+
+                    if (pasteTextIsKnown)
+                    {
+                        // we were given text to directly place on the clipboard without needing to do a copy.
+                        Contract.ThrowIfNull(pasteText);
+                        var json = new StringCopyPasteData(ImmutableArray.Create(StringCopyPasteContent.ForText(pasteText))).ToJson();
+                        Contract.ThrowIfNull(json);
+                        service.TrySetClipboardData(StringCopyPasteCommandHandler.KeyAndVersion, json);
+                    }
+
                     _commandHandler.ExecuteCommand(
                         new PasteCommandArgs(this.TextView, this.SubjectBuffer), () =>
                         {
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
index 49663dffd4118..0b4740cf44133 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerUnknownSourceTests.cs
@@ -11,7 +11,7 @@ protected static void TestPasteUnknownSource(string pasteText, string markup, st
         {
             using var state = StringCopyPasteTestState.CreateTestState(copyFileMarkup: null, pasteFileMarkup: markup);
 
-            state.TestCopyPaste(expectedMarkup, pasteText, afterUndo);
+            state.TestCopyPaste(expectedMarkup, pasteText, pasteTextIsKnown: false, afterUndo);
         }
     }
 }

From 97c363c87b56e66ee7dd0229863ba1905779bd79 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 16:18:15 -0700
Subject: [PATCH 298/413] Add region

---
 .../PasteKnownSourceIntoSingleLineRawStringTests.cs         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index 492c158f528b3..fc0450f1a1df7 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -12,6 +12,10 @@ public class PasteKnownSourceIntoSingleLineRawStringTests : StringCopyPasteComma
         [WpfFact]
         public void TestPasteSimpleNormalLiteralContent()
         {
+            #region Normal Copy/Paste tests
+
+            // Tests where we actually set up a document to copy code from.
+
             TestCopyPaste(
 @"var v = ""{|Copy:goo|}"";",
 @"
@@ -991,6 +995,8 @@ public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLitera
     """""" """"X{@""goo""}Y""""[||]"""""";");
         }
 
+        #endregion
+
         #region Known Source tests
 
         // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).

From 1aa1dffcdba38cccdab72d752bfdb773842bdc64 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 17:35:50 -0700
Subject: [PATCH 299/413] Add tests

---
 ...ownSourceIntoRawInterpolatedStringTests.cs | 738 ++++++++++++++++++
 1 file changed, 738 insertions(+)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
new file mode 100644
index 0000000000000..8e10889aaf96e
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
@@ -0,0 +1,738 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoRawInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{{[||]"";",
+@"
+var dest =
+    $""{[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{{[||]"";",
+@"
+var dest =
+    $""{[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{{}}[||]"";",
+@"
+var dest =
+    $""{}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{{}}[||]"";",
+@"
+var dest =
+    $""{}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{{0}}[||]"";",
+@"
+var dest =
+    $""{0}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{{0}}[||]"";",
+@"
+var dest =
+    $""{0}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""\n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""\n[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""o[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""\r\n[||]"";",
+@"
+var dest =
+    $""
+[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent2()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""\r\n[||]"";",
+@"
+var dest =
+    $""
+[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""\""[||]"";",
+@"
+var dest =
+    $""""""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $"" \""\"" [||]"";",
+@"
+var dest =
+    $"" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"" \""\"" [||]"";",
+@"
+var dest =
+    $"" """" [||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""    goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""goo\r\nbar[||]"";",
+@"
+var dest =
+    $""    goo
+    bar[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{0:X}[||]"";",
+@"
+var dest =
+    $""[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""{0:""""X""""}[||]"";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""{0:\""X\""}[||]"";",
+@"
+var dest =
+    $""{0:""""X""""}[||]"";");
+        }
+    }
+}

From 327aaa4c40a59c3f1d3b1e1f97130bb1e4e884cc Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 18:01:45 -0700
Subject: [PATCH 300/413] Add tests

---
 ...ownSourceIntoRawInterpolatedStringTests.cs | 192 ++++++++++--------
 1 file changed, 108 insertions(+), 84 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
index 8e10889aaf96e..0fbd6fcbf4776 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
@@ -19,10 +19,10 @@ public void TestPasteSimpleNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $""""""goo[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -35,10 +35,10 @@ public void TestPasteSimpleNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $"""""" goo[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -51,10 +51,10 @@ public void TestPasteOpenBraceNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""{{[||]"";",
+    $$""""""{[||] """""";",
 @"
 var dest =
-    $""{[||]"";");
+    $""""""{[||] """""";");
         }
 
         [WpfFact]
@@ -67,10 +67,10 @@ public void TestPasteOpenBraceNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{{[||]"";",
+    $$"""""" {[||]"""""";",
 @"
 var dest =
-    $""{[||]"";");
+    $"""""" {[||]"""""";");
         }
 
         [WpfFact]
@@ -83,10 +83,10 @@ public void TestPasteOpenCloseBraceNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""{{}}[||]"";",
+    $$""""""{}[||] """""";",
 @"
 var dest =
-    $""{}[||]"";");
+    $""""""{}[||] """""";");
         }
 
         [WpfFact]
@@ -99,10 +99,10 @@ public void TestPasteOpenCloseBraceNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{{}}[||]"";",
+    $$"""""" {}[||]"""""";",
 @"
 var dest =
-    $""{}[||]"";");
+    $"""""" {}[||]"""""";");
         }
 
         [WpfFact]
@@ -115,10 +115,10 @@ public void TestPasteLooksLikeInterpolationNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""{{0}}[||]"";",
+    $$""""""{0}[||] """""";",
 @"
 var dest =
-    $""{0}[||]"";");
+    $""""""{0}[||] """""";");
         }
 
         [WpfFact]
@@ -131,10 +131,10 @@ public void TestPasteLooksLikeInterpolationNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{{0}}[||]"";",
+    $$"""""" {0}[||]"""""";",
 @"
 var dest =
-    $""{0}[||]"";");
+    $"""""" {0}[||]"""""";");
         }
 
         [WpfFact]
@@ -147,10 +147,10 @@ public void TestPasteSimpleSubstringNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""o[||]"";",
+    $""""""o[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -163,10 +163,10 @@ public void TestPasteSimpleSubstringNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""o[||]"";",
+    $"""""" o[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -179,10 +179,10 @@ public void TestPastePartiallySelectedEscapeNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""n[||]"";",
+    $""""""n[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -195,10 +195,10 @@ public void TestPastePartiallySelectedEscapeNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""n[||]"";",
+    $"""""" n[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -243,10 +243,12 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+    ""[||] 
+    """""";",
 @"
 var dest =
-    $""""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -259,10 +261,12 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+     ""
+    [||]"""""";",
 @"
 var dest =
-    $""""[||]"";");
+    $"""" ""[||]"""""";");
         }
 
         [WpfFact]
@@ -275,10 +279,12 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+    ""[||] 
+    """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""\""[||] """""";");
         }
 
         [WpfFact]
@@ -291,10 +297,12 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+     ""
+    [||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" \""[||]"""""";");
         }
 
         [WpfFact]
@@ -307,10 +315,10 @@ public void TestPasteSimpleVerbatimLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $""""""goo[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -323,10 +331,10 @@ public void TestPasteSimpleVerbatimLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $"""""" goo[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -339,10 +347,10 @@ public void TestPasteSimpleSubstringVerbatimLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""o[||]"";",
+    $""""""o[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -355,10 +363,10 @@ public void TestPasteSimpleSubstringVerbatimLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""o[||]"";",
+    $"""""" o[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -405,10 +413,12 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+    ""[||] 
+    """""";",
 @"
 var dest =
-    $""""""[||]"";");
+    $""""""""""[||] """""";");
         }
 
         [WpfFact]
@@ -421,10 +431,12 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""\""[||]"";",
+    $""""""
+     ""
+    [||]"""""";",
 @"
 var dest =
-    $""""""[||]"";");
+    $"""""" [||]"""""""""";");
         }
 
         [WpfFact]
@@ -437,10 +449,10 @@ public void TestPasteSimpleRawSingleLineLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $""""""goo[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -453,10 +465,10 @@ public void TestPasteSimpleRawSingleLineLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $"""""" goo[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -469,10 +481,10 @@ public void TestPasteQuotesRawSingleLineLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $"" \""\"" [||]"";",
+    $"""""" """" [||] """""";",
 @"
 var dest =
-    $"" """" [||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -485,10 +497,10 @@ public void TestPasteQuotesRawSingleLineLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $"" \""\"" [||]"";",
+    $""""""  """" [||]"""""";",
 @"
 var dest =
-    $"" """" [||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -503,10 +515,10 @@ public void TestPasteSimpleRawMultiLineLiteralContent1()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $""""""goo[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -521,10 +533,10 @@ public void TestPasteSimpleRawMultiLineLiteralContent1B()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo[||]"";",
+    $"""""" goo[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -540,11 +552,14 @@ public void TestPasteSimpleRawMultiLineLiteralContent2()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo\r\nbar[||]"";",
+    $""""""
+    goo
+    bar[||] 
+    """""";",
 @"
 var dest =
-    $""goo
-    bar[||]"";");
+    $""""""goo
+    bar[||] """""";");
         }
 
         [WpfFact]
@@ -560,11 +575,14 @@ public void TestPasteSimpleRawMultiLineLiteralContent2B()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo\r\nbar[||]"";",
+    $""""""
+     goo
+    bar
+    [||]"""""";",
 @"
 var dest =
-    $""goo
-    bar[||]"";");
+    $"""""" goo
+    bar[||]"""""";");
         }
 
         [WpfFact]
@@ -580,11 +598,14 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
     $""""""[||] """""";",
 @"
 var dest =
-    $""goo\r\nbar[||]"";",
+    $""""""
+    goo
+    bar[||] 
+    """""";",
 @"
 var dest =
-    $""    goo
-    bar[||]"";");
+    $""""""    goo
+    bar[||] """""";");
         }
 
         [WpfFact]
@@ -600,11 +621,14 @@ public void TestPasteSimpleRawMultiLineLiteralContent3B()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""goo\r\nbar[||]"";",
+    $""""""
+     goo
+    bar
+    [||]"""""";",
 @"
 var dest =
-    $""    goo
-    bar[||]"";");
+    $""""""     goo
+    bar[||]"""""";");
         }
 
         [WpfFact]
@@ -617,10 +641,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     $""""""[||] """""";",
 @"
 var dest =
-    $""{0:X}[||]"";",
+    $""""""{0:X}[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -633,10 +657,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{0:X}[||]"";",
+    $"""""" {0:X}[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -649,10 +673,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     $""""""[||] """""";",
 @"
 var dest =
-    $""{0:\""X\""}[||]"";",
+    $""""""{0:""X""}[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""{0:\""X\""}[||] """""";");
         }
 
         [WpfFact]
@@ -665,10 +689,10 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{0:\""X\""}[||]"";",
+    $"""""" {0:""X""}[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" {0:\""X\""}[||]"""""";");
         }
 
         [WpfFact]
@@ -681,10 +705,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     $""""""[||] """""";",
 @"
 var dest =
-    $""{0:X}[||]"";",
+    $""""""{0:X}[||] """""";",
 @"
 var dest =
-    $""[||]"";");
+    $""""""[||] """""";");
         }
 
         [WpfFact]
@@ -697,10 +721,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{0:X}[||]"";",
+    $"""""" {0:X}[||]"""""";",
 @"
 var dest =
-    $""[||]"";");
+    $"""""" [||]"""""";");
         }
 
         [WpfFact]
@@ -713,10 +737,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     $""""""[||] """""";",
 @"
 var dest =
-    $""{0:\""X\""}[||]"";",
+    $""""""{0:""X""}[||] """""";",
 @"
 var dest =
-    $""{0:""""X""""}[||]"";");
+    $""""""{0:""""X""""}[||] """""";");
         }
 
         [WpfFact]
@@ -729,10 +753,10 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""{0:\""X\""}[||]"";",
+    $"""""" {0:""X""}[||]"""""";",
 @"
 var dest =
-    $""{0:""""X""""}[||]"";");
+    $"""""" {0:""""X""""}[||]"""""";");
         }
     }
 }

From 28eaeca1086b5a7472f73db2b8790d26ee554d8b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 18:14:52 -0700
Subject: [PATCH 301/413] Add region

---
 ...ownSourceIntoRawInterpolatedStringTests.cs | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
index 0fbd6fcbf4776..734d7632c07a5 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
@@ -209,12 +209,10 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
 @"
 var dest =
     $""""""[||] """""";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
 @"
 var dest =
-    $""\n[||]"";",
-@"
-var dest =
-    $""[||]"";");
+    $""""""\n[||] """""";");
         }
 
         [WpfFact]
@@ -225,12 +223,10 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent2()
 @"
 var dest =
     $"""""" [||]"""""";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n     \n    \r\n    [||]\"\"\";",
 @"
 var dest =
-    $""\n[||]"";",
-@"
-var dest =
-    $""[||]"";");
+    $"""""" \n[||]"""""";");
         }
 
         [WpfFact]
@@ -248,7 +244,7 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent()
     """""";",
 @"
 var dest =
-    $""""""[||] """""";");
+    $""""""""[||] """""";");
         }
 
         [WpfFact]
@@ -266,7 +262,7 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
     [||]"""""";",
 @"
 var dest =
-    $"""" ""[||]"""""";");
+    $"""""" ""[||]"""""";");
         }
 
         [WpfFact]
@@ -379,11 +375,14 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent()
     $""""""[||] """""";",
 @"
 var dest =
-    $""\r\n[||]"";",
+    $""""""
+    
+    [||] 
+    """""";",
 @"
 var dest =
-    $""
-[||]"";");
+    $""""""
+[||] """""";");
         }
 
         [WpfFact]
@@ -396,11 +395,14 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent2()
     $"""""" [||]"""""";",
 @"
 var dest =
-    $""\r\n[||]"";",
+    $""""""
+     
+    
+    [||]"""""";",
 @"
 var dest =
-    $""
-[||]"";");
+    $"""""" 
+[||]"""""";");
         }
 
         [WpfFact]
@@ -436,7 +438,7 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
     [||]"""""";",
 @"
 var dest =
-    $"""""" [||]"""""""""";");
+    $"""""" """"[||]"""""";");
         }
 
         [WpfFact]

From 79d5f1f0258373423b2995d7f5e83f3ad2546b59 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 18:23:07 -0700
Subject: [PATCH 302/413] Add tests

---
 ...ownSourceIntoRawInterpolatedStringTests.cs |  764 --------
 ...ntoSingleLineRawInterpolatedStringTests.cs | 1558 +++++++++++++++++
 2 files changed, 1558 insertions(+), 764 deletions(-)
 delete mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
deleted file mode 100644
index 734d7632c07a5..0000000000000
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoRawInterpolatedStringTests.cs
+++ /dev/null
@@ -1,764 +0,0 @@
-// 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 Roslyn.Test.Utilities;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
-{
-    public class PasteKnownSourceIntoRawInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
-    {
-        [WpfFact]
-        public void TestPasteSimpleNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""goo[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" goo[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteOpenBraceNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $$""""""{[||] """""";",
-@"
-var dest =
-    $""""""{[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteOpenBraceNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $$"""""" {[||]"""""";",
-@"
-var dest =
-    $"""""" {[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteOpenCloseBraceNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $$""""""{}[||] """""";",
-@"
-var dest =
-    $""""""{}[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteOpenCloseBraceNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $$"""""" {}[||]"""""";",
-@"
-var dest =
-    $"""""" {}[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $$""""""{0}[||] """""";",
-@"
-var dest =
-    $""""""{0}[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteLooksLikeInterpolationNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $$"""""" {0}[||]"""""";",
-@"
-var dest =
-    $"""""" {0}[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleSubstringNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""o[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleSubstringNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" o[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""n[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPastePartiallySelectedEscapeNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" n[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedEscapeNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
-@"
-var dest =
-    $""""""\n[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedEscapeNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n     \n    \r\n    [||]\"\"\";",
-@"
-var dest =
-    $"""""" \n[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
-var dest =
-    $""""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
-var dest =
-    $"""""" ""[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedQuoteNormalLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
-var dest =
-    $""""""\""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedQuoteNormalLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
-var dest =
-    $"""""" \""[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleVerbatimLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""goo[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleVerbatimLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" goo[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleSubstringVerbatimLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""o[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleSubstringVerbatimLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" o[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSelectedVerbatimNewLineLiteralContent()
-        {
-            TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    
-    [||] 
-    """""";",
-@"
-var dest =
-    $""""""
-[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSelectedVerbatimNewLineLiteralContent2()
-        {
-            TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     
-    
-    [||]"""""";",
-@"
-var dest =
-    $"""""" 
-[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
-var dest =
-    $""""""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
-var dest =
-    $"""""" """"[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawSingleLineLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""goo[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawSingleLineLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" goo[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteQuotesRawSingleLineLiteralContent()
-        {
-            TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $"""""" """" [||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteQuotesRawSingleLineLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""  """" [||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent1()
-        {
-            TestCopyPaste(
-@"var v = """"""
-    {|Copy:goo|}
-    """""";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""goo[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent1B()
-        {
-            TestCopyPaste(
-@"var v = """"""
-    {|Copy:goo|}
-    """""";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" goo[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = """"""
-    {|Copy:goo
-    bar|}
-    """""";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    goo
-    bar[||] 
-    """""";",
-@"
-var dest =
-    $""""""goo
-    bar[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent2B()
-        {
-            TestCopyPaste(
-@"var v = """"""
-    {|Copy:goo
-    bar|}
-    """""";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     goo
-    bar
-    [||]"""""";",
-@"
-var dest =
-    $"""""" goo
-    bar[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent3()
-        {
-            TestCopyPaste(
-@"var v = """"""
-{|Copy:    goo
-    bar|}
-    """""";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""
-    goo
-    bar[||] 
-    """""";",
-@"
-var dest =
-    $""""""    goo
-    bar[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteSimpleRawMultiLineLiteralContent3B()
-        {
-            TestCopyPaste(
-@"var v = """"""
-{|Copy:    goo
-    bar|}
-    """""";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $""""""
-     goo
-    bar
-    [||]"""""";",
-@"
-var dest =
-    $""""""     goo
-    bar[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
-        {
-            TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""{0:X}[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1B()
-        {
-            TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" {0:X}[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""{0:""X""}[||] """""";",
-@"
-var dest =
-    $""""""{0:\""X\""}[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2B()
-        {
-            TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" {0:""X""}[||]"""""";",
-@"
-var dest =
-    $"""""" {0:\""X\""}[||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
-        {
-            TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""{0:X}[||] """""";",
-@"
-var dest =
-    $""""""[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1B()
-        {
-            TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" {0:X}[||]"""""";",
-@"
-var dest =
-    $"""""" [||]"""""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
-        {
-            TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
-var dest =
-    $""""""[||] """""";",
-@"
-var dest =
-    $""""""{0:""X""}[||] """""";",
-@"
-var dest =
-    $""""""{0:""""X""""}[||] """""";");
-        }
-
-        [WpfFact]
-        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2B()
-        {
-            TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
-var dest =
-    $"""""" [||]"""""";",
-@"
-var dest =
-    $"""""" {0:""X""}[||]"""""";",
-@"
-var dest =
-    $"""""" {0:""""X""""}[||]"""""";");
-        }
-    }
-}
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
new file mode 100644
index 0000000000000..f0916a99b0bc4
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
@@ -0,0 +1,1558 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoSingleLineRawInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        #region Normal Copy/Paste tests
+
+        // Tests where we actually set up a document to copy code from.
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""goo[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" goo[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $$""""""{[||] """""";",
+@"
+var dest =
+    $""""""{[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $$"""""" {[||]"""""";",
+@"
+var dest =
+    $"""""" {[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $$""""""{}[||] """""";",
+@"
+var dest =
+    $""""""{}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $$"""""" {}[||]"""""";",
+@"
+var dest =
+    $"""""" {}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $$""""""{0}[||] """""";",
+@"
+var dest =
+    $""""""{0}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $$"""""" {0}[||]"""""";",
+@"
+var dest =
+    $"""""" {0}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""o[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" o[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""n[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" n[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+@"
+var dest =
+    $""""""\n[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n     \n    \r\n    [||]\"\"\";",
+@"
+var dest =
+    $"""""" \n[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    $""""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    $"""""" ""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    $""""""\""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    $"""""" \""[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""goo[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" goo[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""o[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" o[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    
+    [||] 
+    """""";",
+@"
+var dest =
+    $""""""
+[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent2()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     
+    
+    [||]"""""";",
+@"
+var dest =
+    $"""""" 
+[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    ""[||] 
+    """""";",
+@"
+var dest =
+    $""""""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     ""
+    [||]"""""";",
+@"
+var dest =
+    $"""""" """"[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""goo[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" goo[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $"""""" """" [||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""  """" [||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""goo[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" goo[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    goo
+    bar[||] 
+    """""";",
+@"
+var dest =
+    $""""""goo
+    bar[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     goo
+    bar
+    [||]"""""";",
+@"
+var dest =
+    $"""""" goo
+    bar[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""
+    goo
+    bar[||] 
+    """""";",
+@"
+var dest =
+    $""""""    goo
+    bar[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3B()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $""""""
+     goo
+    bar
+    [||]"""""";",
+@"
+var dest =
+    $""""""     goo
+    bar[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""{0:X}[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" {0:X}[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""{0:""X""}[||] """""";",
+@"
+var dest =
+    $""""""{0:\""X\""}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" {0:""X""}[||]"""""";",
+@"
+var dest =
+    $"""""" {0:\""X\""}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""{0:X}[||] """""";",
+@"
+var dest =
+    $""""""[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1B()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" {0:X}[||]"""""";",
+@"
+var dest =
+    $"""""" [||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $""""""[||] """""";",
+@"
+var dest =
+    $""""""{0:""X""}[||] """""";",
+@"
+var dest =
+    $""""""{0:""""X""""}[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2B()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $"""""" [||]"""""";",
+@"
+var dest =
+    $"""""" {0:""X""}[||]"""""";",
+@"
+var dest =
+    $"""""" {0:""""X""""}[||]"""""";");
+        }
+
+        #endregion
+
+        #region Known Source tests
+
+        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
+        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = $""""""[||] """"""",
+"var x = $\"\"\"\r\n    \n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = $"""""" [||]""""""",
+"var x = $\"\"\"\r\n     \n    \r\n    [||]\"\"\"",
+                afterUndo:
+"var x = $\"\"\" \n[||]\"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = $""""""[||] """"""",
+"var x = $\"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\r\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = $"""""" [||]""""""",
+"var x = $\"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                afterUndo:
+"var x = $\"\"\" \r\n[||]\"\"\"");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""    [||] """"""",
+                afterUndo:
+@"var x = $""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""     [||]""""""",
+                afterUndo:
+@"var x = $"""""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "    \r\n",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        
+    [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+        
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""'[||] """"""",
+                afterUndo:
+@"var x = $""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = $"""""" [||]""""""",
+@"var x = $"""""" '[||]""""""",
+                afterUndo:
+@"var x = $"""""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    ""[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""
+     ""
+    [||]""""""",
+                afterUndo:
+@"var x = $"""""" ""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""""
+    """"""[||] 
+    """"""""",
+                afterUndo:
+@"var x = $""""""""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""""
+     """"""
+    [||]""""""""",
+                afterUndo:
+@"var x = $"""""" """"""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $"""""" ""[||] """"""",
+@"var x = $"""""""""" """"""""[||] """"""""""",
+                afterUndo:
+@"var x = $"""""" """"""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $"""""" ""[||]"" """"""",
+@"var x = $"""""""""""" """"""""[||]"" """"""""""""",
+                afterUndo:
+@"var x = $"""""" """"""""[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $"""""" [||]"" """"""",
+@"var x = $"""""""""" """"""[||]"" """"""""""",
+                afterUndo:
+@"var x = $"""""" """"""[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestQuadrupleQuoteIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"\"",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCurlyIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "{",
+@"var x = $""""""[||] """"""",
+@"var x = $$""""""{[||] """"""",
+                afterUndo:
+@"var x = $""""""{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCurlyIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "{",
+@"var x = $"""""" [||]""""""",
+@"var x = $$"""""" {[||]""""""",
+                afterUndo:
+@"var x = $"""""" {[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"{{{",
+@"var x = $""""""[||] """"""",
+@"var x = $$$$""""""
+    ""{{{[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""""{{{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"{{{",
+@"var x = $""""""[||] """"""",
+@"var x = $$$$""""""""
+    """"""{{{[||] 
+    """"""""",
+                afterUndo:
+@"var x = $""""""""""""{{{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: " \"\"\"{{{",
+@"var x = $""""""[||] """"""",
+@"var x = $$$$"""""""" """"""{{{[||] """"""""",
+                afterUndo:
+@"var x = $"""""" """"""{{{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""[||] """"""",
+@"var x = $$$$""""""{{{[||] """"""",
+                afterUndo:
+@"var x = $""""""{{{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $"""""" [||]""""""",
+@"var x = $$$$"""""" {{{[||]""""""",
+                afterUndo:
+@"var x = $"""""" {{{[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $"""""" ""[||] """"""",
+@"var x = $$$$"""""" ""{{{[||] """"""",
+                afterUndo:
+@"var x = $"""""" ""{{{[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $"""""" ""[||]"" """"""",
+@"var x = $$$$"""""" ""{{{[||]"" """"""",
+                afterUndo:
+@"var x = $"""""" ""{{{[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $"""""" [||]"" """"""",
+@"var x = $$$$"""""" {{{[||]"" """"""",
+                afterUndo:
+@"var x = $"""""" {{{[||]"" """"""");
+        }
+
+        [WpfFact]
+        public void TestInterpolationIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "{0}",
+@"var x = $"""""" [||] """"""",
+@"var x = $$"""""" {0}[||] """"""",
+                afterUndo:
+@"var x = $"""""" {0}[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}",
+@"var x = $"""""" [||] """"""",
+@"var x = $$"""""" {}[||] """"""",
+                afterUndo:
+@"var x = $"""""" {}[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}",
+@"var x = $$"""""" [||] """"""",
+@"var x = $$"""""" {}[||] """"""",
+                afterUndo:
+@"var x = $$"""""" [||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}",
+@"var x = $$"""""" [||] """"""",
+@"var x = $$$"""""" {{}[||] """"""",
+                afterUndo:
+@"var x = $$"""""" {{}[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}}",
+@"var x = $$"""""" [||] """"""",
+@"var x = $$$"""""" {}}[||] """"""",
+                afterUndo:
+@"var x = $$"""""" {}}[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}}",
+@"var x = $$"""""" [||] """"""",
+@"var x = $$$"""""" {{}}[||] """"""",
+                afterUndo:
+@"var x = $$"""""" {{}}[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestComplexStringIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "  \"\"  ",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""  """"  [||] """"""",
+                afterUndo:
+@"var x = $""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""abc[||] """"""",
+                afterUndo:
+@"var x = $""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = $"""""" [||]""""""",
+@"var x = $"""""" abc[||]""""""",
+                afterUndo:
+@"var x = $"""""" [||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    abc
+    def[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+def[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""
+     abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = $"""""" abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine4()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""goo[||]""""""",
+@"var x = $""""""
+    gooabc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""gooabc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine5()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""goo[||]bar""""""",
+@"var x = $""""""
+    gooabc
+    def[||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""gooabc
+def[||]bar""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine6()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""goo[||]bar""""""",
+@"var x = $""""""
+    gooabc
+    def
+    [||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""gooabc
+def
+[||]bar""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    abc
+        def
+    ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+    def
+ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""
+     abc
+        def
+    ghi
+    [||]""""""",
+                afterUndo:
+@"var x = $"""""" abc
+    def
+ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+        abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""    abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""
+         abc
+        def
+        ghi
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""     abc
+    def
+    ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+            abc
+        def
+        ghi[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""        abc
+    def
+    ghi[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = $"""""" [||]""""""",
+@"var x = $""""""
+             abc
+        def
+        ghi
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""         abc
+    def
+    ghi[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||]{|Selection:    |}""""""",
+@"var x = $""""""
+    abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""  [||]{|Selection:    |}  """"""",
+@"var x = $""""""
+      abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = $""""""  abc
+def[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""[||]{|Selection:    |}""""""",
+@"var x = $""""""
+    abc
+    def
+    
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""abc
+def
+[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""  [||]{|Selection:    |}  """"""",
+@"var x = $""""""
+      abc
+    def
+    [||]  
+    """"""",
+                afterUndo:
+@"var x = $""""""  abc
+def
+[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||]{|Selection:    |}  """"""",
+@"var x = $""""""
+    abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+def[||]  """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""  [||]{|Selection:    |}""""""",
+@"var x = $""""""
+      abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""  abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"bar",
+@"var x = $""""""[||]goo""""""",
+@"var x = $""""""
+    ""bar[||]goo
+    """"""",
+                afterUndo:
+@"var x = $""""""""bar[||]goo""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "bar\"",
+@"var x = $""""""goo[||]""""""",
+@"var x = $""""""
+    goobar""
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""goobar""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = $""""""[||]{|Selection:    |}""""""",
+@"var x = $""""""
+    """"
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""""""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""[||]{|Selection:    |}""""""",
+@"var x = $""""""""
+    """"""
+    [||]""""""""",
+                afterUndo:
+@"var x = $""""""""""""[||]""""""");
+        }
+
+        #endregion
+    }
+}

From a83b3127da14caac251bda4e56eb9fa9eb2eb227 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 19:08:52 -0700
Subject: [PATCH 303/413] Add tests

---
 ...eKnownSourceIntoMultiLineRawStringTests.cs | 1167 +++++++++++++++++
 ...KnownSourceIntoSingleLineRawStringTests.cs |    8 +-
 2 files changed, 1171 insertions(+), 4 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
new file mode 100644
index 0000000000000..123f8d8a179d4
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
@@ -0,0 +1,1167 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoMultiLineRawStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        #region Normal Copy/Paste tests
+
+        // Tests where we actually set up a document to copy code from.
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    o[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    n[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+"\r\nvar dest =\r\n    \"\"\"\r\n    \n    [||]\r\n    \"\"\";",
+"\r\nvar dest =\r\n    \"\"\"\r\n    \\n[||]\r\n    \"\"\";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    \""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    o[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    
+    [||]
+    """""";",
+"\r\nvar dest =\r\n    \"\"\"\r\n    \r\n[||]\r\n    \"\"\";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    """"[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+     """" [||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo
+    bar[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    goo
+    bar[||]
+    """""";",
+@"
+var dest =
+    """"""
+        goo
+    bar[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:X}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:""X""}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:\""X\""}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {""goo""}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    X{""goo""}Y[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""X{""goo""}Y""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    \""X{""goo""}Y\""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""X{@""goo""}Y""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    \""X{@""goo""}Y\""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:X}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:""X""}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    {0:""""X""""}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{""goo""}|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    {""goo""}[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:X{""goo""}Y|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    X{""goo""}Y[||]
+    """""";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""X{""goo""}Y""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    """"X{""goo""}Y""""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
+@"
+var dest =
+    """"""
+    [||]
+    """""";",
+@"
+var dest =
+    """"""
+    ""X{@""goo""}Y""[||]
+    """""";",
+@"
+var dest =
+    """"""
+    """"X{@""goo""}Y""""[||]
+    """""";");
+        }
+
+        #endregion
+
+        #region Known Source tests
+
+        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
+        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineRawStringTests.cs
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = """"""
+    [||]
+    """"""",
+"var x = \"\"\"\r\n    \n    [||]\r\n    \"\"\"",
+                afterUndo:
+"var x = \"\"\"\r\n    \n[||]\r\n    \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = """"""
+    [||]
+    """"""",
+"var x = \"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+                afterUndo:
+"var x = \"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+        [||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "    \r\n",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+        
+    [||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+        
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    '[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    ""[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""""
+    """"""[||]
+    """"""""",
+                afterUndo:
+@"var x = """"""
+    """"""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTwoQuotesIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = """"""
+    ""[||]
+    """"""",
+@"var x = """"""""
+    """"""[||]
+    """"""""",
+                afterUndo:
+@"var x = """"""
+    """"""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""
+    ""[||]
+    """"""",
+@"var x = """"""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = """"""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""
+    ""[||]""
+    """"""",
+@"var x = """"""""""""
+    """"""""[||]""
+    """"""""""""",
+                afterUndo:
+@"var x = """"""
+    """"""""[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""
+    [||]""
+    """"""",
+@"var x = """"""""""
+    """"""[||]""
+    """"""""""",
+                afterUndo:
+@"var x = """"""
+    """"""[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuadrupleQuoteIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"\"",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = """"""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestComplexStringIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "  \"\"  ",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+      """"  [||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    abc[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine4()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""
+    goo[||]
+    """"""",
+@"var x = """"""
+    gooabc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    gooabc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine5()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""
+    goo[||]bar
+    """"""",
+@"var x = """"""
+    gooabc
+    def[||]bar
+    """"""",
+                afterUndo:
+@"var x = """"""
+    gooabc
+def[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine6()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = """"""
+    goo[||]bar
+    """"""",
+@"var x = """"""
+    gooabc
+    def
+    [||]bar
+    """"""",
+                afterUndo:
+@"var x = """"""
+    gooabc
+def
+[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+    abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+        abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+        abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = """"""
+    [||]
+    """"""",
+@"var x = """"""
+            abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+            abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = """"""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = """"""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = """"""
+    abc
+    def
+    [||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+def
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = """"""
+    [||]{|Selection:    |}  
+    """"""",
+@"var x = """"""
+    abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+def[||]  
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"bar",
+@"var x = """"""
+    [||]goo
+    """"""",
+@"var x = """"""
+    ""bar[||]goo
+    """"""",
+                afterUndo:
+@"var x = """"""
+    [||]goo
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = """"""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = """"""
+    """"[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+        [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = """"""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = """"""""
+    """"""[||]
+    """"""""",
+                afterUndo:
+@"var x = """"""
+    """"""[||]
+    """"""");
+        }
+
+        #endregion
+    }
+}
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index fc0450f1a1df7..19b67d1545384 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -9,13 +9,13 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
 {
     public class PasteKnownSourceIntoSingleLineRawStringTests : StringCopyPasteCommandHandlerKnownSourceTests
     {
+        #region Normal Copy/Paste tests
+
+        // Tests where we actually set up a document to copy code from.
+
         [WpfFact]
         public void TestPasteSimpleNormalLiteralContent()
         {
-            #region Normal Copy/Paste tests
-
-            // Tests where we actually set up a document to copy code from.
-
             TestCopyPaste(
 @"var v = ""{|Copy:goo|}"";",
 @"

From 6ab6c26743f99486716dd16decbd3fc6b808c204 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 19:48:58 -0700
Subject: [PATCH 304/413] Add tests

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 1928 +++++++++++++++++
 1 file changed, 1928 insertions(+)
 create mode 100644 src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
new file mode 100644
index 0000000000000..51752ce4fd0f9
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -0,0 +1,1928 @@
+// 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 Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.StringCopyPaste
+{
+    public class PasteKnownSourceIntoMultiLineRawInterpolatedStringTests : StringCopyPasteCommandHandlerKnownSourceTests
+    {
+        #region Normal Copy/Paste tests
+
+        // Tests where we actually set up a document to copy code from.
+
+        [WpfFact]
+        public void TestPasteSimpleNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $$""""""
+    {[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteOpenCloseBraceNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $$""""""
+    {}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteLooksLikeInterpolationNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $$""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    o[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:n|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    n[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\n|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+@"
+var dest =
+    $""""""\n[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPastePartiallySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""\{|Copy:""|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    ""[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    ""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedQuoteNormalLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = ""{|Copy:\""|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    ""[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    \""[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:goo|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleSubstringVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""g{|Copy:o|}o"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    o[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSelectedVerbatimNewLineLiteralContent()
+        {
+            TestCopyPaste(
+"var v = @\"{|Copy:\r\n|}\";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    
+    [||] 
+    """""";",
+@"
+var dest =
+    $""""""
+[||] """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = @""{|Copy:""""|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    ""[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    """"[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy:goo|}"""""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteQuotesRawSingleLineLiteralContent()
+        {
+            TestCopyPaste(
+@"var v = """"""{|Copy: """" |}"""""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+     """" [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo|}
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = """"""
+    {|Copy:goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo
+    bar[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteSimpleRawMultiLineLiteralContent3()
+        {
+            TestCopyPaste(
+@"var v = """"""
+{|Copy:    goo
+    bar|}
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    goo
+    bar[||]
+    """""";",
+@"
+var dest =
+    $""""""
+        goo
+    bar[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:X}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $""{|Copy:{0:\""X\""}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:""X""}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:\""X\""}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:X}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:X}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0:""""X""""}|}"";",
+@"
+var dest =
+    $""""""
+    [||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:""X""}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0:""""X""""}[||]
+    """""";");
+        }
+
+        #endregion
+
+        #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
+
+        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
+        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = $""""""
+    [||]
+    """"""",
+"var x = $\"\"\"\r\n    \n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoSingleLineRawString2_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = $""""""
+    [||]
+    """"""",
+"var x = $\"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\r\n[||] \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""    [||] """"""",
+                afterUndo:
+@"var x = $""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "    \r\n",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        
+    [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+        
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    '[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""
+    ""[||] 
+    """"""",
+                afterUndo:
+@"var x = $""""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""[||] """"""",
+@"var x = $""""""""
+    """"""[||] 
+    """"""""",
+                afterUndo:
+@"var x = $""""""""""""[||] """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""
+    ""[||]
+    """"""",
+@"var x = $""""""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""
+    ""[||]""
+    """"""",
+@"var x = $""""""""""""
+    """"""""[||]""
+    """"""""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""""[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""
+    [||]""
+    """"""",
+@"var x = $""""""""""
+    """"""[||]""
+    """"""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuadrupleQuoteIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"\"",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCurlyIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$""""""
+    {[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""
+    ""{{{[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    ""{{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""""
+    """"""{{{[||]
+    """"""""",
+                afterUndo:
+@"var x = $""""""
+    """"""{{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: " \"\"\"{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""""
+     """"""{{{[||]
+    """"""""",
+                afterUndo:
+@"var x = $""""""
+     """"""{{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""
+    {{{[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""
+    ""[||]
+    """"""",
+@"var x = $$$$""""""
+    ""{{{[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    ""{{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""
+    ""[||]""
+    """"""",
+@"var x = $$$$""""""
+    ""{{{[||]""
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    ""{{{[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""
+    [||]""
+    """"""",
+@"var x = $$$$""""""
+    {{{[||]""
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {{{[||]""
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestInterpolationIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "{0}",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$""""""
+    {0}[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {0}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$""""""
+    {}[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}",
+@"var x = $$""""""
+    [||]
+    """"""",
+@"var x = $$""""""
+    {}[||]
+    """"""",
+                afterUndo:
+@"var x = $$""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}",
+@"var x = $$""""""
+    [||]
+    """"""",
+@"var x = $$$""""""
+    {{}[||]
+    """"""",
+                afterUndo:
+@"var x = $$""""""
+    {{}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}}",
+@"var x = $$""""""
+    [||]
+    """"""",
+@"var x = $$$""""""
+    {}}[||]
+    """"""",
+                afterUndo:
+@"var x = $$""""""
+    {}}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoSingleLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}}",
+@"var x = $$""""""
+    [||]
+    """"""",
+@"var x = $$$""""""
+    {{}}[||]
+    """"""",
+                afterUndo:
+@"var x = $$""""""
+    {{}}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestComplexStringIntoSingleLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "  \"\"  ",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+      """"  [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawString_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine4()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    goo[||]
+    """"""",
+@"var x = $""""""
+    gooabc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine5()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    goo[||]bar
+    """"""",
+@"var x = $""""""
+    gooabc
+    def[||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine6()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""
+    goo[||]bar
+    """"""",
+@"var x = $""""""
+    gooabc
+    def
+    [||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def
+[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+        abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+            abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+            abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = $""""""
+    abc
+    def
+    [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+def
+[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    [||]{|Selection:    |}  
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]  
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+def[||]  
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringHeader1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"bar",
+@"var x = $""""""
+    [||]goo
+    """"""",
+@"var x = $""""""
+    ""bar[||]goo
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]goo
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = $""""""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = $""""""
+    """"[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""""""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""
+    [||]{|Selection:    |}
+    """"""",
+@"var x = $""""""""
+    """"""[||]
+    """"""""",
+                afterUndo:
+@"var x = $""""""""""""[||]""""""");
+        }
+
+        #endregion
+
+        #region Known Source tests 'PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests'
+
+        [WpfFact]
+        public void TestNewLineIntoMultiLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\n",
+@"var x = $""""""
+    [||]
+    """"""",
+"var x = $\"\"\"\r\n    \n    [||]\r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestNewLineIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\r\n",
+@"var x = $""""""
+    [||]
+    """"""",
+"var x = $\"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+                afterUndo:
+"var x = $\"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoMultiLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "    ",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSpacesIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "    \r\n",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        
+    [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+        
+[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestSingleQuoteIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "'",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    '[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestDoubleQuoteIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    ""[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoMultiLineRawString1()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""""
+    """"""[||]
+    """"""""",
+                afterUndo:
+@"var x = $""""""
+    """"""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""  
+    [||]
+    """"""  ",
+@"var x = $""""""""  
+    """"""[||]
+    """"""""  ",
+                afterUndo:
+@"var x = $""""""  
+    """"""[||]
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoMultiLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""  
+    ""[||]
+    """"""  ",
+@"var x = $""""""""""  
+    """"""""[||]
+    """"""""""  ",
+                afterUndo:
+@"var x = $""""""  
+    """"""""[||]
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoMultiLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""  
+    ""[||]""  
+    """"""  ",
+@"var x = $""""""""""""  
+    """"""""[||]""  
+    """"""""""""  ",
+                afterUndo:
+@"var x = $""""""  
+    """"""""[||]""  
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteIntoMultiLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""  
+    [||]""
+    """"""  ",
+@"var x = $""""""""""  
+    """"""[||]""
+    """"""""""  ",
+                afterUndo:
+@"var x = $""""""  
+    """"""[||]""
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestQuadrupleQuoteIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"\"",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""""""
+    """"""""[||]
+    """"""""""",
+                afterUndo:
+@"var x = $""""""
+    """"""""[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenBraceIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$""""""
+    {[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""
+    {{{[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleOpenBraceIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{{",
+@"var x = $$""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""
+    {{{[||]
+    """"""",
+                afterUndo:
+@"var x = $$""""""
+    {{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenBraceIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "{",
+@"var x = $$$""""""  
+    {[||]{
+    """"""  ",
+@"var x = $$$$""""""  
+    {{[||]{
+    """"""  ",
+                afterUndo:
+@"var x = $$$""""""  
+    {{[||]{
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestInterpolationIntoMultiLineRawString3()
+        {
+            TestPasteKnownSource(
+                pasteText: "{0}",
+@"var x = $""""""  
+    [||]
+    """"""  ",
+@"var x = $$""""""  
+    {0}[||]
+    """"""  ",
+                afterUndo:
+@"var x = $""""""  
+    {0}[||]
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseIntoMultiLineRawString4()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}",
+@"var x = $""""""  
+    [||]  
+    """"""  ",
+@"var x = $$""""""  
+    {}[||]  
+    """"""  ",
+                afterUndo:
+@"var x = $""""""  
+    {}[||]  
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoMultiLineRawString5()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}",
+@"var x = $$""""""  
+    [||]
+    """"""  ",
+@"var x = $$$""""""  
+    {{}[||]
+    """"""  ",
+                afterUndo:
+@"var x = $$""""""  
+    {{}[||]
+    """"""  ");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "{}}",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$""""""
+    {}}[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {}}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestOpenCloseBraceIntoMultiLineRawString2()
+        {
+            TestPasteKnownSource(
+                pasteText: "{{}}",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$""""""
+    {{}}[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    {{}}[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestTripleQuoteTripleOpenBraceIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"{{{",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $$$$""""""""
+    """"""{{{[||]
+    """"""""",
+                afterUndo:
+@"var x = $""""""
+    """"""{{{[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestComplexStringIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "  \"\"  ",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+      """"  [||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+      """"  [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawString()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine1()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine2()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+[||]
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+abc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine3()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||]
+
+    """"""",
+@"var x = $""""""
+    abc
+    def[||]
+
+    """"""",
+                afterUndo:
+@"var x = $""""""abc
+def[||]
+
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine4()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    goo[||]
+    """"""",
+@"var x = $""""""
+    gooabc
+    def[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine5()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""
+    goo[||]bar
+    """"""",
+@"var x = $""""""
+    gooabc
+    def[||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine6()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""
+    goo[||]bar
+    """"""",
+@"var x = $""""""
+    gooabc
+    def
+    [||]bar
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    gooabc
+def
+[||]bar
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine7()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine8()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+    abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    [||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine9()
+        {
+            TestPasteKnownSource(
+                pasteText: "    abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+        abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+        abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine10()
+        {
+            TestPasteKnownSource(
+                pasteText: "        abc\r\n    def\r\n    ghi",
+@"var x = $""""""
+    [||]
+    """"""",
+@"var x = $""""""
+            abc
+        def
+        ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+            abc
+    def
+    ghi[||]
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine11()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||]{|Selection:
+
+    |}""""""",
+@"var x = $""""""
+    abc
+    def
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""abc
+def[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine12()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef\r\n",
+@"var x = $""""""[||]{|Selection:
+
+    |}""""""",
+@"var x = $""""""
+    abc
+    def
+    
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""abc
+def
+[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine13()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\ndef",
+@"var x = $""""""[||]{|Selection:
+
+ |}   """"""",
+@"var x = $""""""
+    abc
+    def
+ [||]   """"""",
+                afterUndo:
+@"var x = $""""""abc
+def[||]   """"""");
+        }
+
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringHeader1()
+        {
+            TestPasteKnownSource(
+                pasteText: "bar",
+@"var x = $""""""[||]
+    goo
+    """"""",
+@"var x = $""""""
+    bar[||]
+    goo
+    """"""",
+                afterUndo:
+@"var x = $""""""bar[||]
+    goo
+    """"""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader1_A()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"",
+@"var x = $""""""[||]{|Selection:
+
+    |}""""""",
+@"var x = $""""""
+    """"
+    [||]""""""",
+                afterUndo:
+@"var x = $""""""""""[||]""""""");
+        }
+
+        [WpfFact]
+        public void TestQuotesIntoHeader2_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "\"\"\"",
+@"var x = $""""""[||]{|Selection:
+
+    |}""""""",
+@"var x = $""""""""
+    """"""
+    [||]""""""""",
+                afterUndo:
+@"var x = $""""""""""""[||]""""""");
+        }
+
+        #endregion
+    }
+}

From af7f5b4166cc236f0233a8a95ce013739d2d7d72 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 19:54:07 -0700
Subject: [PATCH 305/413] Add tests

---
 .../KnownSourcePasteProcessor.cs              | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index da6d9647ea811..2e0165ea18524 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -245,6 +245,34 @@ private TextChange GetContentEditForRawString(
             using var _ = PooledStringBuilder.GetInstance(out var builder);
 
             var isLiteral = StringExpressionBeforePaste is LiteralExpressionSyntax;
+
+#if false
+
+
+                        // The first line is often special.  It may be copied without any whitespace (e.g. the user
+                        // starts their selection at the start of text on that line, not the start of the line itself).
+                        // So we use some heuristics to try to decide what to do depending on how much whitespace we see
+                        // on that first copied line.
+
+                        TextBeforePaste.GetLineAndOffset(change.OldSpan.Start, out var line, out var offset);
+
+                        // First, ensure that the indentation whitespace of the *inserted* first line is sufficient.
+                        if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
+                        {
+                            // if the first chunk was pasted into the space after the first `"""` then we need to actually
+                            // insert a newline, then the indentation whitespace, then the first line of the change.
+                            buffer.Append(NewLine);
+                            buffer.Append(indentationWhitespace);
+                        }
+                        else if (offset < indentationWhitespace.Length)
+                        {
+                            // On the first line, we were pasting into the indentation whitespace.  Ensure we add enough
+                            // whitespace so that the trimmed line starts at an acceptable position.
+                            buffer.Append(indentationWhitespace[offset..]);
+                        }
+#endif
+
+
             foreach (var content in _copyPasteData.Contents)
             {
                 if (content.IsText)

From dc3d0ef0732d96d217c6c73942064dee7f1d1987 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 20:04:03 -0700
Subject: [PATCH 306/413] Deal with selection at start of literal

---
 .../KnownSourcePasteProcessor.cs              | 20 +++++++++++++++++--
 ...IntoMultiLineRawInterpolatedStringTests.cs |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 2e0165ea18524..9d7ba10605af8 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -245,6 +245,7 @@ private TextChange GetContentEditForRawString(
             using var _ = PooledStringBuilder.GetInstance(out var builder);
 
             var isLiteral = StringExpressionBeforePaste is LiteralExpressionSyntax;
+            var isMultiLine = IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste);
 
 #if false
 
@@ -272,14 +273,29 @@ private TextChange GetContentEditForRawString(
                         }
 #endif
 
-
-            foreach (var content in _copyPasteData.Contents)
+            for (var contentIndex = 0; contentIndex < _copyPasteData.Contents.Length; contentIndex++)
             {
+                var content = _copyPasteData.Contents[contentIndex];
                 if (content.IsText)
                 {
                     // Convert the string to a source-text instance so we can easily process it one line at a time.
                     var sourceText = SourceText.From(content.TextValue);
 
+                    if (contentIndex == 0 && isMultiLine)
+                    {
+                        TextBeforePaste.GetLineAndOffset(_selectionSpanBeforePaste.Start, out var line, out var offset);
+                        if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
+                        {
+                            // the user selection starts on the line containing the leading delimiter.  e.g.
+                            // var v = """ [| ...
+                            //
+                            // In this case, ensure we add a new-line + indentation so that the copied
+                            // text will actually start in the right location.
+                            builder.Append(NewLine);
+                            builder.Append(indentationWhitespace);
+                        }
+                    }
+
                     for (var i = 0; i < sourceText.Lines.Count; i++)
                     {
                         if (i != 0)
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 51752ce4fd0f9..ac6ef48d25b83 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -1602,7 +1602,7 @@ public void TestComplexStringIntoMultiLineRawString()
     """"""",
                 afterUndo:
 @"var x = $""""""
-      """"  [||]
+    [||]
     """"""");
         }
 

From 6b9d0e06fe59e3227c7a58e43289259ab944c925 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 20:43:26 -0700
Subject: [PATCH 307/413] Add tests

---
 .../KnownSourcePasteProcessor.cs              | 89 ++++++++++---------
 ...IntoMultiLineRawInterpolatedStringTests.cs | 45 ++++++----
 2 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 9d7ba10605af8..0f86236095212 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -247,54 +247,43 @@ private TextChange GetContentEditForRawString(
             var isLiteral = StringExpressionBeforePaste is LiteralExpressionSyntax;
             var isMultiLine = IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste);
 
-#if false
-
-
-                        // The first line is often special.  It may be copied without any whitespace (e.g. the user
-                        // starts their selection at the start of text on that line, not the start of the line itself).
-                        // So we use some heuristics to try to decide what to do depending on how much whitespace we see
-                        // on that first copied line.
-
-                        TextBeforePaste.GetLineAndOffset(change.OldSpan.Start, out var line, out var offset);
-
-                        // First, ensure that the indentation whitespace of the *inserted* first line is sufficient.
-                        if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
-                        {
-                            // if the first chunk was pasted into the space after the first `"""` then we need to actually
-                            // insert a newline, then the indentation whitespace, then the first line of the change.
-                            buffer.Append(NewLine);
-                            buffer.Append(indentationWhitespace);
-                        }
-                        else if (offset < indentationWhitespace.Length)
-                        {
-                            // On the first line, we were pasting into the indentation whitespace.  Ensure we add enough
-                            // whitespace so that the trimmed line starts at an acceptable position.
-                            buffer.Append(indentationWhitespace[offset..]);
-                        }
-#endif
-
             for (var contentIndex = 0; contentIndex < _copyPasteData.Contents.Length; contentIndex++)
             {
+                if (contentIndex == 0 && isMultiLine)
+                {
+                    TextBeforePaste.GetLineAndOffset(_selectionSpanBeforePaste.Start, out var line, out var offset);
+                    if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
+                    {
+                        // the user selection starts on the line containing the leading delimiter.  e.g.
+                        //
+                        // var v = """ [|
+                        //      content|]
+                        //      """
+                        //
+                        // In this case, ensure we add a new-line + indentation so that the copied
+                        // text will actually start in the right location.
+                        builder.Append(NewLine);
+                        builder.Append(indentationWhitespace);
+                    }
+                    else if (offset < indentationWhitespace.Length)
+                    {
+                        // if the line they're pasting into doesn't have enough indentation whitespace, then
+                        // add enough whitespace to make the text insertion point level.  e.g.:
+                        //
+                        // var v = """
+                        //   [|   content|]
+                        //      """
+                        builder.Append(indentationWhitespace[offset..]);
+                    }
+                }
+
                 var content = _copyPasteData.Contents[contentIndex];
+                SourceText? lastContentSourceText = null;
                 if (content.IsText)
                 {
                     // Convert the string to a source-text instance so we can easily process it one line at a time.
                     var sourceText = SourceText.From(content.TextValue);
-
-                    if (contentIndex == 0 && isMultiLine)
-                    {
-                        TextBeforePaste.GetLineAndOffset(_selectionSpanBeforePaste.Start, out var line, out var offset);
-                        if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
-                        {
-                            // the user selection starts on the line containing the leading delimiter.  e.g.
-                            // var v = """ [| ...
-                            //
-                            // In this case, ensure we add a new-line + indentation so that the copied
-                            // text will actually start in the right location.
-                            builder.Append(NewLine);
-                            builder.Append(indentationWhitespace);
-                        }
-                    }
+                    lastContentSourceText = sourceText;
 
                     for (var i = 0; i < sourceText.Lines.Count; i++)
                     {
@@ -331,6 +320,24 @@ private TextChange GetContentEditForRawString(
                 {
                     throw ExceptionUtilities.UnexpectedValue(content.Kind);
                 }
+
+                if (contentIndex == _copyPasteData.Contents.Length - 1 && isMultiLine)
+                {
+                    // Similar to the check we do for the first-change, if the last change was pasted into the space
+                    // before the last `"""` then we need potentially insert a newline, then enough indentation
+                    // whitespace to keep delimiter in the right location.
+
+                    TextBeforePaste.GetLineAndOffset(_selectionSpanBeforePaste.End, out var line, out var offset);
+
+                    if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.Span.End).LineNumber)
+                    {
+                        var hasNewLine = content.IsText && HasNewLine(lastContentSourceText!.Lines.Last());
+                        if (!hasNewLine)
+                            builder.Append(NewLine);
+
+                        builder.Append(TextBeforePaste.ToString(new TextSpan(TextBeforePaste.Lines[line].Start, offset)));
+                    }
+                }
             }
 
             return new TextChange(_selectionSpanBeforePaste, builder.ToString());
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index ac6ef48d25b83..f75c9323fe38f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -155,10 +155,12 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
     $""""""
     [||]
     """""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||]\r\n    \"\"\";",
 @"
 var dest =
-    $""""""\n[||] """""";");
+    $""""""
+    \n[||]
+    """""";");
         }
 
         [WpfFact]
@@ -179,7 +181,7 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent()
 @"
 var dest =
     $""""""
-    ""[||]
+    [||]
     """""";");
         }
 
@@ -263,12 +265,14 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent()
 var dest =
     $""""""
     
-    [||] 
+    [||]
     """""";",
 @"
 var dest =
     $""""""
-[||] """""";");
+    
+[||]
+    """""";");
         }
 
         [WpfFact]
@@ -517,9 +521,9 @@ public void TestNewLineIntoSingleLineRawString1_A()
 @"var x = $""""""
     [||]
     """"""",
-"var x = $\"\"\"\r\n    \n    [||] \r\n    \"\"\"",
+"var x = $\"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
-"var x = $\"\"\"\n[||] \"\"\"");
+"var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
         }
 
         [WpfFact]
@@ -530,9 +534,9 @@ public void TestNewLineIntoSingleLineRawString2_A()
 @"var x = $""""""
     [||]
     """"""",
-"var x = $\"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+"var x = $\"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
                 afterUndo:
-"var x = $\"\"\"\r\n[||] \"\"\"");
+"var x = $\"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
         }
 
         [WpfFact]
@@ -543,9 +547,13 @@ public void TestSpacesIntoSingleLineRawString1_A()
 @"var x = $""""""
     [||]
     """"""",
-@"var x = $""""""    [||] """"""",
+@"var x = $""""""
+        [||]
+    """"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+@"var x = $""""""
+    [||]
+    """"""");
         }
 
         [WpfFact]
@@ -1148,7 +1156,8 @@ public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
 @"var x = $""""""
     abc
 def
-[||]""""""");
+[||]
+    """"""");
         }
 
         [WpfFact]
@@ -1199,7 +1208,9 @@ public void TestQuotesIntoHeader1()
     """"[||]
     """"""",
                 afterUndo:
-@"var x = $""""""""""[||]""""""");
+@"var x = $""""""
+        [||]
+    """"""");
         }
 
         [WpfFact]
@@ -1214,7 +1225,9 @@ public void TestQuotesIntoHeader2()
     """"""[||]
     """"""""",
                 afterUndo:
-@"var x = $""""""""""""[||]""""""");
+@"var x = $""""""
+    """"""[||]
+    """"""");
         }
 
         #endregion
@@ -1776,7 +1789,9 @@ public void TestNormalTextIntoMultiLineRawStringMultiLine8()
     """"""",
                 afterUndo:
 @"var x = $""""""
-    [||]
+    abc
+    def
+    ghi[||]
     """"""");
         }
 

From a66767427ae27d41d525cece29f0262caf28c68d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 20:57:17 -0700
Subject: [PATCH 308/413] add tests

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index f75c9323fe38f..39f444979ccb1 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -506,6 +506,94 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     """""";");
         }
 
+        [WpfFact]
+        public void TestPasteBracesWithExistingInterpolation1()
+        {
+            TestPasteKnownSource(
+pasteText: @"{{{",
+@"
+var dest =
+    $""""""
+    [||]{0}
+    """""";",
+@"
+var dest =
+    $$$$""""""
+    {{{[||]{{{{0}}}}
+    """""";",
+@"
+var dest =
+    $""""""
+    {{{[||]{0}
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteBracesWithExistingInterpolation2()
+        {
+            TestPasteKnownSource(
+pasteText: @"{{{",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $$$$""""""
+    {{{{0}}}}{{{[||]
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}{{{[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteBracesWithExistingInterpolation3()
+        {
+            TestPasteKnownSource(
+pasteText: @"{{{",
+@"
+var dest =
+    $""""""
+    {0}[||]{1}
+    """""";",
+@"
+var dest =
+    $$$$""""""
+    {{{{0}}}}{{{[||]{{{{1}}}}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}{{{[||]{1}
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteBracesWithExistingInterpolation4()
+        {
+            TestPasteKnownSource(
+pasteText: @"{{{",
+@"
+var dest =
+    $""""""
+    {0}[||]{|Selection:{1}|}{2}
+    """""";",
+@"
+var dest =
+    $$$$""""""
+    {{{{0}}}}{{{[||]{{{{2}}}}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}{{{[||]{2}
+    """""";");
+        }
+
         #endregion
 
         #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'

From 8a276a0387c45b16f4ad8453c69d2e19fc6c870e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:14:54 -0700
Subject: [PATCH 309/413] Add tests

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 289 +++++++++++++++++-
 1 file changed, 282 insertions(+), 7 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 39f444979ccb1..e17aa7a7b7189 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -506,6 +506,288 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
     """""";");
         }
 
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection1()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:|}
+
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+
+    """""";",
+@"
+var dest =
+    $""""""{0}[||]
+
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection2()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+|}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection3()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+  |}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection4()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+    |}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection5()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+
+|}    """""";",
+@"
+var dest =
+    $""""""
+    {0}
+[||]    """""";",
+@"
+var dest =
+    $""""""{0}[||]    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection6()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+
+  |}  """""";",
+@"
+var dest =
+    $""""""
+    {0}
+  [||]  """""";",
+@"
+var dest =
+    $""""""{0}[||]  """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection7()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""[||]{|Selection:
+
+    |}"""""";",
+@"
+var dest =
+    $""""""
+    {0}
+    [||]"""""";",
+@"
+var dest =
+    $""""""{0}[||]"""""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection8()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:|}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection9()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:  |}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection10()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:    |}
+    """""";",
+@"
+var dest =
+    $""""""
+    {0}[||]
+    """""";",
+@"
+var dest =
+    $""""""
+{0}[||]
+    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection11()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:
+|}    """""";",
+@"
+var dest =
+    $""""""
+    {0}
+[||]    """""";",
+@"
+var dest =
+    $""""""
+{0}[||]    """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection12()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:
+  |}  """""";",
+@"
+var dest =
+    $""""""
+    {0}
+  [||]  """""";",
+@"
+var dest =
+    $""""""
+{0}[||]  """""";");
+        }
+
+        [WpfFact]
+        public void TestPasteInterpolationIntoSelection13()
+        {
+            TestCopyPaste(
+@"var v = $@""{|Copy:{0}|}"";",
+@"
+var dest =
+    $""""""
+[||]{|Selection:
+    |}"""""";",
+@"
+var dest =
+    $""""""
+    {0}
+    [||]"""""";",
+@"
+var dest =
+    $""""""
+{0}[||]"""""";");
+        }
+
+        #endregion
+
+        #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
+
+        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
+        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+
         [WpfFact]
         public void TestPasteBracesWithExistingInterpolation1()
         {
@@ -594,13 +876,6 @@ public void TestPasteBracesWithExistingInterpolation4()
     """""";");
         }
 
-        #endregion
-
-        #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
-
-        // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
-        // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
-
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString1_A()
         {

From f1815fe29e81c86417728885489f5a1db8235d52 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:23:17 -0700
Subject: [PATCH 310/413] Refactor

---
 .../KnownSourcePasteProcessor.cs              | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 0f86236095212..86227d29060ca 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -151,27 +151,16 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             // At this point, we will now have the information necessary to actually insert the content and do things 
             // like give interpolations the proper number of braces for the final string we're making.
 
-            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1, indentationWhitespace: "");
-
-            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
-                new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
-            var snapshotBeforeDummyPaste = clonedBuffer.CurrentSnapshot;
-
-            var edit = clonedBuffer.CreateEdit();
-            edit.Replace(_selectionSpanBeforePaste.ToSpan(), dummyContentEdit.NewText);
+            DetermineTopLevelChangesToMakeToRawString(
+                out var quotesToAdd, out var dollarSignsToAdd, out var convertToMultiLine);
 
-            var snapshotAfterDummyPaste = edit.Apply();
-            var textAfterDummyPaste = snapshotAfterDummyPaste.AsText();
-
-            var contentSpansAfterDummyPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
-                ts => MapSpan(ts, snapshotBeforeDummyPaste, snapshotAfterDummyPaste));
-
-            var quotesToAdd = GetQuotesToAddToRawString(textAfterDummyPaste, contentSpansAfterDummyPaste);
-            var dollarSignsToAdd = GetDollarSignsToAddToRawString(textAfterDummyPaste, contentSpansAfterDummyPaste);
-            //var openBracesToAdd = dollarSignsToAdd == null ? null : new string('{', dollarSignsToAdd.Length);
-            //var closeBracesToAdd = dollarSignsToAdd == null ? null : new string('}', dollarSignsToAdd.Length);
+            return DetermineTotalEditsToMakeToRawString(
+                quotesToAdd, dollarSignsToAdd, convertToMultiLine, cancellationToken);
+        }
 
-            var convertToMultiLine = !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) && RawContentMustBeMultiLine(textAfterDummyPaste, contentSpansAfterDummyPaste);
+        private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
+            string? quotesToAdd, string? dollarSignsToAdd, bool convertToMultiLine, CancellationToken cancellationToken)
+        {
             var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
 
             var finalDollarSignCount = StringExpressionBeforePasteInfo.DelimiterDollarCount +
@@ -215,6 +204,32 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             return edits.ToImmutable();
         }
 
+        private void DetermineTopLevelChangesToMakeToRawString(out string? quotesToAdd, out string? dollarSignsToAdd, out bool convertToMultiLine)
+        {
+            PerformInitialBasicPasteInRawString(out var textAfterBasicPaste, out var contentSpansAfterBasicPaste);
+
+            quotesToAdd = GetQuotesToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste);
+            dollarSignsToAdd = GetDollarSignsToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste);
+            convertToMultiLine = !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) && RawContentMustBeMultiLine(textAfterBasicPaste, contentSpansAfterBasicPaste);
+        }
+
+        private void PerformInitialBasicPasteInRawString(out SourceText textAfterDummyPaste, out ImmutableArray<TextSpan> contentSpansAfterDummyPaste)
+        {
+            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1, indentationWhitespace: "");
+
+            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
+                new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
+            var snapshotBeforeDummyPaste = clonedBuffer.CurrentSnapshot;
+
+            var edit = clonedBuffer.CreateEdit();
+            edit.Replace(_selectionSpanBeforePaste.ToSpan(), dummyContentEdit.NewText);
+
+            var snapshotAfterDummyPaste = edit.Apply();
+            textAfterDummyPaste = snapshotAfterDummyPaste.AsText();
+            contentSpansAfterDummyPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
+                ts => MapSpan(ts, snapshotBeforeDummyPaste, snapshotAfterDummyPaste));
+        }
+
         private void UpdateExistingInterpolationBraces(
             ArrayBuilder<TextChange> edits, bool beforeSelection, int dollarSignsToAdd)
         {

From bfb8b27a49060f00deb8f3363428046d47b251f1 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:30:48 -0700
Subject: [PATCH 311/413] Share more code

---
 .../StringCopyPaste/AbstractPasteProcessor.cs |  9 +++--
 .../KnownSourcePasteProcessor.cs              | 34 ++++++++-----------
 .../StringCopyPasteCommandHandler.cs          |  9 ++---
 .../UnknownSourcePasteProcessor.cs            | 12 +++----
 4 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index 692621e8a2fbe..d754c3f66304c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -85,10 +85,9 @@ internal abstract class AbstractPasteProcessor
         protected readonly string NewLine;
 
         /// <summary>
-        /// Users preferred indentation options.  Used when dealing with raw strings that we have to convert from
-        /// single-line to multiline.
+        /// Amount to indent content in a multi-line raw string literal.
         /// </summary>
-        protected readonly IndentationOptions IndentationOptions;
+        protected readonly string IndentationWhitespace;
 
         /// <summary>
         /// The set of <see cref="ITextChange"/>'s that produced <see cref="SnapshotAfterPaste"/> from <see
@@ -98,7 +97,7 @@ internal abstract class AbstractPasteProcessor
 
         protected AbstractPasteProcessor(
             string newLine,
-            IndentationOptions indentationOptions,
+            string indentationWhitespace,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
@@ -106,7 +105,7 @@ protected AbstractPasteProcessor(
             ExpressionSyntax stringExpressionBeforePaste)
         {
             NewLine = newLine;
-            IndentationOptions = indentationOptions;
+            IndentationWhitespace = indentationWhitespace;
 
             SnapshotBeforePaste = snapshotBeforePaste;
             SnapshotAfterPaste = snapshotAfterPaste;
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 86227d29060ca..0694ad9c2335c 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -43,7 +43,7 @@ internal class KnownSourcePasteProcessor : AbstractPasteProcessor
 
         public KnownSourcePasteProcessor(
             string newLine,
-            IndentationOptions indentationOptions,
+            string indentationWhitespace,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
@@ -52,7 +52,7 @@ public KnownSourcePasteProcessor(
             TextSpan selectionSpanBeforePaste,
             StringCopyPasteData copyPasteData,
             ITextBufferFactoryService2 textBufferFactoryService)
-            : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
+            : base(newLine, indentationWhitespace, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _selectionSpanBeforePaste = selectionSpanBeforePaste;
             _copyPasteData = copyPasteData;
@@ -67,7 +67,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
 
             // Smart Pasting into raw string not supported yet.  
             return IsAnyRawStringExpression(StringExpressionBeforePaste)
-                ? GetEditsForRawString(cancellationToken)
+                ? GetEditsForRawString()
                 : GetEditsForNonRawString();
         }
 
@@ -131,7 +131,7 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             return ImmutableArray.Create(new TextChange(_selectionSpanBeforePaste, builder.ToString()));
         }
 
-        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
+        private ImmutableArray<TextChange> GetEditsForRawString()
         {
             // To make a change to a raw string we have to go through several passes to determine what to do.
             //
@@ -155,14 +155,12 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
                 out var quotesToAdd, out var dollarSignsToAdd, out var convertToMultiLine);
 
             return DetermineTotalEditsToMakeToRawString(
-                quotesToAdd, dollarSignsToAdd, convertToMultiLine, cancellationToken);
+                quotesToAdd, dollarSignsToAdd, convertToMultiLine);
         }
 
         private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
-            string? quotesToAdd, string? dollarSignsToAdd, bool convertToMultiLine, CancellationToken cancellationToken)
+            string? quotesToAdd, string? dollarSignsToAdd, bool convertToMultiLine)
         {
-            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
-
             var finalDollarSignCount = StringExpressionBeforePasteInfo.DelimiterDollarCount +
                 (dollarSignsToAdd == null ? 0 : dollarSignsToAdd.Length);
 
@@ -179,7 +177,7 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
             // A newline and the indentation to start with.  Note: adding the indentation hear means that existing
             // content will start at the right location, as will any content we are pasting in.
             if (convertToMultiLine)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + IndentationWhitespace));
 
             // If we need to add braces to existing interpolations, do so now for the interpolations before the selection.
             if (dollarSignsToAdd != null)
@@ -187,7 +185,7 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
 
             // Now determine the actual content to add again, this time properly emitting it with
             // indentation/interpolations correctly.
-            edits.Add(GetContentEditForRawString(insertInterpolations: true, finalDollarSignCount, indentationWhitespace));
+            edits.Add(GetContentEditForRawString(insertInterpolations: true, finalDollarSignCount));
 
             // If we need to add braces to existing interpolations, do so now for the interpolations before the selection.
             if (dollarSignsToAdd != null)
@@ -195,7 +193,7 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
 
             // A final new-line and indentation before the end delimiter.
             if (convertToMultiLine)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + IndentationWhitespace));
 
             // Then  any extra quotes to the end delimiter.
             if (quotesToAdd != null)
@@ -215,7 +213,7 @@ private void DetermineTopLevelChangesToMakeToRawString(out string? quotesToAdd,
 
         private void PerformInitialBasicPasteInRawString(out SourceText textAfterDummyPaste, out ImmutableArray<TextSpan> contentSpansAfterDummyPaste)
         {
-            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1, indentationWhitespace: "");
+            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1);
 
             var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
                 new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
@@ -252,9 +250,7 @@ private void UpdateExistingInterpolationBraces(
         }
 
         private TextChange GetContentEditForRawString(
-            bool insertInterpolations,
-            int dollarSignCount,
-            string indentationWhitespace)
+            bool insertInterpolations, int dollarSignCount)
         {
             dollarSignCount = Math.Max(1, dollarSignCount);
             using var _ = PooledStringBuilder.GetInstance(out var builder);
@@ -278,9 +274,9 @@ private TextChange GetContentEditForRawString(
                         // In this case, ensure we add a new-line + indentation so that the copied
                         // text will actually start in the right location.
                         builder.Append(NewLine);
-                        builder.Append(indentationWhitespace);
+                        builder.Append(IndentationWhitespace);
                     }
-                    else if (offset < indentationWhitespace.Length)
+                    else if (offset < IndentationWhitespace.Length)
                     {
                         // if the line they're pasting into doesn't have enough indentation whitespace, then
                         // add enough whitespace to make the text insertion point level.  e.g.:
@@ -288,7 +284,7 @@ private TextChange GetContentEditForRawString(
                         // var v = """
                         //   [|   content|]
                         //      """
-                        builder.Append(indentationWhitespace[offset..]);
+                        builder.Append(IndentationWhitespace[offset..]);
                     }
                 }
 
@@ -303,7 +299,7 @@ private TextChange GetContentEditForRawString(
                     for (var i = 0; i < sourceText.Lines.Count; i++)
                     {
                         if (i != 0)
-                            builder.Append(indentationWhitespace);
+                            builder.Append(IndentationWhitespace);
 
                         builder.Append(sourceText.ToString(sourceText.Lines[i].SpanIncludingLineBreak));
                     }
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index b73749ff57012..87456d55a1b4a 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -134,8 +134,9 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
 
             var newLine = textView.Options.GetNewLineCharacter();
             var indentationOptions = documentBeforePaste.GetIndentationOptionsAsync(_globalOptions, cancellationToken).WaitAndGetResult(cancellationToken);
+            var indentationWhitespace = stringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(documentBeforePaste, indentationOptions, cancellationToken);
 
-            var textChanges = GetEdits(newLine, indentationOptions, cancellationToken);
+            var textChanges = GetEdits(newLine, indentationWhitespace, cancellationToken);
 
             // If we didn't get any viable changes back, don't do anything.
             if (textChanges.IsDefaultOrEmpty)
@@ -183,7 +184,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             transaction.Complete();
             return;
 
-            ImmutableArray<TextChange> GetEdits(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
+            ImmutableArray<TextChange> GetEdits(string newLine, string indentationWhitespace, CancellationToken cancellationToken)
             {
                 // See if this is a paste of the last copy that we heard about.
                 var edits = TryGetEditsFromKnownCopySource(newLine, indentationOptions, cancellationToken);
@@ -192,7 +193,7 @@ ImmutableArray<TextChange> GetEdits(string newLine, IndentationOptions indentati
 
                 // If not, then just go through teh fallback code path that applies more heuristics.
                 var unknownPasteProcessor = new UnknownSourcePasteProcessor(
-                    newLine, indentationOptions,
+                    newLine, indentationWhitespace,
                     snapshotBeforePaste, snapshotAfterPaste,
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste, pasteWasSuccessful);
@@ -215,7 +216,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
                     return default;
 
                 var knownProcessor = new KnownSourcePasteProcessor(
-                    newLine, indentationOptions,
+                    newLine, indentationWhitespace,
                     snapshotBeforePaste, snapshotAfterPaste,
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste,
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 779c2a2329bae..70af60dc29cc2 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -37,14 +37,14 @@ internal sealed class UnknownSourcePasteProcessor : AbstractPasteProcessor
 
         public UnknownSourcePasteProcessor(
             string newLine,
-            IndentationOptions indentationOptions,
+            string indentationWhitespace,
             ITextSnapshot snapshotBeforePaste,
             ITextSnapshot snapshotAfterPaste,
             Document documentBeforePaste,
             Document documentAfterPaste,
             ExpressionSyntax stringExpressionBeforePaste,
             bool pasteWasSuccessful)
-            : base(newLine, indentationOptions, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
+            : base(newLine, indentationWhitespace, snapshotBeforePaste, snapshotAfterPaste, documentBeforePaste, documentAfterPaste, stringExpressionBeforePaste)
         {
             _pasteWasSuccessful = pasteWasSuccessful;
         }
@@ -172,13 +172,11 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
 
             var mustBeMultiLine = RawContentMustBeMultiLine(TextAfterPaste, TextContentsSpansAfterPaste);
 
-            var indentationWhitespace = StringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(DocumentBeforePaste, IndentationOptions, cancellationToken);
-
             using var _ = PooledStringBuilder.GetInstance(out var buffer);
 
             // A newline and the indentation to start with.
             if (mustBeMultiLine)
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + IndentationWhitespace));
 
             SourceText? textOfCurrentChange = null;
             var commonIndentationPrefix = GetCommonIndentationPrefix(Changes) ?? "";
@@ -213,7 +211,7 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
 
                     // if we ended with a newline, make sure the next line is indented enough.
                     if (HasNewLine(currentChangeLine))
-                        buffer.Append(indentationWhitespace);
+                        buffer.Append(IndentationWhitespace);
                 }
 
                 edits.Add(new TextChange(change.OldSpan.ToTextSpan(), buffer.ToString()));
@@ -222,7 +220,7 @@ private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
             // if the last change ended at the closing delimiter *and* ended with a newline, then we don't need to add a
             // final newline-space at the end because we will have already done that.
             if (mustBeMultiLine && !LastPastedLineAddedNewLine())
-                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + indentationWhitespace));
+                edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.EndDelimiterSpan.Start, 0), NewLine + IndentationWhitespace));
 
             return;
 

From 37809abe019a4719357b187e7318c9a3315f635f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:36:11 -0700
Subject: [PATCH 312/413] Add tewsts

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 21 +++++++++++++++++++
 ...eKnownSourceIntoMultiLineRawStringTests.cs | 21 +++++++++++++++++++
 ...IntoMultiLineInterpolatedRawStringTests.cs | 21 +++++++++++++++++++
 ...nknownSourceIntoMultiLineRawStringTests.cs | 21 +++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index e17aa7a7b7189..34721bdc5800f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -1420,6 +1420,27 @@ public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
     """"""");
         }
 
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $""""""
+          [||]
+          """"""",
+@"var x = $""""""
+          abc
+              def
+          ghi[||]
+          """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
index 123f8d8a179d4..652a317b1cdaf 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
@@ -989,6 +989,27 @@ public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
     """"""");
         }
 
+        [WpfFact]
+        public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
+        {
+            TestPasteKnownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = """"""
+          [||]
+          """"""",
+@"var x = """"""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
index 8c7d45c43dc5b..0bfe0ec087303 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
@@ -550,6 +550,27 @@ public void TestNormalTextIntoMultiLineRawStringMultiLine7()
     """"""");
         }
 
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
+        {
+            TestPasteUnknownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = $""""""
+          [||]
+          """"""",
+@"var x = $""""""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = $""""""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine8()
         {
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
index 6bfea24393734..7164ec51928c0 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
@@ -380,6 +380,27 @@ public void TestNormalTextIntoMultiLineRawStringMultiLine7()
     """"""");
         }
 
+        [WpfFact]
+        public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
+        {
+            TestPasteUnknownSource(
+                pasteText: "abc\r\n    def\r\nghi",
+@"var x = """"""
+          [||]
+          """"""",
+@"var x = """"""
+    abc
+        def
+    ghi[||]
+    """"""",
+                afterUndo:
+@"var x = """"""
+    abc
+    def
+ghi[||]
+    """"""");
+        }
+
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine8()
         {

From 8d0846706849a1d020334a075e7db670cf052ae0 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:47:49 -0700
Subject: [PATCH 313/413] Fix indentation when custom indentation is involved

---
 .../StringCopyPasteCommandHandler.cs          | 35 ++++++++++++++++---
 ...IntoMultiLineRawInterpolatedStringTests.cs |  4 +--
 ...eKnownSourceIntoMultiLineRawStringTests.cs | 12 +++----
 ...IntoMultiLineInterpolatedRawStringTests.cs | 12 +++----
 ...nknownSourceIntoMultiLineRawStringTests.cs | 12 +++----
 5 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 87456d55a1b4a..9c5ec62dede34 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -133,8 +133,8 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
                 snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
 
             var newLine = textView.Options.GetNewLineCharacter();
-            var indentationOptions = documentBeforePaste.GetIndentationOptionsAsync(_globalOptions, cancellationToken).WaitAndGetResult(cancellationToken);
-            var indentationWhitespace = stringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(documentBeforePaste, indentationOptions, cancellationToken);
+            var indentationWhitespace = DetermineIndentationWhitespace(
+                documentBeforePaste, snapshotBeforePaste.AsText(), stringExpressionBeforePaste, cancellationToken);
 
             var textChanges = GetEdits(newLine, indentationWhitespace, cancellationToken);
 
@@ -187,11 +187,11 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             ImmutableArray<TextChange> GetEdits(string newLine, string indentationWhitespace, CancellationToken cancellationToken)
             {
                 // See if this is a paste of the last copy that we heard about.
-                var edits = TryGetEditsFromKnownCopySource(newLine, indentationOptions, cancellationToken);
+                var edits = TryGetEditsFromKnownCopySource(newLine, cancellationToken);
                 if (!edits.IsDefaultOrEmpty)
                     return edits;
 
-                // If not, then just go through teh fallback code path that applies more heuristics.
+                // If not, then just go through the fallback code path that applies more heuristics.
                 var unknownPasteProcessor = new UnknownSourcePasteProcessor(
                     newLine, indentationWhitespace,
                     snapshotBeforePaste, snapshotAfterPaste,
@@ -200,7 +200,7 @@ ImmutableArray<TextChange> GetEdits(string newLine, string indentationWhitespace
                 return unknownPasteProcessor.GetEdits(cancellationToken);
             }
 
-            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, IndentationOptions indentationOptions, CancellationToken cancellationToken)
+            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, CancellationToken cancellationToken)
             {
                 // For simplicity, we only support smart copy/paste when we are pasting into a single contiguous region.
                 if (selectionsBeforePaste.Count != 1)
@@ -226,6 +226,31 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, Indent
             }
         }
 
+        private string DetermineIndentationWhitespace(
+            Document documentBeforePaste,
+            SourceText textBeforePaste,
+            ExpressionSyntax stringExpressionBeforePaste,
+            CancellationToken cancellationToken)
+        {
+            // Only raw strings care about indentation.  Don't bother computing if we don't need it.
+            if (!IsAnyRawStringExpression(stringExpressionBeforePaste))
+                return "";
+
+            if (IsAnyMultiLineRawStringExpression(stringExpressionBeforePaste))
+            {
+                // already have a multi-line raw string.  The indentation of it's end delimiter is the indentation all
+                // lines within it should have.
+                var lastLine = textBeforePaste.Lines.GetLineFromPosition(stringExpressionBeforePaste.Span.End);
+                var quotePosition = lastLine.GetFirstNonWhitespacePosition()!.Value;
+                return textBeforePaste.ToString(TextSpan.FromBounds(lastLine.Span.Start, quotePosition));
+            }
+
+            // Otherwise, we have a single-line raw string.  Determine the default indentation desired here.
+            // We'll use that if we have to convert this single-line raw string to a multi-line one.
+            var indentationOptions = documentBeforePaste.GetIndentationOptionsAsync(_globalOptions, cancellationToken).WaitAndGetResult(cancellationToken);
+            return stringExpressionBeforePaste.GetFirstToken().GetPreferredIndentation(documentBeforePaste, indentationOptions, cancellationToken);
+        }
+
         /// <summary>
         /// Returns true if the paste resulted in legal code for the string literal.  The string literal is
         /// considered legal if it has the same span as the original string (adjusted as per the edit) and that
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 34721bdc5800f..91d2e0cde89b8 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -1435,10 +1435,10 @@ public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
           """"""",
                 afterUndo:
 @"var x = $""""""
-    abc
+          abc
     def
 ghi[||]
-    """"""");
+          """"""");
         }
 
         [WpfFact]
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
index 652a317b1cdaf..0f8a0ad4a37c4 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
@@ -998,16 +998,16 @@ public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
           [||]
           """"""",
 @"var x = """"""
-    abc
-        def
-    ghi[||]
-    """"""",
+          abc
+              def
+          ghi[||]
+          """"""",
                 afterUndo:
 @"var x = """"""
-    abc
+          abc
     def
 ghi[||]
-    """"""");
+          """"""");
         }
 
         [WpfFact]
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
index 0bfe0ec087303..c06d20481cd31 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
@@ -559,16 +559,16 @@ public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
           [||]
           """"""",
 @"var x = $""""""
-    abc
-        def
-    ghi[||]
-    """"""",
+          abc
+              def
+          ghi[||]
+          """"""",
                 afterUndo:
 @"var x = $""""""
-    abc
+          abc
     def
 ghi[||]
-    """"""");
+          """"""");
         }
 
         [WpfFact]
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
index 7164ec51928c0..082a9c0ce3354 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
@@ -389,16 +389,16 @@ public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
           [||]
           """"""",
 @"var x = """"""
-    abc
-        def
-    ghi[||]
-    """"""",
+          abc
+              def
+          ghi[||]
+          """"""",
                 afterUndo:
 @"var x = """"""
-    abc
+          abc
     def
 ghi[||]
-    """"""");
+          """"""");
         }
 
         [WpfFact]

From 9ec1a8a3ea645bed7d52d5e3ec24adad17a9e9e4 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 21:50:44 -0700
Subject: [PATCH 314/413] Simplify

---
 .../StringCopyPasteCommandHandler.cs          | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 9c5ec62dede34..32214b92bd256 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -129,14 +129,7 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             if (stringExpressionBeforePaste == null)
                 return;
 
-            var pasteWasSuccessful = PasteWasSuccessful(
-                snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
-
-            var newLine = textView.Options.GetNewLineCharacter();
-            var indentationWhitespace = DetermineIndentationWhitespace(
-                documentBeforePaste, snapshotBeforePaste.AsText(), stringExpressionBeforePaste, cancellationToken);
-
-            var textChanges = GetEdits(newLine, indentationWhitespace, cancellationToken);
+            var textChanges = GetEdits(cancellationToken);
 
             // If we didn't get any viable changes back, don't do anything.
             if (textChanges.IsDefaultOrEmpty)
@@ -184,13 +177,20 @@ public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, Com
             transaction.Complete();
             return;
 
-            ImmutableArray<TextChange> GetEdits(string newLine, string indentationWhitespace, CancellationToken cancellationToken)
+            ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
             {
+                var newLine = textView.Options.GetNewLineCharacter();
+                var indentationWhitespace = DetermineIndentationWhitespace(
+                    documentBeforePaste, snapshotBeforePaste.AsText(), stringExpressionBeforePaste, cancellationToken);
+
                 // See if this is a paste of the last copy that we heard about.
-                var edits = TryGetEditsFromKnownCopySource(newLine, cancellationToken);
+                var edits = TryGetEditsFromKnownCopySource(newLine, indentationWhitespace, cancellationToken);
                 if (!edits.IsDefaultOrEmpty)
                     return edits;
 
+                var pasteWasSuccessful = PasteWasSuccessful(
+                    snapshotBeforePaste, snapshotAfterPaste, documentAfterPaste, stringExpressionBeforePaste, cancellationToken);
+
                 // If not, then just go through the fallback code path that applies more heuristics.
                 var unknownPasteProcessor = new UnknownSourcePasteProcessor(
                     newLine, indentationWhitespace,
@@ -200,7 +200,8 @@ ImmutableArray<TextChange> GetEdits(string newLine, string indentationWhitespace
                 return unknownPasteProcessor.GetEdits(cancellationToken);
             }
 
-            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(string newLine, CancellationToken cancellationToken)
+            ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(
+                string newLine, string indentationWhitespace, CancellationToken cancellationToken)
             {
                 // For simplicity, we only support smart copy/paste when we are pasting into a single contiguous region.
                 if (selectionsBeforePaste.Count != 1)

From cceb6bf90a5c41945c4b57517a31866f2d635f1a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 22:01:45 -0700
Subject: [PATCH 315/413] add docs

---
 .../KnownSourcePasteProcessor.cs              | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 0694ad9c2335c..42a7031499c08 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -151,11 +151,41 @@ private ImmutableArray<TextChange> GetEditsForRawString()
             // At this point, we will now have the information necessary to actually insert the content and do things 
             // like give interpolations the proper number of braces for the final string we're making.
 
-            DetermineTopLevelChangesToMakeToRawString(
-                out var quotesToAdd, out var dollarSignsToAdd, out var convertToMultiLine);
+            var (quotesToAdd, dollarSignsToAdd, convertToMultiLine) = DetermineTopLevelChangesToMakeToRawString();
 
-            return DetermineTotalEditsToMakeToRawString(
-                quotesToAdd, dollarSignsToAdd, convertToMultiLine);
+            return DetermineTotalEditsToMakeToRawString(quotesToAdd, dollarSignsToAdd, convertToMultiLine);
+        }
+
+        private (string? quotesToAdd, string? dollarSignsToAdd, bool convertToMultiLine) DetermineTopLevelChangesToMakeToRawString()
+        {
+            PerformInitialBasicPasteInRawString(out var textAfterBasicPaste, out var contentSpansAfterBasicPaste);
+
+            var convertToMultiLine = !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) && RawContentMustBeMultiLine(textAfterBasicPaste, contentSpansAfterBasicPaste);
+            return (GetQuotesToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste),
+                    GetDollarSignsToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste),
+                    convertToMultiLine);
+        }
+
+        private void PerformInitialBasicPasteInRawString(
+            out SourceText textAfterBasicPaste, out ImmutableArray<TextSpan> contentSpansAfterBasicPaste)
+        {
+            var trivialContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1);
+
+            // We want to map spans forward (which requires tracking spans), but we don't want to modify the original
+            // text buffer.  So clone the text buffer to a new one where we can then make the change without touching
+            // the original.
+            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
+                new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
+            var snapshotBeforeTrivialEdit = clonedBuffer.CurrentSnapshot;
+
+            var edit = clonedBuffer.CreateEdit();
+            edit.Replace(_selectionSpanBeforePaste.ToSpan(), trivialContentEdit.NewText);
+
+            var snapshotAfterTrivialEdit = edit.Apply();
+
+            textAfterBasicPaste = snapshotAfterTrivialEdit.AsText();
+            contentSpansAfterBasicPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
+                ts => MapSpan(ts, snapshotBeforeTrivialEdit, snapshotAfterTrivialEdit));
         }
 
         private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
@@ -202,32 +232,6 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
             return edits.ToImmutable();
         }
 
-        private void DetermineTopLevelChangesToMakeToRawString(out string? quotesToAdd, out string? dollarSignsToAdd, out bool convertToMultiLine)
-        {
-            PerformInitialBasicPasteInRawString(out var textAfterBasicPaste, out var contentSpansAfterBasicPaste);
-
-            quotesToAdd = GetQuotesToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste);
-            dollarSignsToAdd = GetDollarSignsToAddToRawString(textAfterBasicPaste, contentSpansAfterBasicPaste);
-            convertToMultiLine = !IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste) && RawContentMustBeMultiLine(textAfterBasicPaste, contentSpansAfterBasicPaste);
-        }
-
-        private void PerformInitialBasicPasteInRawString(out SourceText textAfterDummyPaste, out ImmutableArray<TextSpan> contentSpansAfterDummyPaste)
-        {
-            var dummyContentEdit = GetContentEditForRawString(insertInterpolations: false, dollarSignCount: -1);
-
-            var clonedBuffer = _textBufferFactoryService.CreateTextBuffer(
-                new SnapshotSpan(SnapshotBeforePaste, 0, SnapshotBeforePaste.Length), SnapshotBeforePaste.ContentType);
-            var snapshotBeforeDummyPaste = clonedBuffer.CurrentSnapshot;
-
-            var edit = clonedBuffer.CreateEdit();
-            edit.Replace(_selectionSpanBeforePaste.ToSpan(), dummyContentEdit.NewText);
-
-            var snapshotAfterDummyPaste = edit.Apply();
-            textAfterDummyPaste = snapshotAfterDummyPaste.AsText();
-            contentSpansAfterDummyPaste = StringExpressionBeforePasteInfo.ContentSpans.SelectAsArray(
-                ts => MapSpan(ts, snapshotBeforeDummyPaste, snapshotAfterDummyPaste));
-        }
-
         private void UpdateExistingInterpolationBraces(
             ArrayBuilder<TextChange> edits, bool beforeSelection, int dollarSignsToAdd)
         {

From f3ec855699e0cab634c06aa9dbbebfa3b2fcc3b8 Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Date: Sat, 7 May 2022 22:02:09 -0700
Subject: [PATCH 316/413] Update
 src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 42a7031499c08..a2d2bd1b44298 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -143,7 +143,7 @@ private ImmutableArray<TextChange> GetEditsForRawString()
             // at the sequences of `"` and `{` in them to see if we need to update the delimiters of the raw string.
             // Note: this is why it is critical that any interpolations are not inserted.  We don't want the content of
             // the interpolation to affect the delimiters.  e.g. a interpolation containing `""""` *inside* of it
-            // doesn't require updating the delimiters of the outer expression.
+            // doesn't require updating the delimiters of the outer raw-string expression.
             //
             // Also, after the text is inserted, look to see if we need to convert a single-line raw expression to
             // multi-line.

From 6296d278bb282b812e50a0826b1606c07f9494da Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 22:03:02 -0700
Subject: [PATCH 317/413] add docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 42a7031499c08..5bcb90fd23e18 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -204,7 +204,7 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
             if (quotesToAdd != null)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.ContentSpans.First().Start, 0), quotesToAdd));
 
-            // A newline and the indentation to start with.  Note: adding the indentation hear means that existing
+            // A newline and the indentation to start with.  Note: adding the indentation here means that existing
             // content will start at the right location, as will any content we are pasting in.
             if (convertToMultiLine)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + IndentationWhitespace));

From a0aa42578640dca584b778c3493775eea1eac44d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sat, 7 May 2022 22:03:30 -0700
Subject: [PATCH 318/413] add docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index a9226e2920a5b..01172169c17e0 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -209,7 +209,7 @@ private ImmutableArray<TextChange> DetermineTotalEditsToMakeToRawString(
             if (convertToMultiLine)
                 edits.Add(new TextChange(new TextSpan(StringExpressionBeforePasteInfo.StartDelimiterSpan.End, 0), NewLine + IndentationWhitespace));
 
-            // If we need to add braces to existing interpolations, do so now for the interpolations before the selection.
+            // If we need to add braces to existing interpolations, do so now for the interpolations after the selection.
             if (dollarSignsToAdd != null)
                 UpdateExistingInterpolationBraces(edits, beforeSelection: true, dollarSignsToAdd.Length);
 

From 037bed589813614aef6b168883d08d488e947eb0 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Sun, 8 May 2022 12:48:45 +0300
Subject: [PATCH 319/413] Doc comments, more tests

---
 .../RemoveUnusedMembersTests.cs               | 35 +++++++++++++++++++
 ...ctRemoveUnusedMembersDiagnosticAnalyzer.cs | 24 +++++++------
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index d309b35fc5a0f..dbd603b7d9b5f 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -4,6 +4,7 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
@@ -1512,6 +1513,23 @@ public async Task PropertyIsIncrementedAndValueDropped_VerifyAnalizerMessage()
                 .WithArguments("MyClass.P"));
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task PropertyIsIncrementedAndValueDropped_NoDiagnosticWhenReadingPropertyFromSomewhereElse()
+        {
+            var code = @"class MyClass
+{
+    public void M1() { Test.P++; }
+}
+
+class Test
+{
+    public static int P { get; set; }
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsIncrementedAndValueUsed()
         {
@@ -1640,6 +1658,23 @@ public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnal
                 .WithArguments("MyClass.P"));
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_NoDiagnosticWhenReadingPropertyFromSomewhereElse()
+        {
+            var code = @"class MyClass
+{
+    public void M1(int x) { Test.P += x; }
+}
+
+class Test
+{
+    public static int P { get; set; }
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task IndexerIsTargetOfCompoundAssignmentAndValueUsed()
         {
diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index 7c378c6546c5d..7fb2c53045b1e 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -68,17 +68,21 @@ protected virtual void HandleNamedTypeSymbolStart(SymbolStartAnalysisContext con
         private sealed class CompilationAnalyzer
         {
             private readonly object _gate;
-            // State map for candidate member symbols, with the value indicating how each symbol is used in executable code.
+            /// <summary>
+            /// State map for candidate member symbols, with the value indicating how each symbol is used in executable code.
+            /// </summary>
             private readonly Dictionary<ISymbol, ValueUsageInfo> _symbolValueUsageStateMap = new();
-            // List of properies, which has a 'get' accessor usage, while the property itself is not used, e.g.:
-            //
-            // class C
-            // {
-            //     private int P { get; set; }
-            //     public void M() { P++; }
-            // }
-            //
-            // Here 'get' accessor is used in increment operation, but 'P' itself is not used anywhere else, so it can be safely removed
+            /// <summary>
+            /// List of properies, which has a 'get' accessor usage, while the property itself is not used, e.g.:
+            /// <code>
+            /// class C
+            /// {
+            ///     private int P { get; set; }
+            ///     public void M() { P++; }
+            /// }
+            /// </code>
+            /// Here 'get' accessor is used in increment operation, but 'P' itself is not used anywhere else, so it can be safely removed
+            /// </summary>
             private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages = new();
             private readonly INamedTypeSymbol _taskType, _genericTaskType, _debuggerDisplayAttributeType, _structLayoutAttributeType;
             private readonly INamedTypeSymbol _eventArgsType;

From 65f86bf89f7a279e64e3cb12925e44f6fa700c91 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Sun, 8 May 2022 17:59:46 +0300
Subject: [PATCH 320/413] Update doc

Co-authored-by: Ashley <neme112@outlook.com>
---
 .../AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index 7fb2c53045b1e..050b3621382f0 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -73,7 +73,7 @@ private sealed class CompilationAnalyzer
             /// </summary>
             private readonly Dictionary<ISymbol, ValueUsageInfo> _symbolValueUsageStateMap = new();
             /// <summary>
-            /// List of properies, which has a 'get' accessor usage, while the property itself is not used, e.g.:
+            /// List of properties that have a 'get' accessor usage, while the value itself is not used, e.g.:
             /// <code>
             /// class C
             /// {

From e53fe5c4bec89d9bfdfd7daa00c3df2d9e65a98e Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Sun, 8 May 2022 18:00:57 +0300
Subject: [PATCH 321/413] Update doc 2

Co-authored-by: Ashley <neme112@outlook.com>
---
 .../AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index 050b3621382f0..3629f61c0d10e 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -81,7 +81,7 @@ private sealed class CompilationAnalyzer
             ///     public void M() { P++; }
             /// }
             /// </code>
-            /// Here 'get' accessor is used in increment operation, but 'P' itself is not used anywhere else, so it can be safely removed
+            /// Here, 'get' accessor is used in an increment operation, but the result of the increment operation isn't used and 'P' itself is not used anywhere else, so it can be safely removed
             /// </summary>
             private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages = new();
             private readonly INamedTypeSymbol _taskType, _genericTaskType, _debuggerDisplayAttributeType, _structLayoutAttributeType;

From d2caff4d59e0b8b4249f44cf6698aff371988625 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Sun, 8 May 2022 18:01:06 +0300
Subject: [PATCH 322/413] Typo

Co-authored-by: Ashley <neme112@outlook.com>
---
 .../Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index dbd603b7d9b5f..a3c40a2d0344f 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -1701,7 +1701,7 @@ public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped()
 
         [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
-        public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnalizerMessage()
+        public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnalyzerMessage()
         {
             var code = @"class MyClass
 {

From baf47f05118c9004f98d1ed166a2f8cf0c308cf4 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Sun, 8 May 2022 18:54:30 +0300
Subject: [PATCH 323/413] Use hashset

---
 .../AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
index 7fb2c53045b1e..d313b84304ad8 100644
--- a/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/RemoveUnusedMembers/AbstractRemoveUnusedMembersDiagnosticAnalyzer.cs
@@ -83,7 +83,7 @@ private sealed class CompilationAnalyzer
             /// </code>
             /// Here 'get' accessor is used in increment operation, but 'P' itself is not used anywhere else, so it can be safely removed
             /// </summary>
-            private readonly List<IPropertySymbol> _propertiesWithShadowGetAccessorUsages = new();
+            private readonly HashSet<IPropertySymbol> _propertiesWithShadowGetAccessorUsages = new();
             private readonly INamedTypeSymbol _taskType, _genericTaskType, _debuggerDisplayAttributeType, _structLayoutAttributeType;
             private readonly INamedTypeSymbol _eventArgsType;
             private readonly DeserializationConstructorCheck _deserializationConstructorCheck;

From f28f4d7697d55310dbd45344fa15810eddb549c7 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 17:34:21 -0700
Subject: [PATCH 324/413] Docs

---
 .../CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 01172169c17e0..80ded82a8fb93 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -264,7 +264,8 @@ private TextChange GetContentEditForRawString(
 
             for (var contentIndex = 0; contentIndex < _copyPasteData.Contents.Length; contentIndex++)
             {
-                if (contentIndex == 0 && isMultiLine)
+                // Special handling for the first thing being pasted if we are pasting into a multi-line expression.
+                if (isMultiLine && contentIndex == 0)
                 {
                     TextBeforePaste.GetLineAndOffset(_selectionSpanBeforePaste.Start, out var line, out var offset);
                     if (line == TextBeforePaste.Lines.GetLineFromPosition(StringExpressionBeforePaste.SpanStart).LineNumber)
@@ -336,7 +337,7 @@ private TextChange GetContentEditForRawString(
                     throw ExceptionUtilities.UnexpectedValue(content.Kind);
                 }
 
-                if (contentIndex == _copyPasteData.Contents.Length - 1 && isMultiLine)
+                if (isMultiLine && contentIndex == _copyPasteData.Contents.Length - 1)
                 {
                     // Similar to the check we do for the first-change, if the last change was pasted into the space
                     // before the last `"""` then we need potentially insert a newline, then enough indentation

From 2b868922daeea1d76dcb6f485243bf8eff283c0e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 17:38:40 -0700
Subject: [PATCH 325/413] Tweak tess

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 356 ++++++------------
 1 file changed, 121 insertions(+), 235 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 91d2e0cde89b8..9dfd4f55969f8 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -17,19 +17,18 @@ public class PasteKnownSourceIntoMultiLineRawInterpolatedStringTests : StringCop
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    $""""""
+    $"""
     [||]
-    """""";",
-@"
-var dest =
+    """;
+"""",
+@"var dest =
     $""""""
     goo[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -40,18 +39,15 @@ public void TestPasteOpenBraceNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:{|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $$""""""
     {[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {[||]
     """""";");
@@ -62,18 +58,15 @@ public void TestPasteOpenCloseBraceNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:{}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $$""""""
     {}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {}[||]
     """""";");
@@ -84,18 +77,15 @@ public void TestPasteLooksLikeInterpolationNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $$""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";");
@@ -106,18 +96,15 @@ public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""g{|Copy:o|}o"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     o[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -128,18 +115,15 @@ public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""\{|Copy:n|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     n[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -150,14 +134,12 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:\n|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||]\r\n    \"\"\";",
-@"
-var dest =
+"var dest =\r\n    $\"\"\"\r\n    \n    [||]\r\n    \"\"\";",
+@"var dest =
     $""""""
     \n[||]
     """""";");
@@ -168,18 +150,15 @@ public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""\{|Copy:""|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     ""[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -190,18 +169,15 @@ public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:\""|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     ""[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     \""[||]
     """""";");
@@ -212,18 +188,15 @@ public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
 @"var v = @""{|Copy:goo|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     goo[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -234,18 +207,15 @@ public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
 @"var v = @""g{|Copy:o|}o"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     o[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -256,19 +226,16 @@ public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
 "var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     
 [||]
@@ -280,18 +247,15 @@ public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
 @"var v = @""{|Copy:""""|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     ""[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     """"[||]
     """""";");
@@ -302,18 +266,15 @@ public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
 @"var v = """"""{|Copy:goo|}"""""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     goo[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -324,18 +285,15 @@ public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
 @"var v = """"""{|Copy: """" |}"""""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
      """" [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -348,18 +306,15 @@ public void TestPasteSimpleRawMultiLineLiteralContent1()
 @"var v = """"""
     {|Copy:goo|}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     goo[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -373,19 +328,16 @@ public void TestPasteSimpleRawMultiLineLiteralContent2()
     {|Copy:goo
     bar|}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     goo
     bar[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -399,19 +351,16 @@ public void TestPasteSimpleRawMultiLineLiteralContent3()
 {|Copy:    goo
     bar|}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     goo
     bar[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
         goo
     bar[||]
@@ -423,18 +372,15 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
         {
             TestCopyPaste(
 @"var v = $""{|Copy:{0:X}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:X}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -445,18 +391,15 @@ public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralC
         {
             TestCopyPaste(
 @"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:""X""}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:\""X\""}[||]
     """""";");
@@ -467,18 +410,15 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0:X}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:X}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";");
@@ -489,18 +429,15 @@ public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedString
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:""X""}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0:""""X""""}[||]
     """""";");
@@ -511,19 +448,16 @@ public void TestPasteInterpolationIntoSelection1()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:|}
 
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
 
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]
 
     """""";");
@@ -534,18 +468,15 @@ public void TestPasteInterpolationIntoSelection2()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
 |}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]
     """""";");
         }
@@ -555,18 +486,15 @@ public void TestPasteInterpolationIntoSelection3()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
   |}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]
     """""";");
         }
@@ -576,18 +504,15 @@ public void TestPasteInterpolationIntoSelection4()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
     |}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]
     """""";");
         }
@@ -597,18 +522,15 @@ public void TestPasteInterpolationIntoSelection5()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
 
 |}    """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
 [||]    """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]    """""";");
         }
 
@@ -617,18 +539,15 @@ public void TestPasteInterpolationIntoSelection6()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
 
   |}  """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
   [||]  """""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]  """""";");
         }
 
@@ -637,18 +556,15 @@ public void TestPasteInterpolationIntoSelection7()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""[||]{|Selection:
 
     |}"""""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
     [||]"""""";",
-@"
-var dest =
+@"var dest =
     $""""""{0}[||]"""""";");
         }
 
@@ -657,18 +573,15 @@ public void TestPasteInterpolationIntoSelection8()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:|}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]
     """""";");
@@ -679,18 +592,15 @@ public void TestPasteInterpolationIntoSelection9()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:  |}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]
     """""";");
@@ -701,18 +611,15 @@ public void TestPasteInterpolationIntoSelection10()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:    |}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]
     """""";");
@@ -723,18 +630,15 @@ public void TestPasteInterpolationIntoSelection11()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:
 |}    """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
 [||]    """""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]    """""";");
         }
@@ -744,18 +648,15 @@ public void TestPasteInterpolationIntoSelection12()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:
   |}  """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
   [||]  """""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]  """""";");
         }
@@ -765,18 +666,15 @@ public void TestPasteInterpolationIntoSelection13()
         {
             TestCopyPaste(
 @"var v = $@""{|Copy:{0}|}"";",
-@"
-var dest =
+@"var dest =
     $""""""
 [||]{|Selection:
     |}"""""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}
     [||]"""""";",
-@"
-var dest =
+@"var dest =
     $""""""
 {0}[||]"""""";");
         }
@@ -793,18 +691,15 @@ public void TestPasteBracesWithExistingInterpolation1()
         {
             TestPasteKnownSource(
 pasteText: @"{{{",
-@"
-var dest =
+@"var dest =
     $""""""
     [||]{0}
     """""";",
-@"
-var dest =
+@"var dest =
     $$$$""""""
     {{{[||]{{{{0}}}}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {{{[||]{0}
     """""";");
@@ -815,18 +710,15 @@ public void TestPasteBracesWithExistingInterpolation2()
         {
             TestPasteKnownSource(
 pasteText: @"{{{",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $$$$""""""
     {{{{0}}}}{{{[||]
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}{{{[||]
     """""";");
@@ -837,18 +729,15 @@ public void TestPasteBracesWithExistingInterpolation3()
         {
             TestPasteKnownSource(
 pasteText: @"{{{",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]{1}
     """""";",
-@"
-var dest =
+@"var dest =
     $$$$""""""
     {{{{0}}}}{{{[||]{{{{1}}}}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}{{{[||]{1}
     """""";");
@@ -859,18 +748,15 @@ public void TestPasteBracesWithExistingInterpolation4()
         {
             TestPasteKnownSource(
 pasteText: @"{{{",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}[||]{|Selection:{1}|}{2}
     """""";",
-@"
-var dest =
+@"var dest =
     $$$$""""""
     {{{{0}}}}{{{[||]{{{{2}}}}
     """""";",
-@"
-var dest =
+@"var dest =
     $""""""
     {0}{{{[||]{2}
     """""";");

From a7c1ca6da5ef93908a9cbdebf1019650c97364c2 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 17:40:03 -0700
Subject: [PATCH 326/413] raw strings

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 68 ++++++++++++-------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 9dfd4f55969f8..71123dd30a1df 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -24,52 +24,68 @@ public void TestPasteSimpleNormalLiteralContent()
     [||]
     """;
 """",
-@"var dest =
-    $""""""
+""""
+var dest =
+    $"""
     goo[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"var dest =
-    $""""""
+"""var v = "{|Copy:{|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $$""""""
+    """;
+"""",
+""""
+var dest =
+    $$"""
     {[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenCloseBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"var dest =
-    $""""""
+"""var v = "{|Copy:{}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $$""""""
+    """;
+"""",
+""""
+var dest =
+    $$"""
     {}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]

From e1aa073e02cee3532b10c2cc70140973c46488af Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 17:58:44 -0700
Subject: [PATCH 327/413] Switch to raw strings

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 2796 +++++++++++------
 1 file changed, 1830 insertions(+), 966 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 71123dd30a1df..105b03ddce668 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -92,59 +92,79 @@ public void TestPasteOpenCloseBraceNormalLiteralContent()
         public void TestPasteLooksLikeInterpolationNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = "{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $$""""""
+    """;
+"""",
+""""
+var dest =
+    $$"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"var dest =
-    $""""""
+"""var v = "g{|Copy:o|}o";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     o[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"var dest =
-    $""""""
+"""var v = "\{|Copy:n|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     n[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
+#if false
+
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
@@ -161,543 +181,722 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
     """""";");
         }
 
+#endif
+
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"var dest =
-    $""""""
+"""var v = "\{|Copy:"|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
-    ""[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
+    "[||]
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"var dest =
-    $""""""
+"""var v = "{|Copy:\"|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
-    ""[||]
-    """""";",
-@"var dest =
-    $""""""
-    \""[||]
-    """""";");
+    """;
+"""",
+""""
+var dest =
+    $"""
+    "[||]
+    """;
+"""",
+""""
+var dest =
+    $"""
+    \"[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"var dest =
-    $""""""
+"""var v = @"{|Copy:goo|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     goo[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"var dest =
-    $""""""
+"""var v = @"g{|Copy:o|}o";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     o[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"var dest =
-    $""""""
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     
 [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"var dest =
-    $""""""
+"""var v = @"{|Copy:""|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
+    "[||]
+    """;
+"""",
+""""
+var dest =
+    $"""
     ""[||]
-    """""";",
-@"var dest =
-    $""""""
-    """"[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"var dest =
-    $""""""
+""""var v = """{|Copy:goo|}""";"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     goo[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"var dest =
-    $""""""
+""""var v = """{|Copy: "" |}""";"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
-     """" [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
+     "" [||]
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     goo[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     goo
     bar[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     goo
     bar[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
         goo
     bar[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"var dest =
-    $""""""
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0:X}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"var dest =
-    $""""""
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
-    {0:""X""}[||]
-    """""";",
-@"var dest =
-    $""""""
-    {0:\""X\""}[||]
-    """""";");
+    """;
+"""",
+""""
+var dest =
+    $"""
+    {0:"X"}[||]
+    """;
+"""",
+""""
+var dest =
+    $"""
+    {0:\"X\"}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0:X}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
+var dest =
+    $"""
     [||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
+    {0:"X"}[||]
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0:""X""}[||]
-    """""";",
-@"var dest =
-    $""""""
-    {0:""""X""""}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:|}
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:|}
 
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
 
-    """""";",
-@"var dest =
-    $""""""{0}[||]
+    """;
+"""",
+""""
+var dest =
+    $"""{0}[||]
 
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
 |}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""{0}[||]
-    """""";");
+    """;
+"""",
+""""
+var dest =
+    $"""{0}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection3()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
   |}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""{0}[||]
-    """""";");
+    """;
+"""",
+""""
+var dest =
+    $"""{0}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection4()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
     |}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""{0}[||]
-    """""";");
+    """;
+"""",
+""""
+var dest =
+    $"""{0}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection5()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
 
-|}    """""";",
-@"var dest =
-    $""""""
+|}    """;
+"""",
+""""
+var dest =
+    $"""
     {0}
-[||]    """""";",
-@"var dest =
-    $""""""{0}[||]    """""";");
+[||]    """;
+"""",
+""""
+var dest =
+    $"""{0}[||]    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection6()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
 
-  |}  """""";",
-@"var dest =
-    $""""""
+  |}  """;
+"""",
+""""
+var dest =
+    $"""
     {0}
-  [||]  """""";",
-@"var dest =
-    $""""""{0}[||]  """""";");
+  [||]  """;
+"""",
+""""
+var dest =
+    $"""{0}[||]  """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection7()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""[||]{|Selection:
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""[||]{|Selection:
 
-    |}"""""";",
-@"var dest =
-    $""""""
+    |}""";
+"""",
+""""
+var dest =
+    $"""
     {0}
-    [||]"""""";",
-@"var dest =
-    $""""""{0}[||]"""""";");
+    [||]""";
+"""",
+""""
+var dest =
+    $"""{0}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection8()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:|}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
 {0}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection9()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:  |}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
 {0}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection10()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:    |}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
 {0}[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection11()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:
-|}    """""";",
-@"var dest =
-    $""""""
+|}    """;
+"""",
+""""
+var dest =
+    $"""
     {0}
-[||]    """""";",
-@"var dest =
-    $""""""
-{0}[||]    """""";");
+[||]    """;
+"""",
+""""
+var dest =
+    $"""
+{0}[||]    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection12()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:
-  |}  """""";",
-@"var dest =
-    $""""""
+  |}  """;
+"""",
+""""
+var dest =
+    $"""
     {0}
-  [||]  """""";",
-@"var dest =
-    $""""""
-{0}[||]  """""";");
+  [||]  """;
+"""",
+""""
+var dest =
+    $"""
+{0}[||]  """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationIntoSelection13()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"var dest =
-    $""""""
+"""var v = $@"{|Copy:{0}|}";""",
+""""
+var dest =
+    $"""
 [||]{|Selection:
-    |}"""""";",
-@"var dest =
-    $""""""
+    |}""";
+"""",
+""""
+var dest =
+    $"""
     {0}
-    [||]"""""";",
-@"var dest =
-    $""""""
-{0}[||]"""""";");
+    [||]""";
+"""",
+""""
+var dest =
+    $"""
+{0}[||]""";
+"""");
         }
 
-        #endregion
+#endregion
 
-        #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
+#region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
 
         // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
         // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
@@ -706,78 +905,104 @@ public void TestPasteInterpolationIntoSelection13()
         public void TestPasteBracesWithExistingInterpolation1()
         {
             TestPasteKnownSource(
-pasteText: @"{{{",
-@"var dest =
-    $""""""
+pasteText: """{{{""",
+""""
+var dest =
+    $"""
     [||]{0}
-    """""";",
-@"var dest =
-    $$$$""""""
+    """;
+"""",
+""""
+var dest =
+    $$$$"""
     {{{[||]{{{{0}}}}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {{{[||]{0}
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteBracesWithExistingInterpolation2()
         {
             TestPasteKnownSource(
-pasteText: @"{{{",
-@"var dest =
-    $""""""
+pasteText: """{{{""",
+""""
+var dest =
+    $"""
     {0}[||]
-    """""";",
-@"var dest =
-    $$$$""""""
+    """;
+"""",
+""""
+var dest =
+    $$$$"""
     {{{{0}}}}{{{[||]
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}{{{[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteBracesWithExistingInterpolation3()
         {
             TestPasteKnownSource(
-pasteText: @"{{{",
-@"var dest =
-    $""""""
+pasteText: """{{{""",
+""""
+var dest =
+    $"""
     {0}[||]{1}
-    """""";",
-@"var dest =
-    $$$$""""""
+    """;
+"""",
+""""
+var dest =
+    $$$$"""
     {{{{0}}}}{{{[||]{{{{1}}}}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}{{{[||]{1}
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteBracesWithExistingInterpolation4()
         {
             TestPasteKnownSource(
-pasteText: @"{{{",
-@"var dest =
-    $""""""
+pasteText: """{{{""",
+""""
+var dest =
+    $"""
     {0}[||]{|Selection:{1}|}{2}
-    """""";",
-@"var dest =
-    $$$$""""""
+    """;
+"""",
+""""
+var dest =
+    $$$$"""
     {{{{0}}}}{{{[||]{{{{2}}}}
-    """""";",
-@"var dest =
-    $""""""
+    """;
+"""",
+""""
+var dest =
+    $"""
     {0}{{{[||]{2}
-    """""";");
+    """;
+"""");
         }
 
+#if false
+
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString1_A()
         {
@@ -791,735 +1016,1061 @@ public void TestNewLineIntoSingleLineRawString1_A()
 "var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
         }
 
+#endif
+
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = $""""""
+                pasteText: """
+
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-"var x = $\"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+    """
+"""",
+""""
+var x = $"""
+    
+    [||]
+    """
+"""",
                 afterUndo:
-"var x = $\"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+""""
+var x = $"""
+    
+[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = $""""""
+                pasteText: """    """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "    \r\n",
-@"var x = $""""""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = $""""""
+                pasteText: """'""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     '[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
-    ""[||] 
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
+    "[||] 
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""[||] """"""");
+"""""
+var x = $""""[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""""
-    """"""[||] 
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $""""
+    """[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||] """"""");
+"""""""
+var x = $""""""[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
-    ""[||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
+    "[||]
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
-    ""[||]""
-    """"""",
-@"var x = $""""""""""""
-    """"""""[||]""
-    """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
+    "[||]"
+    """
+"""",
+"""""""
+var x = $""""""
+    """"[||]"
+    """"""
+""""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]""
-    """"""");
+"""""
+var x = $"""
+    """"[||]"
+    """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
-    [||]""
-    """"""",
-@"var x = $""""""""""
-    """"""[||]""
-    """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
+    [||]"
+    """
+"""",
+""""""
+var x = $"""""
+    """[||]"
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""[||]""
-    """"""");
+""""
+var x = $"""
+    """[||]"
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"\"",
-@"var x = $""""""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "{",
-@"var x = $""""""
+                pasteText: """{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "\"{{{",
-@"var x = $""""""
+                pasteText: """
+                "{{{
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""
-    ""{{{[||]
-    """"""",
+    """
+"""",
+""""
+var x = $$$$"""
+    "{{{[||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
-    ""{{{[||]
-    """"""");
+""""
+var x = $"""
+    "{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"{{{",
-@"var x = $""""""
+                pasteText: """"
+                """{{{
+                """",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""""
-    """"""{{{[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $$$$""""
+    """{{{[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""{{{[||]
-    """"""");
+""""
+var x = $"""
+    """{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: " \"\"\"{{{",
-@"var x = $""""""
+                pasteText: """" """{{{"""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""""
-     """"""{{{[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $$$$""""
+     """{{{[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-     """"""{{{[||]
-    """"""");
+""""
+var x = $"""
+     """{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""
+                pasteText: """{{{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""
+    """
+"""",
+""""
+var x = $$$$"""
     {{{[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {{{[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""
-    ""[||]
-    """"""",
-@"var x = $$$$""""""
-    ""{{{[||]
-    """"""",
+                pasteText: """{{{""",
+""""
+var x = $"""
+    "[||]
+    """
+"""",
+""""
+var x = $$$$"""
+    "{{{[||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
-    ""{{{[||]
-    """"""");
+""""
+var x = $"""
+    "{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""
-    ""[||]""
-    """"""",
-@"var x = $$$$""""""
-    ""{{{[||]""
-    """"""",
+                pasteText: """{{{""",
+""""
+var x = $"""
+    "[||]"
+    """
+"""",
+""""
+var x = $$$$"""
+    "{{{[||]"
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
-    ""{{{[||]""
-    """"""");
+""""
+var x = $"""
+    "{{{[||]"
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""
-    [||]""
-    """"""",
-@"var x = $$$$""""""
-    {{{[||]""
-    """"""",
+                pasteText: """{{{""",
+""""
+var x = $"""
+    [||]"
+    """
+"""",
+""""
+var x = $$$$"""
+    {{{[||]"
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
-    {{{[||]""
-    """"""");
+""""
+var x = $"""
+    {{{[||]"
+    """
+"""");
         }
 
         [WpfFact]
         public void TestInterpolationIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "{0}",
-@"var x = $""""""
+                pasteText: """{0}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {0}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {0}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "{}",
-@"var x = $""""""
+                pasteText: """{}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "{}",
-@"var x = $$""""""
+                pasteText: """{}""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "{{}",
-@"var x = $$""""""
+                pasteText: """{{}""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {{}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     {{}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "{}}",
-@"var x = $$""""""
+                pasteText: """{}}""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     {}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "{{}}",
-@"var x = $$""""""
+                pasteText: """{{}}""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {{}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     {{}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "  \"\"  ",
-@"var x = $""""""
+                pasteText: """  ""  """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
-      """"  [||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+      ""  [||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = $""""""
+                pasteText: """abc""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def
 [||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
         def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
     def
 ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""
           [||]
-          """"""",
-@"var x = $""""""
+          """
+"""",
+""""
+var x = $"""
           abc
               def
           ghi[||]
-          """"""",
+          """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
           abc
     def
 ghi[||]
-          """"""");
+          """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
             abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
             abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     [||]{|Selection:    |}
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""
     [||]{|Selection:    |}
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     [||]{|Selection:    |}  
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def[||]  
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"bar",
-@"var x = $""""""
+                pasteText: """
+                "bar
+                """,
+""""
+var x = $"""
     [||]goo
-    """"""",
-@"var x = $""""""
-    ""bar[||]goo
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]goo
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = $""""""
+                pasteText: """
+                ""
+                """,
+""""
+var x = $"""
     [||]{|Selection:    |}
-    """"""",
-@"var x = $""""""
-    """"[||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+    ""[||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
     [||]{|Selection:    |}
-    """"""",
-@"var x = $""""""""
-    """"""[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $""""
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""[||]
-    """"""");
+""""
+var x = $"""
+    """[||]
+    """
+"""");
         }
 
         #endregion
 
-        #region Known Source tests 'PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests'
+#region Known Source tests 'PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests'
 
+#if false
         [WpfFact]
         public void TestNewLineIntoMultiLineRawString1()
         {
@@ -1533,697 +2084,1010 @@ public void TestNewLineIntoMultiLineRawString1()
 "var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
         }
 
+#endif
+
         [WpfFact]
         public void TestNewLineIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = $""""""
+                pasteText: """
+
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-"var x = $\"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+    """
+"""",
+""""
+var x = $"""
+    
+    [||]
+    """
+"""",
                 afterUndo:
-"var x = $\"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+""""
+var x = $"""
+    
+[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = $""""""
+                pasteText: """    """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "    \r\n",
-@"var x = $""""""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = $""""""
+                pasteText: """'""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     '[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = $""""""
+                pasteText: """
+                "
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
-    ""[||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+    "[||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""
-    """"""[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $""""
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""[||]
-    """"""");
+""""
+var x = $"""
+    """[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
     [||]
-    """"""  ",
-@"var x = $""""""""  
-    """"""[||]
-    """"""""  ",
+    """  
+"""",
+"""""
+var x = $""""  
+    """[||]
+    """"  
+""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""[||]
-    """"""  ");
+""""
+var x = $"""  
+    """[||]
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    ""[||]
-    """"""  ",
-@"var x = $""""""""""  
-    """"""""[||]
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    "[||]
+    """  
+"""",
+""""""
+var x = $"""""  
+    """"[||]
+    """""  
+"""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""""[||]
-    """"""  ");
+"""""
+var x = $"""  
+    """"[||]
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    ""[||]""  
-    """"""  ",
-@"var x = $""""""""""""  
-    """"""""[||]""  
-    """"""""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    "[||]"  
+    """  
+"""",
+"""""""
+var x = $""""""  
+    """"[||]"  
+    """"""  
+""""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""""[||]""  
-    """"""  ");
+"""""
+var x = $"""  
+    """"[||]"  
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    [||]""
-    """"""  ",
-@"var x = $""""""""""  
-    """"""[||]""
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    [||]"
+    """  
+"""",
+""""""
+var x = $"""""  
+    """[||]"
+    """""  
+"""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""[||]""
-    """"""  ");
+""""
+var x = $"""  
+    """[||]"
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"\"",
-@"var x = $""""""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestOpenBraceIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "{",
-@"var x = $""""""
+                pasteText: """{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""
+                pasteText: """{{{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""
+    """
+"""",
+""""
+var x = $$$$"""
     {{{[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {{{[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $$""""""
+                pasteText: """{{{""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$$$""""""
+    """
+"""",
+""""
+var x = $$$$"""
     {{{[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     {{{[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenBraceIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "{",
-@"var x = $$$""""""  
+                pasteText: """{""",
+""""
+var x = $$$"""  
     {[||]{
-    """"""  ",
-@"var x = $$$$""""""  
+    """  
+"""",
+""""
+var x = $$$$"""  
     {{[||]{
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $$$""""""  
+""""
+var x = $$$"""  
     {{[||]{
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestInterpolationIntoMultiLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "{0}",
-@"var x = $""""""  
+                pasteText: """{0}""",
+""""
+var x = $"""  
     [||]
-    """"""  ",
-@"var x = $$""""""  
+    """  
+"""",
+""""
+var x = $$"""  
     {0}[||]
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $""""""  
+""""
+var x = $"""  
     {0}[||]
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseIntoMultiLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "{}",
-@"var x = $""""""  
+                pasteText: """{}""",
+""""
+var x = $"""  
     [||]  
-    """"""  ",
-@"var x = $$""""""  
+    """  
+"""",
+""""
+var x = $$"""  
     {}[||]  
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $""""""  
+""""
+var x = $"""  
     {}[||]  
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "{{}",
-@"var x = $$""""""  
+                pasteText: """{{}""",
+""""
+var x = $$"""  
     [||]
-    """"""  ",
-@"var x = $$$""""""  
+    """  
+"""",
+""""
+var x = $$$"""  
     {{}[||]
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $$""""""  
+""""
+var x = $$"""  
     {{}[||]
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "{}}",
-@"var x = $""""""
+                pasteText: """{}}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "{{}}",
-@"var x = $""""""
+                pasteText: """{{}}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {{}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {{}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteTripleOpenBraceIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"{{{",
-@"var x = $""""""
+                pasteText: """"
+                """{{{
+                """",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""""
-    """"""{{{[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $$$$""""
+    """{{{[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""{{{[||]
-    """"""");
+""""
+var x = $"""
+    """{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "  \"\"  ",
-@"var x = $""""""
+                pasteText: """  ""  """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
-      """"  [||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+      ""  [||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = $""""""
+                pasteText: """abc""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine1()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine2()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
 [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
 abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine3()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]
 
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def[||]
 
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine4()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine5()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine6()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def
 [||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine7()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
         def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
     def
 ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine8()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine9()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine10()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
             abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
             abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine11()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""
+    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]""""""");
+""""
+var x = $"""abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine12()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
 
-    |}""""""",
-@"var x = $""""""
+                """,
+""""
+var x = $"""[||]{|Selection:
+
+    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine13()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:
 
- |}   """"""",
-@"var x = $""""""
+ |}   """
+"""",
+""""
+var x = $"""
     abc
     def
- [||]   """"""",
+ [||]   """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]   """"""");
+""""
+var x = $"""abc
+def[||]   """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringHeader1()
         {
             TestPasteKnownSource(
-                pasteText: "bar",
-@"var x = $""""""[||]
+                pasteText: """bar""",
+""""
+var x = $"""[||]
     goo
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     bar[||]
     goo
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""bar[||]
+""""
+var x = $"""bar[||]
     goo
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                ""
+                """,
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""
-    """"
-    [||]""""""",
+    |}"""
+"""",
+""""
+var x = $"""
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""""""[||]""""""");
+""""""
+var x = $"""""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2_B()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""""
-    """"""
-    [||]""""""""",
+    |}"""
+"""",
+"""""
+var x = $""""
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||]""""""");
+"""""""
+var x = $""""""[||]"""
+""""""");
         }
 
-        #endregion
+#endregion
     }
 }

From aabb329d1d41072b97d06d9bafd703234d080589 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:00:34 -0700
Subject: [PATCH 328/413] UNcomment

---
 ...IntoMultiLineRawInterpolatedStringTests.cs | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index 105b03ddce668..b5d8ef16abeef 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -163,26 +163,26 @@ public void TestPastePartiallySelectedEscapeNormalLiteralContent()
 """");
         }
 
-#if false
-
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
 @"var v = ""{|Copy:\n|}"";",
-@"var dest =
-    $""""""
+""""
+var dest =
+    $"""
     [||]
-    """""";",
+    """;
+"""",
 "var dest =\r\n    $\"\"\"\r\n    \n    [||]\r\n    \"\"\";",
-@"var dest =
-    $""""""
+""""
+var dest =
+    $"""
     \n[||]
-    """""";");
+    """;
+"""");
         }
 
-#endif
-
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
@@ -1001,23 +1001,21 @@ public void TestPasteBracesWithExistingInterpolation4()
 """");
         }
 
-#if false
-
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""",
+    """
+"""",
 "var x = $\"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
 "var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
         }
 
-#endif
-
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_A()
         {
@@ -2068,24 +2066,23 @@ public void TestQuotesIntoHeader2()
 
         #endregion
 
-#region Known Source tests 'PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests'
+        #region Known Source tests 'PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests'
 
-#if false
         [WpfFact]
         public void TestNewLineIntoMultiLineRawString1()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""",
+    """
+"""",
 "var x = $\"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
 "var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
         }
 
-#endif
-
         [WpfFact]
         public void TestNewLineIntoMultiLineRawString2()
         {

From 1f992a7ba96e7d6be61b9b505e4c0591be62ff1d Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:07:01 -0700
Subject: [PATCH 329/413] UNcomment

---
 ...eKnownSourceIntoMultiLineRawStringTests.cs | 1429 ++++++++++-------
 1 file changed, 889 insertions(+), 540 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
index 0f8a0ad4a37c4..91572f345fd5e 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
@@ -17,638 +17,742 @@ public class PasteKnownSourceIntoMultiLineRawStringTests : StringCopyPasteComman
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     o[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     n[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-"\r\nvar dest =\r\n    \"\"\"\r\n    \n    [||]\r\n    \"\"\";",
-"\r\nvar dest =\r\n    \"\"\"\r\n    \\n[||]\r\n    \"\"\";");
+    """;
+"""",
+"var dest =\r\n    \"\"\"\r\n    \n    [||]\r\n    \"\"\";",
+""""
+var dest =
+    """
+    \n[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||]
-    """""";",
-@"
+    """
+    "[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||]
-    """""";",
-@"
+    """
+    "[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    \""[||]
-    """""";");
+    """
+    \"[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     o[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     
     [||]
-    """""";",
-"\r\nvar dest =\r\n    \"\"\"\r\n    \r\n[||]\r\n    \"\"\";");
+    """;
+"""",
+""""
+var dest =
+    """
+    
+[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||]
-    """""";",
-@"
+    """
+    "[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    """"[||]
-    """""";");
+    """
+    ""[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-     """" [||]
-    """""";",
-@"
+    """
+     "" [||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo
     bar[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo
     bar[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
         goo
     bar[||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0}|}"";",
-@"
+"""var v = $"{|Copy:{0}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     {0}[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     {0:X}[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {0:""X""}[||]
-    """""";",
-@"
+    """
+    {0:"X"}[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {0:\""X\""}[||]
-    """""";");
+    """
+    {0:\"X\"}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {""goo""}[||]
-    """""";",
-@"
+    """
+    {"goo"}[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    X{""goo""}Y[||]
-    """""";",
-@"
+    """
+    X{"goo"}Y[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{"goo"}Y\"|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{""goo""}Y""[||]
-    """""";",
-@"
+    """
+    "X{"goo"}Y"[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    \""X{""goo""}Y\""[||]
-    """""";");
+    """
+    \"X{"goo"}Y\"[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{@"goo"}Y\"|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{@""goo""}Y""[||]
-    """""";",
-@"
+    """
+    "X{@"goo"}Y"[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    \""X{@""goo""}Y\""[||]
-    """""";");
+    """
+    \"X{@"goo"}Y\"[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"
+"""var v = $@"{|Copy:{0}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     {0}[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     {0:X}[||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {0:""X""}[||]
-    """""";",
-@"
+    """
+    {0:"X"}[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {0:""""X""""}[||]
-    """""";");
+    """
+    {0:""X""}[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $@"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    {""goo""}[||]
-    """""";",
-@"
+    """
+    {"goo"}[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $@"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    X{""goo""}Y[||]
-    """""";",
-@"
+    """
+    X{"goo"}Y[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";");
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{"goo"}Y""|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{""goo""}Y""[||]
-    """""";",
-@"
+    """
+    "X{"goo"}Y"[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    """"X{""goo""}Y""""[||]
-    """""";");
+    """
+    ""X{"goo"}Y""[||]
+    """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{@"goo"}Y""|}";""",
+""""
 var dest =
-    """"""
+    """
     [||]
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{@""goo""}Y""[||]
-    """""";",
-@"
+    """
+    "X{@"goo"}Y"[||]
+    """;
+"""",
+""""
 var dest =
-    """"""
-    """"X{@""goo""}Y""""[||]
-    """""";");
+    """
+    ""X{@"goo"}Y""[||]
+    """;
+"""");
         }
 
         #endregion
@@ -663,9 +767,11 @@ public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""",
+    """
+"""",
 "var x = \"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
 "var x = \"\"\"\r\n    \n[||]\r\n    \"\"\"");
@@ -675,514 +781,757 @@ public void TestNewLineIntoSingleLineRawString1_A()
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = """"""
+                pasteText: """
+
+
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
+    
     [||]
-    """"""",
-"var x = \"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+    """
+"""",
                 afterUndo:
-"var x = \"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+""""
+var x = """
+    
+[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """    """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
         [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "    \r\n",
-@"var x = """"""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
         
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """'""",
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
     '[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
-    ""[||]
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
+    "[||]
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""""
-    """"""[||]
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
+    [||]
+    """
+"""",
+"""""
+var x = """"
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = """"""
-    """"""[||]
-    """"""");
+""""
+var x = """
+    """[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTwoQuotesIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = """"""
-    ""[||]
-    """"""",
-@"var x = """"""""
-    """"""[||]
-    """"""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """
+    "[||]
+    """
+"""",
+"""""
+var x = """"
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = """"""
-    """"""[||]
-    """"""");
+""""
+var x = """
+    """[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
-    ""[||]
-    """"""",
-@"var x = """"""""""
-    """"""""[||]
-    """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
+    "[||]
+    """
+"""",
+""""""
+var x = """""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]
-    """"""");
+"""""
+var x = """
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
-    ""[||]""
-    """"""",
-@"var x = """"""""""""
-    """"""""[||]""
-    """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
+    "[||]"
+    """
+"""",
+"""""""
+var x = """"""
+    """"[||]"
+    """"""
+""""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]""
-    """"""");
+"""""
+var x = """
+    """"[||]"
+    """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
-    [||]""
-    """"""",
-@"var x = """"""""""
-    """"""[||]""
-    """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
+    [||]"
+    """
+"""",
+""""""
+var x = """""
+    """[||]"
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""[||]""
-    """"""");
+""""
+var x = """
+    """[||]"
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"\"",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""""""
-    """"""""[||]
-    """"""""""",
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = """
+    [||]
+    """
+"""",
+""""""
+var x = """""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]
-    """"""");
+"""""
+var x = """
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "  \"\"  ",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
-      """"  [||]
-    """"""",
+                pasteText: """  ""  """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
+      ""  [||]
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """abc""",
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
     abc[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     goo[||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     goo[||]bar
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def[||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """
     goo[||]bar
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def
 [||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
     abc
         def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
     def
 ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """
           [||]
-          """"""",
-@"var x = """"""
+          """
+"""",
+""""
+var x = """
           abc
               def
           ghi[||]
-          """"""",
+          """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
           abc
     def
 ghi[||]
-          """"""");
+          """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
     abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
         abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """"""
-    [||]
-    """"""",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
             abc
         def
         ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
             abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     [||]{|Selection:    |}
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """
     [||]{|Selection:    |}
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
 def
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     [||]{|Selection:    |}  
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
 def[||]  
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"bar",
-@"var x = """"""
+                pasteText: """
+                "bar
+                """,
+""""
+var x = """
     [||]goo
-    """"""",
-@"var x = """"""
-    ""bar[||]goo
-    """"""",
+    """
+"""",
+""""
+var x = """
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]goo
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = """"""
+                pasteText: """
+                ""
+                """,
+""""
+var x = """
     [||]{|Selection:    |}
-    """"""",
-@"var x = """"""
-    """"[||]
-    """"""",
+    """
+"""",
+""""
+var x = """
+    ""[||]
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
     [||]{|Selection:    |}
-    """"""",
-@"var x = """"""""
-    """"""[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = """"
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = """"""
-    """"""[||]
-    """"""");
+""""
+var x = """
+    """[||]
+    """
+"""");
         }
 
-        #endregion
+#endregion
     }
 }

From ed7e2b5bb2c2a1308c0b4a6c77758ca85121773c Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:10:38 -0700
Subject: [PATCH 330/413] Switch to raw strings

---
 ...SourceIntoNormalInterpolatedStringTests.cs | 401 +++++++++++-------
 1 file changed, 238 insertions(+), 163 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
index 49c6a8cc84cb0..b702cb71f2fc5 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalInterpolatedStringTests.cs
@@ -13,362 +13,437 @@ public class PasteKnownSourceIntoNormalInterpolatedStringTests : StringCopyPaste
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo[||]"";",
-@"
+    $"goo[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteOpenBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
+"""var v = "{|Copy:{|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{{[||]"";",
-@"
+    $"{{[||]";
+""",
+"""
 var dest =
-    $""{[||]"";");
+    $"{[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteOpenCloseBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
+"""var v = "{|Copy:{}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{{}}[||]"";",
-@"
+    $"{{}}[||]";
+""",
+"""
 var dest =
-    $""{}[||]"";");
+    $"{}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteLooksLikeInterpolationNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
+"""var v = "{|Copy:{0}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{{0}}[||]"";",
-@"
+    $"{{0}}[||]";
+""",
+"""
 var dest =
-    $""{0}[||]"";");
+    $"{0}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""o[||]"";",
-@"
+    $"o[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""n[||]"";",
-@"
+    $"n[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""\n[||]"";",
-@"
+    $"\n[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""\""[||]"";",
-@"
+    $"\"[||]";
+""",
+"""
 var dest =
-    $""""[||]"";");
+    $""[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""\""[||]"";",
-@"
+    $"\"[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo[||]"";",
-@"
+    $"goo[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""o[||]"";",
-@"
+    $"o[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    $""[||]"";",
-@"
-var dest =
-    $""\r\n[||]"";",
-@"
-var dest =
-    $""
-[||]"";");
+"""
+var v = @"{|Copy:
+|}";
+""",
+"""
+var dest =
+    $"[||]";
+""",
+"""
+var dest =
+    $"\r\n[||]";
+""",
+"""
+var dest =
+    $"
+[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""\""[||]"";",
-@"
+    $"\"[||]";
+""",
+""""
 var dest =
-    $""""""[||]"";");
+    $"""[||]";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo[||]"";",
-@"
+    $"goo[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $"" \""\"" [||]"";",
-@"
+    $" \"\" [||]";
+""",
+"""
 var dest =
-    $"" """" [||]"";");
+    $" "" [||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo[||]"";",
-@"
+    $"goo[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo\r\nbar[||]"";",
-@"
+    $"goo\r\nbar[||]";
+""",
+"""
 var dest =
-    $""goo
-    bar[||]"";");
+    $"goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""goo\r\nbar[||]"";",
-@"
+    $"goo\r\nbar[||]";
+""",
+"""
 var dest =
-    $""    goo
-    bar[||]"";");
+    $"    goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{0:X}[||]"";",
-@"
+    $"{0:X}[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{0:\""X\""}[||]"";",
-@"
+    $"{0:\"X\"}[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{0:X}[||]"";",
-@"
+    $"{0:X}[||]";
+""",
+"""
 var dest =
-    $""[||]"";");
+    $"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+"""
 var dest =
-    $""[||]"";",
-@"
+    $"[||]";
+""",
+"""
 var dest =
-    $""{0:\""X\""}[||]"";",
-@"
+    $"{0:\"X\"}[||]";
+""",
+"""
 var dest =
-    $""{0:""""X""""}[||]"";");
+    $"{0:""X""}[||]";
+""");
         }
     }
 }

From 911ac4c1397a612b33e4d1c01b050ab1c2375c03 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:13:27 -0700
Subject: [PATCH 331/413] Switch to raw strings

---
 .../PasteKnownSourceIntoNormalStringTests.cs  | 517 +++++++++++-------
 1 file changed, 308 insertions(+), 209 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
index d70293bad7d71..220b27cfb9e1f 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoNormalStringTests.cs
@@ -13,472 +13,571 @@ public class PasteKnownSourceIntoNormalStringTests : StringCopyPasteCommandHandl
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo[||]"";",
-@"
+    "goo[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""o[||]"";",
-@"
+    "o[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""n[||]"";",
-@"
+    "n[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\n[||]"";",
-@"
+    "\n[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""[||]"";",
-@"
+    "\"[||]";
+""",
+"""
 var dest =
-    """"[||]"";");
+    ""[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""[||]"";",
-@"
+    "\"[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo[||]"";",
-@"
+    "goo[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""o[||]"";",
-@"
+    "o[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    ""[||]"";",
-@"
-var dest =
-    ""\r\n[||]"";",
-"\r\nvar dest =\r\n    \"\r\n[||]\";");
+"""
+var v = @"{|Copy:
+|}";
+""",
+"""
+var dest =
+    "[||]";
+""",
+"""
+var dest =
+    "\r\n[||]";
+""",
+"""
+var dest =
+    "
+[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""[||]"";",
-@"
+    "\"[||]";
+""",
+""""
 var dest =
-    """"""[||]"";");
+    """[||]";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo[||]"";",
-@"
+    "goo[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    "" \""\"" [||]"";",
-@"
+    " \"\" [||]";
+""",
+"""
 var dest =
-    "" """" [||]"";");
+    " "" [||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo[||]"";",
-@"
+    "goo[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo\r\nbar[||]"";",
-@"
+    "goo\r\nbar[||]";
+""",
+"""
 var dest =
-    ""goo
-    bar[||]"";");
+    "goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""goo\r\nbar[||]"";",
-@"
+    "goo\r\nbar[||]";
+""",
+"""
 var dest =
-    ""    goo
-    bar[||]"";");
+    "    goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0}|}"";",
-@"
+"""var v = $"{|Copy:{0}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0}[||]"";",
-@"
+    "{0}[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0:X}[||]"";",
-@"
+    "{0:X}[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0:\""X\""}[||]"";",
-@"
+    "{0:\"X\"}[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $"{|Copy:{"goo"}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{\""goo\""}[||]"";",
-@"
+    "{\"goo\"}[||]";
+""",
+"""
 var dest =
-    ""{""goo""}[||]"";");
+    "{"goo"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $"{|Copy:X{"goo"}Y|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""X{\""goo\""}Y[||]"";",
-@"
+    "X{\"goo\"}Y[||]";
+""",
+"""
 var dest =
-    ""X{""goo""}Y[||]"";");
+    "X{"goo"}Y[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{"goo"}Y\"|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""X{\""goo\""}Y\""[||]"";",
-@"
+    "\"X{\"goo\"}Y\"[||]";
+""",
+"""
 var dest =
-    ""\""X{""goo""}Y\""[||]"";");
+    "\"X{"goo"}Y\"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{@"goo"}Y\"|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""X{@\""goo\""}Y\""[||]"";",
-@"
+    "\"X{@\"goo\"}Y\"[||]";
+""",
+"""
 var dest =
-    ""\""X{@""goo""}Y\""[||]"";");
+    "\"X{@"goo"}Y\"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"
+"""var v = $@"{|Copy:{0}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0}[||]"";",
-@"
+    "{0}[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0:X}[||]"";",
-@"
+    "{0:X}[||]";
+""",
+"""
 var dest =
-    ""[||]"";");
+    "[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{0:\""X\""}[||]"";",
-@"
+    "{0:\"X\"}[||]";
+""",
+"""
 var dest =
-    ""{0:""""X""""}[||]"";");
+    "{0:""X""}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $@"{|Copy:{"goo"}|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""{\""goo\""}[||]"";",
-@"
+    "{\"goo\"}[||]";
+""",
+"""
 var dest =
-    ""{""goo""}[||]"";");
+    "{"goo"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $@"{|Copy:X{"goo"}Y|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""X{\""goo\""}Y[||]"";",
-@"
+    "X{\"goo\"}Y[||]";
+""",
+"""
 var dest =
-    ""X{""goo""}Y[||]"";");
+    "X{"goo"}Y[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{"goo"}Y""|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""X{\""goo\""}Y\""[||]"";",
-@"
+    "\"X{\"goo\"}Y\"[||]";
+""",
+""""
 var dest =
-    """"""X{""goo""}Y""""[||]"";");
+    """X{"goo"}Y""[||]";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{@"goo"}Y""|}";""",
+"""
 var dest =
-    ""[||]"";",
-@"
+    "[||]";
+""",
+"""
 var dest =
-    ""\""X{@\""goo\""}Y\""[||]"";",
-@"
+    "\"X{@\"goo\"}Y\"[||]";
+""",
+""""
 var dest =
-    """"""X{@""goo""}Y""""[||]"";");
+    """X{@"goo"}Y""[||]";
+"""");
         }
     }
 }

From abb14396b35fe5ca1014d6541de90f778829cd4e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:19:31 -0700
Subject: [PATCH 332/413] Switch to raw strings

---
 ...ntoSingleLineRawInterpolatedStringTests.cs | 1879 +++++++++++------
 1 file changed, 1246 insertions(+), 633 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
index f0916a99b0bc4..170eff663bcb4 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
@@ -17,752 +17,906 @@ public class PasteKnownSourceIntoSingleLineRawInterpolatedStringTests : StringCo
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""goo[||] """""";",
-@"
+    $"""goo[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" goo[||]"""""";",
-@"
+    $""" goo[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
+"""var v = "{|Copy:{|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $$""""""{[||] """""";",
-@"
+    $$"""{[||] """;
+"""",
+""""
 var dest =
-    $""""""{[||] """""";");
+    $"""{[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenBraceNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
+"""var v = "{|Copy:{|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $$"""""" {[||]"""""";",
-@"
+    $$""" {[||]""";
+"""",
+""""
 var dest =
-    $"""""" {[||]"""""";");
+    $""" {[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenCloseBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
+"""var v = "{|Copy:{}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $$""""""{}[||] """""";",
-@"
+    $$"""{}[||] """;
+"""",
+""""
 var dest =
-    $""""""{}[||] """""";");
+    $"""{}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteOpenCloseBraceNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
+"""var v = "{|Copy:{}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $$"""""" {}[||]"""""";",
-@"
+    $$""" {}[||]""";
+"""",
+""""
 var dest =
-    $"""""" {}[||]"""""";");
+    $""" {}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteLooksLikeInterpolationNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
+"""var v = "{|Copy:{0}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $$""""""{0}[||] """""";",
-@"
+    $$"""{0}[||] """;
+"""",
+""""
 var dest =
-    $""""""{0}[||] """""";");
+    $"""{0}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteLooksLikeInterpolationNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
+"""var v = "{|Copy:{0}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $$"""""" {0}[||]"""""";",
-@"
+    $$""" {0}[||]""";
+"""",
+""""
 var dest =
-    $"""""" {0}[||]"""""";");
+    $""" {0}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""o[||] """""";",
-@"
+    $"""o[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" o[||]"""""";",
-@"
+    $""" o[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""n[||] """""";",
-@"
+    $"""n[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" n[||]"""""";",
-@"
+    $""" n[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
-@"
+    $"""[||] """;
+"""",
+"var dest =\r\n    $\"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+""""
 var dest =
-    $""""""\n[||] """""";");
+    $"""\n[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-"\r\nvar dest =\r\n    $\"\"\"\r\n     \n    \r\n    [||]\"\"\";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" \n[||]"""""";");
+    $"""
+     
+    
+    [||]""";
+"""",
+""""
+var dest =
+    $""" \n[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
+    $"""
+    "[||] 
+    """;
+"""",
+"""""
 var dest =
-    $""""""""[||] """""";");
+    $""""[||] """;
+""""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
+    $"""
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    $"""""" ""[||]"""""";");
+    $""" "[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
+    $"""
+    "[||] 
+    """;
+"""",
+""""
 var dest =
-    $""""""\""[||] """""";");
+    $"""\"[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
+    $"""
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    $"""""" \""[||]"""""";");
+    $""" \"[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""goo[||] """""";",
-@"
+    $"""goo[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent2()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" goo[||]"""""";",
-@"
+    $""" goo[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""o[||] """""";",
-@"
+    $"""o[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent2()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" o[||]"""""";",
-@"
+    $""" o[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
+    $"""
     
     [||] 
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""
-[||] """""";");
+    $"""
+[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent2()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
+    $"""
      
     
-    [||]"""""";",
-@"
+    [||]""";
+"""",
+""""
 var dest =
-    $"""""" 
-[||]"""""";");
+    $""" 
+[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
-    ""[||] 
-    """""";",
-@"
+    $"""
+    "[||] 
+    """;
+"""",
+""""""
 var dest =
-    $""""""""""[||] """""";");
+    $"""""[||] """;
+"""""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
-     ""
-    [||]"""""";",
-@"
+    $"""
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    $"""""" """"[||]"""""";");
+    $""" ""[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""goo[||] """""";",
-@"
+    $"""goo[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" goo[||]"""""";",
-@"
+    $""" goo[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $"""""" """" [||] """""";",
-@"
+    $""" "" [||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""  """" [||]"""""";",
-@"
+    $"""  "" [||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""goo[||] """""";",
-@"
+    $"""goo[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1B()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" goo[||]"""""";",
-@"
+    $""" goo[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
+    $"""
     goo
     bar[||] 
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""goo
-    bar[||] """""";");
+    $"""goo
+    bar[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2B()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
+    $"""
      goo
     bar
-    [||]"""""";",
-@"
+    [||]""";
+"""",
+""""
 var dest =
-    $"""""" goo
-    bar[||]"""""";");
+    $""" goo
+    bar[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""
+    $"""
     goo
     bar[||] 
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $""""""    goo
-    bar[||] """""";");
+    $"""    goo
+    bar[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3B()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $""""""
+    $"""
      goo
     bar
-    [||]"""""";",
-@"
+    [||]""";
+"""",
+""""
 var dest =
-    $""""""     goo
-    bar[||]"""""";");
+    $"""     goo
+    bar[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:X}[||] """""";",
-@"
+    $"""{0:X}[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1B()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:X}[||]"""""";",
-@"
+    $""" {0:X}[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:""X""}[||] """""";",
-@"
+    $"""{0:"X"}[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:\""X\""}[||] """""";");
+    $"""{0:\"X\"}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2B()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:""X""}[||]"""""";",
-@"
+    $""" {0:"X"}[||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:\""X\""}[||]"""""";");
+    $""" {0:\"X\"}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:X}[||] """""";",
-@"
+    $"""{0:X}[||] """;
+"""",
+""""
 var dest =
-    $""""""[||] """""";");
+    $"""[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1B()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:X}[||]"""""";",
-@"
+    $""" {0:X}[||]""";
+"""",
+""""
 var dest =
-    $"""""" [||]"""""";");
+    $""" [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
 var dest =
-    $""""""[||] """""";",
-@"
+    $"""[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:""X""}[||] """""";",
-@"
+    $"""{0:"X"}[||] """;
+"""",
+""""
 var dest =
-    $""""""{0:""""X""""}[||] """""";");
+    $"""{0:""X""}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2B()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
 var dest =
-    $"""""" [||]"""""";",
-@"
+    $""" [||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:""X""}[||]"""""";",
-@"
+    $""" {0:"X"}[||]""";
+"""",
+""""
 var dest =
-    $"""""" {0:""""X""""}[||]"""""";");
+    $""" {0:""X""}[||]""";
+"""");
         }
 
         #endregion
@@ -777,7 +931,9 @@ public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = $""""""[||] """"""",
+""""
+var x = $"""[||] """
+"""",
 "var x = $\"\"\"\r\n    \n    [||] \r\n    \"\"\"",
                 afterUndo:
 "var x = $\"\"\"\n[||] \"\"\"");
@@ -788,7 +944,9 @@ public void TestNewLineIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = $"""""" [||]""""""",
+""""
+var x = $""" [||]"""
+"""",
 "var x = $\"\"\"\r\n     \n    \r\n    [||]\"\"\"",
                 afterUndo:
 "var x = $\"\"\" \n[||]\"\"\"");
@@ -798,761 +956,1216 @@ public void TestNewLineIntoSingleLineRawString1_B()
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = $""""""[||] """"""",
-"var x = $\"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
+    
+    [||] 
+    """
+"""",
                 afterUndo:
-"var x = $\"\"\"\r\n[||] \"\"\"");
+""""
+var x = $"""
+[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_B()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = $"""""" [||]""""""",
-"var x = $\"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
+     
+    
+    [||]"""
+"""",
                 afterUndo:
-"var x = $\"\"\" \r\n[||]\"\"\"");
+""""
+var x = $""" 
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""    [||] """"""",
+                pasteText: """    """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""    [||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""     [||]""""""",
+                pasteText: """    """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""     [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "    \r\n",
-@"var x = $""""""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""'[||] """"""",
+                pasteText: """'""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""'[||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = $"""""" [||]""""""",
-@"var x = $"""""" '[||]""""""",
+                pasteText: """'""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $""" '[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
-    ""[||] 
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
+    "[||] 
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""[||] """"""");
+"""""
+var x = $""""[||] """
+""""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
-     ""
-    [||]""""""",
+                pasteText: """
+                "
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
+     "
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" ""[||]""""""");
+""""
+var x = $""" "[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""""
-    """"""[||] 
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $""""
+    """[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||] """"""");
+"""""""
+var x = $""""""[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""""
-     """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" [||]"""
+"""",
+"""""
+var x = $""""
+     """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $"""""" """"""[||]""""""");
+""""
+var x = $""" """[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" ""[||] """"""",
-@"var x = $"""""""""" """"""""[||] """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" "[||] """
+"""",
+""""""
+var x = $""""" """"[||] """""
+"""""",
                 afterUndo:
-@"var x = $"""""" """"""""[||] """"""");
+"""""
+var x = $""" """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" ""[||]"" """"""",
-@"var x = $"""""""""""" """"""""[||]"" """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" "[||]" """
+"""",
+"""""""
+var x = $"""""" """"[||]" """"""
+""""""",
                 afterUndo:
-@"var x = $"""""" """"""""[||]"" """"""");
+"""""
+var x = $""" """"[||]" """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" [||]"" """"""",
-@"var x = $"""""""""" """"""[||]"" """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" [||]" """
+"""",
+""""""
+var x = $""""" """[||]" """""
+"""""",
                 afterUndo:
-@"var x = $"""""" """"""[||]"" """"""");
+""""
+var x = $""" """[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"\"",
-@"var x = $""""""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "{",
-@"var x = $""""""[||] """"""",
-@"var x = $$""""""{[||] """"""",
+                pasteText: """{""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$"""{[||] """
+"""",
                 afterUndo:
-@"var x = $""""""{[||] """"""");
+""""
+var x = $"""{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "{",
-@"var x = $"""""" [||]""""""",
-@"var x = $$"""""" {[||]""""""",
+                pasteText: """{""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $$""" {[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" {[||]""""""");
+""""
+var x = $""" {[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""
-    ""{{{[||] 
-    """"""",
+                pasteText: """
+                "{{{
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$$$"""
+    "{{{[||] 
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""{{{[||] """"""");
+"""""
+var x = $""""{{{[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""""
-    """"""{{{[||] 
-    """"""""",
+                pasteText: """"
+                """{{{
+                """",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $$$$""""
+    """{{{[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""""""""{{{[||] """"""");
+"""""""
+var x = $""""""{{{[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: " \"\"\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$"""""""" """"""{{{[||] """"""""",
+                pasteText: """" """{{{"""",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $$$$"""" """{{{[||] """"
+""""",
                 afterUndo:
-@"var x = $"""""" """"""{{{[||] """"""");
+""""
+var x = $""" """{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""{{{[||] """"""",
+                pasteText: """{{{""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$$$"""{{{[||] """
+"""",
                 afterUndo:
-@"var x = $""""""{{{[||] """"""");
+""""
+var x = $"""{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $"""""" [||]""""""",
-@"var x = $$$$"""""" {{{[||]""""""",
+                pasteText: """{{{""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $$$$""" {{{[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" {{{[||]""""""");
+""""
+var x = $""" {{{[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $"""""" ""[||] """"""",
-@"var x = $$$$"""""" ""{{{[||] """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" "[||] """
+"""",
+""""
+var x = $$$$""" "{{{[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" ""{{{[||] """"""");
+""""
+var x = $""" "{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $"""""" ""[||]"" """"""",
-@"var x = $$$$"""""" ""{{{[||]"" """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" "[||]" """
+"""",
+""""
+var x = $$$$""" "{{{[||]" """
+"""",
                 afterUndo:
-@"var x = $"""""" ""{{{[||]"" """"""");
+""""
+var x = $""" "{{{[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "{{{",
-@"var x = $"""""" [||]"" """"""",
-@"var x = $$$$"""""" {{{[||]"" """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" [||]" """
+"""",
+""""
+var x = $$$$""" {{{[||]" """
+"""",
                 afterUndo:
-@"var x = $"""""" {{{[||]"" """"""");
+""""
+var x = $""" {{{[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestInterpolationIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "{0}",
-@"var x = $"""""" [||] """"""",
-@"var x = $$"""""" {0}[||] """"""",
+                pasteText: """{0}""",
+""""
+var x = $""" [||] """
+"""",
+""""
+var x = $$""" {0}[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" {0}[||] """"""");
+""""
+var x = $""" {0}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString1()
         {
             TestPasteKnownSource(
-                pasteText: "{}",
-@"var x = $"""""" [||] """"""",
-@"var x = $$"""""" {}[||] """"""",
+                pasteText: """{}""",
+""""
+var x = $""" [||] """
+"""",
+""""
+var x = $$""" {}[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" {}[||] """"""");
+""""
+var x = $""" {}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "{}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$"""""" {}[||] """"""",
+                pasteText: """{}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$""" {}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" [||] """"""");
+""""
+var x = $$""" [||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "{{}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {{}[||] """"""",
+                pasteText: """{{}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {{}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {{}[||] """"""");
+""""
+var x = $$""" {{}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "{}}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {}}[||] """"""",
+                pasteText: """{}}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {}}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {}}[||] """"""");
+""""
+var x = $$""" {}}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "{{}}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {{}}[||] """"""",
+                pasteText: """{{}}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {{}}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {{}}[||] """"""");
+""""
+var x = $$""" {{}}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "  \"\"  ",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""  """"  [||] """"""",
+                pasteText: """  ""  """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""  ""  [||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""abc[||] """"""",
+                pasteText: """abc""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""abc[||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = $"""""" [||]""""""",
-@"var x = $"""""" abc[||]""""""",
+                pasteText: """abc""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $""" abc[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
     def[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||] """"""");
+""""
+var x = $"""abc
+def[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
      abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" abc
-def[||]""""""");
+""""
+var x = $""" abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""goo[||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""goo[||]"""
+"""",
+""""
+var x = $"""
     gooabc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
-def[||]""""""");
+""""
+var x = $"""gooabc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""goo[||]bar""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""goo[||]bar"""
+"""",
+""""
+var x = $"""
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
-def[||]bar""""""");
+""""
+var x = $"""gooabc
+def[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""goo[||]bar""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""goo[||]bar"""
+"""",
+""""
+var x = $"""
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
+""""
+var x = $"""gooabc
 def
-[||]bar""""""");
+[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
         def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-ghi[||] """"""");
+ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
      abc
         def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" abc
+""""
+var x = $""" abc
     def
-ghi[||]""""""");
+ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
         abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""    abc
+""""
+var x = $"""    abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
          abc
         def
         ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""     abc
+""""
+var x = $"""     abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
             abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""        abc
+""""
+var x = $"""        abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
              abc
         def
         ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""         abc
+""""
+var x = $"""         abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]""""""");
+""""
+var x = $"""abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""  [||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
       abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""  abc
-def[||]  """"""");
+""""
+var x = $"""  abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""  [||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
       abc
     def
     [||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""  abc
+""""
+var x = $"""  abc
 def
-[||]  """"""");
+[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]  """"""");
+""""
+var x = $"""abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""  [||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
       abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""  abc
-def[||]""""""");
+""""
+var x = $"""  abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"bar",
-@"var x = $""""""[||]goo""""""",
-@"var x = $""""""
-    ""bar[||]goo
-    """"""",
+                pasteText: """
+                "bar
+                """,
+""""
+var x = $"""[||]goo"""
+"""",
+""""
+var x = $"""
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""bar[||]goo""""""");
+"""""
+var x = $""""bar[||]goo"""
+""""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_B()
         {
             TestPasteKnownSource(
-                pasteText: "bar\"",
-@"var x = $""""""goo[||]""""""",
-@"var x = $""""""
-    goobar""
-    [||]""""""",
+                pasteText: """
+                bar"
+                """,
+""""
+var x = $"""goo[||]"""
+"""",
+""""
+var x = $"""
+    goobar"
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""goobar""[||]""""""");
+""""
+var x = $"""goobar"[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
-    """"
-    [||]""""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""""""[||]""""""");
+""""""
+var x = $"""""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""""
-    """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+"""""
+var x = $""""
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||]""""""");
+"""""""
+var x = $""""""[||]"""
+""""""");
         }
 
-        #endregion
+#endregion
     }
 }

From 0077f84b29158ac9b344f2703ea71cae1a78b8b1 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:24:17 -0700
Subject: [PATCH 333/413] Switch to raw strings

---
 ...KnownSourceIntoSingleLineRawStringTests.cs | 1915 +++++++++++------
 1 file changed, 1238 insertions(+), 677 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index 19b67d1545384..afc14bc870554 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -17,982 +17,1176 @@ public class PasteKnownSourceIntoSingleLineRawStringTests : StringCopyPasteComma
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""goo[||] """""";",
-@"
+    """goo[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" goo[||]"""""";",
-@"
+    """ goo[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""o[||] """""";",
-@"
+    """o[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" o[||]"""""";",
-@"
+    """ o[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""n[||] """""";",
-@"
+    """n[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" n[||]"""""";",
-@"
+    """ n[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-"\r\nvar dest =\r\n    \"\"\"\r\n    \n    [||] \r\n    \"\"\";",
-"\r\nvar dest =\r\n    \"\"\"\\n[||] \"\"\";");
+    """[||] """;
+"""",
+"var dest =\r\n    \"\"\"\r\n    \n    [||] \r\n    \"\"\";",
+"var dest =\r\n    \"\"\"\\n[||] \"\"\";");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\n|}"";",
-@"
+"""var v = "{|Copy:\n|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-"\r\nvar dest =\r\n    \"\"\"\r\n     \n    \r\n    [||]\"\"\";",
-"\r\nvar dest =\r\n    \"\"\" \\n[||]\"\"\";");
+    """ [||]""";
+"""",
+"var dest =\r\n    \"\"\"\r\n     \n    \r\n    [||]\"\"\";",
+"var dest =\r\n    \"\"\" \\n[||]\"\"\";");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||] 
-    """""";",
-@"
+    """
+    "[||] 
+    """;
+"""",
+"""""
 var dest =
-    """"""""[||] """""";");
+    """"[||] """;
+""""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""
-    [||]"""""";",
-@"
+    """
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    """""" ""[||]"""""";");
+    """ "[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||] 
-    """""";",
-@"
+    """
+    "[||] 
+    """;
+"""",
+""""
 var dest =
-    """"""\""[||] """""";");
+    """\"[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""
-    [||]"""""";",
-@"
+    """
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    """""" \""[||]"""""";");
+    """ \"[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""goo[||] """""";",
-@"
+    """goo[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent_2()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" goo[||]"""""";",
-@"
+    """ goo[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""o[||] """""";",
-@"
+    """o[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent2()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" o[||]"""""";",
-@"
+    """ o[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
+    """
     
     [||] 
-    """""";",
-"\r\nvar dest =\r\n    \"\"\"\r\n[||] \"\"\";");
+    """;
+"""",
+""""
+var dest =
+    """
+[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent2()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
+"""
+var v = @"{|Copy:
+|}";
+""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
+    """
      
     
-    [||]"""""";",
-"\r\nvar dest =\r\n    \"\"\" \r\n[||]\"\"\";");
+    [||]""";
+"""",
+""""
+var dest =
+    """ 
+[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""[||] 
-    """""";",
-@"
+    """
+    "[||] 
+    """;
+"""",
+""""""
 var dest =
-    """"""""""[||] """""";");
+    """""[||] """;
+"""""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent2()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""
-    [||]"""""";",
-@"
+    """
+     "
+    [||]""";
+"""",
+""""
 var dest =
-    """""" """"[||]"""""";");
+    """ ""[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""goo[||] """""";",
-@"
+    """goo[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" goo[||]"""""";",
-@"
+    """ goo[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """""" """" [||] """""";",
-@"
+    """ "" [||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""  """" [||]"""""";",
-@"
+    """  "" [||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""goo[||] """""";",
-@"
+    """goo[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1b()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" goo[||]"""""";",
-@"
+    """ goo[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo
     bar[||] 
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""goo
-    bar[||] """""";");
+    """goo
+    bar[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2b()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
+    """
      goo
     bar
-    [||]"""""";",
-@"
+    [||]""";
+"""",
+""""
 var dest =
-    """""" goo
-    bar[||]"""""";");
+    """ goo
+    bar[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
+    """
     goo
     bar[||] 
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """"""    goo
-    bar[||] """""";");
+    """    goo
+    bar[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3b()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
+    """;
+"""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
+    """
      goo
     bar
-    [||]"""""";",
-@"
+    [||]""";
+"""",
+""""
 var dest =
-    """"""     goo
-    bar[||]"""""";");
+    """     goo
+    bar[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0}|}"";",
-@"
+"""var v = $"{|Copy:{0}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0}[||] """""";",
-@"
+    """{0}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromInterpolatedStringLiteralContentb()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0}|}"";",
-@"
+"""var v = $"{|Copy:{0}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0}[||]"""""";",
-@"
+    """ {0}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0:X}[||] """""";",
-@"
+    """{0:X}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0:X}[||]"""""";",
-@"
+    """ {0:X}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0:""X""}[||] """""";",
-@"
+    """{0:"X"}[||] """;
+"""",
+""""
 var dest =
-    """"""{0:\""X\""}[||] """""";");
+    """{0:\"X\"}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0:""X""}[||]"""""";",
-@"
+    """ {0:"X"}[||]""";
+"""",
+""""
 var dest =
-    """""" {0:\""X\""}[||]"""""";");
+    """ {0:\"X\"}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{""goo""}[||] """""";",
-@"
+    """{"goo"}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {""goo""}[||]"""""";",
-@"
+    """ {"goo"}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""X{""goo""}Y[||] """""";",
-@"
+    """X{"goo"}Y[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" X{""goo""}Y[||]"""""";",
-@"
+    """ X{"goo"}Y[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{"goo"}Y\"|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{""goo""}Y""[||] 
-    """""";",
-@"
+    """
+    "X{"goo"}Y"[||] 
+    """;
+"""",
+""""
 var dest =
-    """"""\""X{""goo""}Y\""[||] """""";");
+    """\"X{"goo"}Y\"[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{"goo"}Y\"|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""X{""goo""}Y""
-    [||]"""""";",
-@"
+    """
+     "X{"goo"}Y"
+    [||]""";
+"""",
+""""
 var dest =
-    """""" \""X{""goo""}Y\""[||]"""""";");
+    """ \"X{"goo"}Y\"[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{@"goo"}Y\"|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{@""goo""}Y""[||] 
-    """""";",
-@"
+    """
+    "X{@"goo"}Y"[||] 
+    """;
+"""",
+""""
 var dest =
-    """"""\""X{@""goo""}Y\""[||] """""";");
+    """\"X{@"goo"}Y\"[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4b()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{@"goo"}Y\"|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""X{@""goo""}Y""
-    [||]"""""";",
-@"
+    """
+     "X{@"goo"}Y"
+    [||]""";
+"""",
+""""
 var dest =
-    """""" \""X{@""goo""}Y\""[||]"""""";");
+    """ \"X{@"goo"}Y\"[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"
+"""var v = $@"{|Copy:{0}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0}[||] """""";",
-@"
+    """{0}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContentb()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"
+"""var v = $@"{|Copy:{0}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0}[||]"""""";",
-@"
+    """ {0}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0:X}[||] """""";",
-@"
+    """{0:X}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0:X}[||]"""""";",
-@"
+    """ {0:X}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{0:""X""}[||] """""";",
-@"
+    """{0:"X"}[||] """;
+"""",
+""""
 var dest =
-    """"""{0:""""X""""}[||] """""";");
+    """{0:""X""}[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {0:""X""}[||]"""""";",
-@"
+    """ {0:"X"}[||]""";
+"""",
+""""
 var dest =
-    """""" {0:""""X""""}[||]"""""";");
+    """ {0:""X""}[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $@"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""{""goo""}[||] """""";",
-@"
+    """{"goo"}[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $@"{|Copy:{"goo"}|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" {""goo""}[||]"""""";",
-@"
+    """ {"goo"}[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $@"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""X{""goo""}Y[||] """""";",
-@"
+    """X{"goo"}Y[||] """;
+"""",
+""""
 var dest =
-    """"""[||] """""";");
+    """[||] """;
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $@"{|Copy:X{"goo"}Y|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """""" X{""goo""}Y[||]"""""";",
-@"
+    """ X{"goo"}Y[||]""";
+"""",
+""""
 var dest =
-    """""" [||]"""""";");
+    """ [||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{"goo"}Y""|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{""goo""}Y""[||] 
-    """""";",
-@"
+    """
+    "X{"goo"}Y"[||] 
+    """;
+"""",
+""""""
 var dest =
-    """"""""""X{""goo""}Y""""[||] """""";");
+    """""X{"goo"}Y""[||] """;
+"""""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{"goo"}Y""|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""X{""goo""}Y""
-    [||]"""""";",
-@"
+    """
+     "X{"goo"}Y"
+    [||]""";
+"""",
+""""
 var dest =
-    """""" """"X{""goo""}Y""""[||]"""""";");
+    """ ""X{"goo"}Y""[||]""";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{@"goo"}Y""|}";""",
+""""
 var dest =
-    """"""[||] """""";",
-@"
+    """[||] """;
+"""",
+""""
 var dest =
-    """"""
-    ""X{@""goo""}Y""[||] 
-    """""";",
-@"
+    """
+    "X{@"goo"}Y"[||] 
+    """;
+"""",
+""""""
 var dest =
-    """"""""""X{@""goo""}Y""""[||] """""";");
+    """""X{@"goo"}Y""[||] """;
+"""""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4b()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{@"goo"}Y""|}";""",
+""""
 var dest =
-    """""" [||]"""""";",
-@"
+    """ [||]""";
+"""",
+""""
 var dest =
-    """"""
-     ""X{@""goo""}Y""
-    [||]"""""";",
-@"
+    """
+     "X{@"goo"}Y"
+    [||]""";
+"""",
+""""
 var dest =
-    """""" """"X{@""goo""}Y""""[||]"""""";");
+    """ ""X{@"goo"}Y""[||]""";
+"""");
         }
 
         #endregion
@@ -1007,7 +1201,9 @@ public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = """"""[||] """"""",
+""""
+var x = """[||] """
+"""",
 "var x = \"\"\"\r\n    \n    [||] \r\n    \"\"\"",
                 afterUndo:
 "var x = \"\"\"\n[||] \"\"\"");
@@ -1018,7 +1214,9 @@ public void TestNewLineIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
                 pasteText: "\n",
-@"var x = """""" [||]""""""",
+""""
+var x = """ [||]"""
+"""",
 "var x = \"\"\"\r\n     \n    \r\n    [||]\"\"\"",
                 afterUndo:
 "var x = \"\"\" \n[||]\"\"\"");
@@ -1028,592 +1226,955 @@ public void TestNewLineIntoSingleLineRawString1_B()
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = """"""[||] """"""",
-"var x = \"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
+    
+    [||] 
+    """
+"""",
                 afterUndo:
-"var x = \"\"\"\r\n[||] \"\"\"");
+""""
+var x = """
+[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_B()
         {
             TestPasteKnownSource(
-                pasteText: "\r\n",
-@"var x = """""" [||]""""""",
-"var x = \"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
+     
+    
+    [||]"""
+"""",
                 afterUndo:
-"var x = \"\"\" \r\n[||]\"\"\"");
+""""
+var x = """ 
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = """"""[||] """"""",
-@"var x = """"""    [||] """"""",
+                pasteText: """    """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """    [||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
-                pasteText: "    ",
-@"var x = """""" [||]""""""",
-@"var x = """"""     [||]""""""",
+                pasteText: """    """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """     [||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteKnownSource(
-                pasteText: "    \r\n",
-@"var x = """"""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
         
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = """"""[||] """"""",
-@"var x = """"""'[||] """"""",
+                pasteText: """'""",
+""""
+var x = """[||] """
+"""",
+""""
+var x = """'[||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "'",
-@"var x = """""" [||]""""""",
-@"var x = """""" '[||]""""""",
+                pasteText: """'""",
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """ '[||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = """"""[||] """"""",
-@"var x = """"""
-    ""[||] 
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
+    "[||] 
+    """
+"""",
                 afterUndo:
-@"var x = """"""""[||] """"""");
+"""""
+var x = """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "\"",
-@"var x = """""" [||]""""""",
-@"var x = """"""
-     ""
-    [||]""""""",
+                pasteText: """
+                "
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
+     "
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" ""[||]""""""");
+""""
+var x = """ "[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""[||] """"""",
-@"var x = """"""""
-    """"""[||] 
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """[||] """
+"""",
+"""""
+var x = """"
+    """[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = """"""""""""[||] """"""");
+"""""""
+var x = """"""[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_B()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" [||]""""""",
-@"var x = """"""""
-     """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ [||]"""
+"""",
+"""""
+var x = """"
+     """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = """""" """"""[||]""""""");
+""""
+var x = """ """[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTwoQuotesIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = """""" ""[||] """"""",
-@"var x = """""""" """"""[||] """"""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """ "[||] """
+"""",
+"""""
+var x = """" """[||] """"
+""""",
                 afterUndo:
-@"var x = """""" """"""[||] """"""");
+""""
+var x = """ """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" ""[||] """"""",
-@"var x = """""""""" """"""""[||] """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ "[||] """
+"""",
+""""""
+var x = """"" """"[||] """""
+"""""",
                 afterUndo:
-@"var x = """""" """"""""[||] """"""");
+"""""
+var x = """ """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" ""[||]"" """"""",
-@"var x = """""""""""" """"""""[||]"" """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ "[||]" """
+"""",
+"""""""
+var x = """""" """"[||]" """"""
+""""""",
                 afterUndo:
-@"var x = """""" """"""""[||]"" """"""");
+"""""
+var x = """ """"[||]" """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" [||]"" """"""",
-@"var x = """""""""" """"""[||]"" """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ [||]" """
+"""",
+""""""
+var x = """"" """[||]" """""
+"""""",
                 afterUndo:
-@"var x = """""" """"""[||]"" """"""");
+""""
+var x = """ """[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"\"",
-@"var x = """"""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = """""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]
-    """"""");
+"""""
+var x = """
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteKnownSource(
-                pasteText: "  \"\"  ",
-@"var x = """"""[||] """"""",
-@"var x = """"""  """"  [||] """"""",
+                pasteText: """  ""  """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """  ""  [||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = """"""[||] """"""",
-@"var x = """"""abc[||] """"""",
+                pasteText: """abc""",
+""""
+var x = """[||] """
+"""",
+""""
+var x = """abc[||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc",
-@"var x = """""" [||]""""""",
-@"var x = """""" abc[||]""""""",
+                pasteText: """abc""",
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """ abc[||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
     def[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||] """"""");
+""""
+var x = """abc
+def[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
      abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" abc
-def[||]""""""");
+""""
+var x = """ abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""goo[||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """goo[||]"""
+"""",
+""""
+var x = """
     gooabc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""gooabc
-def[||]""""""");
+""""
+var x = """gooabc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""goo[||]bar""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """goo[||]bar"""
+"""",
+""""
+var x = """
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""gooabc
-def[||]bar""""""");
+""""
+var x = """gooabc
+def[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""goo[||]bar""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """goo[||]bar"""
+"""",
+""""
+var x = """
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""gooabc
+""""
+var x = """gooabc
 def
-[||]bar""""""");
+[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
         def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-ghi[||] """"""");
+ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
      abc
         def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" abc
+""""
+var x = """ abc
     def
-ghi[||]""""""");
+ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
         abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""    abc
+""""
+var x = """    abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
         {
             TestPasteKnownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
          abc
         def
         ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""     abc
+""""
+var x = """     abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
             abc
         def
         ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""        abc
+""""
+var x = """        abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
         {
             TestPasteKnownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
              abc
         def
         ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""         abc
+""""
+var x = """         abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]""""""");
+""""
+var x = """abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""  [||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """  [||]{|Selection:    |}  """
+"""",
+""""
+var x = """
       abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""  abc
-def[||]  """"""");
+""""
+var x = """  abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""  [||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """  [||]{|Selection:    |}  """
+"""",
+""""
+var x = """
       abc
     def
     [||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""  abc
+""""
+var x = """  abc
 def
-[||]  """"""");
+[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:    |}  """
+"""",
+""""
+var x = """
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]  """"""");
+""""
+var x = """abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
         {
             TestPasteKnownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""  [||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """  [||]{|Selection:    |}"""
+"""",
+""""
+var x = """
       abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""  abc
-def[||]""""""");
+""""
+var x = """  abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteKnownSource(
-                pasteText: "\"bar",
-@"var x = """"""[||]goo""""""",
-@"var x = """"""
-    ""bar[||]goo
-    """"""",
+                pasteText: """
+                "bar
+                """,
+""""
+var x = """[||]goo"""
+"""",
+""""
+var x = """
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = """"""""bar[||]goo""""""");
+"""""
+var x = """"bar[||]goo"""
+""""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_B()
         {
             TestPasteKnownSource(
-                pasteText: "bar\"",
-@"var x = """"""goo[||]""""""",
-@"var x = """"""
-    goobar""
-    [||]""""""",
+                pasteText: """
+                bar"
+                """,
+""""
+var x = """goo[||]"""
+"""",
+""""
+var x = """
+    goobar"
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""goobar""[||]""""""");
+""""
+var x = """goobar"[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
-    """"
-    [||]""""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""""""[||]""""""");
+""""""
+var x = """""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteKnownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""""
-    """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+"""""
+var x = """"
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = """"""""""""[||]""""""");
+"""""""
+var x = """"""[||]"""
+""""""");
         }
 
-        #endregion
+#endregion
     }
 }

From d52c0906be237edbb98b4faef8ab51d793ba5b90 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:26:56 -0700
Subject: [PATCH 334/413] Switch to raw strings

---
 ...urceIntoVerbatimInterpolatedStringTests.cs | 419 +++++++++++-------
 1 file changed, 247 insertions(+), 172 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
index 1b64ed31d47c9..02b4421ef5593 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -13,366 +13,441 @@ public class PasteKnownSourceIntoVerbatimInterpolatedStringTests : StringCopyPas
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""goo[||]"";",
-@"
+    $@"goo[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteOpenBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{|}"";",
-@"
+"""var v = "{|Copy:{|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{{[||]"";",
-@"
+    $@"{{[||]";
+""",
+"""
 var dest =
-    $@""{[||]"";");
+    $@"{[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteOpenCloseBraceNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{}|}"";",
-@"
+"""var v = "{|Copy:{}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{{}}[||]"";",
-@"
+    $@"{{}}[||]";
+""",
+"""
 var dest =
-    $@""{}[||]"";");
+    $@"{}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteLooksLikeInterpolationNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:{0}|}"";",
-@"
+"""var v = "{|Copy:{0}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{{0}}[||]"";",
-@"
+    $@"{{0}}[||]";
+""",
+"""
 var dest =
-    $@""{0}[||]"";");
+    $@"{0}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""o[||]"";",
-@"
+    $@"o[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""n[||]"";",
-@"
+    $@"n[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\r\n|}"";",
-@"
+"""var v = "{|Copy:\r\n|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""
-[||]"";",
-@"
+    $@"
+[||]";
+""",
+"""
 var dest =
-    $@""\r\n[||]"";");
+    $@"\r\n[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+""""
 var dest =
-    $@""""""[||]"";",
-@"
+    $@"""[||]";
+"""",
+"""
 var dest =
-    $@""""[||]"";");
+    $@""[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+""""
 var dest =
-    $@""""""[||]"";",
-@"
+    $@"""[||]";
+"""",
+"""
 var dest =
-    $@""\""[||]"";");
+    $@"\"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""goo[||]"";",
-@"
+    $@"goo[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""o[||]"";",
-@"
+    $@"o[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    $@""[||]"";",
-@"
-var dest =
-    $@""
-[||]"";",
-@"
-var dest =
-    $@""[||]"";");
+"""
+var v = @"{|Copy:
+|}";
+""",
+"""
+var dest =
+    $@"[||]";
+""",
+"""
+var dest =
+    $@"
+[||]";
+""",
+"""
+var dest =
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+""""
 var dest =
-    $@""""""[||]"";",
-@"
+    $@"""[||]";
+"""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""goo[||]"";",
-@"
+    $@"goo[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""""
 var dest =
-    $@"" """""""" [||]"";",
-@"
+    $@" """" [||]";
+""""",
+"""
 var dest =
-    $@"" """" [||]"";");
+    $@" "" [||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""goo[||]"";",
-@"
+    $@"goo[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
-var dest =
-    $@""[||]"";",
-@"
-var dest =
-    $@""goo
-bar[||]"";",
-@"
-var dest =
-    $@""goo
-    bar[||]"";");
+    """;
+"""",
+"""
+var dest =
+    $@"[||]";
+""",
+"""
+var dest =
+    $@"goo
+bar[||]";
+""",
+"""
+var dest =
+    $@"goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
-var dest =
-    $@""[||]"";",
-@"
-var dest =
-    $@""goo
-bar[||]"";",
-@"
-var dest =
-    $@""    goo
-    bar[||]"";");
+    """;
+"""",
+"""
+var dest =
+    $@"[||]";
+""",
+"""
+var dest =
+    $@"goo
+bar[||]";
+""",
+"""
+var dest =
+    $@"    goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{0:X}[||]"";",
-@"
+    $@"{0:X}[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{0:""""X""""}[||]"";",
-@"
+    $@"{0:""X""}[||]";
+""",
+"""
 var dest =
-    $@""{0:\""X\""}[||]"";");
+    $@"{0:\"X\"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{0:X}[||]"";",
-@"
+    $@"{0:X}[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+"""
 var dest =
-    $@""[||]"";",
-@"
+    $@"[||]";
+""",
+"""
 var dest =
-    $@""{0:""""X""""}[||]"";",
-@"
+    $@"{0:""X""}[||]";
+""",
+"""
 var dest =
-    $@""[||]"";");
+    $@"[||]";
+""");
         }
     }
 }

From 207715a4522710c6274330d594ed9e4951dbd3e3 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:29:10 -0700
Subject: [PATCH 335/413] Switch to raw strings

---
 ...PasteKnownSourceIntoVerbatimStringTests.cs | 538 +++++++++++-------
 1 file changed, 317 insertions(+), 221 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
index 1cf454d0af24f..b4a162586d4af 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoVerbatimStringTests.cs
@@ -13,477 +13,573 @@ public class PasteKnownSourceIntoVerbatimStringTests : StringCopyPasteCommandHan
         public void TestPasteSimpleNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:goo|}"";",
-@"
+"""var v = "{|Copy:goo|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""goo[||]"";",
-@"
+    @"goo[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""g{|Copy:o|}o"";",
-@"
+"""var v = "g{|Copy:o|}o";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""o[||]"";",
-@"
+    @"o[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:n|}"";",
-@"
+"""var v = "\{|Copy:n|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""n[||]"";",
-@"
+    @"n[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\r\n|}"";",
-@"
+"""var v = "{|Copy:\r\n|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""
-[||]"";",
-@"
+    @"
+[||]";
+""",
+"""
 var dest =
-    @""\r\n[||]"";");
+    @"\r\n[||]";
+""");
         }
 
         [WpfFact]
         public void TestPastePartiallySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""\{|Copy:""|}"";",
-@"
+"""var v = "\{|Copy:"|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""[||]"";",
-@"
+    @"""[||]";
+"""",
+"""
 var dest =
-    @""""[||]"";");
+    @""[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedQuoteNormalLiteralContent()
         {
             TestCopyPaste(
-@"var v = ""{|Copy:\""|}"";",
-@"
+"""var v = "{|Copy:\"|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""[||]"";",
-@"
+    @"""[||]";
+"""",
+"""
 var dest =
-    @""\""[||]"";");
+    @"\"[||]";
+""");
         }
         [WpfFact]
         public void TestPasteSimpleVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:goo|}"";",
-@"
+"""var v = @"{|Copy:goo|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""goo[||]"";",
-@"
+    @"goo[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleSubstringVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""g{|Copy:o|}o"";",
-@"
+"""var v = @"g{|Copy:o|}o";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""o[||]"";",
-@"
+    @"o[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSelectedVerbatimNewLineLiteralContent()
         {
             TestCopyPaste(
-"var v = @\"{|Copy:\r\n|}\";",
-@"
-var dest =
-    @""[||]"";",
-@"
-var dest =
-    @""
-[||]"";",
-@"
-var dest =
-    @""[||]"";");
+"""
+var v = @"{|Copy:
+|}";
+""",
+"""
+var dest =
+    @"[||]";
+""",
+"""
+var dest =
+    @"
+[||]";
+""",
+"""
+var dest =
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteFullySelectedEscapeVerbatimLiteralContent()
         {
             TestCopyPaste(
-@"var v = @""{|Copy:""""|}"";",
-@"
+"""var v = @"{|Copy:""|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""[||]"";",
-@"
+    @"""[||]";
+"""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy:goo|}"""""";",
-@"
+""""var v = """{|Copy:goo|}""";"""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""goo[||]"";",
-@"
+    @"goo[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteQuotesRawSingleLineLiteralContent()
         {
             TestCopyPaste(
-@"var v = """"""{|Copy: """" |}"""""";",
-@"
+""""var v = """{|Copy: "" |}""";"""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""""
 var dest =
-    @"" """""""" [||]"";",
-@"
+    @" """" [||]";
+""""",
+"""
 var dest =
-    @"" """" [||]"";");
+    @" "" [||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent1()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo|}
-    """""";",
-@"
+    """;
+"""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""goo[||]"";",
-@"
+    @"goo[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent2()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
     {|Copy:goo
     bar|}
-    """""";",
-@"
-var dest =
-    @""[||]"";",
-@"
-var dest =
-    @""goo
-bar[||]"";",
-@"
-var dest =
-    @""goo
-    bar[||]"";");
+    """;
+"""",
+"""
+var dest =
+    @"[||]";
+""",
+"""
+var dest =
+    @"goo
+bar[||]";
+""",
+"""
+var dest =
+    @"goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteSimpleRawMultiLineLiteralContent3()
         {
             TestCopyPaste(
-@"var v = """"""
+""""
+var v = """
 {|Copy:    goo
     bar|}
-    """""";",
-@"
-var dest =
-    @""[||]"";",
-@"
-var dest =
-    @""goo
-bar[||]"";",
-@"
-var dest =
-    @""    goo
-    bar[||]"";");
+    """;
+"""",
+"""
+var dest =
+    @"[||]";
+""",
+"""
+var dest =
+    @"goo
+bar[||]";
+""",
+"""
+var dest =
+    @"    goo
+    bar[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0}|}"";",
-@"
+"""var v = $"{|Copy:{0}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0}[||]"";",
-@"
+    @"{0}[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:X}|}"";",
-@"
+"""var v = $"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0:X}[||]"";",
-@"
+    @"{0:X}[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{0:\""X\""}|}"";",
-@"
+"""var v = $"{|Copy:{0:\"X\"}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0:""""X""""}[||]"";",
-@"
+    @"{0:""X""}[||]";
+""",
+"""
 var dest =
-    @""{0:\""X\""}[||]"";");
+    @"{0:\"X\"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $"{|Copy:{"goo"}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{""""goo""""}[||]"";",
-@"
+    @"{""goo""}[||]";
+""",
+"""
 var dest =
-    @""{""goo""}[||]"";");
+    @"{"goo"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $"{|Copy:X{"goo"}Y|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""X{""""goo""""}Y[||]"";",
-@"
+    @"X{""goo""}Y[||]";
+""",
+"""
 var dest =
-    @""X{""goo""}Y[||]"";");
+    @"X{"goo"}Y[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{"goo"}Y\"|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""X{""""goo""""}Y""""[||]"";",
-@"
+    @"""X{""goo""}Y""[||]";
+"""",
+"""
 var dest =
-    @""\""X{""goo""}Y\""[||]"";");
+    @"\"X{"goo"}Y\"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $""{|Copy:\""X{@""goo""}Y\""|}"";",
-@"
+"""var v = $"{|Copy:\"X{@"goo"}Y\"|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""X{@""""goo""""}Y""""[||]"";",
-@"
+    @"""X{@""goo""}Y""[||]";
+"""",
+"""
 var dest =
-    @""\""X{@""goo""}Y\""[||]"";");
+    @"\"X{@"goo"}Y\"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationFromVerbatimInterpolatedStringLiteralContent()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0}|}"";",
-@"
+"""var v = $@"{|Copy:{0}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0}[||]"";",
-@"
+    @"{0}[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:X}|}"";",
-@"
+"""var v = $@"{|Copy:{0:X}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0:X}[||]"";",
-@"
+    @"{0:X}[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithFormatClauseFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{0:""""X""""}|}"";",
-@"
+"""var v = $@"{|Copy:{0:""X""}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{0:""""X""""}[||]"";",
-@"
+    @"{0:""X""}[||]";
+""",
+"""
 var dest =
-    @""[||]"";");
+    @"[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent1()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:{""goo""}|}"";",
-@"
+"""var v = $@"{|Copy:{"goo"}|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""{""""goo""""}[||]"";",
-@"
+    @"{""goo""}[||]";
+""",
+"""
 var dest =
-    @""{""goo""}[||]"";");
+    @"{"goo"}[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent2()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:X{""goo""}Y|}"";",
-@"
+"""var v = $@"{|Copy:X{"goo"}Y|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+"""
 var dest =
-    @""X{""""goo""""}Y[||]"";",
-@"
+    @"X{""goo""}Y[||]";
+""",
+"""
 var dest =
-    @""X{""goo""}Y[||]"";");
+    @"X{"goo"}Y[||]";
+""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent3()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{"goo"}Y""|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""X{""""goo""""}Y""""[||]"";",
-@"
+    @"""X{""goo""}Y""[||]";
+"""",
+""""
 var dest =
-    @""""""X{""goo""}Y""""[||]"";");
+    @"""X{"goo"}Y""[||]";
+"""");
         }
 
         [WpfFact]
         public void TestPasteInterpolationWithStringFromVerbatimInterpolatedStringLiteralContent4()
         {
             TestCopyPaste(
-@"var v = $@""{|Copy:""""X{@""goo""}Y""""|}"";",
-@"
+"""var v = $@"{|Copy:""X{@"goo"}Y""|}";""",
+"""
 var dest =
-    @""[||]"";",
-@"
+    @"[||]";
+""",
+""""
 var dest =
-    @""""""X{@""""goo""""}Y""""[||]"";",
-@"
+    @"""X{@""goo""}Y""[||]";
+"""",
+""""
 var dest =
-    @""""""X{@""goo""}Y""""[||]"";");
+    @"""X{@"goo"}Y""[||]";
+"""");
         }
     }
 }

From cc7c4bebd9adc876c3e8587e6f0153db1847914b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:31:37 -0700
Subject: [PATCH 336/413] Switch to raw strings

---
 ...IntoMultiLineInterpolatedRawStringTests.cs | 923 ++++++++++++------
 1 file changed, 623 insertions(+), 300 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
index c06d20481cd31..e761402ed28ce 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineInterpolatedRawStringTests.cs
@@ -15,9 +15,11 @@ public void TestNewLineIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""",
+    """
+"""",
 "var x = $\"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
 "var x = $\"\"\"\r\n    \n[||]\r\n    \"\"\"");
@@ -27,710 +29,1031 @@ public void TestNewLineIntoMultiLineRawString1()
         public void TestNewLineIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = $""""""
+                pasteText: """
+
+
+                """,
+""""
+var x = $"""
+    [||]
+    """
+"""",
+""""
+var x = $"""
+    
     [||]
-    """"""",
-"var x = $\"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+    """
+"""",
                 afterUndo:
-"var x = $\"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+""""
+var x = $"""
+    
+[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = $""""""
+                pasteText: """    """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "    \r\n",
-@"var x = $""""""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = $""""""
+                pasteText: """'""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     '[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = $""""""
+                pasteText: """
+                "
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
-    ""[||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+    "[||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""
-    """"""[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $""""
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""[||]
-    """"""");
+""""
+var x = $"""
+    """[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
     [||]
-    """"""  ",
-@"var x = $""""""""  
-    """"""[||]
-    """"""""  ",
+    """  
+"""",
+"""""
+var x = $""""  
+    """[||]
+    """"  
+""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""[||]
-    """"""  ");
+""""
+var x = $"""  
+    """[||]
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    ""[||]
-    """"""  ",
-@"var x = $""""""""""  
-    """"""""[||]
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    "[||]
+    """  
+"""",
+""""""
+var x = $"""""  
+    """"[||]
+    """""  
+"""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""""[||]
-    """"""  ");
+"""""
+var x = $"""  
+    """"[||]
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    ""[||]""  
-    """"""  ",
-@"var x = $""""""""""""  
-    """"""""[||]""  
-    """"""""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    "[||]"  
+    """  
+"""",
+"""""""
+var x = $""""""  
+    """"[||]"  
+    """"""  
+""""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""""[||]""  
-    """"""  ");
+"""""
+var x = $"""  
+    """"[||]"  
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""  
-    [||]""
-    """"""  ",
-@"var x = $""""""""""  
-    """"""[||]""
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""  
+    [||]"
+    """  
+"""",
+""""""
+var x = $"""""  
+    """[||]"
+    """""  
+"""""",
                 afterUndo:
-@"var x = $""""""  
-    """"""[||]""
-    """"""  ");
+""""
+var x = $"""  
+    """[||]"
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"\"",
-@"var x = $""""""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestOpenBraceIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-@"var x = $""""""
+                pasteText: """{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$""""""
+    """
+"""",
+""""
+var x = $$"""
     {[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $""""""
+                pasteText: """{{{""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""
+    """
+"""",
+""""
+var x = $$$$"""
     {{{[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {{{[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $$""""""
+                pasteText: """{{{""",
+""""
+var x = $$"""
     [||]
-    """"""",
-@"var x = $$$$""""""
+    """
+"""",
+""""
+var x = $$$$"""
     {{{[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $$""""""
+""""
+var x = $$"""
     {{{[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenBraceIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-@"var x = $$$""""""  
+                pasteText: """{""",
+""""
+var x = $$$"""  
     {[||]{
-    """"""  ",
-@"var x = $$$$""""""  
+    """  
+"""",
+""""
+var x = $$$$"""  
     {{[||]{
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $$$""""""  
+""""
+var x = $$$"""  
     {{[||]{
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestInterpolationIntoMultiLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "{0}",
-@"var x = $""""""  
+                pasteText: """{0}""",
+""""
+var x = $"""  
     [||]
-    """"""  ",
-@"var x = $""""""  
+    """  
+"""",
+""""
+var x = $"""  
     {0}[||]
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $""""""  
+""""
+var x = $"""  
     [||]
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseIntoMultiLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "{}",
-@"var x = $""""""  
+                pasteText: """{}""",
+""""
+var x = $"""  
     [||]  
-    """"""  ",
-@"var x = $$""""""  
+    """  
+"""",
+""""
+var x = $$"""  
     {}[||]  
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $""""""  
+""""
+var x = $"""  
     {}[||]  
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "{{}",
-@"var x = $$""""""  
+                pasteText: """{{}""",
+""""
+var x = $$"""  
     [||]
-    """"""  ",
-@"var x = $$$""""""  
+    """  
+"""",
+""""
+var x = $$$"""  
     {{}[||]
-    """"""  ",
+    """  
+"""",
                 afterUndo:
-@"var x = $$""""""  
+""""
+var x = $$"""  
     {{}[||]
-    """"""  ");
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "{}}",
-@"var x = $""""""
+                pasteText: """{}}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "{{}}",
-@"var x = $""""""
+                pasteText: """{{}}""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$""""""
+    """
+"""",
+""""
+var x = $$$"""
     {{}}[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     {{}}[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteTripleOpenBraceIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"{{{",
-@"var x = $""""""
+                pasteText: """"
+                """{{{
+                """",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $$$$""""""""
-    """"""{{{[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = $$$$""""
+    """{{{[||]
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""
-    """"""{{{[||]
-    """"""");
+""""
+var x = $"""
+    """{{{[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "  \"\"  ",
-@"var x = $""""""
+                pasteText: """  ""  """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
-    """"  [||]
-    """"""",
+    """
+"""",
+""""
+var x = $"""
+    ""  [||]
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
-      """"  [||]
-    """"""");
+""""
+var x = $"""
+      ""  [||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = $""""""
+                pasteText: """abc""",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine1()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine2()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
 [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
 abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine3()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]
 
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def[||]
 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def[||]
 
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine4()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine5()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def[||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine6()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""
     goo[||]bar
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     gooabc
 def
 [||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine7()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
         def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     abc
     def
 ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""
           [||]
-          """"""",
-@"var x = $""""""
+          """
+"""",
+""""
+var x = $"""
           abc
               def
           ghi[||]
-          """"""",
+          """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
           abc
     def
 ghi[||]
-          """"""");
+          """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine8()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine9()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine10()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
         abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
             abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine11()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""
+    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]""""""");
+""""
+var x = $"""abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine12()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""
+    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine13()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:
 
- |}   """"""",
-@"var x = $""""""
+ |}   """
+"""",
+""""
+var x = $"""
     abc
     def
- [||]   """"""",
+ [||]   """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]   """"""");
+""""
+var x = $"""abc
+def[||]   """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "bar",
-@"var x = $""""""[||]
+                pasteText: """bar""",
+""""
+var x = $"""[||]
     goo
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     bar[||]
     goo
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""bar[||]
+""""
+var x = $"""bar[||]
     goo
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """
+                ""
+                """,
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""
-    """"
-    [||]""""""",
+    |}"""
+"""",
+""""
+var x = $"""
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""""""[||]""""""");
+""""""
+var x = $"""""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||]{|Selection:
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||]{|Selection:
 
-    |}""""""",
-@"var x = $""""""""
-    """"""
-    [||]""""""""",
+    |}"""
+"""",
+"""""
+var x = $""""
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||]""""""");
+"""""""
+var x = $""""""[||]"""
+""""""");
         }
     }
 }

From ecb7e7f37b427bf3faf9b92bd5a3cff3e93510ff Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:33:33 -0700
Subject: [PATCH 337/413] Switch to raw strings

---
 ...nknownSourceIntoMultiLineRawStringTests.cs | 729 ++++++++++++------
 1 file changed, 495 insertions(+), 234 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
index 082a9c0ce3354..1aed2eab1a8ad 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoMultiLineRawStringTests.cs
@@ -15,9 +15,11 @@ public void TestNewLineIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""",
+    """
+"""",
 "var x = \"\"\"\r\n    \n    [||]\r\n    \"\"\"",
                 afterUndo:
 "var x = \"\"\"\r\n    \n[||]\r\n    \"\"\"");
@@ -27,540 +29,799 @@ public void TestNewLineIntoMultiLineRawString1()
         public void TestNewLineIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = """"""
+                pasteText: """
+
+
+                """,
+""""
+var x = """
+    [||]
+    """
+"""",
+""""
+var x = """
+    
     [||]
-    """"""",
-"var x = \"\"\"\r\n    \r\n    [||]\r\n    \"\"\"",
+    """
+"""",
                 afterUndo:
-"var x = \"\"\"\r\n    \r\n[||]\r\n    \"\"\"");
+""""
+var x = """
+    
+[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = """"""
+                pasteText: """    """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
         [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "    \r\n",
-@"var x = """"""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = """"""
+                pasteText: """'""",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     '[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = """"""
+                pasteText: """
+                "
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
-    ""[||]
-    """"""",
+    """
+"""",
+""""
+var x = """
+    "[||]
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""
+                pasteText: """"
+                """
+                """",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""""
-    """"""[||]
-    """"""""",
+    """
+"""",
+"""""
+var x = """"
+    """[||]
+    """"
+""""",
                 afterUndo:
-@"var x = """"""
-    """"""[||]
-    """"""");
+""""
+var x = """
+    """[||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""  
+                pasteText: """"
+                """
+                """",
+""""
+var x = """  
     [||]
-    """"""  ",
-@"var x = """"""""  
-    """"""[||]
-    """"""""  ",
+    """  
+"""",
+"""""
+var x = """"  
+    """[||]
+    """"  
+""""",
                 afterUndo:
-@"var x = """"""  
-    """"""[||]
-    """"""  ");
+""""
+var x = """  
+    """[||]
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""  
-    ""[||]
-    """"""  ",
-@"var x = """"""""""  
-    """"""""[||]
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """  
+    "[||]
+    """  
+"""",
+""""""
+var x = """""  
+    """"[||]
+    """""  
+"""""",
                 afterUndo:
-@"var x = """"""  
-    """"""""[||]
-    """"""  ");
+"""""
+var x = """  
+    """"[||]
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""  
-    ""[||]""  
-    """"""  ",
-@"var x = """"""""""""  
-    """"""""[||]""  
-    """"""""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """  
+    "[||]"  
+    """  
+"""",
+"""""""
+var x = """"""  
+    """"[||]"  
+    """"""  
+""""""",
                 afterUndo:
-@"var x = """"""  
-    """"""""[||]""  
-    """"""  ");
+"""""
+var x = """  
+    """"[||]"  
+    """  
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoMultiLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""  
-    [||]""
-    """"""  ",
-@"var x = """"""""""  
-    """"""[||]""
-    """"""""""  ",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """  
+    [||]"
+    """  
+"""",
+""""""
+var x = """""  
+    """[||]"
+    """""  
+"""""",
                 afterUndo:
-@"var x = """"""  
-    """"""[||]""
-    """"""  ");
+""""
+var x = """  
+    """[||]"
+    """  
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"\"",
-@"var x = """"""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = """""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]
-    """"""");
+"""""
+var x = """
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "  \"\"  ",
-@"var x = """"""
+                pasteText: """  ""  """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
-    """"  [||]
-    """"""",
+    """
+"""",
+""""
+var x = """
+    ""  [||]
+    """
+"""",
                 afterUndo:
-@"var x = """"""
-      """"  [||]
-    """"""");
+""""
+var x = """
+      ""  [||]
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = """"""
+                pasteText: """abc""",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine1()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine2()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
 [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
 abc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine3()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]
-
-    """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]
+
+    """
+"""",
+""""
+var x = """
     abc
     def[||]
 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
 def[||]
 
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine4()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     goo[||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine5()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """
     goo[||]bar
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def[||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine6()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """
     goo[||]bar
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     gooabc
 def
 [||]bar
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine7()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
         def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     abc
     def
 ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine7_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """
           [||]
-          """"""",
-@"var x = """"""
+          """
+"""",
+""""
+var x = """
           abc
               def
           ghi[||]
-          """"""",
+          """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
           abc
     def
 ghi[||]
-          """"""");
+          """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine8()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
     [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine9()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine10()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
         abc
     def
     ghi[||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
             abc
     def
     ghi[||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine11()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:
-
-    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:
+
+    |}"""
+"""",
+""""
+var x = """
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]""""""");
+""""
+var x = """abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine12()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""[||]{|Selection:
-
-    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """[||]{|Selection:
+
+    |}"""
+"""",
+""""
+var x = """
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringMultiLine13()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:
-
- |}   """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:
+
+ |}   """
+"""",
+""""
+var x = """
     abc
     def
- [||]   """"""",
+ [||]   """
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]   """"""");
+""""
+var x = """abc
+def[||]   """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoMultiLineRawStringHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "bar",
-@"var x = """"""[||]
+                pasteText: """bar""",
+""""
+var x = """[||]
     goo
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     bar[||]
     goo
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""bar[||]
+""""
+var x = """bar[||]
     goo
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"",
-@"var x = """"""[||]{|Selection:
-
-    |}""""""",
-@"var x = """"""
-    """"
-    [||]""""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """[||]{|Selection:
+
+    |}"""
+"""",
+""""
+var x = """
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""""""[||]""""""");
+""""""
+var x = """""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""[||]{|Selection:
-
-    |}""""""",
-@"var x = """"""""
-    """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """[||]{|Selection:
+
+    |}"""
+"""",
+"""""
+var x = """"
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = """"""""""""[||]""""""");
+"""""""
+var x = """"""[||]"""
+""""""");
         }
     }
 }

From 54c4e4ed894d9085849d95026a68b8a8dc9c93db Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:37:31 -0700
Subject: [PATCH 338/413] Switch to raw strings

---
 ...SourceIntoNormalInterpolatedStringTests.cs | 600 +++++++++++++-----
 1 file changed, 435 insertions(+), 165 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
index f230eea528fde..dc7a17c770250 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
@@ -17,8 +17,12 @@ public void TestNewLineIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $""[||]""",
-                @"var x = $""\n[||]""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"\n[||]"
+                """,
                 afterUndo: "var x = $\"\n[||]\"");
         }
 
@@ -26,10 +30,20 @@ public void TestNewLineIntoNormalInterpolatedString1()
         public void TestNewLineIntoNormalInterpolatedString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $""[||]""",
-                @"var x = $""\r\n[||]""",
-                afterUndo: "var x = $\"\r\n[||]\"");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"\r\n[||]"
+                """,
+                afterUndo: """
+                var x = $"
+                [||]"
+                """);
         }
 
         [WpfFact]
@@ -37,8 +51,12 @@ public void TestTabIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $""[||]""",
-                @"var x = $""\t[||]""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"\t[||]"
+                """,
                 afterUndo: "var x = $\"\t[||]\"");
         }
 
@@ -46,20 +64,34 @@ public void TestTabIntoNormalInterpolatedString1()
         public void TestSingleQuoteIntoNormalInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $""[||]""",
-                @"var x = $""'[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """'""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"'[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoNormalInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $""[||]""",
-                @"var x = $""\""[||]""",
-                afterUndo: "var x = $\"\"[||]\"");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"\"[||]"
+                """,
+                afterUndo: """
+                var x = $""[||]"
+                """);
         }
 
         [WpfFact]
@@ -67,8 +99,12 @@ public void TestComplexStringIntoNormalInterpolatedString()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $""[||]""",
-                @"var x = $""\t\""\""\t[||]""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"\t\"\"\t[||]"
+                """,
                 afterUndo: "var x = $\"\t\"\"\t[||]\"");
         }
 
@@ -76,90 +112,144 @@ public void TestComplexStringIntoNormalInterpolatedString()
         public void TestNormalTextIntoNormalInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $""[||]""",
-                @"var x = $""abc[||]""",
-                afterUndo: @"var x = $""[||]""");
+                pasteText: """abc""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"abc[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $""[||]""",
-                @"var x = $""{{[||]""",
-                afterUndo: "var x = $\"{[||]\"");
+                pasteText: """{""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"{{[||]"
+                """,
+                afterUndo: """
+                var x = $"{[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $""[||]""",
-                @"var x = $""{{[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """{{""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"{{[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $""[||]""",
-                @"var x = $""{{0[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """{{0""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"{{0[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $""[||]""",
-                @"var x = $""}}[||]""",
-                afterUndo: "var x = $\"}[||]\"");
+                pasteText: """}""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"}}[||]"
+                """,
+                afterUndo: """
+                var x = $"}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $""[||]""",
-                @"var x = $""}}[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """}}""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"}}[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $""[||]""",
-                @"var x = $""}}0[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """}}0""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"}}0[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $""[||]""",
-                @"var x = $""x{0}y[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"x{0}y[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoNormalInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $""[||]""",
-                @"var x = $""x{{0}}y[||]""",
-                afterUndo: "var x = $\"[||]\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $"[||]"
+                """,
+                """
+                var x = $"x{{0}}y[||]"
+                """,
+                afterUndo: """
+                var x = $"[||]"
+                """);
         }
 
         #endregion
@@ -171,8 +261,12 @@ public void TestNewLineIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $""[||]{0}""",
-                @"var x = $""\n[||]{0}""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"\n[||]{0}"
+                """,
                 afterUndo: "var x = $\"\n[||]{0}\"");
         }
 
@@ -180,10 +274,20 @@ public void TestNewLineIntoNormalInterpolatedStringBeforeHole1()
         public void TestNewLineIntoNormalInterpolatedStringBeforeHole2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $""[||]{0}""",
-                @"var x = $""\r\n[||]{0}""",
-                afterUndo: "var x = $\"\r\n[||]{0}\"");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"\r\n[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"
+                [||]{0}"
+                """);
         }
 
         [WpfFact]
@@ -191,8 +295,12 @@ public void TestTabIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $""[||]{0}""",
-                @"var x = $""\t[||]{0}""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"\t[||]{0}"
+                """,
                 afterUndo: "var x = $\"\t[||]{0}\"");
         }
 
@@ -200,20 +308,34 @@ public void TestTabIntoNormalInterpolatedStringBeforeHole1()
         public void TestSingleQuoteIntoNormalInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $""[||]{0}""",
-                @"var x = $""'[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """'""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"'[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoNormalInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $""[||]{0}""",
-                @"var x = $""\""[||]{0}""",
-                afterUndo: "var x = $\"\"[||]{0}\"");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"\"[||]{0}"
+                """,
+                afterUndo: """
+                var x = $""[||]{0}"
+                """);
         }
 
         [WpfFact]
@@ -221,8 +343,12 @@ public void TestComplexStringIntoNormalInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $""[||]{0}""",
-                @"var x = $""\t\""\""\t[||]{0}""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"\t\"\"\t[||]{0}"
+                """,
                 afterUndo: "var x = $\"\t\"\"\t[||]{0}\"");
         }
 
@@ -230,103 +356,161 @@ public void TestComplexStringIntoNormalInterpolatedStringBeforeHole()
         public void TestNormalTextIntoNormalInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $""[||]{0}""",
-                @"var x = $""abc[||]{0}""",
-                afterUndo: @"var x = $""[||]{0}""");
+                pasteText: """abc""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"abc[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $""[||]{0}""",
-                @"var x = $""{{[||]{0}""",
-                afterUndo: "var x = $\"{[||]{0}\"");
+                pasteText: """{""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"{{[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"{[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $""[||]{0}""",
-                @"var x = $""{{[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """{{""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"{{[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $""[||]{0}""",
-                @"var x = $""{{0[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """{{0""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"{{0[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $""[||]{0}""",
-                @"var x = $""}}[||]{0}""",
-                afterUndo: "var x = $\"}[||]{0}\"");
+                pasteText: """}""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"}}[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"}[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $""[||]{0}""",
-                @"var x = $""}}[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """}}""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"}}[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $""[||]{0}""",
-                @"var x = $""}}0[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """}}0""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"}}0[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $""[||]{0}""",
-                @"var x = $""x{0}y[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"x{0}y[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoNormalInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $""[||]{0}""",
-                @"var x = $""x{{0}}y[||]{0}""",
-                afterUndo: "var x = $\"[||]{0}\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $"[||]{0}"
+                """,
+                """
+                var x = $"x{{0}}y[||]{0}"
+                """,
+                afterUndo: """
+                var x = $"[||]{0}"
+                """);
         }
 
-        #endregion
+#endregion
 
-        #region Paste from external source into normal interpolated string after hole
+#region Paste from external source into normal interpolated string after hole
 
         [WpfFact]
         public void TestNewLineIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}\n[||]""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}\n[||]"
+                """,
                 afterUndo: "var x = $\"{0}\n[||]\"");
         }
 
@@ -334,10 +518,20 @@ public void TestNewLineIntoNormalInterpolatedStringAfterHole1()
         public void TestNewLineIntoNormalInterpolatedStringAfterHole2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}\r\n[||]""",
-                afterUndo: "var x = $\"{0}\r\n[||]\"");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}\r\n[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}
+                [||]"
+                """);
         }
 
         [WpfFact]
@@ -345,8 +539,12 @@ public void TestTabIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}\t[||]""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}\t[||]"
+                """,
                 afterUndo: "var x = $\"{0}\t[||]\"");
         }
 
@@ -354,20 +552,34 @@ public void TestTabIntoNormalInterpolatedStringAfterHole1()
         public void TestSingleQuoteIntoNormalInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}'[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """'""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}'[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoNormalInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}\""[||]""",
-                afterUndo: "var x = $\"{0}\"[||]\"");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}\"[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}"[||]"
+                """);
         }
 
         [WpfFact]
@@ -375,8 +587,12 @@ public void TestComplexStringIntoNormalInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}\t\""\""\t[||]""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}\t\"\"\t[||]"
+                """,
                 afterUndo: "var x = $\"{0}\t\"\"\t[||]\"");
         }
 
@@ -384,92 +600,146 @@ public void TestComplexStringIntoNormalInterpolatedStringAfterHole()
         public void TestNormalTextIntoNormalInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}abc[||]""",
-                afterUndo: @"var x = $""{0}[||]""");
+                pasteText: """abc""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}abc[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}{{[||]""",
-                afterUndo: "var x = $\"{0}{[||]\"");
+                pasteText: """{""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}{{[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}{[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}{{[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """{{""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}{{[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}{{0[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """{{0""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}{{0[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}}}[||]""",
-                afterUndo: "var x = $\"{0}}[||]\"");
+                pasteText: """}""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}}}[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}}}[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """}}""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}}}[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}}}0[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """}}0""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}}}0[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}x{0}y[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}x{0}y[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoNormalInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $""{0}[||]""",
-                @"var x = $""{0}x{{0}}y[||]""",
-                afterUndo: "var x = $\"{0}[||]\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $"{0}[||]"
+                """,
+                """
+                var x = $"{0}x{{0}}y[||]"
+                """,
+                afterUndo: """
+                var x = $"{0}[||]"
+                """);
         }
 
-        #endregion
+#endregion
     }
 }

From 224f515300d05c6daf63f38cdf56bbe5bfa0d53b Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:39:35 -0700
Subject: [PATCH 339/413] Switch to raw strings

---
 ...PasteUnknownSourceIntoNormalStringTests.cs | 100 +++++++++++++-----
 1 file changed, 74 insertions(+), 26 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalStringTests.cs
index 748403b963629..fd5ecc8692847 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalStringTests.cs
@@ -15,8 +15,12 @@ public void TestNewLineIntoNormalString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = ""[||]""",
-                @"var x = ""\n[||]""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\n[||]"
+                """,
                 afterUndo: "var x = \"\n[||]\"");
         }
 
@@ -24,10 +28,20 @@ public void TestNewLineIntoNormalString1()
         public void TestNewLineIntoNormalString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = ""[||]""",
-                @"var x = ""\r\n[||]""",
-                afterUndo: "var x = \"\r\n[||]\"");
+                pasteText: """
+
+
+                """,
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\r\n[||]"
+                """,
+                afterUndo: """
+                var x = "
+                [||]"
+                """);
         }
 
         [WpfFact]
@@ -35,8 +49,12 @@ public void TestTabIntoNormalString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = ""[||]""",
-                @"var x = ""\t[||]""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\t[||]"
+                """,
                 afterUndo: "var x = \"\t[||]\"");
         }
 
@@ -44,30 +62,50 @@ public void TestTabIntoNormalString1()
         public void TestBackslashTIntoNormalString1()
         {
             TestPasteUnknownSource(
-                pasteText: @"\t",
-                @"var x = ""[||]""",
-                @"var x = ""\t[||]""",
-                afterUndo: @"var x = ""[||]""");
+                pasteText: """\t""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\t[||]"
+                """,
+                afterUndo: """
+                var x = "[||]"
+                """);
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoNormalString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = ""[||]""",
-                @"var x = ""'[||]""",
-                afterUndo: "var x = \"[||]\"");
+                pasteText: """'""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "'[||]"
+                """,
+                afterUndo: """
+                var x = "[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoNormalString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = ""[||]""",
-                @"var x = ""\""[||]""",
-                afterUndo: "var x = \"\"[||]\"");
+                pasteText: """
+                "
+                """,
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\"[||]"
+                """,
+                afterUndo: """
+                var x = ""[||]"
+                """);
         }
 
         [WpfFact]
@@ -75,8 +113,12 @@ public void TestComplexStringIntoNormalString()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = ""[||]""",
-                @"var x = ""\t\""\""\t[||]""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "\t\"\"\t[||]"
+                """,
                 afterUndo: "var x = \"\t\"\"\t[||]\"");
         }
 
@@ -84,10 +126,16 @@ public void TestComplexStringIntoNormalString()
         public void TestNormalTextIntoNormalString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = ""[||]""",
-                @"var x = ""abc[||]""",
-                afterUndo: @"var x = ""[||]""");
+                pasteText: """abc""",
+                """
+                var x = "[||]"
+                """,
+                """
+                var x = "abc[||]"
+                """,
+                afterUndo: """
+                var x = "[||]"
+                """);
         }
     }
 }

From 612bab7cebecbeda1de10b30c40dd05b0fe27711 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:45:07 -0700
Subject: [PATCH 340/413] lint

---
 .../CSharp/StringCopyPaste/AbstractPasteProcessor.cs |  2 +-
 .../StringCopyPaste/KnownSourcePasteProcessor.cs     |  2 +-
 .../StringCopyPaste/StringCopyPasteCommandHandler.cs |  4 ++--
 .../StringCopyPaste/UnknownSourcePasteProcessor.cs   | 12 +++++-------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
index d754c3f66304c..2f1db0deaa883 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/AbstractPasteProcessor.cs
@@ -126,7 +126,7 @@ protected AbstractPasteProcessor(
         /// <summary>
         /// Determine the edits that should be made to smartly handle pasting hte data that is on the clipboard._selectionBeforePaste
         /// </summary>
-        public abstract ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken);
+        public abstract ImmutableArray<TextChange> GetEdits();
 
         /// <summary>
         /// Takes a span in <see cref="SnapshotBeforePaste"/> and maps it appropriately (in an <see
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
index 80ded82a8fb93..5543a1cbe3e0e 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/KnownSourcePasteProcessor.cs
@@ -59,7 +59,7 @@ public KnownSourcePasteProcessor(
             _textBufferFactoryService = textBufferFactoryService;
         }
 
-        public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+        public override ImmutableArray<TextChange> GetEdits()
         {
             // For pastes into non-raw strings, we can just determine how the change should be escaped in-line at that
             // same location the paste originally happened at.  For raw-strings things get more complex as we have to
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index 32214b92bd256..c6964a76ae853 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -197,7 +197,7 @@ ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
                     snapshotBeforePaste, snapshotAfterPaste,
                     documentBeforePaste, documentAfterPaste,
                     stringExpressionBeforePaste, pasteWasSuccessful);
-                return unknownPasteProcessor.GetEdits(cancellationToken);
+                return unknownPasteProcessor.GetEdits();
             }
 
             ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(
@@ -223,7 +223,7 @@ ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(
                     stringExpressionBeforePaste,
                     selectionsBeforePaste[0].Span.ToTextSpan(),
                     copyPasteData, _textBufferFactoryService);
-                return knownProcessor.GetEdits(cancellationToken);
+                return knownProcessor.GetEdits();
             }
         }
 
diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
index 70af60dc29cc2..bd43d4270edc4 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/UnknownSourcePasteProcessor.cs
@@ -49,7 +49,7 @@ public UnknownSourcePasteProcessor(
             _pasteWasSuccessful = pasteWasSuccessful;
         }
 
-        public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
+        public override ImmutableArray<TextChange> GetEdits()
         {
             // If we have a raw-string, then we always want to check for changes to make, even if the paste was
             // technically legal.  This is because we may want to touch up things like indentation to make the
@@ -71,7 +71,7 @@ public override ImmutableArray<TextChange> GetEdits(CancellationToken cancellati
             // same location the paste originally happened at.  For raw-strings things get more complex as we have to
             // deal with things like indentation and potentially adding newlines to make things legal.
             return IsAnyRawStringExpression(StringExpressionBeforePaste)
-                ? GetEditsForRawString(cancellationToken)
+                ? GetEditsForRawString()
                 : GetEditsForNonRawString();
         }
 
@@ -107,7 +107,7 @@ private ImmutableArray<TextChange> GetEditsForNonRawString()
             return textChanges.ToImmutableAndClear();
         }
 
-        private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancellationToken)
+        private ImmutableArray<TextChange> GetEditsForRawString()
         {
             // Can't really figure anything out if the raw string is in error.
             if (NodeOrTokenContainsError(StringExpressionBeforePaste))
@@ -141,7 +141,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
             if (IsAnyMultiLineRawStringExpression(StringExpressionBeforePaste))
                 AdjustWhitespaceAndAddTextChangesForMultiLineRawStringLiteral(edits);
             else
-                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits, cancellationToken);
+                AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(edits);
 
             // Then  any extra quotes to the end delimiter.
             if (quotesToAdd != null)
@@ -160,9 +160,7 @@ private ImmutableArray<TextChange> GetEditsForRawString(CancellationToken cancel
 
         // Pasting with single line case.
 
-        private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(
-            ArrayBuilder<TextChange> edits,
-            CancellationToken cancellationToken)
+        private void AdjustWhitespaceAndAddTextChangesForSingleLineRawStringLiteral(ArrayBuilder<TextChange> edits)
         {
             // When pasting into a single-line raw literal we will keep it a single line if we can.  If the content
             // we're pasting starts/ends with a quote, or contains a newline, then we have to convert to a multiline.

From 448d3f98e3b5b87f35fd6afd672ea6eb3cc41528 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:49:52 -0700
Subject: [PATCH 341/413] Switch to raw strings

---
 ...ntoSingleLineInterpolatedRawStringTests.cs | 1051 ++++++++++++-----
 1 file changed, 755 insertions(+), 296 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
index 6de9e7ed884fc..7246a80c34537 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
@@ -14,7 +14,9 @@ public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = $""""""[||] """"""",
+""""
+var x = $"""[||] """
+"""",
 "var x = $\"\"\"\r\n    \n    [||] \r\n    \"\"\"",
                 afterUndo:
 "var x = $\"\"\"\n[||] \"\"\"");
@@ -25,7 +27,9 @@ public void TestNewLineIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = $"""""" [||]""""""",
+""""
+var x = $""" [||]"""
+"""",
 "var x = $\"\"\"\r\n     \n    \r\n    [||]\"\"\"",
                 afterUndo:
 "var x = $\"\"\" \n[||]\"\"\"");
@@ -35,759 +39,1214 @@ public void TestNewLineIntoSingleLineRawString1_B()
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = $""""""[||] """"""",
-"var x = $\"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
+    
+    [||] 
+    """
+"""",
                 afterUndo:
-"var x = $\"\"\"\r\n[||] \"\"\"");
+""""
+var x = $"""
+[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = $"""""" [||]""""""",
-"var x = $\"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
+     
+    
+    [||]"""
+"""",
                 afterUndo:
-"var x = $\"\"\" \r\n[||]\"\"\"");
+""""
+var x = $""" 
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""    [||] """"""",
+                pasteText: """    """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""    [||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""     [||]""""""",
+                pasteText: """    """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""     [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "    \r\n",
-@"var x = $""""""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""
+    """
+"""",
+""""
+var x = $"""
     
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""
+""""
+var x = $"""
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""'[||] """"""",
+                pasteText: """'""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""'[||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = $"""""" [||]""""""",
-@"var x = $"""""" '[||]""""""",
+                pasteText: """'""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $""" '[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
-    ""[||] 
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
+    "[||] 
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""[||] """"""");
+"""""
+var x = $""""[||] """
+""""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
-     ""
-    [||]""""""",
+                pasteText: """
+                "
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
+     "
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" ""[||]""""""");
+""""
+var x = $""" "[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""""
-    """"""[||] 
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $""""
+    """[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||] """"""");
+"""""""
+var x = $""""""[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""""
-     """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" [||]"""
+"""",
+"""""
+var x = $""""
+     """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $"""""" """"""[||]""""""");
+""""
+var x = $""" """[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" ""[||] """"""",
-@"var x = $"""""""""" """"""""[||] """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" "[||] """
+"""",
+""""""
+var x = $""""" """"[||] """""
+"""""",
                 afterUndo:
-@"var x = $"""""" """"""""[||] """"""");
+"""""
+var x = $""" """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" ""[||]"" """"""",
-@"var x = $"""""""""""" """"""""[||]"" """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" "[||]" """
+"""",
+"""""""
+var x = $"""""" """"[||]" """"""
+""""""",
                 afterUndo:
-@"var x = $"""""" """"""""[||]"" """"""");
+"""""
+var x = $""" """"[||]" """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $"""""" [||]"" """"""",
-@"var x = $"""""""""" """"""[||]"" """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $""" [||]" """
+"""",
+""""""
+var x = $""""" """[||]" """""
+"""""",
                 afterUndo:
-@"var x = $"""""" """"""[||]"" """"""");
+""""
+var x = $""" """[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"\"",
-@"var x = $""""""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = $"""
     [||]
-    """"""",
-@"var x = $""""""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = $"""""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = $""""""
-    """"""""[||]
-    """"""");
+"""""
+var x = $"""
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-@"var x = $""""""[||] """"""",
-@"var x = $$""""""{[||] """"""",
+                pasteText: """{""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$"""{[||] """
+"""",
                 afterUndo:
-@"var x = $""""""{[||] """"""");
+""""
+var x = $"""{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-@"var x = $"""""" [||]""""""",
-@"var x = $$"""""" {[||]""""""",
+                pasteText: """{""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $$""" {[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" {[||]""""""");
+""""
+var x = $""" {[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""
-    ""{{{[||] 
-    """"""",
+                pasteText: """
+                "{{{
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$$$"""
+    "{{{[||] 
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""{{{[||] """"""");
+"""""
+var x = $""""{{{[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""""
-    """"""{{{[||] 
-    """"""""",
+                pasteText: """"
+                """{{{
+                """",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $$$$""""
+    """{{{[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = $""""""""""""{{{[||] """"""");
+"""""""
+var x = $""""""{{{[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleOpenQuoteAndTripleOpenBraceIntoSingleLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: " \"\"\"{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$"""""""" """"""{{{[||] """"""""",
+                pasteText: """" """{{{"""",
+""""
+var x = $"""[||] """
+"""",
+"""""
+var x = $$$$"""" """{{{[||] """"
+""""",
                 afterUndo:
-@"var x = $"""""" """"""{{{[||] """"""");
+""""
+var x = $""" """{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $""""""[||] """"""",
-@"var x = $$$$""""""{{{[||] """"""",
+                pasteText: """{{{""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $$$$"""{{{[||] """
+"""",
                 afterUndo:
-@"var x = $""""""{{{[||] """"""");
+""""
+var x = $"""{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $"""""" [||]""""""",
-@"var x = $$$$"""""" {{{[||]""""""",
+                pasteText: """{{{""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $$$$""" {{{[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" {{{[||]""""""");
+""""
+var x = $""" {{{[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $"""""" ""[||] """"""",
-@"var x = $$$$"""""" ""{{{[||] """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" "[||] """
+"""",
+""""
+var x = $$$$""" "{{{[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" ""{{{[||] """"""");
+""""
+var x = $""" "{{{[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $"""""" ""[||]"" """"""",
-@"var x = $$$$"""""" ""{{{[||]"" """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" "[||]" """
+"""",
+""""
+var x = $$$$""" "{{{[||]" """
+"""",
                 afterUndo:
-@"var x = $"""""" ""{{{[||]"" """"""");
+""""
+var x = $""" "{{{[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestTripleOpenBraceIntoSingleLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "{{{",
-@"var x = $"""""" [||]"" """"""",
-@"var x = $$$$"""""" {{{[||]"" """"""",
+                pasteText: """{{{""",
+""""
+var x = $""" [||]" """
+"""",
+""""
+var x = $$$$""" {{{[||]" """
+"""",
                 afterUndo:
-@"var x = $"""""" {{{[||]"" """"""");
+""""
+var x = $""" {{{[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestInterpolationIntoSingleLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{0}",
-@"var x = $"""""" [||] """"""",
-@"var x = $"""""" {0}[||] """"""",
+                pasteText: """{0}""",
+""""
+var x = $""" [||] """
+"""",
+""""
+var x = $""" {0}[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" [||] """"""");
+""""
+var x = $""" [||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{}",
-@"var x = $"""""" [||] """"""",
-@"var x = $$"""""" {}[||] """"""",
+                pasteText: """{}""",
+""""
+var x = $""" [||] """
+"""",
+""""
+var x = $$""" {}[||] """
+"""",
                 afterUndo:
-@"var x = $"""""" {}[||] """"""");
+""""
+var x = $""" {}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "{}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$"""""" {}[||] """"""",
+                pasteText: """{}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$""" {}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" [||] """"""");
+""""
+var x = $$""" [||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "{{}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {{}[||] """"""",
+                pasteText: """{{}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {{}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {{}[||] """"""");
+""""
+var x = $$""" {{}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "{}}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {}}[||] """"""",
+                pasteText: """{}}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {}}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {}}[||] """"""");
+""""
+var x = $$""" {}}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestOpenCloseBraceIntoSingleLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "{{}}",
-@"var x = $$"""""" [||] """"""",
-@"var x = $$$"""""" {{}}[||] """"""",
+                pasteText: """{{}}""",
+""""
+var x = $$""" [||] """
+"""",
+""""
+var x = $$$""" {{}}[||] """
+"""",
                 afterUndo:
-@"var x = $$"""""" {{}}[||] """"""");
+""""
+var x = $$""" {{}}[||] """
+"""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "  \"\"  ",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""  """"  [||] """"""",
+                pasteText: """  ""  """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""  ""  [||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""abc[||] """"""",
+                pasteText: """abc""",
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""abc[||] """
+"""",
                 afterUndo:
-@"var x = $""""""[||] """"""");
+""""
+var x = $"""[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = $"""""" [||]""""""",
-@"var x = $"""""" abc[||]""""""",
+                pasteText: """abc""",
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $""" abc[||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" [||]""""""");
+""""
+var x = $""" [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
     def[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||] """"""");
+""""
+var x = $"""abc
+def[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
      abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" abc
-def[||]""""""");
+""""
+var x = $""" abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""goo[||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""goo[||]"""
+"""",
+""""
+var x = $"""
     gooabc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
-def[||]""""""");
+""""
+var x = $"""gooabc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""goo[||]bar""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""goo[||]bar"""
+"""",
+""""
+var x = $"""
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
-def[||]bar""""""");
+""""
+var x = $"""gooabc
+def[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""goo[||]bar""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""goo[||]bar"""
+"""",
+""""
+var x = $"""
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""gooabc
+""""
+var x = $"""gooabc
 def
-[||]bar""""""");
+[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
         def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-ghi[||] """"""");
+ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
      abc
         def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $"""""" abc
+""""
+var x = $""" abc
     def
-ghi[||]""""""");
+ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""    abc
+""""
+var x = $"""    abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
      abc
     def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""     abc
+""""
+var x = $"""     abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $""""""[||] """"""",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $"""[||] """
+"""",
+""""
+var x = $"""
         abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""        abc
+""""
+var x = $"""        abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = $"""""" [||]""""""",
-@"var x = $""""""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = $""" [||]"""
+"""",
+""""
+var x = $"""
          abc
     def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""         abc
+""""
+var x = $"""         abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]""""""");
+""""
+var x = $"""abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""  [||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
       abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""  abc
-def[||]  """"""");
+""""
+var x = $"""  abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""abc
+""""
+var x = $"""abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = $""""""  [||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
       abc
     def
     [||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""  abc
+""""
+var x = $"""  abc
 def
-[||]  """"""");
+[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""[||]{|Selection:    |}  """"""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""[||]{|Selection:    |}  """
+"""",
+""""
+var x = $"""
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = $""""""abc
-def[||]  """"""");
+""""
+var x = $"""abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = $""""""  [||]{|Selection:    |}""""""",
-@"var x = $""""""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = $"""  [||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
       abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""  abc
-def[||]""""""");
+""""
+var x = $"""  abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"bar",
-@"var x = $""""""[||]goo""""""",
-@"var x = $""""""
-    ""bar[||]goo
-    """"""",
+                pasteText: """
+                "bar
+                """,
+""""
+var x = $"""[||]goo"""
+"""",
+""""
+var x = $"""
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = $""""""""bar[||]goo""""""");
+"""""
+var x = $""""bar[||]goo"""
+""""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "bar\"",
-@"var x = $""""""goo[||]""""""",
-@"var x = $""""""
-    goobar""
-    [||]""""""",
+                pasteText: """
+                bar"
+                """,
+""""
+var x = $"""goo[||]"""
+"""",
+""""
+var x = $"""
+    goobar"
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""goobar""[||]""""""");
+""""
+var x = $"""goobar"[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""
-    """"
-    [||]""""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+""""
+var x = $"""
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = $""""""""""[||]""""""");
+""""""
+var x = $"""""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = $""""""[||]{|Selection:    |}""""""",
-@"var x = $""""""""
-    """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = $"""[||]{|Selection:    |}"""
+"""",
+"""""
+var x = $""""
+    """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = $""""""""""""[||]""""""");
+"""""""
+var x = $""""""[||]"""
+""""""");
         }
     }
 }

From 93e35d6a15f7bf9712703d4f332bfc5976713f1f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:52:06 -0700
Subject: [PATCH 342/413] Switch to raw strings

---
 ...knownSourceIntoSingleLineRawStringTests.cs | 833 +++++++++++++-----
 1 file changed, 600 insertions(+), 233 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
index 06fffa17920b3..11813a3b8a4fa 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoSingleLineRawStringTests.cs
@@ -15,7 +15,9 @@ public void TestNewLineIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = """"""[||] """"""",
+""""
+var x = """[||] """
+"""",
 "var x = \"\"\"\r\n    \n    [||] \r\n    \"\"\"",
                 afterUndo:
 "var x = \"\"\"\n[||] \"\"\"");
@@ -26,7 +28,9 @@ public void TestNewLineIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-@"var x = """""" [||]""""""",
+""""
+var x = """ [||]"""
+"""",
 "var x = \"\"\"\r\n     \n    \r\n    [||]\"\"\"",
                 afterUndo:
 "var x = \"\"\" \n[||]\"\"\"");
@@ -36,590 +40,953 @@ public void TestNewLineIntoSingleLineRawString1_B()
         public void TestNewLineIntoSingleLineRawString2_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = """"""[||] """"""",
-"var x = \"\"\"\r\n    \r\n    [||] \r\n    \"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
+    
+    [||] 
+    """
+"""",
                 afterUndo:
-"var x = \"\"\"\r\n[||] \"\"\"");
+""""
+var x = """
+[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNewLineIntoSingleLineRawString2_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-@"var x = """""" [||]""""""",
-"var x = \"\"\"\r\n     \r\n    \r\n    [||]\"\"\"",
+                pasteText: """
+
+
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
+     
+    
+    [||]"""
+"""",
                 afterUndo:
-"var x = \"\"\" \r\n[||]\"\"\"");
+""""
+var x = """ 
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = """"""[||] """"""",
-@"var x = """"""    [||] """"""",
+                pasteText: """    """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """    [||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "    ",
-@"var x = """""" [||]""""""",
-@"var x = """"""     [||]""""""",
+                pasteText: """    """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """     [||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestSpacesIntoSingleLineRawString2()
         {
             TestPasteUnknownSource(
-                pasteText: "    \r\n",
-@"var x = """"""
+                pasteText: """
+                    
+
+                """,
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""
+    """
+"""",
+""""
+var x = """
     
     [||]
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""
+""""
+var x = """
         
 [||]
-    """"""");
+    """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = """"""[||] """"""",
-@"var x = """"""'[||] """"""",
+                pasteText: """'""",
+""""
+var x = """[||] """
+"""",
+""""
+var x = """'[||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-@"var x = """""" [||]""""""",
-@"var x = """""" '[||]""""""",
+                pasteText: """'""",
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """ '[||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = """"""[||] """"""",
-@"var x = """"""
-    ""[||] 
-    """"""",
+                pasteText: """
+                "
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
+    "[||] 
+    """
+"""",
                 afterUndo:
-@"var x = """"""""[||] """"""");
+"""""
+var x = """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-@"var x = """""" [||]""""""",
-@"var x = """"""
-     ""
-    [||]""""""",
+                pasteText: """
+                "
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
+     "
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" ""[||]""""""");
+""""
+var x = """ "[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""[||] """"""",
-@"var x = """"""""
-    """"""[||] 
-    """"""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """[||] """
+"""",
+"""""
+var x = """"
+    """[||] 
+    """"
+""""",
                 afterUndo:
-@"var x = """"""""""""[||] """"""");
+"""""""
+var x = """"""[||] """
+""""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" [||]""""""",
-@"var x = """"""""
-     """"""
-    [||]""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ [||]"""
+"""",
+"""""
+var x = """"
+     """
+    [||]""""
+""""",
                 afterUndo:
-@"var x = """""" """"""[||]""""""");
+""""
+var x = """ """[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestTwoQuotesIntoSingleLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"",
-@"var x = """""" ""[||] """"""",
-@"var x = """""""" """"""[||] """"""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """ "[||] """
+"""",
+"""""
+var x = """" """[||] """"
+""""",
                 afterUndo:
-@"var x = """""" """"""[||] """"""");
+""""
+var x = """ """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString3()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" ""[||] """"""",
-@"var x = """""""""" """"""""[||] """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ "[||] """
+"""",
+""""""
+var x = """"" """"[||] """""
+"""""",
                 afterUndo:
-@"var x = """""" """"""""[||] """"""");
+"""""
+var x = """ """"[||] """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString4()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" ""[||]"" """"""",
-@"var x = """""""""""" """"""""[||]"" """"""""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ "[||]" """
+"""",
+"""""""
+var x = """""" """"[||]" """"""
+""""""",
                 afterUndo:
-@"var x = """""" """"""""[||]"" """"""");
+"""""
+var x = """ """"[||]" """
+""""");
         }
 
         [WpfFact]
         public void TestTripleQuoteIntoSingleLineRawString5()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """""" [||]"" """"""",
-@"var x = """""""""" """"""[||]"" """"""""""",
+                pasteText: """"
+                """
+                """",
+""""
+var x = """ [||]" """
+"""",
+""""""
+var x = """"" """[||]" """""
+"""""",
                 afterUndo:
-@"var x = """""" """"""[||]"" """"""");
+""""
+var x = """ """[||]" """
+"""");
         }
 
         [WpfFact]
         public void TestQuadrupleQuoteIntoSingleLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"\"",
-@"var x = """"""
+                pasteText: """""
+                """"
+                """"",
+""""
+var x = """
     [||]
-    """"""",
-@"var x = """"""""""
-    """"""""[||]
-    """"""""""",
+    """
+"""",
+""""""
+var x = """""
+    """"[||]
+    """""
+"""""",
                 afterUndo:
-@"var x = """"""
-    """"""""[||]
-    """"""");
+"""""
+var x = """
+    """"[||]
+    """
+""""");
         }
 
         [WpfFact]
         public void TestComplexStringIntoSingleLineRawString()
         {
             TestPasteUnknownSource(
-                pasteText: "  \"\"  ",
-@"var x = """"""[||] """"""",
-@"var x = """"""  """"  [||] """"""",
+                pasteText: """  ""  """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """  ""  [||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = """"""[||] """"""",
-@"var x = """"""abc[||] """"""",
+                pasteText: """abc""",
+""""
+var x = """[||] """
+"""",
+""""
+var x = """abc[||] """
+"""",
                 afterUndo:
-@"var x = """"""[||] """"""");
+""""
+var x = """[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawString_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-@"var x = """""" [||]""""""",
-@"var x = """""" abc[||]""""""",
+                pasteText: """abc""",
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """ abc[||]"""
+"""",
                 afterUndo:
-@"var x = """""" [||]""""""");
+""""
+var x = """ [||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
     def[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||] """"""");
+""""
+var x = """abc
+def[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
      abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" abc
-def[||]""""""");
+""""
+var x = """ abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine4()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""goo[||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """goo[||]"""
+"""",
+""""
+var x = """
     gooabc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""gooabc
-def[||]""""""");
+""""
+var x = """gooabc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine5()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""goo[||]bar""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """goo[||]bar"""
+"""",
+""""
+var x = """
     gooabc
     def[||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""gooabc
-def[||]bar""""""");
+""""
+var x = """gooabc
+def[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine6()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""goo[||]bar""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """goo[||]bar"""
+"""",
+""""
+var x = """
     gooabc
     def
     [||]bar
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""gooabc
+""""
+var x = """gooabc
 def
-[||]bar""""""");
+[||]bar"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
         def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-ghi[||] """"""");
+ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine7_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\nghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
      abc
         def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """""" abc
+""""
+var x = """ abc
     def
-ghi[||]""""""");
+ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine8_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_A()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
     abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""    abc
+""""
+var x = """    abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine9_B()
         {
             TestPasteUnknownSource(
-                pasteText: "    abc\r\n    def\r\n    ghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                    abc
+                    def
+                    ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
      abc
     def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""     abc
+""""
+var x = """     abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_A()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """"""[||] """"""",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """[||] """
+"""",
+""""
+var x = """
         abc
     def
     ghi[||] 
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""        abc
+""""
+var x = """        abc
     def
-    ghi[||] """"""");
+    ghi[||] """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine10_B()
         {
             TestPasteUnknownSource(
-                pasteText: "        abc\r\n    def\r\n    ghi",
-@"var x = """""" [||]""""""",
-@"var x = """"""
+                pasteText: """
+                        abc
+                    def
+                    ghi
+                """,
+""""
+var x = """ [||]"""
+"""",
+""""
+var x = """
          abc
     def
     ghi
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""         abc
+""""
+var x = """         abc
     def
-    ghi[||]""""""");
+    ghi[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
     abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]""""""");
+""""
+var x = """abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine11_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""  [||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """  [||]{|Selection:    |}  """
+"""",
+""""
+var x = """
       abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""  abc
-def[||]  """"""");
+""""
+var x = """  abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
     abc
     def
     
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""abc
+""""
+var x = """abc
 def
-[||]""""""");
+[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine12_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef\r\n",
-@"var x = """"""  [||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+
+                """,
+""""
+var x = """  [||]{|Selection:    |}  """
+"""",
+""""
+var x = """
       abc
     def
     [||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""  abc
+""""
+var x = """  abc
 def
-[||]  """"""");
+[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_A()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""[||]{|Selection:    |}  """"""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """[||]{|Selection:    |}  """
+"""",
+""""
+var x = """
     abc
     def[||]  
-    """"""",
+    """
+"""",
                 afterUndo:
-@"var x = """"""abc
-def[||]  """"""");
+""""
+var x = """abc
+def[||]  """
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringSingleLine13_B()
         {
             TestPasteUnknownSource(
-                pasteText: "abc\r\ndef",
-@"var x = """"""  [||]{|Selection:    |}""""""",
-@"var x = """"""
+                pasteText: """
+                abc
+                def
+                """,
+""""
+var x = """  [||]{|Selection:    |}"""
+"""",
+""""
+var x = """
       abc
     def
-    [||]""""""",
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""  abc
-def[||]""""""");
+""""
+var x = """  abc
+def[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_A()
         {
             TestPasteUnknownSource(
-                pasteText: "\"bar",
-@"var x = """"""[||]goo""""""",
-@"var x = """"""
-    ""bar[||]goo
-    """"""",
+                pasteText: """
+                "bar
+                """,
+""""
+var x = """[||]goo"""
+"""",
+""""
+var x = """
+    "bar[||]goo
+    """
+"""",
                 afterUndo:
-@"var x = """"""""bar[||]goo""""""");
+"""""
+var x = """"bar[||]goo"""
+""""");
         }
 
         [WpfFact]
         public void TestNormalTextIntoSingleLineRawStringHeader1_B()
         {
             TestPasteUnknownSource(
-                pasteText: "bar\"",
-@"var x = """"""goo[||]""""""",
-@"var x = """"""
-    goobar""
-    [||]""""""",
+                pasteText: """
+                bar"
+                """,
+""""
+var x = """goo[||]"""
+"""",
+""""
+var x = """
+    goobar"
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""goobar""[||]""""""");
+""""
+var x = """goobar"[||]"""
+"""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader1()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""
-    """"
-    [||]""""""",
+                pasteText: """
+                ""
+                """,
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+""""
+var x = """
+    ""
+    [||]"""
+"""",
                 afterUndo:
-@"var x = """"""""""[||]""""""");
+""""""
+var x = """""[||]"""
+"""""");
         }
 
         [WpfFact]
         public void TestQuotesIntoHeader2()
         {
             TestPasteUnknownSource(
-                pasteText: "\"\"\"",
-@"var x = """"""[||]{|Selection:    |}""""""",
-@"var x = """"""""
-    """"""
-    [||]""""""""",
-                afterUndo:
-@"var x = """"""""""""[||]""""""");
+                pasteText: """"
+                """
+                """",
+""""
+var x = """[||]{|Selection:    |}"""
+"""",
+"""""
+var x = """"
+    """
+    [||]""""
+""""",
+                afterUndo:
+"""""""
+var x = """"""[||]"""
+""""""");
         }
     }
 }

From 42c0a6fae6737b3af21ab6066a98a86f82188602 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:55:04 -0700
Subject: [PATCH 343/413] Switch to raw strings

---
 ...urceIntoVerbatimInterpolatedStringTests.cs | 600 +++++++++++++-----
 1 file changed, 435 insertions(+), 165 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
index aa00f842b9380..f4b2f830a7340 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -20,19 +20,33 @@ public void TestNewLineIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $@""[||]""",
+                """
+                var x = $@"[||]"
+                """,
                 "var x = $@\"\n[||]\"",
-                afterUndo: @"var x = $@""[||]""");
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $@""[||]""",
-                "var x = $@\"\r\n[||]\"",
-                afterUndo: @"var x = $@""[||]""");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"
+                [||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
@@ -40,29 +54,47 @@ public void TestTabIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $@""[||]""",
+                """
+                var x = $@"[||]"
+                """,
                 "var x = $@\"\t[||]\"",
-                afterUndo: @"var x = $@""[||]""");
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoVerbatimInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $@""[||]""",
-                @"var x = $@""'[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """'""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"'[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoVerbatimInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $@""[||]""",
-                "var x = $@\"\"\"[||]\"",
-                afterUndo: "var x = $@\"\"[||]\"");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $@"[||]"
+                """,
+                """"
+                var x = $@"""[||]"
+                """",
+                afterUndo: """
+                var x = $@""[||]"
+                """);
         }
 
         [WpfFact]
@@ -70,123 +102,195 @@ public void TestComplexStringIntoVerbatimInterpolatedString()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $@""[||]""",
+                """
+                var x = $@"[||]"
+                """,
                 "var x = $@\"\t\"\"\t[||]\"",
-                afterUndo: @"var x = $@""[||]""");
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestVerbatimTextIntoVerbatimInterpolatedString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $@""[||]""",
-                @"var x = $@""abc[||]""",
-                afterUndo: @"var x = $@""[||]""");
+                pasteText: """abc""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"abc[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $@""[||]""",
-                @"var x = $@""{{[||]""",
-                afterUndo: "var x = $@\"{[||]\"");
+                pasteText: """{""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"{{[||]"
+                """,
+                afterUndo: """
+                var x = $@"{[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $@""[||]""",
-                @"var x = $@""{{[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """{{""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"{{[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $@""[||]""",
-                @"var x = $@""{{0[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """{{0""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"{{0[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $@""[||]""",
-                @"var x = $@""}}[||]""",
-                afterUndo: "var x = $@\"}[||]\"");
+                pasteText: """}""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"}}[||]"
+                """,
+                afterUndo: """
+                var x = $@"}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $@""[||]""",
-                @"var x = $@""}}[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """}}""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"}}[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $@""[||]""",
-                @"var x = $@""}}0[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """}}0""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"}}0[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $@""[||]""",
-                @"var x = $@""x{0}y[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"x{0}y[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoVerbatimInterpolatedString1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $@""[||]""",
-                @"var x = $@""x{{0}}y[||]""",
-                afterUndo: "var x = $@\"[||]\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $@"[||]"
+                """,
+                """
+                var x = $@"x{{0}}y[||]"
+                """,
+                afterUndo: """
+                var x = $@"[||]"
+                """);
         }
 
         #endregion
 
-        #region Paste from external source into verbatim interpolated string before hole
+#region Paste from external source into verbatim interpolated string before hole
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $@""[||]{0}""",
+                """
+                var x = $@"[||]{0}"
+                """,
                 "var x = $@\"\n[||]{0}\"",
-                afterUndo: @"var x = $@""[||]{0}""");
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringBeforeHole2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $@""[||]{0}""",
-                "var x = $@\"\r\n[||]{0}\"",
-                afterUndo: @"var x = $@""[||]{0}""");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"
+                [||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
@@ -194,29 +298,47 @@ public void TestTabIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $@""[||]{0}""",
+                """
+                var x = $@"[||]{0}"
+                """,
                 "var x = $@\"\t[||]{0}\"",
-                afterUndo: @"var x = $@""[||]{0}""");
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoVerbatimInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""'[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """'""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"'[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoVerbatimInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""""""[||]{0}""",
-                afterUndo: @"var x = $@""""[||]{0}""");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $@"[||]{0}"
+                """,
+                """"
+                var x = $@"""[||]{0}"
+                """",
+                afterUndo: """
+                var x = $@""[||]{0}"
+                """);
         }
 
         [WpfFact]
@@ -224,123 +346,195 @@ public void TestComplexStringIntoVerbatimInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $@""[||]{0}""",
+                """
+                var x = $@"[||]{0}"
+                """,
                 "var x = $@\"\t\"\"\t[||]{0}\"",
-                afterUndo: @"var x = $@""[||]{0}""");
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestVerbatimTextIntoVerbatimInterpolatedStringBeforeHole()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""abc[||]{0}""",
-                afterUndo: @"var x = $@""[||]{0}""");
+                pasteText: """abc""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"abc[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""{{[||]{0}""",
-                afterUndo: "var x = $@\"{[||]{0}\"");
+                pasteText: """{""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"{{[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"{[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""{{[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """{{""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"{{[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""{{0[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """{{0""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"{{0[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""}}[||]{0}""",
-                afterUndo: "var x = $@\"}[||]{0}\"");
+                pasteText: """}""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"}}[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"}[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""}}[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """}}""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"}}[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""}}0[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """}}0""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"}}0[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""x{0}y[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"x{0}y[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoVerbatimInterpolatedStringBeforeHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $@""[||]{0}""",
-                @"var x = $@""x{{0}}y[||]{0}""",
-                afterUndo: "var x = $@\"[||]{0}\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $@"[||]{0}"
+                """,
+                """
+                var x = $@"x{{0}}y[||]{0}"
+                """,
+                afterUndo: """
+                var x = $@"[||]{0}"
+                """);
         }
 
         #endregion
 
-        #region Paste from external source into verbatim interpolated string after hole
+#region Paste from external source into verbatim interpolated string after hole
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = $@""{0}[||]""",
+                """
+                var x = $@"{0}[||]"
+                """,
                 "var x = $@\"{0}\n[||]\"",
-                afterUndo: @"var x = $@""{0}[||]""");
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringAfterHole2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = $@""{0}[||]""",
-                "var x = $@\"{0}\r\n[||]\"",
-                afterUndo: @"var x = $@""{0}[||]""");
+                pasteText: """
+
+
+                """,
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}
+                [||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
@@ -348,29 +542,47 @@ public void TestTabIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = $@""{0}[||]""",
+                """
+                var x = $@"{0}[||]"
+                """,
                 "var x = $@\"{0}\t[||]\"",
-                afterUndo: @"var x = $@""{0}[||]""");
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoVerbatimInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}'[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """'""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}'[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoVerbatimInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}""""[||]""",
-                afterUndo: @"var x = $@""{0}""[||]""");
+                pasteText: """
+                "
+                """,
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}""[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}"[||]"
+                """);
         }
 
         [WpfFact]
@@ -378,101 +590,159 @@ public void TestComplexStringIntoVerbatimInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = $@""{0}[||]""",
+                """
+                var x = $@"{0}[||]"
+                """,
                 "var x = $@\"{0}\t\"\"\t[||]\"",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestVerbatimTextIntoVerbatimInterpolatedStringAfterHole()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}abc[||]""",
-                afterUndo: @"var x = $@""{0}[||]""");
+                pasteText: """abc""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}abc[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestOpenCurlyIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}{{[||]""",
-                afterUndo: "var x = $@\"{0}{[||]\"");
+                pasteText: """{""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}{{[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}{[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}{{[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """{{""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}{{[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoOpenCurliesAndContentIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "{{0",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}{{0[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """{{0""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}{{0[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCloseCurlyIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}}}[||]""",
-                afterUndo: "var x = $@\"{0}}[||]\"");
+                pasteText: """}""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}}}[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}}}[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """}}""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}}}[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestTwoCloseCurliesAndContentIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "}}0",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}}}0[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """}}0""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}}}0[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurlyWithContentIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{0}y",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}x{0}y[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """x{0}y""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}x{0}y[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
         [WpfFact]
         public void TestCurliesWithContentIntoVerbatimInterpolatedStringAfterHole1()
         {
             TestPasteUnknownSource(
-                pasteText: "x{{0}}y",
-                @"var x = $@""{0}[||]""",
-                @"var x = $@""{0}x{{0}}y[||]""",
-                afterUndo: "var x = $@\"{0}[||]\"");
+                pasteText: """x{{0}}y""",
+                """
+                var x = $@"{0}[||]"
+                """,
+                """
+                var x = $@"{0}x{{0}}y[||]"
+                """,
+                afterUndo: """
+                var x = $@"{0}[||]"
+                """);
         }
 
-        #endregion
+#endregion
     }
 }

From ec496bdbbacb2ae9af8f3f3e0f486842d32aef18 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:56:51 -0700
Subject: [PATCH 344/413] Switch to raw strings

---
 ...steUnknownSourceIntoVerbatimStringTests.cs | 86 ++++++++++++++-----
 1 file changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimStringTests.cs
index 2a7752dd050b3..2f9d6888d4d2c 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimStringTests.cs
@@ -15,19 +15,33 @@ public void TestNewLineIntoVerbatimString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\n",
-                @"var x = @""[||]""",
+                """
+                var x = @"[||]"
+                """,
                 "var x = @\"\n[||]\"",
-                afterUndo: @"var x = @""[||]""");
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestNewLineIntoVerbatimString2()
         {
             TestPasteUnknownSource(
-                pasteText: "\r\n",
-                @"var x = @""[||]""",
-                "var x = @\"\r\n[||]\"",
-                afterUndo: @"var x = @""[||]""");
+                pasteText: """
+
+
+                """,
+                """
+                var x = @"[||]"
+                """,
+                """
+                var x = @"
+                [||]"
+                """,
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
 
         [WpfFact]
@@ -35,29 +49,47 @@ public void TestTabIntoVerbatimString1()
         {
             TestPasteUnknownSource(
                 pasteText: "\t",
-                @"var x = @""[||]""",
+                """
+                var x = @"[||]"
+                """,
                 "var x = @\"\t[||]\"",
-                afterUndo: @"var x = @""[||]""");
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestSingleQuoteIntoVerbatimString()
         {
             TestPasteUnknownSource(
-                pasteText: "'",
-                @"var x = @""[||]""",
-                @"var x = @""'[||]""",
-                afterUndo: @"var x = @""[||]""");
+                pasteText: """'""",
+                """
+                var x = @"[||]"
+                """,
+                """
+                var x = @"'[||]"
+                """,
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestDoubleQuoteIntoVerbatimString()
         {
             TestPasteUnknownSource(
-                pasteText: "\"",
-                @"var x = @""[||]""",
-                @"var x = @""""""[||]""",
-                afterUndo: @"var x = @""""[||]""");
+                pasteText: """
+                "
+                """,
+                """
+                var x = @"[||]"
+                """,
+                """"
+                var x = @"""[||]"
+                """",
+                afterUndo: """
+                var x = @""[||]"
+                """);
         }
 
         [WpfFact]
@@ -65,19 +97,29 @@ public void TestComplexStringIntoVerbatimString()
         {
             TestPasteUnknownSource(
                 pasteText: "\t\"\"\t",
-                @"var x = @""[||]""",
+                """
+                var x = @"[||]"
+                """,
                 "var x = @\"\t\"\"\t[||]\"",
-                afterUndo: @"var x = @""[||]""");
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
 
         [WpfFact]
         public void TestNormalTextIntoVerbatimString()
         {
             TestPasteUnknownSource(
-                pasteText: "abc",
-                @"var x = @""[||]""",
-                @"var x = @""abc[||]""",
-                afterUndo: @"var x = @""[||]""");
+                pasteText: """abc""",
+                """
+                var x = @"[||]"
+                """,
+                """
+                var x = @"abc[||]"
+                """,
+                afterUndo: """
+                var x = @"[||]"
+                """);
         }
     }
 }

From 1a6bc4914bd020f994b63a44ead9741077ac563f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 18:58:25 -0700
Subject: [PATCH 345/413] Formatting

---
 ...steKnownSourceIntoMultiLineRawInterpolatedStringTests.cs | 6 +++---
 .../PasteKnownSourceIntoMultiLineRawStringTests.cs          | 2 +-
 ...teKnownSourceIntoSingleLineRawInterpolatedStringTests.cs | 2 +-
 .../PasteKnownSourceIntoSingleLineRawStringTests.cs         | 2 +-
 .../PasteUnknownSourceIntoNormalInterpolatedStringTests.cs  | 6 +++---
 ...PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
index b5d8ef16abeef..ff8592b8555da 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawInterpolatedStringTests.cs
@@ -894,9 +894,9 @@ public void TestPasteInterpolationIntoSelection13()
 """");
         }
 
-#endregion
+        #endregion
 
-#region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
+        #region Known Source tests 'PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests'
 
         // Tests where we place things directly on the clipboard (avoiding the need to do the actual copy).
         // This allows a port of the tests in PasteUnknownSourceIntoSingleLineInterpolatedRawStringTests.cs
@@ -3085,6 +3085,6 @@ public void TestQuotesIntoHeader2_B()
 """"""");
         }
 
-#endregion
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
index 91572f345fd5e..432b4b4d39065 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoMultiLineRawStringTests.cs
@@ -1532,6 +1532,6 @@ public void TestQuotesIntoHeader2()
 """");
         }
 
-#endregion
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
index 170eff663bcb4..652c4651f53a5 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
@@ -2166,6 +2166,6 @@ public void TestQuotesIntoHeader2()
 """"""");
         }
 
-#endregion
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
index afc14bc870554..270c27df5a4d1 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawStringTests.cs
@@ -2175,6 +2175,6 @@ public void TestQuotesIntoHeader2()
 """"""");
         }
 
-#endregion
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
index dc7a17c770250..4e2f737c59021 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoNormalInterpolatedStringTests.cs
@@ -496,9 +496,9 @@ public void TestCurliesWithContentIntoNormalInterpolatedStringBeforeHole1()
                 """);
         }
 
-#endregion
+        #endregion
 
-#region Paste from external source into normal interpolated string after hole
+        #region Paste from external source into normal interpolated string after hole
 
         [WpfFact]
         public void TestNewLineIntoNormalInterpolatedStringAfterHole1()
@@ -740,6 +740,6 @@ public void TestCurliesWithContentIntoNormalInterpolatedStringAfterHole1()
                 """);
         }
 
-#endregion
+        #endregion
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
index f4b2f830a7340..cfe461bf0a507 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteUnknownSourceIntoVerbatimInterpolatedStringTests.cs
@@ -257,7 +257,7 @@ public void TestCurliesWithContentIntoVerbatimInterpolatedString1()
 
         #endregion
 
-#region Paste from external source into verbatim interpolated string before hole
+        #region Paste from external source into verbatim interpolated string before hole
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringBeforeHole1()
@@ -501,7 +501,7 @@ public void TestCurliesWithContentIntoVerbatimInterpolatedStringBeforeHole1()
 
         #endregion
 
-#region Paste from external source into verbatim interpolated string after hole
+        #region Paste from external source into verbatim interpolated string after hole
 
         [WpfFact]
         public void TestNewLineIntoVerbatimInterpolatedStringAfterHole1()
@@ -743,6 +743,6 @@ public void TestCurliesWithContentIntoVerbatimInterpolatedStringAfterHole1()
                 """);
         }
 
-#endregion
+        #endregion
     }
 }

From d2ac1939cf9753c9fe70d45ffec27a83afaeec07 Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Sun, 8 May 2022 19:53:16 -0700
Subject: [PATCH 346/413] Remove VB FixAll tests for Invert conditional
 refactoring

---
 .../InvertConditional/InvertIfTests_FixAll.vb | 368 ------------------
 1 file changed, 368 deletions(-)
 delete mode 100644 src/EditorFeatures/VisualBasicTest/InvertConditional/InvertIfTests_FixAll.vb

diff --git a/src/EditorFeatures/VisualBasicTest/InvertConditional/InvertIfTests_FixAll.vb b/src/EditorFeatures/VisualBasicTest/InvertConditional/InvertIfTests_FixAll.vb
deleted file mode 100644
index f54807cc440d9..0000000000000
--- a/src/EditorFeatures/VisualBasicTest/InvertConditional/InvertIfTests_FixAll.vb
+++ /dev/null
@@ -1,368 +0,0 @@
-' 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 Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
-
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.InvertConditional
-    <Trait(Traits.Feature, Traits.Features.CodeActionsInvertConditional)>
-    Partial Public Class InvertConditionalTests
-        Inherits AbstractVisualBasicCodeActionTest
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInDocument() As Task
-            Await TestInRegularAndScriptAsync(
-"Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInDocument:|}If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class",
-"Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class")
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInProject() As Task
-            Dim input = <Workspace>
-                            <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                <Document><![CDATA[
-Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInProject:|}If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                                <Document><![CDATA[
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                            <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                <ProjectReference>Assembly1</ProjectReference>
-                                <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                        </Workspace>.ToString()
-
-            Dim expected = <Workspace>
-                               <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                   <Document><![CDATA[
-Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                                   <Document><![CDATA[
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                               <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                   <ProjectReference>Assembly1</ProjectReference>
-                                   <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                           </Workspace>.ToString()
-
-            Await TestInRegularAndScriptAsync(input, expected)
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInSolution() As Task
-            Dim input = <Workspace>
-                            <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                <Document><![CDATA[
-Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInSolution:|}If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                                <Document><![CDATA[
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                            <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                <ProjectReference>Assembly1</ProjectReference>
-                                <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                        </Workspace>.ToString()
-
-            Dim expected = <Workspace>
-                               <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                   <Document><![CDATA[
-Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                                   <Document><![CDATA[
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                               <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                   <ProjectReference>Assembly1</ProjectReference>
-                                   <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                           </Workspace>.ToString()
-
-            Await TestInRegularAndScriptAsync(input, expected)
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInContainingMember() As Task
-            Await TestInRegularAndScriptAsync(
-"Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInContainingMember:|}If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class",
-"Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-        Dim c2 = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class")
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInContainingType() As Task
-            Await TestInRegularAndScriptAsync(
-"Partial Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInContainingType:|}If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class
-
-Partial Class C
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class",
-"Partial Class C
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-        Dim c2 = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-        Dim c2 = If(Not x, b, a)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-        Dim c2 = If(x, a, b)
-    End Sub
-End Class
-
-Partial Class C
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-        Dim c2 = If(Not x, b, a)
-    End Sub
-End Class")
-        End Function
-
-        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)>
-        Public Async Function InvertConditional_FixAllInContainingType_AcrossFiles() As Task
-            Dim input = <Workspace>
-                            <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                <Document><![CDATA[
-Partial Class C1
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = {|FixAllInContainingType:|}If(x, a, b)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                                <Document><![CDATA[
-Partial Class C1
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                            <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                <ProjectReference>Assembly1</ProjectReference>
-                                <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                </Document>
-                            </Project>
-                        </Workspace>.ToString()
-
-            Dim expected = <Workspace>
-                               <Project Language="Visual Basic" AssemblyName="Assembly1" CommonReferences="true">
-                                   <Document><![CDATA[
-Partial Class C1
-    Sub M1(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-
-    Sub M2(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class]]>
-                                   </Document>
-                                   <Document><![CDATA[
-Partial Class C1
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(Not x, b, a)
-    End Sub
-End Class
-
-Class C2
-    Sub M3(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                               <Project Language="Visual Basic" AssemblyName="Assembly2" CommonReferences="true">
-                                   <ProjectReference>Assembly1</ProjectReference>
-                                   <Document><![CDATA[
-Class C3
-    Sub M4(x As Boolean, a As Integer, b As Integer)
-        Dim c = If(x, a, b)
-    End Sub
-End Class]]>
-                                   </Document>
-                               </Project>
-                           </Workspace>.ToString()
-
-            Await TestInRegularAndScriptAsync(input, expected)
-        End Function
-    End Class
-End Namespace

From 083c0a665a24a0c729b63628265c6ca2223e2762 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 20:28:20 -0700
Subject: [PATCH 347/413] lint

---
 .../CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index c6964a76ae853..c4c0a52cd5d87 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -184,7 +184,7 @@ ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
                     documentBeforePaste, snapshotBeforePaste.AsText(), stringExpressionBeforePaste, cancellationToken);
 
                 // See if this is a paste of the last copy that we heard about.
-                var edits = TryGetEditsFromKnownCopySource(newLine, indentationWhitespace, cancellationToken);
+                var edits = TryGetEditsFromKnownCopySource(newLine, indentationWhitespace);
                 if (!edits.IsDefaultOrEmpty)
                     return edits;
 
@@ -201,7 +201,7 @@ ImmutableArray<TextChange> GetEdits(CancellationToken cancellationToken)
             }
 
             ImmutableArray<TextChange> TryGetEditsFromKnownCopySource(
-                string newLine, string indentationWhitespace, CancellationToken cancellationToken)
+                string newLine, string indentationWhitespace)
             {
                 // For simplicity, we only support smart copy/paste when we are pasting into a single contiguous region.
                 if (selectionsBeforePaste.Count != 1)

From 30bf2750b367037cfff79fdd9578c5aaebb92dbd Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Sun, 8 May 2022 20:34:03 -0700
Subject: [PATCH 348/413] Cleanup

---
 .../PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
index f0916a99b0bc4..9382c1e69b32b 100644
--- a/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
+++ b/src/EditorFeatures/CSharpTest/StringCopyPaste/PasteKnownSourceIntoSingleLineRawInterpolatedStringTests.cs
@@ -219,7 +219,7 @@ public void TestPasteFullySelectedEscapeNormalLiteralContent()
     $""""""\n[||] """""";");
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "Investigating")]
         public void TestPasteFullySelectedEscapeNormalLiteralContent2()
         {
             TestCopyPaste(

From 1d69a3f23cdfbb616c1d4c8ca3735208895fb766 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 9 May 2022 09:07:23 -0700
Subject: [PATCH 349/413] Ensure we do string-copy-paste before format-on-paste

---
 .../CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs | 6 ++++--
 .../Extensibility/Commands/PredefinedCommandHandlerNames.cs | 5 +++++
 src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
index c4c0a52cd5d87..5587df535d02d 100644
--- a/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs
@@ -23,6 +23,7 @@
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
 using Microsoft.VisualStudio.Text.Operations;
+using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
 using VSUtilities = Microsoft.VisualStudio.Utilities;
 
@@ -43,8 +44,9 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.StringCopyPaste
     /// doesn't want the change we made, they can always undo to get the prior paste behavior.
     /// </remarks>
     [Export(typeof(ICommandHandler))]
-    [VSUtilities.ContentType(ContentTypeNames.CSharpContentType)]
-    [VSUtilities.Name(nameof(StringCopyPasteCommandHandler))]
+    [ContentType(ContentTypeNames.CSharpContentType)]
+    [Name(PredefinedCommandHandlerNames.StringCopyPaste)]
+    [Order(After = PredefinedCommandHandlerNames.FormatDocument)]
     internal partial class StringCopyPasteCommandHandler :
         IChainedCommandHandler<CutCommandArgs>,
         IChainedCommandHandler<CopyCommandArgs>,
diff --git a/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs b/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs
index 97d870afb95ff..de1e119d5563a 100644
--- a/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs
+++ b/src/EditorFeatures/Core/Extensibility/Commands/PredefinedCommandHandlerNames.cs
@@ -147,6 +147,11 @@ internal static class PredefinedCommandHandlerNames
         /// </summary>
         public const string SignatureHelpAfterCompletion = "Signature Help After Completion Command Handler";
 
+        /// <summary>
+        /// Command handler name for String Copy Paste.
+        /// </summary>
+        public const string StringCopyPaste = "String Copy Paste";
+
         /// <summary>
         /// Command handler name for Toggle Block Comments.
         /// </summary>
diff --git a/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs b/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs
index 8f1f2991f8719..cfd0f0cb137b3 100644
--- a/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs
+++ b/src/EditorFeatures/Core/Formatting/FormatCommandHandler.cs
@@ -33,6 +33,7 @@ namespace Microsoft.CodeAnalysis.Formatting
     [ContentType(ContentTypeNames.RoslynContentType)]
     [Name(PredefinedCommandHandlerNames.FormatDocument)]
     [Order(After = PredefinedCommandHandlerNames.Rename)]
+    [Order(Before = PredefinedCommandHandlerNames.StringCopyPaste)]
     [Order(Before = PredefinedCompletionNames.CompletionCommandHandler)]
     internal partial class FormatCommandHandler :
         ICommandHandler<FormatDocumentCommandArgs>,

From 9ac5b37269eafe0af5f81a36e4c9056ea6f42a11 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Mon, 9 May 2022 11:44:55 -0700
Subject: [PATCH 350/413] Avoid yield in ReadAsync/WriteAsync unless on main
 thread

---
 .../Utilities/WorkspaceThreadingService.cs    |  2 ++
 .../Test/Workspaces/TextFactoryTests.cs       |  4 +--
 .../Utilities/IWorkspaceThreadingService.cs   |  2 ++
 .../TemporaryStorageServiceFactory.cs         | 36 ++++++++++++++-----
 .../TemporaryStorageServiceTests.cs           | 22 ++++++------
 5 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/EditorFeatures/Core/Shared/Utilities/WorkspaceThreadingService.cs b/src/EditorFeatures/Core/Shared/Utilities/WorkspaceThreadingService.cs
index ec046b340bf44..0fdfb00677591 100644
--- a/src/EditorFeatures/Core/Shared/Utilities/WorkspaceThreadingService.cs
+++ b/src/EditorFeatures/Core/Shared/Utilities/WorkspaceThreadingService.cs
@@ -23,6 +23,8 @@ public WorkspaceThreadingService(IThreadingContext threadingContext)
             _threadingContext = threadingContext;
         }
 
+        public bool IsOnMainThread => _threadingContext.JoinableTaskContext.IsOnMainThread;
+
         public TResult Run<TResult>(Func<Task<TResult>> asyncMethod)
         {
             return _threadingContext.JoinableTaskFactory.Run(asyncMethod);
diff --git a/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs b/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
index d4c139598ad1d..1adb91c252704 100644
--- a/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
+++ b/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
@@ -66,7 +66,7 @@ public void TestCreateTextUsesByteOrderMarkIfPresent()
         public async Task TestCreateFromTemporaryStorage()
         {
             var textFactory = CreateMockTextFactoryService();
-            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
 
             var text = SourceText.From("Hello, World!");
 
@@ -87,7 +87,7 @@ public async Task TestCreateFromTemporaryStorage()
         public async Task TestCreateFromTemporaryStorageWithEncoding()
         {
             var textFactory = CreateMockTextFactoryService();
-            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
 
             var text = SourceText.From("Hello, World!", Encoding.ASCII);
 
diff --git a/src/Workspaces/Core/Portable/Shared/Utilities/IWorkspaceThreadingService.cs b/src/Workspaces/Core/Portable/Shared/Utilities/IWorkspaceThreadingService.cs
index 4df5b7713a370..5908f722789c7 100644
--- a/src/Workspaces/Core/Portable/Shared/Utilities/IWorkspaceThreadingService.cs
+++ b/src/Workspaces/Core/Portable/Shared/Utilities/IWorkspaceThreadingService.cs
@@ -25,6 +25,8 @@ namespace Microsoft.CodeAnalysis.Shared.Utilities
     /// </remarks>
     internal interface IWorkspaceThreadingService
     {
+        bool IsOnMainThread { get; }
+
         TResult Run<TResult>(Func<Task<TResult>> asyncMethod);
     }
 
diff --git a/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs b/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
index ee02638a6bab5..b1af50487281e 100644
--- a/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
+++ b/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
@@ -23,10 +23,14 @@ namespace Microsoft.CodeAnalysis.Host
     [ExportWorkspaceServiceFactory(typeof(ITemporaryStorageService), ServiceLayer.Default), Shared]
     internal partial class TemporaryStorageServiceFactory : IWorkspaceServiceFactory
     {
+        private readonly IWorkspaceThreadingService? _workspaceThreadingService;
+
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public TemporaryStorageServiceFactory()
+        public TemporaryStorageServiceFactory(
+            [Import(AllowDefault = true)] IWorkspaceThreadingService? workspaceThreadingService)
         {
+            _workspaceThreadingService = workspaceThreadingService;
         }
 
         public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
@@ -37,7 +41,7 @@ public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
             // and .NET Core Windows. For non-Windows .NET Core scenarios, we can return the TrivialTemporaryStorageService
             // until https://github.com/dotnet/runtime/issues/30878 is fixed.
             return PlatformInformation.IsWindows || PlatformInformation.IsRunningOnMono
-                ? new TemporaryStorageService(textFactory)
+                ? new TemporaryStorageService(_workspaceThreadingService, textFactory)
                 : TrivialTemporaryStorageService.Instance;
         }
 
@@ -67,6 +71,7 @@ internal class TemporaryStorageService : ITemporaryStorageService2
             /// <seealso cref="_weakFileReference"/>
             private const long MultiFileBlockSize = SingleFileThreshold * 32;
 
+            private readonly IWorkspaceThreadingService? _workspaceThreadingService;
             private readonly ITextFactoryService _textFactory;
 
             /// <summary>
@@ -112,8 +117,11 @@ internal class TemporaryStorageService : ITemporaryStorageService2
             /// <seealso cref="_weakFileReference"/>
             private long _offset;
 
-            public TemporaryStorageService(ITextFactoryService textFactory)
-                => _textFactory = textFactory;
+            public TemporaryStorageService(IWorkspaceThreadingService? workspaceThreadingService, ITextFactoryService textFactory)
+            {
+                _workspaceThreadingService = workspaceThreadingService;
+                _textFactory = textFactory;
+            }
 
             public ITemporaryTextStorage CreateTemporaryTextStorage(CancellationToken cancellationToken)
                 => new TemporaryTextStorage(this);
@@ -242,7 +250,7 @@ public SourceText ReadText(CancellationToken cancellationToken)
                     }
                 }
 
-                public Task<SourceText> ReadTextAsync(CancellationToken cancellationToken)
+                public async Task<SourceText> ReadTextAsync(CancellationToken cancellationToken)
                 {
                     // There is a reason for implementing it like this: proper async implementation
                     // that reads the underlying memory mapped file stream in an asynchronous fashion
@@ -254,7 +262,13 @@ public Task<SourceText> ReadTextAsync(CancellationToken cancellationToken)
                     // of a page fault. Therefore, if we're going to be blocking a thread, we should
                     // just block one thread and do the whole thing at once vs. a fake "async"
                     // implementation which will continue to requeue work back to the thread pool.
-                    return Task.Factory.StartNew(() => ReadText(cancellationToken), cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
+                    if (_service._workspaceThreadingService is { IsOnMainThread: true })
+                    {
+                        await Task.Yield().ConfigureAwait(false);
+                        cancellationToken.ThrowIfCancellationRequested();
+                    }
+
+                    return ReadText(cancellationToken);
                 }
 
                 public void WriteText(SourceText text, CancellationToken cancellationToken)
@@ -281,10 +295,16 @@ public void WriteText(SourceText text, CancellationToken cancellationToken)
                     }
                 }
 
-                public Task WriteTextAsync(SourceText text, CancellationToken cancellationToken = default)
+                public async Task WriteTextAsync(SourceText text, CancellationToken cancellationToken)
                 {
                     // See commentary in ReadTextAsync for why this is implemented this way.
-                    return Task.Factory.StartNew(() => WriteText(text, cancellationToken), cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
+                    if (_service._workspaceThreadingService is { IsOnMainThread: true })
+                    {
+                        await Task.Yield().ConfigureAwait(false);
+                        cancellationToken.ThrowIfCancellationRequested();
+                    }
+
+                    WriteText(text, cancellationToken);
                 }
 
                 private static unsafe TextReader CreateTextReaderFromTemporaryStorage(ISupportDirectMemoryAccess accessor, int streamLength)
diff --git a/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs b/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
index c14ea562a6859..89b6ab18dadd2 100644
--- a/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
+++ b/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
@@ -27,7 +27,7 @@ public void TestTemporaryStorageText()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
 
             // test normal string
             var text = SourceText.From(new string(' ', 4096) + "public class A {}");
@@ -48,7 +48,7 @@ public void TestTemporaryStorageStream()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var temporaryStorage = service.CreateTemporaryStreamStorage(System.Threading.CancellationToken.None);
 
             using var data = SerializableBytes.CreateWritableStream();
@@ -91,7 +91,7 @@ public void TestTemporaryTextStorageExceptions()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryTextStorage(CancellationToken.None);
 
             // Nothing has been written yet
@@ -112,7 +112,7 @@ public void TestTemporaryStreamStorageExceptions()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             // Nothing has been written yet
@@ -135,7 +135,7 @@ public void TestZeroLengthStreams()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             // 0 length streams are allowed
@@ -155,7 +155,7 @@ public void TestTemporaryStorageMemoryMappedFileManagement()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var buffer = new MemoryStream(257 * 1024 + 1);
             for (var i = 0; i < buffer.Length; i++)
             {
@@ -202,7 +202,7 @@ public void TestTemporaryStorageScaling()
             {
                 using var workspace = new AdhocWorkspace();
                 var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-                var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+                var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
 
                 using var data = SerializableBytes.CreateWritableStream();
                 for (var i = 0; i < 1024 * 128; i++)
@@ -235,7 +235,7 @@ public void StreamTest1()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -262,7 +262,7 @@ public void StreamTest2()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -299,7 +299,7 @@ public void StreamTest3()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -336,7 +336,7 @@ public void TestTemporaryStorageTextEncoding()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(textFactory);
+            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
 
             // test normal string
             var text = SourceText.From(new string(' ', 4096) + "public class A {}", Encoding.ASCII);

From c510b7cbdf074b664b3e01767fc9e193ab13e6bd Mon Sep 17 00:00:00 2001
From: Briana <brianaeng@users.noreply.github.com>
Date: Mon, 9 May 2022 12:16:45 -0700
Subject: [PATCH 351/413] Bump timeout from 200 => 260 min (#60909)

---
 azure-pipelines-richnav.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml
index e68c88ad6c78e..e113832f281ae 100644
--- a/azure-pipelines-richnav.yml
+++ b/azure-pipelines-richnav.yml
@@ -23,7 +23,7 @@ jobs:
     demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
   variables:
     EnableRichCodeNavigation: true
-  timeoutInMinutes: 200
+  timeoutInMinutes: 260
 
   steps:
     - task: PowerShell@2

From 74c2b7146eab9afac7cc1eb46e4ce314d32c2194 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Mon, 9 May 2022 22:33:43 +0300
Subject: [PATCH 352/413] Tweak tests

---
 .../RemoveUnusedMembersTests.cs               | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index a3c40a2d0344f..175337b57dd4d 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -1515,16 +1515,13 @@ public async Task PropertyIsIncrementedAndValueDropped_VerifyAnalizerMessage()
 
         [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
-        public async Task PropertyIsIncrementedAndValueDropped_NoDiagnosticWhenReadingPropertyFromSomewhereElse()
+        public async Task PropertyIsIncrementedAndValueDropped_NoDiagnosticWhenPropertyIsReadSomewhereElse()
         {
             var code = @"class MyClass
 {
-    public void M1() { Test.P++; }
-}
-
-class Test
-{
-    public static int P { get; set; }
+    private int P { get; set; }
+    public void M1() { ++P; }
+    public int M2() => P;
 }";
 
             await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
@@ -1660,16 +1657,13 @@ public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnal
 
         [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
-        public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_NoDiagnosticWhenReadingPropertyFromSomewhereElse()
+        public async Task PropertyIsTargetOfCompoundAssignmentAndValueDropped_NoDiagnosticWhenPropertyIsReadSomewhereElse()
         {
             var code = @"class MyClass
 {
-    public void M1(int x) { Test.P += x; }
-}
-
-class Test
-{
-    public static int P { get; set; }
+    private int P { get; set; }
+    public void M1(int x) { P += x; }
+    public int M2() => P;
 }";
 
             await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());

From 6dac65d662a07b115826859a2734a8f5381d4482 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Mon, 9 May 2022 12:35:25 -0700
Subject: [PATCH 353/413] Avoid direct construction of MEF parts in tests

---
 .../Test/Workspaces/TextFactoryTests.cs       | 78 ++++++-------------
 .../TemporaryStorageServiceFactory.cs         |  2 +
 .../TemporaryStorageServiceTests.cs           | 24 +++---
 3 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs b/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
index 1adb91c252704..4be1374dcd5f3 100644
--- a/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
+++ b/src/EditorFeatures/Test/Workspaces/TextFactoryTests.cs
@@ -2,9 +2,6 @@
 // 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.IO;
 using System.Linq;
 using System.Text;
@@ -13,9 +10,6 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Utilities;
-using Moq;
 using Roslyn.Test.Utilities;
 using Xunit;
 
@@ -29,7 +23,11 @@ public class TextFactoryTests
         [Fact, WorkItem(1038018, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1038018"), WorkItem(1041792, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1041792")]
         public void TestCreateTextFallsBackToSystemDefaultEncoding()
         {
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+            var textFactoryService = Assert.IsType<EditorTextFactoryService>(workspace.Services.GetRequiredService<ITextFactoryService>());
+
             TestCreateTextInferredEncoding(
+                textFactoryService,
                 _nonUTF8StringBytes,
                 defaultEncoding: null,
                 expectedEncoding: Encoding.Default);
@@ -38,7 +36,11 @@ public void TestCreateTextFallsBackToSystemDefaultEncoding()
         [Fact, WorkItem(1038018, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1038018")]
         public void TestCreateTextFallsBackToUTF8Encoding()
         {
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+            var textFactoryService = Assert.IsType<EditorTextFactoryService>(workspace.Services.GetRequiredService<ITextFactoryService>());
+
             TestCreateTextInferredEncoding(
+                textFactoryService,
                 new ASCIIEncoding().GetBytes("Test"),
                 defaultEncoding: null,
                 expectedEncoding: new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true));
@@ -47,7 +49,11 @@ public void TestCreateTextFallsBackToUTF8Encoding()
         [Fact, WorkItem(1038018, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1038018")]
         public void TestCreateTextFallsBackToProvidedDefaultEncoding()
         {
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+            var textFactoryService = Assert.IsType<EditorTextFactoryService>(workspace.Services.GetRequiredService<ITextFactoryService>());
+
             TestCreateTextInferredEncoding(
+                textFactoryService,
                 new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true).GetBytes("Test"),
                 defaultEncoding: Encoding.GetEncoding(1254),
                 expectedEncoding: Encoding.GetEncoding(1254));
@@ -56,7 +62,11 @@ public void TestCreateTextFallsBackToProvidedDefaultEncoding()
         [Fact, WorkItem(1038018, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1038018")]
         public void TestCreateTextUsesByteOrderMarkIfPresent()
         {
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+            var textFactoryService = Assert.IsType<EditorTextFactoryService>(workspace.Services.GetRequiredService<ITextFactoryService>());
+
             TestCreateTextInferredEncoding(
+                textFactoryService,
                 Encoding.UTF8.GetPreamble().Concat(new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true).GetBytes("Test")).ToArray(),
                 defaultEncoding: Encoding.GetEncoding(1254),
                 expectedEncoding: Encoding.UTF8);
@@ -65,8 +75,9 @@ public void TestCreateTextUsesByteOrderMarkIfPresent()
         [Fact]
         public async Task TestCreateFromTemporaryStorage()
         {
-            var textFactory = CreateMockTextFactoryService();
-            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+
+            var temporaryStorageService = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
 
             var text = SourceText.From("Hello, World!");
 
@@ -86,8 +97,9 @@ public async Task TestCreateFromTemporaryStorage()
         [Fact]
         public async Task TestCreateFromTemporaryStorageWithEncoding()
         {
-            var textFactory = CreateMockTextFactoryService();
-            var temporaryStorageService = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            using var workspace = new AdhocWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
+
+            var temporaryStorageService = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
 
             var text = SourceText.From("Hello, World!", Encoding.ASCII);
 
@@ -104,53 +116,11 @@ public async Task TestCreateFromTemporaryStorageWithEncoding()
             Assert.Equal(text2.Encoding, Encoding.ASCII);
         }
 
-        private static EditorTextFactoryService CreateMockTextFactoryService()
+        private static void TestCreateTextInferredEncoding(ITextFactoryService textFactoryService, byte[] bytes, Encoding? defaultEncoding, Encoding expectedEncoding)
         {
-            var mockTextBufferFactoryService = new Mock<ITextBufferFactoryService>(MockBehavior.Strict);
-            mockTextBufferFactoryService
-                .Setup(t => t.CreateTextBuffer(It.IsAny<TextReader>(), It.IsAny<IContentType>()))
-                .Returns<TextReader, IContentType>((reader, contentType) =>
-                {
-                    var text = reader.ReadToEnd();
-
-                    var mockImage = new Mock<ITextImage>(MockBehavior.Strict);
-                    mockImage.Setup(i => i.GetText(It.IsAny<Span>())).Returns(text);
-                    mockImage.Setup(i => i.Length).Returns(text.Length);
-
-                    var mockSnapshot = new Mock<ITextSnapshot2>(MockBehavior.Strict);
-                    mockSnapshot.Setup(s => s.TextImage).Returns(mockImage.Object);
-                    mockSnapshot.Setup(s => s.GetText()).Returns(text);
-
-                    var mockTextBuffer = new Mock<ITextBuffer>(MockBehavior.Strict);
-                    mockTextBuffer.Setup(b => b.CurrentSnapshot).Returns(mockSnapshot.Object);
-                    return mockTextBuffer.Object;
-                });
-
-            var mockUnknownContentType = new Mock<IContentType>(MockBehavior.Strict);
-            var mockContentTypeRegistryService = new Mock<IContentTypeRegistryService>(MockBehavior.Strict);
-            mockContentTypeRegistryService.Setup(r => r.UnknownContentType).Returns(mockUnknownContentType.Object);
-
-            return new EditorTextFactoryService(new FakeTextBufferCloneService(), mockTextBufferFactoryService.Object, mockContentTypeRegistryService.Object);
-        }
-
-        private static void TestCreateTextInferredEncoding(byte[] bytes, Encoding defaultEncoding, Encoding expectedEncoding)
-        {
-            var factory = CreateMockTextFactoryService();
             using var stream = new MemoryStream(bytes);
-            var text = factory.CreateText(stream, defaultEncoding);
+            var text = textFactoryService.CreateText(stream, defaultEncoding);
             Assert.Equal(expectedEncoding, text.Encoding);
         }
-
-        private class FakeTextBufferCloneService : ITextBufferCloneService
-        {
-            public ITextBuffer CloneWithUnknownContentType(SnapshotSpan span) => throw new NotImplementedException();
-
-            public ITextBuffer CloneWithUnknownContentType(ITextImage textImage) => throw new NotImplementedException();
-
-            public ITextBuffer CloneWithRoslynContentType(SourceText sourceText) => throw new NotImplementedException();
-
-            public ITextBuffer Clone(SourceText sourceText, IContentType contentType) => throw new NotImplementedException();
-
-        }
     }
 }
diff --git a/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs b/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
index b1af50487281e..17489290589e6 100644
--- a/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
+++ b/src/Workspaces/Core/Portable/TemporaryStorage/TemporaryStorageServiceFactory.cs
@@ -33,6 +33,7 @@ public TemporaryStorageServiceFactory(
             _workspaceThreadingService = workspaceThreadingService;
         }
 
+        [Obsolete(MefConstruction.FactoryMethodMessage, error: true)]
         public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices)
         {
             var textFactory = workspaceServices.GetRequiredService<ITextFactoryService>();
@@ -117,6 +118,7 @@ internal class TemporaryStorageService : ITemporaryStorageService2
             /// <seealso cref="_weakFileReference"/>
             private long _offset;
 
+            [Obsolete(MefConstruction.FactoryMethodMessage, error: true)]
             public TemporaryStorageService(IWorkspaceThreadingService? workspaceThreadingService, ITextFactoryService textFactory)
             {
                 _workspaceThreadingService = workspaceThreadingService;
diff --git a/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs b/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
index 89b6ab18dadd2..75ec29d4728f0 100644
--- a/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
+++ b/src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs
@@ -2,8 +2,6 @@
 // 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.IO;
@@ -27,7 +25,7 @@ public void TestTemporaryStorageText()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
 
             // test normal string
             var text = SourceText.From(new string(' ', 4096) + "public class A {}");
@@ -48,7 +46,7 @@ public void TestTemporaryStorageStream()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var temporaryStorage = service.CreateTemporaryStreamStorage(System.Threading.CancellationToken.None);
 
             using var data = SerializableBytes.CreateWritableStream();
@@ -91,7 +89,7 @@ public void TestTemporaryTextStorageExceptions()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryTextStorage(CancellationToken.None);
 
             // Nothing has been written yet
@@ -112,7 +110,7 @@ public void TestTemporaryStreamStorageExceptions()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             // Nothing has been written yet
@@ -135,7 +133,7 @@ public void TestZeroLengthStreams()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             // 0 length streams are allowed
@@ -155,7 +153,7 @@ public void TestTemporaryStorageMemoryMappedFileManagement()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var buffer = new MemoryStream(257 * 1024 + 1);
             for (var i = 0; i < buffer.Length; i++)
             {
@@ -202,7 +200,7 @@ public void TestTemporaryStorageScaling()
             {
                 using var workspace = new AdhocWorkspace();
                 var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-                var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+                var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
 
                 using var data = SerializableBytes.CreateWritableStream();
                 for (var i = 0; i < 1024 * 128; i++)
@@ -235,7 +233,7 @@ public void StreamTest1()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -262,7 +260,7 @@ public void StreamTest2()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -299,7 +297,7 @@ public void StreamTest3()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
             var storage = service.CreateTemporaryStreamStorage(CancellationToken.None);
 
             using var expected = new MemoryStream();
@@ -336,7 +334,7 @@ public void TestTemporaryStorageTextEncoding()
         {
             using var workspace = new AdhocWorkspace();
             var textFactory = Assert.IsType<TextFactoryService>(workspace.Services.GetService<ITextFactoryService>());
-            var service = new TemporaryStorageServiceFactory.TemporaryStorageService(workspaceThreadingService: null, textFactory);
+            var service = Assert.IsType<TemporaryStorageServiceFactory.TemporaryStorageService>(workspace.Services.GetRequiredService<ITemporaryStorageService>());
 
             // test normal string
             var text = SourceText.From(new string(' ', 4096) + "public class A {}", Encoding.ASCII);

From e2185a335c3b1766945e2b1d3682dfecc6b5e2a6 Mon Sep 17 00:00:00 2001
From: Alireza Habibi <habibi.alireza@outlook.com>
Date: Tue, 10 May 2022 01:08:35 +0430
Subject: [PATCH 354/413] Fix compiler warning reported for target-typed new
 under collection initializer (#61040)

* Fix compiler warning reported for target-typed new under collection initializer
---
 .../Portable/Binder/Binder_Conversions.cs     | 27 +++++------
 .../Portable/Binder/Binder_Expressions.cs     |  3 +-
 .../CSharp/Portable/BoundTree/BoundNodes.xml  | 13 ++---
 .../Generated/BoundNodes.xml.Generated.cs     | 19 +++++---
 .../Symbols/ObsoleteAttributeHelpers.cs       |  1 +
 .../Semantics/ImplicitObjectCreationTests.cs  | 48 +++++++++++++++++++
 6 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs
index 292f04561e606..cf86b929070ba 100644
--- a/src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs
+++ b/src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs
@@ -343,12 +343,12 @@ internal void CheckConstraintLanguageVersionAndRuntimeSupportForConversion(Synta
             }
         }
 
-        private BoundExpression ConvertObjectCreationExpression(
+        private static BoundExpression ConvertObjectCreationExpression(
             SyntaxNode syntax, BoundUnconvertedObjectCreationExpression node, Conversion conversion, bool isCast, TypeSymbol destination,
             ConversionGroup? conversionGroupOpt, bool wasCompilerGenerated, BindingDiagnosticBag diagnostics)
         {
             var arguments = AnalyzedArguments.GetInstance(node.Arguments, node.ArgumentRefKindsOpt, node.ArgumentNamesOpt);
-            BoundExpression expr = bindObjectCreationExpression(node, destination.StrippedType(), arguments, diagnostics);
+            BoundExpression expr = bindObjectCreationExpression(node.Syntax, node.InitializerOpt, node.Binder, destination.StrippedType(), arguments, diagnostics);
             arguments.Free();
 
             Debug.Assert(expr is BoundObjectCreationExpressionBase { WasTargetTyped: true } or
@@ -367,7 +367,7 @@ private BoundExpression ConvertObjectCreationExpression(
                                   syntax,
                                   expr,
                                   expr is BoundBadExpression ? Conversion.NoConversion : conversion,
-                                  CheckOverflowAtRuntime,
+                                  node.Binder.CheckOverflowAtRuntime,
                                   explicitCastInCode: isCast && !wasCompilerGenerated,
                                   conversionGroupOpt,
                                   expr.ConstantValue,
@@ -376,21 +376,22 @@ private BoundExpression ConvertObjectCreationExpression(
 
             return expr;
 
-            BoundExpression bindObjectCreationExpression(BoundUnconvertedObjectCreationExpression node, TypeSymbol type, AnalyzedArguments arguments, BindingDiagnosticBag diagnostics)
+            static BoundExpression bindObjectCreationExpression(
+                SyntaxNode syntax, InitializerExpressionSyntax? initializerOpt, Binder binder,
+                TypeSymbol type, AnalyzedArguments arguments, BindingDiagnosticBag diagnostics)
             {
-                var syntax = node.Syntax;
                 switch (type.TypeKind)
                 {
                     case TypeKind.Enum:
                     case TypeKind.Struct:
                     case TypeKind.Class when !type.IsAnonymousType: // We don't want to enable object creation with unspeakable types
-                        return BindClassCreationExpression(syntax, type.Name, typeNode: syntax, (NamedTypeSymbol)type, arguments, diagnostics, node.InitializerOpt, wasTargetTyped: true);
+                        return binder.BindClassCreationExpression(syntax, type.Name, typeNode: syntax, (NamedTypeSymbol)type, arguments, diagnostics, initializerOpt, wasTargetTyped: true);
                     case TypeKind.TypeParameter:
-                        return BindTypeParameterCreationExpression(syntax, (TypeParameterSymbol)type, arguments, node.InitializerOpt, typeSyntax: syntax, wasTargetTyped: true, diagnostics);
+                        return binder.BindTypeParameterCreationExpression(syntax, (TypeParameterSymbol)type, arguments, initializerOpt, typeSyntax: syntax, wasTargetTyped: true, diagnostics);
                     case TypeKind.Delegate:
-                        return BindDelegateCreationExpression(syntax, (NamedTypeSymbol)type, arguments, node.InitializerOpt, wasTargetTyped: true, diagnostics);
+                        return binder.BindDelegateCreationExpression(syntax, (NamedTypeSymbol)type, arguments, initializerOpt, wasTargetTyped: true, diagnostics);
                     case TypeKind.Interface:
-                        return BindInterfaceCreationExpression(syntax, (NamedTypeSymbol)type, diagnostics, typeNode: syntax, arguments, node.InitializerOpt, wasTargetTyped: true);
+                        return binder.BindInterfaceCreationExpression(syntax, (NamedTypeSymbol)type, diagnostics, typeNode: syntax, arguments, initializerOpt, wasTargetTyped: true);
                     case TypeKind.Array:
                     case TypeKind.Class:
                     case TypeKind.Dynamic:
@@ -401,7 +402,7 @@ BoundExpression bindObjectCreationExpression(BoundUnconvertedObjectCreationExpre
                         Error(diagnostics, ErrorCode.ERR_UnsafeTypeInObjectCreation, syntax, type);
                         goto case TypeKind.Error;
                     case TypeKind.Error:
-                        return MakeBadExpressionForObjectCreation(syntax, type, arguments, node.InitializerOpt, typeSyntax: syntax, diagnostics);
+                        return binder.MakeBadExpressionForObjectCreation(syntax, type, arguments, initializerOpt, typeSyntax: syntax, diagnostics);
                     case var v:
                         throw ExceptionUtilities.UnexpectedValue(v);
                 }
@@ -462,13 +463,11 @@ private BoundExpression ConvertSwitchExpression(BoundUnconvertedSwitchExpression
             for (int i = 0, n = source.SwitchArms.Length; i < n; i++)
             {
                 var oldCase = source.SwitchArms[i];
-                Debug.Assert(oldCase.Syntax is SwitchExpressionArmSyntax);
-                var binder = GetRequiredBinder(oldCase.Syntax);
                 var oldValue = oldCase.Value;
                 var newValue =
                     targetTyped
-                    ? binder.CreateConversion(oldValue.Syntax, oldValue, underlyingConversions[i], isCast: false, conversionGroupOpt: null, destination, diagnostics)
-                    : binder.GenerateConversionForAssignment(destination, oldValue, diagnostics);
+                    ? CreateConversion(oldValue.Syntax, oldValue, underlyingConversions[i], isCast: false, conversionGroupOpt: null, destination, diagnostics)
+                    : GenerateConversionForAssignment(destination, oldValue, diagnostics);
                 var newCase = (oldValue == newValue) ? oldCase :
                     new BoundSwitchExpressionArm(oldCase.Syntax, oldCase.Locals, oldCase.Pattern, oldCase.WhenClause, newValue, oldCase.Label, oldCase.HasErrors);
                 builder.Add(newCase);
diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
index aa382d6a986bd..729ac73c9ad4d 100644
--- a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
+++ b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
@@ -4204,7 +4204,8 @@ private BoundExpression BindImplicitObjectCreationExpression(ImplicitObjectCreat
                 arguments.Arguments.ToImmutable(),
                 arguments.Names.ToImmutableOrNull(),
                 arguments.RefKinds.ToImmutableOrNull(),
-                node.Initializer);
+                node.Initializer,
+                binder: this);
             arguments.Free();
             return result;
         }
diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml b/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml
index 17539c2ff0a5c..60aa25e9dabce 100644
--- a/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml
+++ b/src/Compilers/CSharp/Portable/BoundTree/BoundNodes.xml
@@ -1785,12 +1785,13 @@
   It does not survive past initial binding.
   -->
   <Node Name="BoundUnconvertedObjectCreationExpression" Base="BoundExpression">
-      <!-- Type is not significant for this node type; always null -->
-      <Field Name="Type" Type="TypeSymbol?" Override="true" Null="always"/>
-      <Field Name="Arguments" Type="ImmutableArray&lt;BoundExpression&gt;"/>
-      <Field Name="ArgumentNamesOpt" Type="ImmutableArray&lt;(string Name, Location Location)?&gt;" Null="allow"/>
-      <Field Name="ArgumentRefKindsOpt" Type="ImmutableArray&lt;RefKind&gt;" Null="allow"/>
-      <Field Name="InitializerOpt" Type="InitializerExpressionSyntax?" Null="allow"/>
+    <!-- Type is not significant for this node type; always null -->
+    <Field Name="Type" Type="TypeSymbol?" Override="true" Null="always"/>
+    <Field Name="Arguments" Type="ImmutableArray&lt;BoundExpression&gt;"/>
+    <Field Name="ArgumentNamesOpt" Type="ImmutableArray&lt;(string Name, Location Location)?&gt;" Null="allow"/>
+    <Field Name="ArgumentRefKindsOpt" Type="ImmutableArray&lt;RefKind&gt;" Null="allow"/>
+    <Field Name="InitializerOpt" Type="InitializerExpressionSyntax?" Null="allow"/>
+    <Field Name="Binder" Type="Binder" Null="disallow"/>
   </Node>
 
   <AbstractNode Name="BoundObjectCreationExpressionBase" Base="BoundExpression">
diff --git a/src/Compilers/CSharp/Portable/Generated/BoundNodes.xml.Generated.cs b/src/Compilers/CSharp/Portable/Generated/BoundNodes.xml.Generated.cs
index ba665ad3e6e92..fa66d8df9f0b5 100644
--- a/src/Compilers/CSharp/Portable/Generated/BoundNodes.xml.Generated.cs
+++ b/src/Compilers/CSharp/Portable/Generated/BoundNodes.xml.Generated.cs
@@ -6310,16 +6310,18 @@ public BoundAttribute Update(MethodSymbol? constructor, ImmutableArray<BoundExpr
 
     internal sealed partial class BoundUnconvertedObjectCreationExpression : BoundExpression
     {
-        public BoundUnconvertedObjectCreationExpression(SyntaxNode syntax, ImmutableArray<BoundExpression> arguments, ImmutableArray<(string Name, Location Location)?> argumentNamesOpt, ImmutableArray<RefKind> argumentRefKindsOpt, InitializerExpressionSyntax? initializerOpt, bool hasErrors = false)
+        public BoundUnconvertedObjectCreationExpression(SyntaxNode syntax, ImmutableArray<BoundExpression> arguments, ImmutableArray<(string Name, Location Location)?> argumentNamesOpt, ImmutableArray<RefKind> argumentRefKindsOpt, InitializerExpressionSyntax? initializerOpt, Binder binder, bool hasErrors = false)
             : base(BoundKind.UnconvertedObjectCreationExpression, syntax, null, hasErrors || arguments.HasErrors())
         {
 
             RoslynDebug.Assert(!arguments.IsDefault, "Field 'arguments' cannot be null (use Null=\"allow\" in BoundNodes.xml to remove this check)");
+            RoslynDebug.Assert(binder is object, "Field 'binder' cannot be null (make the type nullable in BoundNodes.xml to remove this check)");
 
             this.Arguments = arguments;
             this.ArgumentNamesOpt = argumentNamesOpt;
             this.ArgumentRefKindsOpt = argumentRefKindsOpt;
             this.InitializerOpt = initializerOpt;
+            this.Binder = binder;
         }
 
 
@@ -6332,14 +6334,16 @@ public BoundUnconvertedObjectCreationExpression(SyntaxNode syntax, ImmutableArra
         public ImmutableArray<RefKind> ArgumentRefKindsOpt { get; }
 
         public InitializerExpressionSyntax? InitializerOpt { get; }
+
+        public Binder Binder { get; }
         [DebuggerStepThrough]
         public override BoundNode? Accept(BoundTreeVisitor visitor) => visitor.VisitUnconvertedObjectCreationExpression(this);
 
-        public BoundUnconvertedObjectCreationExpression Update(ImmutableArray<BoundExpression> arguments, ImmutableArray<(string Name, Location Location)?> argumentNamesOpt, ImmutableArray<RefKind> argumentRefKindsOpt, InitializerExpressionSyntax? initializerOpt)
+        public BoundUnconvertedObjectCreationExpression Update(ImmutableArray<BoundExpression> arguments, ImmutableArray<(string Name, Location Location)?> argumentNamesOpt, ImmutableArray<RefKind> argumentRefKindsOpt, InitializerExpressionSyntax? initializerOpt, Binder binder)
         {
-            if (arguments != this.Arguments || argumentNamesOpt != this.ArgumentNamesOpt || argumentRefKindsOpt != this.ArgumentRefKindsOpt || initializerOpt != this.InitializerOpt)
+            if (arguments != this.Arguments || argumentNamesOpt != this.ArgumentNamesOpt || argumentRefKindsOpt != this.ArgumentRefKindsOpt || initializerOpt != this.InitializerOpt || binder != this.Binder)
             {
-                var result = new BoundUnconvertedObjectCreationExpression(this.Syntax, arguments, argumentNamesOpt, argumentRefKindsOpt, initializerOpt, this.HasErrors);
+                var result = new BoundUnconvertedObjectCreationExpression(this.Syntax, arguments, argumentNamesOpt, argumentRefKindsOpt, initializerOpt, binder, this.HasErrors);
                 result.CopyAttributes(this);
                 return result;
             }
@@ -11613,7 +11617,7 @@ internal abstract partial class BoundTreeRewriter : BoundTreeVisitor
         {
             ImmutableArray<BoundExpression> arguments = this.VisitList(node.Arguments);
             TypeSymbol? type = this.VisitType(node.Type);
-            return node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt);
+            return node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt, node.Binder);
         }
         public override BoundNode? VisitObjectCreationExpression(BoundObjectCreationExpression node)
         {
@@ -13693,12 +13697,12 @@ public NullabilityRewriter(ImmutableDictionary<BoundExpression, (NullabilityInfo
 
             if (_updatedNullabilities.TryGetValue(node, out (NullabilityInfo Info, TypeSymbol? Type) infoAndType))
             {
-                updatedNode = node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt);
+                updatedNode = node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt, node.Binder);
                 updatedNode.TopLevelNullability = infoAndType.Info;
             }
             else
             {
-                updatedNode = node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt);
+                updatedNode = node.Update(arguments, node.ArgumentNamesOpt, node.ArgumentRefKindsOpt, node.InitializerOpt, node.Binder);
             }
             return updatedNode;
         }
@@ -15994,6 +15998,7 @@ private BoundTreeDumperNodeProducer()
             new TreeDumperNode("argumentNamesOpt", node.ArgumentNamesOpt, null),
             new TreeDumperNode("argumentRefKindsOpt", node.ArgumentRefKindsOpt, null),
             new TreeDumperNode("initializerOpt", node.InitializerOpt, null),
+            new TreeDumperNode("binder", node.Binder, null),
             new TreeDumperNode("type", node.Type, null),
             new TreeDumperNode("isSuppressed", node.IsSuppressed, null),
             new TreeDumperNode("hasErrors", node.HasErrors, null)
diff --git a/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs b/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs
index fda7370bcffeb..f9658e1da2f38 100644
--- a/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs
+++ b/src/Compilers/CSharp/Portable/Symbols/ObsoleteAttributeHelpers.cs
@@ -158,6 +158,7 @@ internal static DiagnosticInfo CreateObsoleteDiagnostic(Symbol symbol, BinderFla
 
             // Issue a specialized diagnostic for add methods of collection initializers
             var isColInit = location.Includes(BinderFlags.CollectionInitializerAddMethod);
+            Debug.Assert(!isColInit || symbol.Name == WellKnownMemberNames.CollectionInitializerAddMethodName);
             var errorCode = (message: data.Message, isError: data.IsError, isColInit) switch
             {
                 // dev11 had a bug in this area (i.e. always produce a warning when there's no message) and we have to match it.
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ImplicitObjectCreationTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ImplicitObjectCreationTests.cs
index 54f4396fab31d..e5368f410e26d 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/ImplicitObjectCreationTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ImplicitObjectCreationTests.cs
@@ -4855,5 +4855,53 @@ void M1<T>(T t)
                 Diagnostic(ErrorCode.ERR_ConstantExpected, "new T()").WithLocation(13, 18)
                 );
         }
+
+        [Fact, WorkItem(60960, "https://github.com/dotnet/roslyn/issues/60960")]
+        public void TestInCollectionInitializer()
+        {
+            var source = @"
+using System;
+using System.Collections.Generic;
+
+_ = new List<A> {new A()};
+_ = new MyList<A> {new A()};
+
+_ = new List<A> {new()};
+_ = new MyList<A> {new()};
+
+class MyList<T> : List<T>
+{
+    [Obsolete(""Message"")]
+    public new void Add(T value) { }
+}
+
+class A
+{
+    [Obsolete(""Message"")]
+    public A() { }
+}
+";
+            var comp = CreateCompilation(source);
+            comp.VerifyDiagnostics(
+                // (5,18): warning CS0618: 'A.A()' is obsolete: 'Message'
+                // _ = new List<A> {new A()};
+                Diagnostic(ErrorCode.WRN_DeprecatedSymbolStr, "new A()").WithArguments("A.A()", "Message").WithLocation(5, 18),
+                // (6,20): warning CS0618: 'A.A()' is obsolete: 'Message'
+                // _ = new MyList<A> {new A()};
+                Diagnostic(ErrorCode.WRN_DeprecatedSymbolStr, "new A()").WithArguments("A.A()", "Message").WithLocation(6, 20),
+                // (6,20): warning CS1062: The best overloaded Add method 'MyList<A>.Add(A)' for the collection initializer element is obsolete. Message
+                // _ = new MyList<A> {new A()};
+                Diagnostic(ErrorCode.WRN_DeprecatedCollectionInitAddStr, "new A()").WithArguments("MyList<A>.Add(A)", "Message").WithLocation(6, 20),
+                // (8,18): warning CS0618: 'A.A()' is obsolete: 'Message'
+                // _ = new List<A> {new()};
+                Diagnostic(ErrorCode.WRN_DeprecatedSymbolStr, "new()").WithArguments("A.A()", "Message").WithLocation(8, 18),
+                // (9,20): warning CS0618: 'A.A()' is obsolete: 'Message'
+                // _ = new MyList<A> {new()};
+                Diagnostic(ErrorCode.WRN_DeprecatedSymbolStr, "new()").WithArguments("A.A()", "Message").WithLocation(9, 20),
+                // (9,20): warning CS1062: The best overloaded Add method 'MyList<A>.Add(A)' for the collection initializer element is obsolete. Message
+                // _ = new MyList<A> {new()};
+                Diagnostic(ErrorCode.WRN_DeprecatedCollectionInitAddStr, "new()").WithArguments("MyList<A>.Add(A)", "Message").WithLocation(9, 20)
+                );
+        }
     }
 }

From 3de502ca53b3adef941085d5ef53c93c1deee785 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Tue, 10 May 2022 00:08:29 +0300
Subject: [PATCH 355/413] More tests

---
 .../RemoveUnusedMembersTests.cs               | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
index 175337b57dd4d..de050d47585db 100644
--- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
+++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -1567,6 +1567,20 @@ public async Task IndexerIsIncrementedAndValueDropped_VerifyAnalizerMessage()
                 .WithArguments("MyClass.this[]"));
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task IndexerIsIncrementedAndValueDropped_NoDiagnosticWhenIndexerIsReadSomewhereElse()
+        {
+            var code = @"class MyClass
+{
+    private int this[int x] { get { return 0; } set { } }
+    public void M1(int x) => ++this[x];
+    public int M2(int x) => this[x];
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task FieldIsTargetOfCompoundAssignmentAndValueUsed()
         {
@@ -1709,6 +1723,20 @@ public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped_VerifyAnaly
                 .WithArguments("MyClass.this[]"));
         }
 
+        [WorkItem(43191, "https://github.com/dotnet/roslyn/issues/43191")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
+        public async Task IndexerIsTargetOfCompoundAssignmentAndValueDropped_NoDiagnosticWhenIndexerIsReadSomewhereElse()
+        {
+            var code = @"class MyClass
+{
+    private int this[int x] { get { return 0; } set { } }
+    public void M1(int x, int y) => this[x] += y;
+    public int M2(int x) => this[x];
+}";
+
+            await VerifyCS.VerifyAnalyzerAsync(code, Array.Empty<DiagnosticResult>());
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedMembers)]
         public async Task FieldIsTargetOfAssignmentAndParenthesized()
         {

From 7dc3c66e47d1b560e552526050ba3f5edfa6cd07 Mon Sep 17 00:00:00 2001
From: "gel@microsoft.com" <gel@microsoft.com>
Date: Fri, 29 Apr 2022 16:28:11 -0700
Subject: [PATCH 356/413] Share SyntaxContext among all providers

via CompletionContext during a completion session to reduce repeat computation.
---
 .../Portable/Completion/CompletionContext.cs  | 21 ++++++++
 .../Portable/Completion/CompletionHelper.cs   | 15 ++++++
 .../CompletionServiceWithProviders.cs         | 17 +++++--
 ...mendationServiceBasedCompletionProvider.cs |  3 +-
 .../AbstractSymbolCompletionProvider.cs       | 45 +++--------------
 ...haredSyntaxContextsWithSpeculativeModel.cs | 50 +++++++++++++++++++
 6 files changed, 109 insertions(+), 42 deletions(-)
 create mode 100644 src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs

diff --git a/src/Features/Core/Portable/Completion/CompletionContext.cs b/src/Features/Core/Portable/Completion/CompletionContext.cs
index c7f64e56717a0..b32c8920829b5 100644
--- a/src/Features/Core/Portable/Completion/CompletionContext.cs
+++ b/src/Features/Core/Portable/Completion/CompletionContext.cs
@@ -7,8 +7,11 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Completion
 {
@@ -34,6 +37,12 @@ public sealed class CompletionContext
         /// </summary>
         public int Position { get; }
 
+        /// <summary>
+        /// By providing this object, we have an opportunity to share requested SyntaxContext among all CompletionProviders
+        /// during a completion session to reduce repeat computation.
+        /// </summary>
+        private SharedSyntaxContextsWithSpeculativeModel? SharedSyntaxContextsWithSpeculativeModel { get; }
+
         /// <summary>
         /// The span of the syntax element at the caret position.
         /// 
@@ -111,6 +120,7 @@ public CompletionContext(
             : this(provider ?? throw new ArgumentNullException(nameof(provider)),
                    document ?? throw new ArgumentNullException(nameof(document)),
                    position,
+                   sharedSyntaxContextsWithSpeculativeModel: null,
                    defaultSpan,
                    trigger,
                    // Publicly available options do not affect this API.
@@ -129,6 +139,7 @@ internal CompletionContext(
             CompletionProvider provider,
             Document document,
             int position,
+            SharedSyntaxContextsWithSpeculativeModel? sharedSyntaxContextsWithSpeculativeModel,
             TextSpan defaultSpan,
             CompletionTrigger trigger,
             in CompletionOptions options,
@@ -143,6 +154,8 @@ internal CompletionContext(
             CancellationToken = cancellationToken;
             _items = new List<CompletionItem>();
 
+            SharedSyntaxContextsWithSpeculativeModel = sharedSyntaxContextsWithSpeculativeModel;
+
 #pragma warning disable RS0030 // Do not used banned APIs
             Options = OptionValueSet.Empty;
 #pragma warning restore
@@ -202,6 +215,14 @@ public CompletionItem? SuggestionModeItem
             }
         }
 
+        internal Task<SyntaxContext?> GetSyntaxContextWithExistingSpeculativeModelAsync(Document document, CancellationToken cancellationToken)
+        {
+            if (SharedSyntaxContextsWithSpeculativeModel is null)
+                return CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(document, Position, cancellationToken);
+
+            return SharedSyntaxContextsWithSpeculativeModel.GetSyntaxContextAsync(document, cancellationToken);
+        }
+
         private CompletionItem FixItem(CompletionItem item)
         {
             // remember provider so we can find it again later
diff --git a/src/Features/Core/Portable/Completion/CompletionHelper.cs b/src/Features/Core/Portable/Completion/CompletionHelper.cs
index bcda620adfbae..24553970ae598 100644
--- a/src/Features/Core/Portable/Completion/CompletionHelper.cs
+++ b/src/Features/Core/Portable/Completion/CompletionHelper.cs
@@ -7,7 +7,11 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.PatternMatching;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 using Microsoft.CodeAnalysis.Tags;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
@@ -477,5 +481,16 @@ static bool KeepAllItemsInTheList(CompletionTriggerKind initialTriggerKind, stri
                     initialTriggerKind == CompletionTriggerKind.Deletion;
             }
         }
+
+        public static async Task<SyntaxContext?> CreateSyntaxContextWithExistingSpeculativeModelAsync(Document document, int position, CancellationToken cancellationToken)
+        {
+            if (!document.SupportsSemanticModel)
+                return null;
+
+            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
+
+            var service = document.GetRequiredLanguageService<ISyntaxContextService>();
+            return service.CreateContext(document, semanticModel, position, cancellationToken);
+        }
     }
 }
diff --git a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs
index 84c57fb13331b..b5204fd633902 100644
--- a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs
+++ b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
@@ -16,6 +17,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
@@ -146,10 +148,14 @@ private protected async Task<CompletionList> GetCompletionsWithAvailabilityOfExp
             var additionalAugmentingProviders = await GetAugmentingProviders(document, triggeredProviders, caretPosition, trigger, options, cancellationToken).ConfigureAwait(false);
             triggeredProviders = triggeredProviders.Except(additionalAugmentingProviders).ToImmutableArray();
 
+            // PERF: Many CompletionProviders compute identical contexts. This actually shows up on the 2-core typing test.
+            // so we try to share a single SyntaxContext based on document/caretPosition among all providers to reduce repeat computation.
+            var sharedContext = new SharedSyntaxContextsWithSpeculativeModel(document, caretPosition);
+
             // Now, ask all the triggered providers, in parallel, to populate a completion context.
             // Note: we keep any context with items *or* with a suggested item.  
             var triggeredContexts = await ComputeNonEmptyCompletionContextsAsync(
-                document, caretPosition, trigger, options, defaultItemSpan, triggeredProviders, cancellationToken).ConfigureAwait(false);
+                document, caretPosition, trigger, options, defaultItemSpan, triggeredProviders, sharedContext, cancellationToken).ConfigureAwait(false);
 
             // Nothing to do if we didn't even get any regular items back (i.e. 0 items or suggestion item only.)
             if (!triggeredContexts.Any(cc => cc.Items.Count > 0))
@@ -168,7 +174,7 @@ private protected async Task<CompletionList> GetCompletionsWithAvailabilityOfExp
             var augmentingProviders = providers.Except(triggeredProviders).ToImmutableArray();
 
             var augmentingContexts = await ComputeNonEmptyCompletionContextsAsync(
-                document, caretPosition, trigger, options, defaultItemSpan, augmentingProviders, cancellationToken).ConfigureAwait(false);
+                document, caretPosition, trigger, options, defaultItemSpan, augmentingProviders, sharedContext, cancellationToken).ConfigureAwait(false);
 
             GC.KeepAlive(semanticModel);
 
@@ -303,6 +309,7 @@ private static async Task<ImmutableArray<CompletionContext>> ComputeNonEmptyComp
             Document document, int caretPosition, CompletionTrigger trigger,
             CompletionOptions options, TextSpan defaultItemSpan,
             ImmutableArray<CompletionProvider> providers,
+            SharedSyntaxContextsWithSpeculativeModel sharedContext,
             CancellationToken cancellationToken)
         {
             var completionContextTasks = new List<Task<CompletionContext>>();
@@ -310,7 +317,7 @@ private static async Task<ImmutableArray<CompletionContext>> ComputeNonEmptyComp
             {
                 completionContextTasks.Add(GetContextAsync(
                     provider, document, caretPosition, trigger,
-                    options, defaultItemSpan, cancellationToken));
+                    options, defaultItemSpan, sharedContext, cancellationToken));
             }
 
             var completionContexts = await Task.WhenAll(completionContextTasks).ConfigureAwait(false);
@@ -399,9 +406,10 @@ private static async Task<CompletionContext> GetContextAsync(
             CompletionTrigger triggerInfo,
             CompletionOptions options,
             TextSpan defaultSpan,
+            SharedSyntaxContextsWithSpeculativeModel? sharedContext,
             CancellationToken cancellationToken)
         {
-            var context = new CompletionContext(provider, document, position, defaultSpan, triggerInfo, options, cancellationToken);
+            var context = new CompletionContext(provider, document, position, sharedContext, defaultSpan, triggerInfo, options, cancellationToken);
             await provider.ProvideCompletionsAsync(context).ConfigureAwait(false);
             return context;
         }
@@ -562,6 +570,7 @@ internal async Task<CompletionContext> GetContextAsync(
                     triggerInfo,
                     options,
                     defaultItemSpan,
+                    sharedContext: null,
                     cancellationToken).ConfigureAwait(false);
             }
 
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
index 9ead77fc94368..f70eaaae6409d 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
@@ -178,7 +178,8 @@ internal sealed override async Task<CompletionDescription> GetDescriptionWorkerA
             foreach (var relatedId in relatedDocumentIds)
             {
                 var relatedDocument = document.Project.Solution.GetRequiredDocument(relatedId);
-                var context = await CreateContextAsync(relatedDocument, position, cancellationToken).ConfigureAwait(false);
+                var context = await CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(relatedDocument, position, cancellationToken).ConfigureAwait(false) as TSyntaxContext;
+                Contract.ThrowIfNull(context);
                 var symbols = await TryGetSymbolsForContextAsync(completionContext: null, context, options, cancellationToken).ConfigureAwait(false);
 
                 if (!symbols.IsDefault)
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
index 7d057e0e16560..e1cf022e64f06 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
@@ -27,11 +27,6 @@ namespace Microsoft.CodeAnalysis.Completion.Providers
     internal abstract partial class AbstractSymbolCompletionProvider<TSyntaxContext> : LSPCompletionProvider
         where TSyntaxContext : SyntaxContext
     {
-        // PERF: Many CompletionProviders derive AbstractSymbolCompletionProvider and therefore
-        // compute identical contexts. This actually shows up on the 2-core typing test.
-        // Cache the most recent document/position/computed SyntaxContext to reduce repeat computation.
-        private static readonly ConditionalWeakTable<Document, Tuple<int, AsyncLazy<TSyntaxContext>>> s_cachedDocuments = new();
-
         protected AbstractSymbolCompletionProvider()
         {
         }
@@ -261,9 +256,10 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                 using (Logger.LogBlock(FunctionId.Completion_SymbolCompletionProvider_GetItemsWorker, cancellationToken))
                 using (var telemetryCounter = new TelemetryCounter(ShouldCollectTelemetryForTargetTypeCompletion && options.TargetTypedCompletionFilter))
                 {
-                    var syntaxContext = await GetOrCreateContextAsync(document, position, cancellationToken).ConfigureAwait(false);
-                    var regularItems = await GetItemsAsync(completionContext, syntaxContext, document, position, options, telemetryCounter, cancellationToken).ConfigureAwait(false);
+                    var syntaxContext = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as TSyntaxContext;
+                    Contract.ThrowIfNull(syntaxContext);
 
+                    var regularItems = await GetItemsAsync(completionContext, syntaxContext, document, position, options, telemetryCounter, cancellationToken).ConfigureAwait(false);
                     completionContext.AddItems(regularItems);
                 }
             }
@@ -290,7 +286,7 @@ private async Task<ImmutableArray<CompletionItem>> GetItemsAsync(
                 return CreateItems(completionContext, itemsForCurrentDocument, _ => syntaxContext, invalidProjectMap: null, totalProjects: null, telemetryCounter);
             }
 
-            var contextAndSymbolLists = await GetPerContextSymbolsAsync(completionContext, document, position, options, new[] { document.Id }.Concat(relatedDocumentIds), cancellationToken).ConfigureAwait(false);
+            var contextAndSymbolLists = await GetPerContextSymbolsAsync(completionContext, document, options, new[] { document.Id }.Concat(relatedDocumentIds), cancellationToken).ConfigureAwait(false);
             var symbolToContextMap = UnionSymbols(contextAndSymbolLists);
             var missingSymbolsMap = FindSymbolsMissingInLinkedContexts(symbolToContextMap, contextAndSymbolLists);
             var totalProjects = contextAndSymbolLists.Select(t => t.documentId.ProjectId).ToList();
@@ -327,7 +323,7 @@ protected virtual Task<bool> IsSemanticTriggerCharacterAsync(Document document,
         }
 
         private async Task<ImmutableArray<(DocumentId documentId, TSyntaxContext syntaxContext, ImmutableArray<(ISymbol symbol, bool preselect)> symbols)>> GetPerContextSymbolsAsync(
-            CompletionContext completionContext, Document document, int position, CompletionOptions options, IEnumerable<DocumentId> relatedDocuments, CancellationToken cancellationToken)
+            CompletionContext completionContext, Document document, CompletionOptions options, IEnumerable<DocumentId> relatedDocuments, CancellationToken cancellationToken)
         {
             var solution = document.Project.Solution;
 
@@ -339,7 +335,9 @@ protected virtual Task<bool> IsSemanticTriggerCharacterAsync(Document document,
                 tasks.Add(Task.Run(async () =>
                 {
                     var relatedDocument = solution.GetRequiredDocument(relatedDocumentId);
-                    var syntaxContext = await GetOrCreateContextAsync(relatedDocument, position, cancellationToken).ConfigureAwait(false);
+                    var syntaxContext = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(relatedDocument, cancellationToken).ConfigureAwait(false) as TSyntaxContext;
+
+                    Contract.ThrowIfNull(syntaxContext);
                     var symbols = await TryGetSymbolsForContextAsync(completionContext, syntaxContext, options, cancellationToken).ConfigureAwait(false);
 
                     return (relatedDocument.Id, syntaxContext, symbols);
@@ -370,33 +368,6 @@ protected virtual Task<bool> IsSemanticTriggerCharacterAsync(Document document,
                 : await GetSymbolsAsync(completionContext, syntaxContext, syntaxContext.Position, options, cancellationToken).ConfigureAwait(false);
         }
 
-        protected static async Task<TSyntaxContext> CreateContextAsync(Document document, int position, CancellationToken cancellationToken)
-        {
-            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-
-            var service = document.GetRequiredLanguageService<ISyntaxContextService>();
-            return (TSyntaxContext)service.CreateContext(document, semanticModel, position, cancellationToken);
-        }
-
-        private static Task<TSyntaxContext> GetOrCreateContextAsync(Document document, int position, CancellationToken cancellationToken)
-        {
-            lock (s_cachedDocuments)
-            {
-                var (cachedPosition, cachedLazyContext) = s_cachedDocuments.GetValue(
-                    document, d => Tuple.Create(position, new AsyncLazy<TSyntaxContext>(ct => CreateContextAsync(d, position, ct), cacheResult: true)));
-
-                if (cachedPosition == position)
-                {
-                    return cachedLazyContext.GetValueAsync(cancellationToken);
-                }
-
-                var lazyContext = new AsyncLazy<TSyntaxContext>(ct => CreateContextAsync(document, position, ct), cacheResult: true);
-                s_cachedDocuments.Remove(document);
-                s_cachedDocuments.Add(document, Tuple.Create(position, lazyContext));
-                return lazyContext.GetValueAsync(cancellationToken);
-            }
-        }
-
         /// <summary>
         /// Given a list of symbols, determine which are not recommended at the same position in linked documents.
         /// </summary>
diff --git a/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
new file mode 100644
index 0000000000000..18c7661b6ca59
--- /dev/null
+++ b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
@@ -0,0 +1,50 @@
+// 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.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Completion
+{
+    internal sealed class SharedSyntaxContextsWithSpeculativeModel
+    {
+        public Document Document { get; }
+        public int Position { get; }
+
+        private readonly ConcurrentDictionary<Document, AsyncLazy<SyntaxContext?>> _cache;
+        private readonly Lazy<ImmutableArray<DocumentId>> _lazyRelatedDocumentIds;
+
+        public SharedSyntaxContextsWithSpeculativeModel(Document document, int position)
+        {
+            Document = document;
+            Position = position;
+            _cache = new();
+            _lazyRelatedDocumentIds = new(Document.GetLinkedDocumentIds, isThreadSafe: true);
+        }
+
+        public Task<SyntaxContext?> GetSyntaxContextAsync(Document document, CancellationToken cancellationToken)
+        {
+            if (!_cache.TryGetValue(document, out var lazyContext))
+            {
+                if (Document.Id != document.Id || !_lazyRelatedDocumentIds.Value.Contains(document.Id))
+                    throw new ArgumentException("Don't support getting SyntaxContext for document unrelated to the original document");
+
+                lazyContext = GetLazySyntaxContextWithSpeculativeModel(document, Position);
+            }
+
+            return lazyContext.GetValueAsync(cancellationToken);
+        }
+
+        private AsyncLazy<SyntaxContext?> GetLazySyntaxContextWithSpeculativeModel(Document document, int position)
+        {
+            return _cache.GetOrAdd(document, d => AsyncLazy.Create(cancellationToken
+                => CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(document, position, cancellationToken), cacheResult: true));
+        }
+    }
+}

From aff44185f6db70de15e5d991f8367144e5a807a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Mon, 9 May 2022 15:34:57 -0700
Subject: [PATCH 357/413] EnC: Implements support for changing namespace
 declarations (#61176)

* Implements support for changing namespace declarations

* Remove unused code

* Test fixes
---
 .../EditAndContinue/ActiveStatementTests.cs   |   1 -
 .../CSharpEditAndContinueAnalyzerTests.cs     |   3 +-
 .../Helpers/EditingTestBase.cs                |   6 +-
 .../EditAndContinue/TopLevelEditingTests.cs   | 741 ++++++++++++++++--
 .../RudeEditDiagnosticTests.cs                |   3 +-
 .../Helpers/EditingTestBase.vb                |   4 +
 .../EditAndContinue/TopLevelEditingTests.vb   | 645 +++++++++++++--
 .../CSharpEditAndContinueAnalyzer.cs          |  73 +-
 .../AbstractEditAndContinueAnalyzer.cs        | 148 +++-
 .../EditAndContinueDiagnosticDescriptors.cs   |   1 +
 .../Portable/EditAndContinue/RudeEditKind.cs  |   3 +-
 .../Core/Portable/FeaturesResources.resx      |   3 +
 .../Portable/xlf/FeaturesResources.cs.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.de.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.es.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.fr.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.it.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.ja.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.ko.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.pl.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.pt-BR.xlf  |   5 +
 .../Portable/xlf/FeaturesResources.ru.xlf     |   5 +
 .../Portable/xlf/FeaturesResources.tr.xlf     |   5 +
 .../xlf/FeaturesResources.zh-Hans.xlf         |   5 +
 .../xlf/FeaturesResources.zh-Hant.xlf         |   5 +
 .../VisualBasicEditAndContinueAnalyzer.vb     | 137 ++--
 26 files changed, 1596 insertions(+), 237 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
index 51425b7128d8a..c602e8c9c62d3 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
@@ -747,7 +747,6 @@ static void Main(String[] args)
             var active = GetActiveStatements(src1, src2);
 
             edits.VerifySemanticDiagnostics(active,
-                Diagnostic(RudeEditKind.Delete, null, FeaturesResources.namespace_),
                 Diagnostic(RudeEditKind.Delete, null, DeletedSymbolDisplay(FeaturesResources.class_, "N.C")));
         }
 
diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/CSharpEditAndContinueAnalyzerTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/CSharpEditAndContinueAnalyzerTests.cs
index 2c81eddb94019..b5ec229d031ff 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/CSharpEditAndContinueAnalyzerTests.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/CSharpEditAndContinueAnalyzerTests.cs
@@ -665,8 +665,7 @@ public class D
             }
 
             Assert.True(result.IsSingle());
-            Assert.Equal(1, result.Single().RudeEditErrors.Count());
-            Assert.Equal(RudeEditKind.Insert, result.Single().RudeEditErrors.Single().Kind);
+            Assert.Empty(result.Single().RudeEditErrors);
         }
 
         [Fact]
diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs
index 427e8c1a82ce9..b38f4698e1ef3 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/Helpers/EditingTestBase.cs
@@ -43,10 +43,12 @@ internal enum MethodKind
         public static string GetResource(string keyword)
             => keyword switch
             {
+                "enum" => FeaturesResources.enum_,
                 "class" => FeaturesResources.class_,
-                "struct" => CSharpFeaturesResources.struct_,
                 "interface" => FeaturesResources.interface_,
-                "record" => CSharpFeaturesResources.record_,
+                "delegate" => FeaturesResources.delegate_,
+                "struct" => CSharpFeaturesResources.struct_,
+                "record" or "record class" => CSharpFeaturesResources.record_,
                 "record struct" => CSharpFeaturesResources.record_struct,
                 _ => throw ExceptionUtilities.UnexpectedValue(keyword)
             };
diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/TopLevelEditingTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
index 2f3263f7ac372..7a607b4a4153e 100644
--- a/src/EditorFeatures/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
+++ b/src/EditorFeatures/CSharpTest/EditAndContinue/TopLevelEditingTests.cs
@@ -2407,6 +2407,96 @@ class C
                 });
         }
 
+        [Theory]
+        [InlineData("class")]
+        [InlineData("struct")]
+        [InlineData("interface")]
+        [InlineData("record")]
+        [InlineData("record struct")]
+        public void Type_Move_NamespaceChange(string keyword)
+        {
+            var declaration = keyword + " C {}";
+            var src1 = $"namespace N {{{declaration,-20}}} namespace M {{             }}";
+            var src2 = $"namespace N {{                 }} namespace M {{{declaration}}}";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [" + declaration + "]@13 -> @45");
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, keyword + " C", GetResource(keyword), "N", "M"));
+        }
+
+        [Fact]
+        public void Type_Move_NamespaceChange_Delegate()
+        {
+            var src1 = @"namespace N { delegate void F(); } namespace M {                    }";
+            var src2 = @"namespace N {                    } namespace M { delegate void F(); }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [delegate void F();]@14 -> @49");
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "delegate void F()", GetResource("delegate"), "N", "M"));
+        }
+
+        [Fact]
+        public void Type_Move_NamespaceChange_Subnamespace()
+        {
+            var src1 = @"namespace N { class C {} } namespace M { namespace O {            } }";
+            var src2 = @"namespace N {            } namespace M { namespace O { class C {} } }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [class C {}]@14 -> @55");
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N", "M.O"));
+        }
+
+        [Fact]
+        public void Type_Move_SameEffectiveNamespace()
+        {
+            var src1 = @"namespace N.M { class C {} } namespace N { namespace M {            } }";
+            var src2 = @"namespace N.M {            } namespace N { namespace M { class C {} } }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [class C {}]@16 -> @57");
+
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Fact]
+        public void Type_Move_MultiFile()
+        {
+            var srcA1 = @"namespace N { class C {} } namespace M {            }";
+            var srcB1 = @"namespace N {            } namespace M { class C {} }";
+            var srcA2 = @"namespace N {            } namespace M { class C {} }";
+            var srcB2 = @"namespace N { class C {} } namespace M {            }";
+
+            var editsA = GetTopEdits(srcA1, srcA2);
+            editsA.VerifyEdits(
+                "Move [class C {}]@14 -> @41");
+
+            var editsB = GetTopEdits(srcB1, srcB2);
+            editsB.VerifyEdits(
+                "Move [class C {}]@41 -> @14");
+
+            EditAndContinueValidation.VerifySemantics(
+                new[] { editsA, editsB },
+                new[]
+                {
+                    DocumentResults(),
+                    DocumentResults(),
+                });
+        }
+
         #endregion
 
         #region Records
@@ -4047,7 +4137,7 @@ public void EnumTrailingCommaDelete_WithInitializer()
         #region Delegates
 
         [Fact]
-        public void Delegates_NoModifiers_Insert()
+        public void Delegate_NoModifiers_Insert()
         {
             var src1 = "";
             var src2 = "delegate void D();";
@@ -4059,7 +4149,7 @@ public void Delegates_NoModifiers_Insert()
         }
 
         [Fact]
-        public void Delegates_NoModifiers_IntoNamespace_Insert()
+        public void Delegate_NoModifiers_IntoNamespace_Insert()
         {
             var src1 = "namespace N { }";
             var src2 = "namespace N { delegate void D(); }";
@@ -4071,7 +4161,7 @@ public void Delegates_NoModifiers_IntoNamespace_Insert()
         }
 
         [Fact]
-        public void Delegates_NoModifiers_IntoType_Insert()
+        public void Delegate_NoModifiers_IntoType_Insert()
         {
             var src1 = "class C { }";
             var src2 = "class C { delegate void D(); }";
@@ -4083,7 +4173,7 @@ public void Delegates_NoModifiers_IntoType_Insert()
         }
 
         [Fact]
-        public void Delegates_Public_IntoType_Insert()
+        public void Delegate_Public_IntoType_Insert()
         {
             var src1 = "class C { }";
             var src2 = "class C { public delegate void D(); }";
@@ -4099,7 +4189,7 @@ public void Delegates_Public_IntoType_Insert()
         }
 
         [Fact]
-        public void Delegates_Generic_Insert()
+        public void Delegate_Generic_Insert()
         {
             var src1 = "class C { }";
             var src2 = "class C { private delegate void D<T>(T a); }";
@@ -4118,7 +4208,7 @@ public void Delegates_Generic_Insert()
         }
 
         [Fact]
-        public void Delegates_Delete()
+        public void Delegate_Delete()
         {
             var src1 = "class C { private delegate void D(); }";
             var src2 = "class C { }";
@@ -4134,7 +4224,7 @@ public void Delegates_Delete()
         }
 
         [Fact]
-        public void Delegates_Rename()
+        public void Delegate_Rename()
         {
             var src1 = "public delegate void D();";
             var src2 = "public delegate void Z();";
@@ -4149,7 +4239,7 @@ public void Delegates_Rename()
         }
 
         [Fact]
-        public void Delegates_Accessibility_Update()
+        public void Delegate_Accessibility_Update()
         {
             var src1 = "public delegate void D();";
             var src2 = "private delegate void D();";
@@ -4164,7 +4254,7 @@ public void Delegates_Accessibility_Update()
         }
 
         [Fact]
-        public void Delegates_ReturnType_Update()
+        public void Delegate_ReturnType_Update()
         {
             var src1 = "public delegate int D();";
             var src2 = "public delegate void D();";
@@ -4179,7 +4269,7 @@ public void Delegates_ReturnType_Update()
         }
 
         [Fact]
-        public void Delegates_ReturnType_AddAttribute()
+        public void Delegate_ReturnType_AddAttribute()
         {
             var attribute = "public class A : System.Attribute { }\n\n";
 
@@ -4201,7 +4291,7 @@ public void Delegates_ReturnType_AddAttribute()
         }
 
         [Fact]
-        public void Delegates_Parameter_Insert()
+        public void Delegate_Parameter_Insert()
         {
             var src1 = "public delegate int D();";
             var src2 = "public delegate int D(int a);";
@@ -4216,7 +4306,7 @@ public void Delegates_Parameter_Insert()
         }
 
         [Fact]
-        public void Delegates_Parameter_Insert_Reloadable()
+        public void Delegate_Parameter_Insert_Reloadable()
         {
             var src1 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]public delegate int D();";
             var src2 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]internal delegate bool D(int a);";
@@ -4229,7 +4319,7 @@ public void Delegates_Parameter_Insert_Reloadable()
         }
 
         [Fact]
-        public void Delegates_Parameter_Delete()
+        public void Delegate_Parameter_Delete()
         {
             var src1 = "public delegate int D(int a);";
             var src2 = "public delegate int D();";
@@ -4244,7 +4334,7 @@ public void Delegates_Parameter_Delete()
         }
 
         [Fact]
-        public void Delegates_Parameter_Rename()
+        public void Delegate_Parameter_Rename()
         {
             var src1 = "public delegate int D(int a);";
             var src2 = "public delegate int D(int b);";
@@ -4268,7 +4358,7 @@ public void Delegates_Parameter_Rename()
         }
 
         [Fact]
-        public void Delegates_Parameter_Update()
+        public void Delegate_Parameter_Update()
         {
             var src1 = "public delegate int D(int a);";
             var src2 = "public delegate int D(byte a);";
@@ -4283,7 +4373,7 @@ public void Delegates_Parameter_Update()
         }
 
         [Fact]
-        public void Delegates_Parameter_AddAttribute_NotSupportedByRuntime()
+        public void Delegate_Parameter_AddAttribute_NotSupportedByRuntime()
         {
             var attribute = "public class AAttribute : System.Attribute { }\n\n";
 
@@ -4301,7 +4391,7 @@ public void Delegates_Parameter_AddAttribute_NotSupportedByRuntime()
         }
 
         [Fact]
-        public void Delegates_Parameter_AddAttribute()
+        public void Delegate_Parameter_AddAttribute()
         {
             var attribute = "public class A : System.Attribute { }\n\n";
 
@@ -4324,7 +4414,7 @@ public void Delegates_Parameter_AddAttribute()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Insert()
+        public void Delegate_TypeParameter_Insert()
         {
             var src1 = "public delegate int D();";
             var src2 = "public delegate int D<T>();";
@@ -4341,7 +4431,7 @@ public void Delegates_TypeParameter_Insert()
 
         [Fact(Skip = "https://github.com/dotnet/roslyn/issues/54881")]
         [WorkItem(54881, "https://github.com/dotnet/roslyn/issues/54881")]
-        public void Delegates_TypeParameter_Insert_Reloadable()
+        public void Delegate_TypeParameter_Insert_Reloadable()
         {
             var src1 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]public delegate int D<out T>();";
             var src2 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]internal delegate bool D<in T, out S>(int a);";
@@ -4353,7 +4443,7 @@ public void Delegates_TypeParameter_Insert_Reloadable()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Delete()
+        public void Delegate_TypeParameter_Delete()
         {
             var src1 = "public delegate int D<T>();";
             var src2 = "public delegate int D();";
@@ -4369,7 +4459,7 @@ public void Delegates_TypeParameter_Delete()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Rename()
+        public void Delegate_TypeParameter_Rename()
         {
             var src1 = "public delegate int D<T>();";
             var src2 = "public delegate int D<S>();";
@@ -4385,7 +4475,7 @@ public void Delegates_TypeParameter_Rename()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Variance1()
+        public void Delegate_TypeParameter_Variance1()
         {
             var src1 = "public delegate int D<T>();";
             var src2 = "public delegate int D<in T>();";
@@ -4401,7 +4491,7 @@ public void Delegates_TypeParameter_Variance1()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Variance2()
+        public void Delegate_TypeParameter_Variance2()
         {
             var src1 = "public delegate int D<out T>();";
             var src2 = "public delegate int D<T>();";
@@ -4417,7 +4507,7 @@ public void Delegates_TypeParameter_Variance2()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_Variance3()
+        public void Delegate_TypeParameter_Variance3()
         {
             var src1 = "public delegate int D<out T>();";
             var src2 = "public delegate int D<in T>();";
@@ -4433,7 +4523,7 @@ public void Delegates_TypeParameter_Variance3()
         }
 
         [Fact]
-        public void Delegates_TypeParameter_AddAttribute()
+        public void Delegate_TypeParameter_AddAttribute()
         {
             var attribute = "public class AAttribute : System.Attribute { }\n\n";
 
@@ -4451,7 +4541,7 @@ public void Delegates_TypeParameter_AddAttribute()
         }
 
         [Fact]
-        public void Delegates_Attribute_Add_NotSupportedByRuntime()
+        public void Delegate_Attribute_Add_NotSupportedByRuntime()
         {
             var attribute = "public class AAttribute : System.Attribute { }\n\n";
 
@@ -4469,7 +4559,7 @@ public void Delegates_Attribute_Add_NotSupportedByRuntime()
         }
 
         [Fact]
-        public void Delegates_Attribute_Add()
+        public void Delegate_Attribute_Add()
         {
             var attribute = "public class AAttribute : System.Attribute { }\n\n";
 
@@ -4487,7 +4577,7 @@ public void Delegates_Attribute_Add()
         }
 
         [Fact]
-        public void Delegates_Attribute_Add_WithReturnTypeAttribute()
+        public void Delegate_Attribute_Add_WithReturnTypeAttribute()
         {
             var attribute = "public class AAttribute : System.Attribute { }\n\n";
 
@@ -4510,7 +4600,7 @@ public void Delegates_Attribute_Add_WithReturnTypeAttribute()
         }
 
         [Fact]
-        public void Delegates_ReadOnlyRef_Parameter_InsertWhole()
+        public void Delegate_ReadOnlyRef_Parameter_InsertWhole()
         {
             var src1 = "";
             var src2 = "public delegate int D(in int b);";
@@ -4527,7 +4617,7 @@ public void Delegates_ReadOnlyRef_Parameter_InsertWhole()
         }
 
         [Fact]
-        public void Delegates_ReadOnlyRef_Parameter_InsertParameter()
+        public void Delegate_ReadOnlyRef_Parameter_InsertParameter()
         {
             var src1 = "public delegate int D();";
             var src2 = "public delegate int D(in int b);";
@@ -4542,7 +4632,7 @@ public void Delegates_ReadOnlyRef_Parameter_InsertParameter()
         }
 
         [Fact]
-        public void Delegates_ReadOnlyRef_Parameter_Update()
+        public void Delegate_ReadOnlyRef_Parameter_Update()
         {
             var src1 = "public delegate int D(int b);";
             var src2 = "public delegate int D(in int b);";
@@ -4557,7 +4647,7 @@ public void Delegates_ReadOnlyRef_Parameter_Update()
         }
 
         [Fact]
-        public void Delegates_ReadOnlyRef_ReturnType_Insert()
+        public void Delegate_ReadOnlyRef_ReturnType_Insert()
         {
             var src1 = "";
             var src2 = "public delegate ref readonly int D();";
@@ -4573,7 +4663,7 @@ public void Delegates_ReadOnlyRef_ReturnType_Insert()
         }
 
         [Fact]
-        public void Delegates_ReadOnlyRef_ReturnType_Update()
+        public void Delegate_ReadOnlyRef_ReturnType_Update()
         {
             var src1 = "public delegate int D();";
             var src2 = "public delegate ref readonly int D();";
@@ -4592,7 +4682,21 @@ public void Delegates_ReadOnlyRef_ReturnType_Update()
         #region Nested Types
 
         [Fact]
-        public void NestedClass_ClassMove1()
+        public void NestedType_Move_Sideways()
+        {
+            var src1 = @"class N { class C {} } class M {            }";
+            var src2 = @"class N {            } class M { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifyEdits(
+                "Move [class C {}]@10 -> @33");
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.Move, "class C", GetResource("class")));
+        }
+
+        [Fact]
+        public void NestedType_Move_Outside()
         {
             var src1 = @"class C { class D { } }";
             var src2 = @"class C { } class D { }";
@@ -4607,38 +4711,88 @@ public void NestedClass_ClassMove1()
         }
 
         [Fact]
-        public void NestedClass_ClassMove2()
+        public void NestedType_Move_Insert()
         {
-            var src1 = @"class C { class D { }  class E { }  class F { } }";
-            var src2 = @"class C { class D { }  class F { } } class E { }  ";
+            var src1 = @"class C { class D { } }";
+            var src2 = @"class C { class E { class D { } } }";
 
             var edits = GetTopEdits(src1, src2);
 
             edits.VerifyEdits(
-                "Move [class E { }]@23 -> @37");
+                "Insert [class E { class D { } }]@10",
+                "Move [class D { }]@10 -> @20");
 
             edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "class E", FeaturesResources.class_));
+                Diagnostic(RudeEditKind.Move, "class D", FeaturesResources.class_));
         }
 
         [Fact]
-        public void NestedClass_ClassInsertMove1()
+        public void NestedType_MoveAndNamespaceChange()
         {
-            var src1 = @"class C { class D { } }";
-            var src2 = @"class C { class E { class D { } } }";
+            var src1 = @"namespace N { class C { class D { } } } namespace M { }";
+            var src2 = @"namespace N { class C { } } namespace M { class D { } }";
 
             var edits = GetTopEdits(src1, src2);
 
             edits.VerifyEdits(
-                "Insert [class E { class D { } }]@10",
-                "Move [class D { }]@10 -> @20");
+                "Move [class D { }]@24 -> @42");
 
             edits.VerifySemanticDiagnostics(
                 Diagnostic(RudeEditKind.Move, "class D", FeaturesResources.class_));
         }
 
         [Fact]
-        public void NestedClass_Insert1()
+        public void NestedType_Move_MultiFile()
+        {
+            var srcA1 = @"partial class N { class C {} } partial class M {            }";
+            var srcB1 = @"partial class N {            } partial class M { class C {} }";
+            var srcA2 = @"partial class N {            } partial class M { class C {} }";
+            var srcB2 = @"partial class N { class C {} } partial class M {            }";
+
+            var editsA = GetTopEdits(srcA1, srcA2);
+            editsA.VerifyEdits(
+                "Move [class C {}]@18 -> @49");
+
+            var editsB = GetTopEdits(srcB1, srcB2);
+            editsB.VerifyEdits(
+                "Move [class C {}]@49 -> @18");
+
+            EditAndContinueValidation.VerifySemantics(
+                new[] { editsA, editsB },
+                new[]
+                {
+                    DocumentResults(),
+                    DocumentResults(),
+                });
+        }
+
+        [Fact]
+        public void NestedType_Move_PartialTypesInSameFile()
+        {
+            var src1 = @"partial class N { class C {} class D {} } partial class N { }";
+            var src2 = @"partial class N { class C {}            } partial class N { class D {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifyEdits(
+                "Move [class D {}]@29 -> @60");
+
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Fact]
+        public void NestedType_Move_Reloadable()
+        {
+            var src1 = ReloadableAttributeSrc + "class N { [CreateNewOnMetadataUpdate]class C {} } class M { }";
+            var src2 = ReloadableAttributeSrc + "class N { } class M { [CreateNewOnMetadataUpdate]class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.Move, "class C", GetResource("class")));
+        }
+
+        [Fact]
+        public void NestedType_Insert1()
         {
             var src1 = @"class C {  }";
             var src2 = @"class C { class D { class E { } } }";
@@ -4653,7 +4807,7 @@ public void NestedClass_Insert1()
         }
 
         [Fact]
-        public void NestedClass_Insert2()
+        public void NestedType_Insert2()
         {
             var src1 = @"class C {  }";
             var src2 = @"class C { protected class D { public class E { } } }";
@@ -4668,7 +4822,7 @@ public void NestedClass_Insert2()
         }
 
         [Fact]
-        public void NestedClass_Insert3()
+        public void NestedType_Insert3()
         {
             var src1 = @"class C {  }";
             var src2 = @"class C { private class D { public class E { } } }";
@@ -4683,7 +4837,7 @@ public void NestedClass_Insert3()
         }
 
         [Fact]
-        public void NestedClass_Insert4()
+        public void NestedType_Insert4()
         {
             var src1 = @"class C {  }";
             var src2 = @"class C { private class D { public D(int a, int b) { } public int P { get; set; } } }";
@@ -4705,7 +4859,7 @@ public void NestedClass_Insert4()
         }
 
         [Fact]
-        public void NestedClass_Insert_ReloadableIntoReloadable1()
+        public void NestedType_Insert_ReloadableIntoReloadable1()
         {
             var src1 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { }";
             var src2 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { [CreateNewOnMetadataUpdate]class D { } }";
@@ -4718,7 +4872,7 @@ public void NestedClass_Insert_ReloadableIntoReloadable1()
         }
 
         [Fact]
-        public void NestedClass_Insert_ReloadableIntoReloadable2()
+        public void NestedType_Insert_ReloadableIntoReloadable2()
         {
             var src1 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { }";
             var src2 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { [CreateNewOnMetadataUpdate]class D { [CreateNewOnMetadataUpdate]class E { } } }";
@@ -4731,7 +4885,7 @@ public void NestedClass_Insert_ReloadableIntoReloadable2()
         }
 
         [Fact]
-        public void NestedClass_Insert_ReloadableIntoReloadable3()
+        public void NestedType_Insert_ReloadableIntoReloadable3()
         {
             var src1 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { }";
             var src2 = ReloadableAttributeSrc + "[CreateNewOnMetadataUpdate]class C { class D { [CreateNewOnMetadataUpdate]class E { } } }";
@@ -4744,7 +4898,7 @@ public void NestedClass_Insert_ReloadableIntoReloadable3()
         }
 
         [Fact]
-        public void NestedClass_Insert_ReloadableIntoReloadable4()
+        public void NestedType_Insert_ReloadableIntoReloadable4()
         {
             var src1 = ReloadableAttributeSrc + "class C { }";
             var src2 = ReloadableAttributeSrc + "class C { [CreateNewOnMetadataUpdate]class D { [CreateNewOnMetadataUpdate]class E { } } }";
@@ -4756,7 +4910,7 @@ public void NestedClass_Insert_ReloadableIntoReloadable4()
         }
 
         [Fact]
-        public void NestedClass_Insert_Member_Reloadable()
+        public void NestedType_Insert_Member_Reloadable()
         {
             var src1 = ReloadableAttributeSrc + "class C { [CreateNewOnMetadataUpdate]class D { } }";
             var src2 = ReloadableAttributeSrc + "class C { [CreateNewOnMetadataUpdate]class D { int x; } }";
@@ -4769,7 +4923,7 @@ public void NestedClass_Insert_Member_Reloadable()
         }
 
         [Fact]
-        public void NestedClass_InsertMemberWithInitializer1()
+        public void NestedType_InsertMemberWithInitializer1()
         {
             var src1 = @"
 class C
@@ -4793,7 +4947,7 @@ private class D
 
         [WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")]
         [Fact]
-        public void NestedClass_Insert_PInvoke()
+        public void NestedType_Insert_PInvoke()
         {
             var src1 = @"
 using System;
@@ -4838,7 +4992,7 @@ abstract class D
 
         [WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")]
         [Fact]
-        public void NestedClass_Insert_VirtualAbstract()
+        public void NestedType_Insert_VirtualAbstract()
         {
             var src1 = @"
 using System;
@@ -4872,7 +5026,7 @@ public virtual event Action E { add { } remove { } }
         }
 
         [Fact]
-        public void NestedClass_TypeReorder1()
+        public void NestedType_TypeReorder1()
         {
             var src1 = @"class C { struct E { } class F { } delegate void D(); interface I {} }";
             var src2 = @"class C { class F { } interface I {} delegate void D(); struct E { } }";
@@ -4887,7 +5041,7 @@ public void NestedClass_TypeReorder1()
         }
 
         [Fact]
-        public void NestedClass_MethodDeleteInsert()
+        public void NestedType_MethodDeleteInsert()
         {
             var src1 = @"public class C { public void goo() {} }";
             var src2 = @"public class C { private class D { public void goo() {} } }";
@@ -4906,7 +5060,7 @@ public void NestedClass_MethodDeleteInsert()
         }
 
         [Fact]
-        public void NestedClass_ClassDeleteInsert()
+        public void NestedType_ClassDeleteInsert()
         {
             var src1 = @"public class C { public class X {} }";
             var src2 = @"public class C { public class D { public class X {} } }";
@@ -5432,7 +5586,7 @@ public void NestedPartialTypeInPartialType_InsertDeleteAndInsertVirtual()
         #region Namespaces
 
         [Fact]
-        public void Namespace_Insert()
+        public void Namespace_Empty_Insert()
         {
             var src1 = @"";
             var src2 = @"namespace C { }";
@@ -5442,12 +5596,11 @@ public void Namespace_Insert()
             edits.VerifyEdits(
                 "Insert [namespace C { }]@0");
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Insert, "namespace C", FeaturesResources.namespace_));
+            edits.VerifySemanticDiagnostics();
         }
 
         [Fact]
-        public void Namespace_InsertNested()
+        public void Namespace_Empty_InsertNested()
         {
             var src1 = @"namespace C { }";
             var src2 = @"namespace C { namespace D { } }";
@@ -5457,12 +5610,11 @@ public void Namespace_InsertNested()
             edits.VerifyEdits(
                 "Insert [namespace D { }]@14");
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Insert, "namespace D", FeaturesResources.namespace_));
+            edits.VerifySemanticDiagnostics();
         }
 
         [Fact]
-        public void Namespace_DeleteNested()
+        public void Namespace_Empty_DeleteNested()
         {
             var src1 = @"namespace C { namespace D { } }";
             var src2 = @"namespace C { }";
@@ -5472,12 +5624,11 @@ public void Namespace_DeleteNested()
             edits.VerifyEdits(
                 "Delete [namespace D { }]@14");
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Delete, "namespace C", FeaturesResources.namespace_));
+            edits.VerifySemanticDiagnostics();
         }
 
         [Fact]
-        public void Namespace_Move()
+        public void Namespace_Empty_Move()
         {
             var src1 = @"namespace C { namespace D { } }";
             var src2 = @"namespace C { } namespace D { }";
@@ -5487,12 +5638,11 @@ public void Namespace_Move()
             edits.VerifyEdits(
                 "Move [namespace D { }]@14 -> @16");
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "namespace D", FeaturesResources.namespace_));
+            edits.VerifySemanticDiagnostics();
         }
 
         [Fact]
-        public void Namespace_Reorder1()
+        public void Namespace_Empty_Reorder1()
         {
             var src1 = @"namespace C { namespace D { } class T { } namespace E { } }";
             var src2 = @"namespace C { namespace E { } class T { } namespace D { } }";
@@ -5507,7 +5657,7 @@ public void Namespace_Reorder1()
         }
 
         [Fact]
-        public void Namespace_Reorder2()
+        public void Namespace_Empty_Reorder2()
         {
             var src1 = @"namespace C { namespace D1 { } namespace D2 { } namespace D3 { } class T { } namespace E { } }";
             var src2 = @"namespace C { namespace E { }                                    class T { } namespace D1 { } namespace D2 { } namespace D3 { } }";
@@ -5522,33 +5672,460 @@ public void Namespace_Reorder2()
         }
 
         [Fact]
-        public void Namespace_FileScoped_Insert()
+        public void Namespace_Empty_FileScoped_Insert()
         {
             var src1 = @"";
-            var src2 = @"namespace C;";
+            var src2 = @"namespace N;";
 
             var edits = GetTopEdits(src1, src2);
 
             edits.VerifyEdits(
-                "Insert [namespace C;]@0");
+                "Insert [namespace N;]@0");
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Insert, "namespace C", FeaturesResources.namespace_));
+            edits.VerifySemanticDiagnostics();
         }
 
         [Fact]
-        public void Namespace_FileScoped_Delete()
+        public void Namespace_Empty_FileScoped_Delete()
         {
-            var src1 = @"namespace C;";
+            var src1 = @"namespace N;";
             var src2 = @"";
 
             var edits = GetTopEdits(src1, src2);
 
             edits.VerifyEdits(
-                "Delete [namespace C;]@0");
+                "Delete [namespace N;]@0");
+
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Theory]
+        [InlineData("namespace N; class C {}")]
+        [InlineData("namespace N { class C {} }")]
+        public void Namespace_Insert_NewType(string src2)
+        {
+            var src1 = @"";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.InsertNotSupportedByRuntime, "class C", GetResource("class")) },
+                capabilities: EditAndContinueCapabilities.Baseline);
+
+            edits.VerifySemantics(
+                new[] { SemanticEdit(SemanticEditKind.Insert, c => c.GetMember("N.C")) },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Theory]
+        [InlineData("namespace N.M { class C {} }")]
+        [InlineData("namespace N.M; class C {}")]
+        public void Namespace_Insert_NewType_Qualified(string src2)
+        {
+            var src1 = "";
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.InsertNotSupportedByRuntime, "class C", GetResource("class")) },
+                capabilities: EditAndContinueCapabilities.Baseline);
+
+            edits.VerifySemantics(
+                new[] { SemanticEdit(SemanticEditKind.Insert, c => c.GetMember("N.M.C")) },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Theory]
+        [InlineData("class")]
+        [InlineData("interface")]
+        [InlineData("enum")]
+        [InlineData("struct")]
+        [InlineData("record")]
+        [InlineData("record struct")]
+        public void Namespace_Insert(string keyword)
+        {
+            var declaration = keyword + " X {}";
+            var src1 = declaration;
+            var src2 = "namespace N { " + declaration + " }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, keyword + " X", GetResource(keyword), "<global namespace>", "N") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_Delegate()
+        {
+            var declaration = "delegate void X();";
+            var src1 = declaration;
+            var src2 = "namespace N { " + declaration + " }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "delegate void X()", GetResource("delegate"), "<global namespace>", "N") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_MultipleDeclarations()
+        {
+            var src1 = @"class C {} class D {}";
+            var src2 = "namespace N { class C {} class D { } }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[]
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "<global namespace>", "N"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class D", GetResource("class"), "<global namespace>", "N")
+                },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_FileScoped()
+        {
+            var src1 = @"class C {}";
+            var src2 = @"namespace N; class C {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "<global namespace>", "N") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_Nested()
+        {
+            var src1 = @"namespace N { class C {} }";
+            var src2 = @"namespace N { namespace M { class C {} } }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N", "N.M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_Qualified()
+        {
+            var src1 = @"class C {}";
+            var src2 = @"namespace N.M { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "<global namespace>", "N.M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Insert_Qualified_FileScoped()
+        {
+            var src1 = @"class C {}";
+            var src2 = @"namespace N.M; class C {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "<global namespace>", "N.M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Theory]
+        [InlineData("class")]
+        [InlineData("interface")]
+        [InlineData("enum")]
+        [InlineData("struct")]
+        [InlineData("record")]
+        [InlineData("record struct")]
+        public void Namespace_Delete(string keyword)
+        {
+            var declaration = keyword + " X {}";
+            var src1 = "namespace N { " + declaration + " }";
+            var src2 = declaration;
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, keyword + " X", GetResource(keyword), "N", "<global namespace>") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Delete_Delegate()
+        {
+            var declaration = "delegate void X();";
+            var src1 = "namespace N { " + declaration + " }";
+            var src2 = declaration;
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "delegate void X()", GetResource("delegate"), "N", "<global namespace>") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Delete_MultipleDeclarations()
+        {
+            var src1 = @"namespace N { class C {} class D { } }";
+            var src2 = @"class C {} class D {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[]
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N", "<global namespace>"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class D", GetResource("class"), "N", "<global namespace>")
+                },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Theory]
+        [InlineData("namespace N.M { class C {} }")]
+        [InlineData("namespace N.M; class C {}")]
+        public void Namespace_Delete_Qualified(string src1)
+        {
+            var src2 = @"class C {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N.M", "<global namespace>") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Qualified_ToFileScoped()
+        {
+            var src1 = @"namespace N.M { class C {} }";
+            var src2 = @"namespace N.M; class C {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Theory]
+        [InlineData("class")]
+        [InlineData("interface")]
+        [InlineData("enum")]
+        [InlineData("struct")]
+        [InlineData("record")]
+        [InlineData("record struct")]
+        public void Namespace_Update(string keyword)
+        {
+            var declaration = keyword + " X {}";
+            var src1 = "namespace N { " + declaration + " }";
+            var src2 = "namespace M { " + declaration + " }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, keyword + " X", GetResource(keyword), "N", "M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_Delegate()
+        {
+            var declaration = "delegate void X();";
+            var src1 = "namespace N { " + declaration + " }";
+            var src2 = "namespace M { " + declaration + " }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "delegate void X()", GetResource("delegate"), "N", "M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_Multiple()
+        {
+            var src1 = @"namespace N { class C {} class D {} }";
+            var src2 = @"namespace M { class C {} class D {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[]
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N", "M"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "class D", GetResource("class"), "N", "M"),
+                },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_Qualified1()
+        {
+            var src1 = @"namespace N.M { class C {} }";
+            var src2 = @"namespace N.M.O { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N.M", "N.M.O") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_Qualified2()
+        {
+            var src1 = @"namespace N.M { class C {} }";
+            var src2 = @"namespace N { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N.M", "N") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_Qualified3()
+        {
+            var src1 = @"namespace N.M1.O { class C {} }";
+            var src2 = @"namespace N.M2.O { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N.M1.O", "N.M2.O") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_FileScoped()
+        {
+            var src1 = @"namespace N; class C {}";
+            var src2 = @"namespace M; class C {}";
+
+            var edits = GetTopEdits(src1, src2);
+            edits.VerifySemanticDiagnostics(
+                new[] { Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N", "M") },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_MultiplePartials1()
+        {
+            var srcA1 = @"namespace N { partial class/*1*/C {} } namespace N { partial class/*2*/C {} }";
+            var srcB1 = @"namespace N { partial class/*3*/C {} } namespace N { partial class/*4*/C {} }";
+            var srcA2 = @"namespace N { partial class/*1*/C {} } namespace M { partial class/*2*/C {} }";
+            var srcB2 = @"namespace M { partial class/*3*/C {} } namespace N { partial class/*4*/C {} }";
+
+            EditAndContinueValidation.VerifySemantics(
+                new[] { GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2) },
+                new[]
+                {
+                    DocumentResults(
+                        semanticEdits: new[]
+                        {
+                            SemanticEdit(SemanticEditKind.Insert, c => c.GetMember<INamedTypeSymbol>("M.C"), partialType: "M.C"),
+                        }),
+                    DocumentResults(
+                        semanticEdits: new[]
+                        {
+                            SemanticEdit(SemanticEditKind.Insert, c => c.GetMember<INamedTypeSymbol>("M.C"), partialType: "M.C"),
+                        }),
+                },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_MultiplePartials2()
+        {
+            var srcA1 = @"namespace N { partial class/*1*/C {} } namespace N { partial class/*2*/C {} }";
+            var srcB1 = @"namespace N { partial class/*3*/C {} } namespace N { partial class/*4*/C {} }";
+            var srcA2 = @"namespace M { partial class/*1*/C {} } namespace M { partial class/*2*/C {} }";
+            var srcB2 = @"namespace M { partial class/*3*/C {} } namespace M { partial class/*4*/C {} }";
+
+            EditAndContinueValidation.VerifySemantics(
+                new[] { GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2) },
+                new[]
+                {
+                    DocumentResults(diagnostics: new[]
+                    {
+                        Diagnostic(RudeEditKind.ChangingNamespace, "partial class/*1*/C", GetResource("class"), "N", "M")
+                    }),
+                    DocumentResults(diagnostics: new[]
+                    {
+                        Diagnostic(RudeEditKind.ChangingNamespace, "partial class/*3*/C", GetResource("class"), "N", "M")
+                    }),
+                },
+                capabilities: EditAndContinueCapabilities.NewTypeDefinition);
+        }
+
+        [Fact]
+        public void Namespace_Update_MultiplePartials_MergeInNewNamspace()
+        {
+            var src1 = @"namespace N { partial class C {} } namespace M { partial class C {} }";
+            var src2 = @"namespace X { partial class C {} } namespace X { partial class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "partial class C", GetResource("class"), "M", "X"),
+                Diagnostic(RudeEditKind.Delete, "partial class C", DeletedSymbolDisplay(GetResource("class"), "C")));
+        }
+
+        [Fact]
+        public void Namespace_Update_MultipleTypesWithSameNameAndArity()
+        {
+            var src1 = @"namespace N1 { class C {} } namespace N2 { class C {} } namespace O { class C {} }";
+            var src2 = @"namespace M1 { class C {} } namespace M2 { class C {} } namespace O { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N2", "M2"),
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N1", "M1"));
+        }
+
+        [Fact]
+        public void Namespace_UpdateAndInsert()
+        {
+            var src1 = @"namespace N.M { class C {} }";
+            var src2 = @"namespace N { namespace M { class C {} } }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Fact]
+        public void Namespace_UpdateAndDelete()
+        {
+            var src1 = @"namespace N { namespace M { class C {} } }";
+            var src2 = @"namespace N.M { class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics();
+        }
+
+        [Fact]
+        public void Namespace_Move1()
+        {
+            var src1 = @"namespace N { namespace M { class C {} class C<T> {} } class D {} }";
+            var src2 = @"namespace N { class D {} } namespace M { class C<T> {} class C {} }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [namespace M { class C {} class C<T> {} }]@14 -> @27",
+                "Reorder [class C<T> {}]@39 -> @41");
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C", GetResource("class"), "N.M", "M"),
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C<T>", GetResource("class"), "N.M", "M"));
+        }
+
+        [Fact]
+        public void Namespace_Move2()
+        {
+            var src1 = @"namespace N1 { namespace M { class C {} } namespace N2 { } }";
+            var src2 = @"namespace N1 { } namespace N2 { namespace M { class C {} } }";
+
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifyEdits(
+                "Move [namespace N2 { }]@42 -> @17",
+                "Move [namespace M { class C {} }]@15 -> @32");
 
             edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Delete, null, FeaturesResources.namespace_));
+                Diagnostic(RudeEditKind.ChangingNamespace, "class C", "class", "N1.M", "N2.M"));
         }
 
         #endregion
diff --git a/src/EditorFeatures/Test/EditAndContinue/RudeEditDiagnosticTests.cs b/src/EditorFeatures/Test/EditAndContinue/RudeEditDiagnosticTests.cs
index dec8ac444678f..2e696945806a9 100644
--- a/src/EditorFeatures/Test/EditAndContinue/RudeEditDiagnosticTests.cs
+++ b/src/EditorFeatures/Test/EditAndContinue/RudeEditDiagnosticTests.cs
@@ -63,13 +63,14 @@ public void ToDiagnostic()
                 RudeEditKind.ChangingStateMachineShape,
                 RudeEditKind.InternalError,
                 RudeEditKind.MemberBodyInternalError,
-                RudeEditKind.ChangingNonCustomAttribute
+                RudeEditKind.ChangingNonCustomAttribute,
             };
 
             var arg3 = new HashSet<RudeEditKind>()
             {
                 RudeEditKind.InsertLambdaWithMultiScopeCapture,
                 RudeEditKind.DeleteLambdaWithMultiScopeCapture,
+                RudeEditKind.ChangingNamespace,
             };
 
             var allKinds = Enum.GetValues(typeof(RudeEditKind)).Cast<RudeEditKind>();
diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb
index cb3cfbd36b220..43253ea4f7c76 100644
--- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb
+++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb
@@ -40,6 +40,8 @@ End Namespace
 
         Public Shared Function GetResource(keyword As String) As String
             Select Case keyword
+                Case "Enum"
+                    Return FeaturesResources.enum_
                 Case "Class"
                     Return FeaturesResources.class_
                 Case "Structure"
@@ -48,6 +50,8 @@ End Namespace
                     Return VBFeaturesResources.module_
                 Case "Interface"
                     Return FeaturesResources.interface_
+                Case "Delegate"
+                    Return FeaturesResources.delegate_
                 Case Else
                     Throw ExceptionUtilities.UnexpectedValue(keyword)
             End Select
diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/TopLevelEditingTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/TopLevelEditingTests.vb
index 388efc5a163de..b819f306f0cd7 100644
--- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/TopLevelEditingTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/TopLevelEditingTests.vb
@@ -1801,6 +1801,90 @@ End Class
                     DocumentResults()
                 })
         End Sub
+
+        <Theory>
+        <InlineData("Class")>
+        <InlineData("Module")>
+        <InlineData("Structure")>
+        <InlineData("Interface")>
+        <InlineData("Enum")>
+        Public Sub Type_Move_NamespaceChange(keyword As String)
+            Dim declaration = keyword & " C : End " & keyword
+            Dim src1 = $"Namespace N : {declaration,-20} : End Namespace : Namespace M :                 End Namespace"
+            Dim src2 = $"Namespace N :                     End Namespace : Namespace M : {declaration} : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [" + declaration + "]@14 -> @64")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, keyword + " C", GetResource(keyword), "N", "M"))
+        End Sub
+
+        <Fact>
+        Public Sub Type_Move_NamespaceChange_Delegate()
+            Dim src1 = "Namespace N : Delegate Sub F() : End Namespace : Namespace M :                    End Namespace"
+            Dim src2 = "Namespace N :                    End Namespace : Namespace M : Delegate Sub F() : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Delegate Sub F()]@14 -> @63")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Delegate Sub F()", GetResource("Delegate"), "N", "M"))
+        End Sub
+
+        <Fact>
+        Public Sub Type_Move_NamespaceChange_Subnamespace()
+            Dim src1 = "Namespace N : Class C : End Class : End Namespace : Namespace M : Namespace O :                       End Namespace : End Namespace"
+            Dim src2 = "Namespace N :                       End Namespace : Namespace M : Namespace O : Class C : End Class : End Namespace : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Class C : End Class]@14 -> @80")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N", "M.O"))
+        End Sub
+
+        <Fact>
+        Public Sub Type_Move_SameEffectiveNamespace()
+            Dim src1 = "Namespace N.M : Class C : End Class : End Namespace : Namespace N : Namespace M :                       End Namespace : End Namespace"
+            Dim src2 = "Namespace N.M :                       End Namespace : Namespace N : Namespace M : Class C : End Class : End Namespace : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Class C : End Class]@16 -> @82")
+
+            edits.VerifySemanticDiagnostics()
+        End Sub
+
+        <Fact>
+        Public Sub Type_Move_MultiFile()
+            Dim srcA1 = "Namespace N : Class C : End Class : End Namespace : Namespace M :                       End Namespace"
+            Dim srcB1 = "Namespace N :                       End Namespace : Namespace M : Class C : End Class : End Namespace"
+            Dim srcA2 = "Namespace N :                       End Namespace : Namespace M : Class C : End Class : End Namespace"
+            Dim srcB2 = "Namespace N : Class C : End Class : End Namespace : Namespace M :                       End Namespace"
+
+            Dim editsA = GetTopEdits(srcA1, srcA2)
+            editsA.VerifyEdits(
+                "Move [Class C : End Class]@14 -> @66")
+
+            Dim editsB = GetTopEdits(srcB1, srcB2)
+            editsB.VerifyEdits(
+                "Move [Class C : End Class]@66 -> @14")
+
+            EditAndContinueValidation.VerifySemantics(
+                {editsA, editsB},
+                {
+                    DocumentResults(),
+                    DocumentResults()
+                })
+        End Sub
 #End Region
 
 #Region "Enums"
@@ -2095,7 +2179,7 @@ End Class
 
 #Region "Delegates"
         <Fact>
-        Public Sub Delegates_NoModifiers_Insert()
+        Public Sub Delegate_NoModifiers_Insert()
             Dim src1 = ""
             Dim src2 = "Delegate Sub C()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2105,7 +2189,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_NoModifiers_IntoNamespace_Insert()
+        Public Sub Delegate_NoModifiers_IntoNamespace_Insert()
             Dim src1 = "Namespace N : End Namespace"
             Dim src2 = "Namespace N : Delegate Sub C() : End Namespace"
             Dim edits = GetTopEdits(src1, src2)
@@ -2115,7 +2199,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_NoModifiers_IntoType_Insert()
+        Public Sub Delegate_NoModifiers_IntoType_Insert()
             Dim src1 = "Class N : End Class"
             Dim src2 = "Class N : Delegate Sub C() : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2124,7 +2208,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Rename()
+        Public Sub Delegate_Rename()
             Dim src1 = "Public Delegate Sub D()"
             Dim src2 = "Public Delegate Sub Z()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2137,7 +2221,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Accessibility_Update()
+        Public Sub Delegate_Accessibility_Update()
             Dim src1 = "Public Delegate Sub D()"
             Dim src2 = "Private Delegate Sub D()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2150,7 +2234,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_ReturnType_Update()
+        Public Sub Delegate_ReturnType_Update()
             Dim src1 = "Public Delegate Function D()"
             Dim src2 = "Public Delegate Sub D()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2163,7 +2247,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_ReturnType_Update2()
+        Public Sub Delegate_ReturnType_Update2()
             Dim src1 = "Public Delegate Function D() As Integer"
             Dim src2 = "Public Delegate Sub D()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2176,7 +2260,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_ReturnType_Update3()
+        Public Sub Delegate_ReturnType_Update3()
             Dim src1 = "Public Delegate Function D()"
             Dim src2 = "Public Delegate Function D() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2189,7 +2273,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_ReturnType_Update4()
+        Public Sub Delegate_ReturnType_Update4()
             Dim src1 = "Public Delegate Function D() As Integer"
             Dim src2 = "Public Delegate Function D()"
             Dim edits = GetTopEdits(src1, src2)
@@ -2202,7 +2286,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_Insert()
+        Public Sub Delegate_Parameter_Insert()
             Dim src1 = "Public Delegate Function D() As Integer"
             Dim src2 = "Public Delegate Function D(a As Integer) As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2216,7 +2300,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_Insert_Reloadable()
+        Public Sub Delegate_Parameter_Insert_Reloadable()
             Dim src1 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Public Delegate Function D() As Integer"
             Dim src2 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Friend Delegate Function D(a As Integer) As Boolean"
 
@@ -2227,7 +2311,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_Delete()
+        Public Sub Delegate_Parameter_Delete()
             Dim src1 = "Public Delegate Function D(a As Integer) As Integer"
             Dim src2 = "Public Delegate Function D() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2241,7 +2325,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_Rename()
+        Public Sub Delegate_Parameter_Rename()
             Dim src1 = "Public Delegate Function D(a As Integer) As Integer"
             Dim src2 = "Public Delegate Function D(b As Integer) As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2264,7 +2348,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_Update()
+        Public Sub Delegate_Parameter_Update()
             Dim src1 = "Public Delegate Function D(a As Integer) As Integer"
             Dim src2 = "Public Delegate Function D(a As Byte) As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2277,7 +2361,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_Parameter_AddAttribute()
+        Public Sub Delegate_Parameter_AddAttribute()
             Dim src1 = "Public Delegate Function D(a As Integer) As Integer"
             Dim src2 = "Public Delegate Function D(<System.Obsolete> a As Integer) As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2295,7 +2379,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Insert()
+        Public Sub Delegate_TypeParameter_Insert()
             Dim src1 = "Public Delegate Function D() As Integer"
             Dim src2 = "Public Delegate Function D(Of T)() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2310,7 +2394,7 @@ End Class
 
         <Fact(Skip:="https://github.com/dotnet/roslyn/issues/54881")>
         <WorkItem(54881, "https://github.com/dotnet/roslyn/issues/54881")>
-        Public Sub Delegates_TypeParameter_Insert_Reloadable()
+        Public Sub Delegate_TypeParameter_Insert_Reloadable()
             Dim src1 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Public Delegate Function D(Of T)() As Integer"
             Dim src2 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Friend Delegate Function D(Of In T, Out S)(a As Integer) As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2320,7 +2404,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Delete()
+        Public Sub Delegate_TypeParameter_Delete()
             Dim src1 = "Public Delegate Function D(Of T)() As Integer"
             Dim src2 = "Public Delegate Function D() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2334,7 +2418,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Rename()
+        Public Sub Delegate_TypeParameter_Rename()
             Dim src1 = "Public Delegate Function D(Of T)() As Integer"
             Dim src2 = "Public Delegate Function D(Of S)() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2348,7 +2432,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Variance1()
+        Public Sub Delegate_TypeParameter_Variance1()
             Dim src1 = "Public Delegate Function D(Of T)() As Integer"
             Dim src2 = "Public Delegate Function D(Of In T)() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2362,7 +2446,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Variance2()
+        Public Sub Delegate_TypeParameter_Variance2()
             Dim src1 = "Public Delegate Function D(Of Out T)() As Integer"
             Dim src2 = "Public Delegate Function D(Of T)() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2376,7 +2460,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_TypeParameter_Variance3()
+        Public Sub Delegate_TypeParameter_Variance3()
             Dim src1 = "Public Delegate Function D(Of Out T)() As Integer"
             Dim src2 = "Public Delegate Function D(Of In T)() As Integer"
             Dim edits = GetTopEdits(src1, src2)
@@ -2390,7 +2474,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub Delegates_AddAttribute()
+        Public Sub Delegate_AddAttribute()
             Dim src1 = "Public Delegate Function D(a As Integer) As Integer"
             Dim src2 = "<System.Obsolete>Public Delegate Function D(a As Integer) As Integer"
 
@@ -2402,39 +2486,38 @@ End Class
                 {Diagnostic(RudeEditKind.ChangingAttributesNotSupportedByRuntime, "Public Delegate Function D(a As Integer)", FeaturesResources.delegate_)},
                 capabilities:=EditAndContinueCapabilities.Baseline)
         End Sub
-
 #End Region
 
 #Region "Nested Types"
 
         <Fact>
-        Public Sub NestedClass_ClassMove1()
-            Dim src1 = "Class C : Class D : End Class : End Class"
-            Dim src2 = "Class C : End Class : Class D : End Class"
-            Dim edits = GetTopEdits(src1, src2)
+        Public Sub NestedType_Move_Sideways()
+            Dim src1 = "Class N : Class C : End Class : End Class : Class M :                       End Class"
+            Dim src2 = "Class N :                       End Class : Class M : Class C : End Class : End Class"
 
+            Dim edits = GetTopEdits(src1, src2)
             edits.VerifyEdits(
-                "Move [Class D : End Class]@10 -> @22")
+                "Move [Class C : End Class]@10 -> @54")
 
             edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "Class D", FeaturesResources.class_))
+                Diagnostic(RudeEditKind.Move, "Class C", GetResource("Class")))
         End Sub
 
         <Fact>
-        Public Sub NestedClass_ClassMove2()
-            Dim src1 = "Class C : Class D : End Class : Class E : End Class : Class F : End Class : End Class"
-            Dim src2 = "Class C : Class D : End Class : Class F : End Class : End CLass : Class E : End Class"
+        Public Sub NestedType_Move_Outside()
+            Dim src1 = "Class C : Class D : End Class : End Class"
+            Dim src2 = "Class C : End Class : Class D : End Class"
             Dim edits = GetTopEdits(src1, src2)
 
             edits.VerifyEdits(
-                "Move [Class E : End Class]@32 -> @66")
+                "Move [Class D : End Class]@10 -> @22")
 
             edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "Class E", FeaturesResources.class_))
+                Diagnostic(RudeEditKind.Move, "Class D", GetResource("Class")))
         End Sub
 
         <Fact>
-        Public Sub NestedClass_ClassInsertMove1()
+        Public Sub NestedType_Move_Insert()
             Dim src1 = "Class C : Class D : End Class : End Class"
             Dim src2 = "Class C : Class E : Class D : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2445,11 +2528,71 @@ End Class
                 "Move [Class D : End Class]@10 -> @20")
 
             edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "Class D", FeaturesResources.class_))
+                Diagnostic(RudeEditKind.Move, "Class D", GetResource("Class")))
+        End Sub
+
+        <Fact>
+        Public Sub NestedType_MoveAndNamespaceChange()
+            Dim src1 = "Namespace N : Class C : Class D : End Class : End Class : End Namespace : Namespace M :                       End Namespace"
+            Dim src2 = "Namespace N : Class C :                       End Class : End Namespace : Namespace M : Class D : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Class D : End Class]@24 -> @88")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.Move, "Class D", GetResource("Class")))
+        End Sub
+
+        <Fact>
+        Public Sub NestedType_Move_MultiFile()
+            Dim srcA1 = "Partial Class N : Class C : End Class : End Class : Partial Class M :                       End Class"
+            Dim srcB1 = "Partial Class N :                       End Class : Partial Class M : Class C : End Class : End Class"
+            Dim srcA2 = "Partial Class N :                       End Class : Partial Class M : Class C : End Class : End Class"
+            Dim srcB2 = "Partial Class N : Class C : End Class : End Class : Partial Class M :                       End Class"
+
+            Dim editsA = GetTopEdits(srcA1, srcA2)
+            editsA.VerifyEdits(
+                "Move [Class C : End Class]@18 -> @70")
+
+            Dim editsB = GetTopEdits(srcB1, srcB2)
+            editsB.VerifyEdits(
+                "Move [Class C : End Class]@70 -> @18")
+
+            EditAndContinueValidation.VerifySemantics(
+                {editsA, editsB},
+                {
+                    DocumentResults(),
+                    DocumentResults()
+                })
+        End Sub
+
+        <Fact>
+        Public Sub NestedType_Move_PartialTypesInSameFile()
+            Dim src1 = "Partial Class N : Class C : End Class : Class D : End Class : End Class : Partial Class N :                       End Class"
+            Dim src2 = "Partial Class N : Class C : End Class :                       End Class : Partial Class N : Class D : End Class : End Class"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifyEdits(
+                "Move [Class D : End Class]@40 -> @92")
+
+            edits.VerifySemanticDiagnostics()
+        End Sub
+
+        <Fact>
+        Public Sub NestedType_Move_Reloadable()
+            Dim src1 = ReloadableAttributeSrc + "Class N : <CreateNewOnMetadataUpdate>Class C : End Class : End Class : Class M : End Class"
+            Dim src2 = ReloadableAttributeSrc + "Class N : End Class : Class M : <CreateNewOnMetadataUpdate>Class C : End Class : End Class"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.Move, "Class C", GetResource("Class")))
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert1()
+        Public Sub NestedType_Insert1()
             Dim src1 = "Class C : End Class"
             Dim src2 = "Class C : Class D : Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2464,7 +2607,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert2()
+        Public Sub NestedType_Insert2()
             Dim src1 = "Class C : End Class"
             Dim src2 = "Class C : Protected Class D : Public Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2479,7 +2622,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert3()
+        Public Sub NestedType_Insert3()
             Dim src1 = "Class C : End Class"
             Dim src2 = "Class C : Private Class D : Public Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2494,7 +2637,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert4()
+        Public Sub NestedType_Insert4()
             Dim src1 = "Class C : End Class"
             Dim src2 = <text>
 Class C
@@ -2525,7 +2668,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert_ReloadableIntoReloadable1()
+        Public Sub NestedType_Insert_ReloadableIntoReloadable1()
             Dim src1 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : End Class"
             Dim src2 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : <CreateNewOnMetadataUpdate>Class D : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2536,7 +2679,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert_ReloadableIntoReloadable2()
+        Public Sub NestedType_Insert_ReloadableIntoReloadable2()
             Dim src1 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : End Class"
             Dim src2 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : <CreateNewOnMetadataUpdate>Class D : <CreateNewOnMetadataUpdate>Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2547,7 +2690,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert_ReloadableIntoReloadable3()
+        Public Sub NestedType_Insert_ReloadableIntoReloadable3()
             Dim src1 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : End Class"
             Dim src2 = ReloadableAttributeSrc & "<CreateNewOnMetadataUpdate>Class C : Class D : <CreateNewOnMetadataUpdate>Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2558,7 +2701,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert_ReloadableIntoReloadable4()
+        Public Sub NestedType_Insert_ReloadableIntoReloadable4()
             Dim src1 = ReloadableAttributeSrc & "Class C : End Class"
             Dim src2 = ReloadableAttributeSrc & "Class C : <CreateNewOnMetadataUpdate>Class D : <CreateNewOnMetadataUpdate>Class E : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2568,7 +2711,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_Insert_Member_Reloadable()
+        Public Sub NestedType_Insert_Member_Reloadable()
             Dim src1 = ReloadableAttributeSrc & "Class C : <CreateNewOnMetadataUpdate>Class D : End Class : End Class"
             Dim src2 = ReloadableAttributeSrc & "Class C : <CreateNewOnMetadataUpdate>Class D : Dim X As Integer = 1 : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2579,7 +2722,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_InsertMemberWithInitializer1()
+        Public Sub NestedType_InsertMemberWithInitializer1()
             Dim src1 = "Public Class C : End Class"
             Dim src2 = "Public Class C : Private Class D : Public Property P As New Object : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2589,7 +2732,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_InsertMemberWithInitializer2()
+        Public Sub NestedType_InsertMemberWithInitializer2()
             Dim src1 = "Public Module C : End Module"
             Dim src2 = "Public Module C : Private Class D : Property P As New Object : End Class : End Module"
             Dim edits = GetTopEdits(src1, src2)
@@ -2600,7 +2743,7 @@ End Class
 
         <WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")>
         <Fact>
-        Public Sub NestedClass_Insert_PInvoke_Syntactic()
+        Public Sub NestedType_Insert_PInvoke_Syntactic()
             Dim src1 = "
 Imports System
 Imports System.Runtime.InteropServices
@@ -2629,7 +2772,7 @@ End Class
 
         <WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")>
         <Fact>
-        Public Sub NestedClass_Insert_PInvoke_Semantic1()
+        Public Sub NestedType_Insert_PInvoke_Semantic1()
             Dim src1 = "
 Imports System
 Imports System.Runtime.InteropServices
@@ -2670,7 +2813,7 @@ End Class"
 
         <WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")>
         <Fact>
-        Public Sub NestedClass_Insert_PInvoke_Semantic2()
+        Public Sub NestedType_Insert_PInvoke_Semantic2()
             Dim src1 = "
 Imports System
 Imports System.Runtime.InteropServices
@@ -2699,7 +2842,7 @@ End Class"
 
         <WorkItem(835827, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/835827")>
         <Fact>
-        Public Sub NestedClass_Insert_VirtualAbstract()
+        Public Sub NestedType_Insert_VirtualAbstract()
             Dim src1 = "
 Imports System
 Imports System.Runtime.InteropServices
@@ -2735,7 +2878,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_TypeReorder1()
+        Public Sub NestedType_TypeReorder1()
             Dim src1 = "Class C : Structure E : End Structure : Class F : End Class : Delegate Sub D() : Interface I : End Interface : End Class"
             Dim src2 = "Class C : Class F : End Class : Interface I : End Interface : Delegate Sub D() : Structure E : End Structure : End Class"
 
@@ -2748,7 +2891,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_MethodDeleteInsert()
+        Public Sub NestedType_MethodDeleteInsert()
             Dim src1 = "Public Class C" & vbLf & "Public Sub goo() : End Sub : End Class"
             Dim src2 = "Public Class C : Private Class D" & vbLf & "Public Sub goo() : End Sub : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -2768,7 +2911,7 @@ End Class
         End Sub
 
         <Fact>
-        Public Sub NestedClass_ClassDeleteInsert()
+        Public Sub NestedType_ClassDeleteInsert()
             Dim src1 = "Public Class C : Public Class X : End Class : End Class"
             Dim src2 = "Public Class C : Public Class D : Public Class X : End Class : End Class : End Class"
             Dim edits = GetTopEdits(src1, src2)
@@ -3140,27 +3283,25 @@ Class B : Inherits Attribute : End Class
 
 #Region "Namespaces"
         <Fact>
-        Public Sub NamespaceInsert()
+        Public Sub Namespace_Empty_Insert()
             Dim src1 = ""
             Dim src2 = "Namespace C : End Namespace"
             Dim edits = GetTopEdits(src1, src2)
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Insert, "Namespace C", FeaturesResources.namespace_))
+            edits.VerifySemanticDiagnostics()
         End Sub
 
         <Fact>
-        Public Sub NamespaceDelete()
+        Public Sub Namespace_Empty_Delete()
             Dim src1 = "Namespace C : End Namespace"
             Dim src2 = ""
             Dim edits = GetTopEdits(src1, src2)
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Delete, Nothing, FeaturesResources.namespace_))
+            edits.VerifySemanticDiagnostics()
         End Sub
 
         <Fact>
-        Public Sub NamespaceMove1()
+        Public Sub Namespace_Empty_Move1()
             Dim src1 = "Namespace C : Namespace D : End Namespace : End Namespace"
             Dim src2 = "Namespace C : End Namespace : Namespace D : End Namespace"
             Dim edits = GetTopEdits(src1, src2)
@@ -3168,12 +3309,11 @@ Class B : Inherits Attribute : End Class
             edits.VerifyEdits(
                 "Move [Namespace D : End Namespace]@14 -> @30")
 
-            edits.VerifySemanticDiagnostics(
-                Diagnostic(RudeEditKind.Move, "Namespace D", FeaturesResources.namespace_))
+            edits.VerifySemanticDiagnostics()
         End Sub
 
         <Fact>
-        Public Sub NamespaceReorder1()
+        Public Sub Namespace_Empty_Reorder1()
             Dim src1 = "Namespace C : Namespace D : End Namespace : Class T : End Class : Namespace E : End Namespace : End Namespace"
             Dim src2 = "Namespace C : Namespace E : End Namespace : Class T : End Class : Namespace D : End Namespace : End Namespace"
             Dim edits = GetTopEdits(src1, src2)
@@ -3186,7 +3326,7 @@ Class B : Inherits Attribute : End Class
         End Sub
 
         <Fact>
-        Public Sub NamespaceReorder2()
+        Public Sub Namespace_Empty_Reorder2()
             Dim src1 = "Namespace C : " &
                           "Namespace D1 : End Namespace : " &
                           "Namespace D2 : End Namespace : " &
@@ -3212,6 +3352,373 @@ Class B : Inherits Attribute : End Class
             edits.VerifySemanticDiagnostics()
         End Sub
 
+        <Fact>
+        Public Sub Namespace_Insert_NewType()
+            Dim src1 = ""
+            Dim src2 = "Namespace N : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.InsertNotSupportedByRuntime, "Class C", GetResource("Class"))},
+                capabilities:=EditAndContinueCapabilities.Baseline)
+
+            edits.VerifySemantics(
+                semanticEdits:={SemanticEdit(SemanticEditKind.Insert, Function(c) c.GetMember("N.C"))},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_NewType_Qualified()
+            Dim src1 = ""
+            Dim src2 = "Namespace N.M : Class C : End Class : End Namespace"
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.InsertNotSupportedByRuntime, "Class C", GetResource("Class"))},
+                capabilities:=EditAndContinueCapabilities.Baseline)
+
+            edits.VerifySemantics(
+                semanticEdits:={SemanticEdit(SemanticEditKind.Insert, Function(c) c.GetMember("N.M.C"))},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Theory>
+        <InlineData("Class")>
+        <InlineData("Interface")>
+        <InlineData("Enum")>
+        <InlineData("Structure")>
+        <InlineData("Module")>
+        Public Sub Namespace_Insert(keyword As String)
+            Dim declaration = keyword & " X : End " & keyword
+            Dim src1 = declaration
+            Dim src2 = "Namespace N : " & declaration & " : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, keyword & " X", GetResource(keyword), "Global", "N")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_Delegate()
+            Dim src1 = "Delegate Sub X()"
+            Dim src2 = "Namespace N : Delegate Sub X() : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Delegate Sub X()", GetResource("Delegate"), "Global", "N")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_MultipleDeclarations()
+            Dim src1 = "Class C : End Class : Class D : End Class"
+            Dim src2 = "Namespace N : Class C : End Class : Class D : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "Global", "N"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class D", GetResource("Class"), "Global", "N")
+                },
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_FileScoped()
+            Dim src1 = "Class C : End Class"
+            Dim src2 = "Namespace N : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "Global", "N")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_Nested()
+            Dim src1 = "Namespace N : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace N : Namespace M : Class C : End Class : End Namespace : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N", "N.M")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_Qualified()
+            Dim src1 = "Class C : End Class"
+            Dim src2 = "Namespace N.M : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "Global", "N.M")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Insert_Qualified_FileScoped()
+            Dim src1 = "Class C : End Class"
+            Dim src2 = "Namespace N.M : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "Global", "N.M")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Theory>
+        <InlineData("Class")>
+        <InlineData("Interface")>
+        <InlineData("Enum")>
+        <InlineData("Structure")>
+        <InlineData("Module")>
+        Public Sub Namespace_Delete(keyword As String)
+            Dim declaration = keyword & " X : End " & keyword
+            Dim src1 = "Namespace N : " & declaration & " : End Namespace"
+            Dim src2 = declaration
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, keyword + " X", GetResource(keyword), "N", "Global")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Delete_Delegate()
+            Dim declaration = "Delegate Sub X()"
+            Dim src1 = "Namespace N : " & declaration & " : End Namespace"
+            Dim src2 = declaration
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Delegate Sub X()", GetResource("Delegate"), "N", "Global")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Delete_MultipleDeclarations()
+            Dim src1 = "Namespace N : Class C : End Class : Class D : End Class : End Namespace"
+            Dim src2 = "Class C : End Class : Class D : End Class"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N", "Global"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class D", GetResource("Class"), "N", "Global")
+                },
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Delete_Qualified()
+            Dim src1 = "Namespace N.M : Class C : End Class : End Namespace"
+            Dim src2 = "Class C : End Class"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N.M", "Global")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Theory>
+        <InlineData("Class")>
+        <InlineData("Interface")>
+        <InlineData("Enum")>
+        <InlineData("Structure")>
+        <InlineData("Module")>
+        Public Sub Namespace_Update(keyword As String)
+            Dim declaration = keyword & " X : End " & keyword
+            Dim src1 = "Namespace N : " & declaration & " : End Namespace"
+            Dim src2 = "Namespace M : " & declaration & " : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, keyword + " X", GetResource(keyword), "N", "M")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_Delegate()
+            Dim Declaration = "Delegate Sub X()"
+            Dim src1 = "Namespace N : " & Declaration & " : End Namespace"
+            Dim src2 = "Namespace M : " & Declaration & " : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Delegate Sub X()", GetResource("Delegate"), "N", "M")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_Multiple()
+            Dim src1 = "Namespace N : Class C : End Class : Class D : End Class : End Namespace"
+            Dim src2 = "Namespace M : Class C : End Class : Class D : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N", "M"),
+                    Diagnostic(RudeEditKind.ChangingNamespace, "Class D", GetResource("Class"), "N", "M")
+                },
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_Qualified1()
+            Dim src1 = "Namespace N.M : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace N.M.O : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N.M", "N.M.O")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_Qualified2()
+            Dim src1 = "Namespace N.M : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace N : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N.M", "N")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_Qualified3()
+            Dim src1 = "Namespace N.M1.O : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace N.M2.O : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+            edits.VerifySemanticDiagnostics(
+                {Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N.M1.O", "N.M2.O")},
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_MultiplePartials1()
+            Dim srcA1 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace N : Partial Class C : End Class : End Namespace"
+            Dim srcB1 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace N : Partial Class C : End Class : End Namespace"
+            Dim srcA2 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace M : Partial Class C : End Class : End Namespace"
+            Dim srcB2 = "Namespace M : Partial Class C : End Class : End Namespace : Namespace N : Partial Class C : End Class : End Namespace"
+
+            EditAndContinueValidation.VerifySemantics(
+                {GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2)},
+                {
+                    DocumentResults(
+                        semanticEdits:=
+                        {
+                            SemanticEdit(SemanticEditKind.Insert, Function(c) c.GetMember("M.C"), partialType:="M.C")
+                        }),
+                    DocumentResults(
+                        semanticEdits:=
+                        {
+                            SemanticEdit(SemanticEditKind.Insert, Function(c) c.GetMember("M.C"), partialType:="M.C")
+                        })
+                },
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_MultiplePartials2()
+            Dim srcA1 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace N : Partial Class C : End Class : End Namespace"
+            Dim srcB1 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace N : Partial Class C : End Class : End Namespace"
+            Dim srcA2 = "Namespace M : Partial Class C : End Class : End Namespace : Namespace M : Partial Class C : End Class : End Namespace"
+            Dim srcB2 = "Namespace M : Partial Class C : End Class : End Namespace : Namespace M : Partial Class C : End Class : End Namespace"
+
+            EditAndContinueValidation.VerifySemantics(
+                {GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2)},
+                {
+                    DocumentResults(diagnostics:=
+                    {
+                        Diagnostic(RudeEditKind.ChangingNamespace, "Partial Class C", GetResource("Class"), "N", "M")
+                    }),
+                    DocumentResults(diagnostics:=
+                    {
+                        Diagnostic(RudeEditKind.ChangingNamespace, "Partial Class C", GetResource("Class"), "N", "M")
+                    })
+                },
+                capabilities:=EditAndContinueCapabilities.NewTypeDefinition)
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_MultiplePartials_MergeInNewNamspace()
+            Dim src1 = "Namespace N : Partial Class C : End Class : End Namespace : Namespace M : Partial Class C : End Class : End Namespace"
+            Dim src2 = "Namespace X : Partial Class C : End Class : End Namespace : Namespace X : Partial Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Partial Class C", GetResource("Class"), "M", "X"),
+                Diagnostic(RudeEditKind.Delete, "Partial Class C", DeletedSymbolDisplay(GetResource("Class"), "C")))
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Update_MultipleTypesWithSameNameAndArity()
+            Dim src1 = "Namespace N1 : Class C : End Class : End Namespace : Namespace N2 : Class C : End Class : End Namespace : Namespace O : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace M1 : Class C : End Class : End Namespace : Namespace M2 : Class C : End Class : End Namespace : Namespace O : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N2", "M2"),
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N1", "M1"))
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_UpdateAndInsert()
+            Dim src1 = "Namespace N.M : Class C : End Class : End Namespace"
+            Dim src2 = "Namespace N : Namespace M : Class C : End Class : End Namespace : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics()
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_UpdateAndDelete()
+            Dim src1 = "Namespace N : Namespace M : Class C : End Class : End Namespace : End Namespace"
+            Dim src2 = "Namespace N.M : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifySemanticDiagnostics()
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Move1()
+            Dim src1 = "Namespace N : Namespace M : Class C : End Class : Class C(Of T) : End Class : End Namespace : Class D : End Class : End Namespace"
+            Dim src2 = "Namespace N : Class D : End Class : End Namespace : Namespace M : Class C(Of T) : End Class : Class C : End Class : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Namespace M : Class C : End Class : Class C(Of T) : End Class : End Namespace]@14 -> @52",
+                "Reorder [Class C(Of T) : End Class]@50 -> @66")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N.M", "M"),
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C(Of T)", GetResource("Class"), "N.M", "M"))
+        End Sub
+
+        <Fact>
+        Public Sub Namespace_Move2()
+            Dim src1 = "Namespace N1 : Namespace M : Class C : End Class : End Namespace : Namespace N2 : End Namespace : End Namespace"
+            Dim src2 = "Namespace N1 : End Namespace : Namespace N2 : Namespace M : Class C : End Class : End Namespace : End Namespace"
+
+            Dim edits = GetTopEdits(src1, src2)
+
+            edits.VerifyEdits(
+                "Move [Namespace N2 : End Namespace]@67 -> @31",
+                "Move [Namespace M : Class C : End Class : End Namespace]@15 -> @46")
+
+            edits.VerifySemanticDiagnostics(
+                Diagnostic(RudeEditKind.ChangingNamespace, "Class C", GetResource("Class"), "N1.M", "N2.M"))
+        End Sub
 #End Region
 
 #Region "Members"
@@ -3434,7 +3941,7 @@ End Class
             '            {
             '                SemanticEdit(SemanticEditKind.Update, c => c.GetMember(Of NamedTypeSymbol)("C").GetMember("F1")),
             '            })
-            '    });
+            '    })
         End Sub
 
         <Fact>
@@ -4846,8 +5353,8 @@ End Interface
             Dim srcC1 = "Partial Class C : End Class"
 
             Dim srcA2 = "Partial Class C : End Class"
-            Dim srcB2 = "partial class C" + vbCrLf + "Partial Private Sub F() : End Sub : End Class"
-            Dim srcC2 = "partial class C" + vbCrLf + "Private Sub F() : End Sub : End Class"
+            Dim srcB2 = "partial Class C" + vbCrLf + "Partial Private Sub F() : End Sub : End Class"
+            Dim srcC2 = "partial Class C" + vbCrLf + "Private Sub F() : End Sub : End Class"
 
             EditAndContinueValidation.VerifySemantics(
                 {GetTopEdits(srcA1, srcA2), GetTopEdits(srcB1, srcB2), GetTopEdits(srcC1, srcC2)},
diff --git a/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs b/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
index e938950ba9dc4..12889bd67fdff 100644
--- a/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
+++ b/src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
@@ -774,6 +774,12 @@ protected override bool TryMatchActiveStatement(
 
         #region Syntax and Semantic Utils
 
+        protected override bool IsNamespaceDeclaration(SyntaxNode node)
+            => node is BaseNamespaceDeclarationSyntax;
+
+        private static bool IsTypeDeclaration(SyntaxNode node)
+            => node is BaseTypeDeclarationSyntax or DelegateDeclarationSyntax;
+
         protected override bool IsCompilationUnitWithGlobalStatements(SyntaxNode node)
             => node is CompilationUnitSyntax unit && unit.ContainsGlobalStatements();
 
@@ -791,6 +797,32 @@ protected override TextSpan GetGlobalStatementDiagnosticSpan(SyntaxNode node)
             return GetDiagnosticSpan(node, EditKind.Delete);
         }
 
+        protected override IEnumerable<SyntaxNode> GetTopLevelTypeDeclarations(SyntaxNode compilationUnit)
+        {
+            using var _ = ArrayBuilder<SyntaxList<MemberDeclarationSyntax>>.GetInstance(out var stack);
+
+            stack.Add(((CompilationUnitSyntax)compilationUnit).Members);
+
+            while (stack.Count > 0)
+            {
+                var members = stack.Last();
+                stack.RemoveLast();
+
+                foreach (var member in members)
+                {
+                    if (IsTypeDeclaration(member))
+                    {
+                        yield return member;
+                    }
+
+                    if (member is BaseNamespaceDeclarationSyntax namespaceMember)
+                    {
+                        stack.Add(namespaceMember.Members);
+                    }
+                }
+            }
+        }
+
         protected override string LineDirectiveKeyword
             => "line";
 
@@ -1341,6 +1373,19 @@ join newVariable in newVariables on oldVariable.Identifier.Text equals newVariab
                     }
 
                     break;
+
+                case EditKind.Move:
+                    Contract.ThrowIfNull(oldNode);
+                    Contract.ThrowIfNull(newNode);
+                    Contract.ThrowIfNull(oldModel);
+
+                    Debug.Assert(oldNode.RawKind == newNode.RawKind);
+                    Debug.Assert(SupportsMove(oldNode));
+                    Debug.Assert(SupportsMove(newNode));
+
+                    return oldNode.IsKind(SyntaxKind.LocalFunctionStatement) ?
+                        OneOrMany<(ISymbol?, ISymbol?, EditKind)>.Empty :
+                        OneOrMany.Create((oldSymbol, newSymbol, editKind));
             }
 
             return (editKind == EditKind.Delete ? oldSymbol : newSymbol) is null ?
@@ -1384,6 +1429,11 @@ join newVariable in newVariables on oldVariable.Identifier.Text equals newVariab
             return symbol;
         }
 
+        private static bool SupportsMove(SyntaxNode node)
+            => node.IsKind(SyntaxKind.LocalFunctionStatement) ||
+               IsTypeDeclaration(node) ||
+               node is BaseNamespaceDeclarationSyntax;
+
         internal override bool ContainsLambda(SyntaxNode declaration)
             => declaration.DescendantNodes().Any(LambdaUtilities.IsLambda);
 
@@ -2221,7 +2271,7 @@ public void ClassifyEdit()
                         return;
 
                     case EditKind.Update:
-                        ClassifyUpdate(_oldNode!, _newNode!);
+                        ClassifyUpdate(_newNode!);
                         return;
 
                     case EditKind.Move:
@@ -2243,13 +2293,11 @@ public void ClassifyEdit()
 
             private void ClassifyMove(SyntaxNode newNode)
             {
-                if (newNode.IsKind(SyntaxKind.LocalFunctionStatement))
+                if (SupportsMove(newNode))
                 {
                     return;
                 }
 
-                // We could perhaps allow moving a type declaration to a different namespace syntax node
-                // as long as it represents semantically the same namespace as the one of the original type declaration.
                 ReportError(RudeEditKind.Move);
             }
 
@@ -2288,8 +2336,6 @@ private void ClassifyInsert(SyntaxNode node)
                 switch (node.Kind())
                 {
                     case SyntaxKind.ExternAliasDirective:
-                    case SyntaxKind.NamespaceDeclaration:
-                    case SyntaxKind.FileScopedNamespaceDeclaration:
                         ReportError(RudeEditKind.Insert);
                         return;
 
@@ -2314,8 +2360,6 @@ private void ClassifyDelete(SyntaxNode oldNode)
                 switch (oldNode.Kind())
                 {
                     case SyntaxKind.ExternAliasDirective:
-                    case SyntaxKind.NamespaceDeclaration:
-                    case SyntaxKind.FileScopedNamespaceDeclaration:
                         // To allow removal of declarations we would need to update method bodies that 
                         // were previously binding to them but now are binding to another symbol that was previously hidden.
                         ReportError(RudeEditKind.Delete);
@@ -2337,7 +2381,7 @@ private void ClassifyDelete(SyntaxNode oldNode)
                 }
             }
 
-            private void ClassifyUpdate(SyntaxNode oldNode, SyntaxNode newNode)
+            private void ClassifyUpdate(SyntaxNode newNode)
             {
                 switch (newNode.Kind())
                 {
@@ -2345,11 +2389,6 @@ private void ClassifyUpdate(SyntaxNode oldNode, SyntaxNode newNode)
                         ReportError(RudeEditKind.Update);
                         return;
 
-                    case SyntaxKind.NamespaceDeclaration:
-                    case SyntaxKind.FileScopedNamespaceDeclaration:
-                        ClassifyUpdate((BaseNamespaceDeclarationSyntax)oldNode, (BaseNamespaceDeclarationSyntax)newNode);
-                        return;
-
                     case SyntaxKind.Attribute:
                         // To allow update of attributes we need to check if the updated attribute
                         // is a pseudo-custom attribute that CLR allows us to change, or if it is a compiler well-know attribute
@@ -2365,12 +2404,6 @@ private void ClassifyUpdate(SyntaxNode oldNode, SyntaxNode newNode)
                 }
             }
 
-            private void ClassifyUpdate(BaseNamespaceDeclarationSyntax oldNode, BaseNamespaceDeclarationSyntax newNode)
-            {
-                Debug.Assert(!SyntaxFactory.AreEquivalent(oldNode.Name, newNode.Name));
-                ReportError(RudeEditKind.Renamed);
-            }
-
             public void ClassifyDeclarationBodyRudeUpdates(SyntaxNode newDeclarationOrBody)
             {
                 foreach (var node in newDeclarationOrBody.DescendantNodesAndSelf(LambdaUtilities.IsNotLambda))
diff --git a/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs b/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
index 8e52dbfcb62a4..3b27e11fef575 100644
--- a/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
+++ b/src/Features/Core/Portable/EditAndContinue/AbstractEditAndContinueAnalyzer.cs
@@ -262,10 +262,16 @@ protected virtual bool StateMachineSuspensionPointKindEquals(SyntaxNode suspensi
         /// </remarks>
         protected abstract bool AreEquivalentActiveStatements(SyntaxNode oldStatement, SyntaxNode newStatement, int statementPart);
 
+        protected abstract bool IsNamespaceDeclaration(SyntaxNode node);
         protected abstract bool IsCompilationUnitWithGlobalStatements(SyntaxNode node);
         protected abstract bool IsGlobalStatement(SyntaxNode node);
         protected abstract TextSpan GetGlobalStatementDiagnosticSpan(SyntaxNode node);
 
+        /// <summary>
+        /// Returns all top-level type declarations (non-nested) for a given compilation unit node.
+        /// </summary>
+        protected abstract IEnumerable<SyntaxNode> GetTopLevelTypeDeclarations(SyntaxNode compilationUnit);
+
         /// <summary>
         /// Returns all symbols associated with an edit and an actual edit kind, which may be different then the specified one.
         /// Returns an empty set if the edit is not associated with any symbols.
@@ -2496,14 +2502,6 @@ private async Task<ImmutableArray<SemanticEditInfo>> AnalyzeSemanticsAsync(
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    if (edit.Kind == EditKind.Move)
-                    {
-                        // Move is either a Rude Edit and already reported in syntax analysis, or has no semantic effect.
-                        // For example, in VB we allow move from field multi-declaration.
-                        // "Dim a, b As Integer" -> "Dim a As Integer" (update) and "Dim b As Integer" (move)
-                        continue;
-                    }
-
                     if (edit.Kind == EditKind.Reorder)
                     {
                         // Currently we don't do any semantic checks for reordering
@@ -2513,16 +2511,24 @@ private async Task<ImmutableArray<SemanticEditInfo>> AnalyzeSemanticsAsync(
                         // Consider: Reordering of fields is not allowed since it changes the layout of the type.
                         // This ordering should however not matter unless the type has explicit layout so we might want to allow it.
                         // We do not check changes to the order if they occur across multiple documents (the containing type is partial).
-                        Debug.Assert(!IsDeclarationWithInitializer(edit.OldNode) && !IsDeclarationWithInitializer(edit.NewNode));
+                        Debug.Assert(!IsDeclarationWithInitializer(edit.OldNode!) && !IsDeclarationWithInitializer(edit.NewNode!));
                         continue;
                     }
 
-                    foreach (var symbolEdits in GetSymbolEdits(edit.Kind, edit.OldNode, edit.NewNode, oldModel, newModel, editMap, cancellationToken))
+                    Debug.Assert(edit.OldNode is null || edit.NewNode is null || IsNamespaceDeclaration(edit.OldNode) == IsNamespaceDeclaration(edit.NewNode));
+
+                    // We can ignore namespace nodes in newly added documents (old model is not available) since 
+                    // all newly added types in these namespaces will have their own syntax edit.
+                    var symbolEdits = oldModel != null && IsNamespaceDeclaration(edit.OldNode ?? edit.NewNode!) ?
+                        OneOrMany.Create(GetNamespaceSymbolEdits(oldModel, newModel, cancellationToken)) :
+                        GetSymbolEdits(edit.Kind, edit.OldNode, edit.NewNode, oldModel, newModel, editMap, cancellationToken);
+
+                    foreach (var symbolEdit in symbolEdits)
                     {
                         Func<SyntaxNode, SyntaxNode?>? syntaxMap;
                         SemanticEditKind editKind;
 
-                        var (oldSymbol, newSymbol, syntacticEditKind) = symbolEdits;
+                        var (oldSymbol, newSymbol, syntacticEditKind) = symbolEdit;
                         var symbol = newSymbol ?? oldSymbol;
                         Contract.ThrowIfNull(symbol);
 
@@ -2531,6 +2537,37 @@ private async Task<ImmutableArray<SemanticEditInfo>> AnalyzeSemanticsAsync(
                             continue;
                         }
 
+                        if (syntacticEditKind == EditKind.Move)
+                        {
+                            Debug.Assert(oldSymbol is INamedTypeSymbol);
+                            Debug.Assert(newSymbol is INamedTypeSymbol);
+
+                            var oldSymbolInNewCompilation = SymbolKey.Create(oldSymbol, cancellationToken).Resolve(newCompilation, ignoreAssemblyKey: true, cancellationToken).Symbol;
+                            var newSymbolInOldCompilation = SymbolKey.Create(newSymbol, cancellationToken).Resolve(oldCompilation, ignoreAssemblyKey: true, cancellationToken).Symbol;
+
+                            if (oldSymbolInNewCompilation == null || newSymbolInOldCompilation == null)
+                            {
+                                if (TypesEquivalent(oldSymbol.ContainingType, newSymbol.ContainingType, exact: false) &&
+                                    !SymbolsEquivalent(oldSymbol.ContainingNamespace, newSymbol.ContainingNamespace))
+                                {
+                                    // pick the first declaration in the new file that contains the namespace change:
+                                    var newTypeDeclaration = GetSymbolDeclarationSyntax(newSymbol.DeclaringSyntaxReferences.First(r => r.SyntaxTree == edit.NewNode!.SyntaxTree), cancellationToken);
+
+                                    diagnostics.Add(new RudeEditDiagnostic(
+                                        RudeEditKind.ChangingNamespace,
+                                        GetDiagnosticSpan(newTypeDeclaration, EditKind.Update),
+                                        newTypeDeclaration,
+                                        new[] { GetDisplayName(newTypeDeclaration), oldSymbol.ContainingNamespace.ToDisplayString(), newSymbol.ContainingNamespace.ToDisplayString() }));
+                                }
+                                else
+                                {
+                                    ReportUpdateRudeEdit(diagnostics, RudeEditKind.Move, edit.NewNode!);
+                                }
+                            }
+
+                            continue;
+                        }
+
                         var symbolKey = SymbolKey.Create(symbol, cancellationToken);
 
                         // Ignore ambiguous resolution result - it may happen if there are semantic errors in the compilation.
@@ -2722,7 +2759,7 @@ private async Task<ImmutableArray<SemanticEditInfo>> AnalyzeSemanticsAsync(
                                         // If we got here for a global statement then the actual edit is a delete of the synthesized Main method
                                         if (IsGlobalMain(oldSymbol))
                                         {
-                                            diagnostics.Add(new RudeEditDiagnostic(RudeEditKind.Delete, diagnosticSpan, edit.OldNode, new[] { GetDisplayName(edit.OldNode, EditKind.Delete) }));
+                                            diagnostics.Add(new RudeEditDiagnostic(RudeEditKind.Delete, diagnosticSpan, edit.OldNode, new[] { GetDisplayName(edit.OldNode!, EditKind.Delete) }));
                                             continue;
                                         }
 
@@ -3249,6 +3286,93 @@ private async Task<ImmutableArray<SemanticEditInfo>> AnalyzeSemanticsAsync(
             }
         }
 
+        private ImmutableArray<(ISymbol? oldSymbol, ISymbol? newSymbol, EditKind editKind)> GetNamespaceSymbolEdits(
+            SemanticModel oldModel,
+            SemanticModel newModel,
+            CancellationToken cancellationToken)
+        {
+            using var _1 = ArrayBuilder<(ISymbol? oldSymbol, ISymbol? newSymbol, EditKind editKind)>.GetInstance(out var builder);
+
+            // Maps type name and arity to indices in builder array. Used to convert delete & insert edits to a move edit.
+            // If multiple types with the same name and arity are deleted we match the inserted types in the order they were declared
+            // and remove the index from the array, until no mathcing deleted type is found in the array of indices.
+            using var _2 = PooledDictionary<(string name, int arity), ArrayBuilder<int>>.GetInstance(out var deletedTypes);
+
+            // used to avoid duplicates due to partial declarations
+            using var _3 = PooledHashSet<INamedTypeSymbol>.GetInstance(out var processedTypes);
+
+            // Check that all top-level types declared in the old document are also declared in the new one.
+            // Those that are not were either deleted or renamed.
+
+            var oldRoot = oldModel.SyntaxTree.GetRoot(cancellationToken);
+            foreach (var oldTypeDeclaration in GetTopLevelTypeDeclarations(oldRoot))
+            {
+                var oldType = (INamedTypeSymbol?)oldModel.GetDeclaredSymbol(oldTypeDeclaration, cancellationToken);
+                Contract.ThrowIfNull(oldType);
+
+                if (!processedTypes.Add(oldType))
+                {
+                    continue;
+                }
+
+                var newType = SymbolKey.Create(oldType, cancellationToken).Resolve(newModel.Compilation, ignoreAssemblyKey: true, cancellationToken).Symbol;
+                if (newType == null)
+                {
+                    var key = (oldType.Name, oldType.Arity);
+
+                    if (!deletedTypes.TryGetValue(key, out var indices))
+                        deletedTypes.Add(key, indices = ArrayBuilder<int>.GetInstance());
+
+                    indices.Add(builder.Count);
+                    builder.Add((oldSymbol: oldType, newSymbol: null, EditKind.Delete));
+                }
+            }
+
+            // reverse all indices:
+            foreach (var (_, indices) in deletedTypes)
+                indices.ReverseContents();
+
+            processedTypes.Clear();
+
+            // Check that all top-level types declared in the new document are also declared in the old one.
+            // Those that are not were added.
+
+            var newRoot = newModel.SyntaxTree.GetRoot(cancellationToken);
+            foreach (var newTypeDeclaration in GetTopLevelTypeDeclarations(newRoot))
+            {
+                var newType = (INamedTypeSymbol?)newModel.GetDeclaredSymbol(newTypeDeclaration, cancellationToken);
+                Contract.ThrowIfNull(newType);
+
+                if (!processedTypes.Add(newType))
+                {
+                    continue;
+                }
+
+                var oldType = SymbolKey.Create(newType, cancellationToken).Resolve(oldModel.Compilation, ignoreAssemblyKey: true, cancellationToken).Symbol;
+                if (oldType == null)
+                {
+                    // Check if a type with the same name and arity was also removed. If so treat it as a move.
+                    if (deletedTypes.TryGetValue((newType.Name, newType.Arity), out var deletedTypeIndices) && deletedTypeIndices.Count > 0)
+                    {
+                        var deletedTypeIndex = deletedTypeIndices.Last();
+                        deletedTypeIndices.RemoveLast();
+
+                        builder[deletedTypeIndex] = (builder[deletedTypeIndex].oldSymbol, newType, EditKind.Move);
+                    }
+                    else
+                    {
+                        builder.Add((oldSymbol: null, newSymbol: newType, EditKind.Insert));
+                    }
+                }
+            }
+
+            // free all index array builders:
+            foreach (var (_, indices) in deletedTypes)
+                indices.Free();
+
+            return builder.ToImmutable();
+        }
+
         private static bool IsReloadable(INamedTypeSymbol type)
         {
             var current = type;
diff --git a/src/Features/Core/Portable/EditAndContinue/EditAndContinueDiagnosticDescriptors.cs b/src/Features/Core/Portable/EditAndContinue/EditAndContinueDiagnosticDescriptors.cs
index 00ea6064c35f0..20aff5aba372d 100644
--- a/src/Features/Core/Portable/EditAndContinue/EditAndContinueDiagnosticDescriptors.cs
+++ b/src/Features/Core/Portable/EditAndContinue/EditAndContinueDiagnosticDescriptors.cs
@@ -153,6 +153,7 @@ void AddGeneralDiagnostic(EditAndContinueErrorCode code, string resourceName, Di
             AddRudeEdit(RudeEditKind.ChangeImplicitMainReturnType, nameof(FeaturesResources.An_update_that_causes_the_return_type_of_implicit_main_to_change_requires_restarting_the_application));
             AddRudeEdit(RudeEditKind.RenamingNotSupportedByRuntime, nameof(FeaturesResources.Renaming_0_requires_restarting_the_application_because_it_is_not_supported_by_the_runtime));
             AddRudeEdit(RudeEditKind.ChangingNonCustomAttribute, nameof(FeaturesResources.Changing_pseudo_custom_attribute_0_of_1_requires_restarting_th_application));
+            AddRudeEdit(RudeEditKind.ChangingNamespace, nameof(FeaturesResources.Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application));
 
             // VB specific
             AddRudeEdit(RudeEditKind.HandlesClauseUpdate, nameof(FeaturesResources.Updating_the_Handles_clause_of_0_requires_restarting_the_application));
diff --git a/src/Features/Core/Portable/EditAndContinue/RudeEditKind.cs b/src/Features/Core/Portable/EditAndContinue/RudeEditKind.cs
index 1803a20bf6c30..51651d78ee10a 100644
--- a/src/Features/Core/Portable/EditAndContinue/RudeEditKind.cs
+++ b/src/Features/Core/Portable/EditAndContinue/RudeEditKind.cs
@@ -134,6 +134,7 @@ internal enum RudeEditKind : ushort
         ChangingConstraints = 105,
         ChangingReloadableTypeNotSupportedByRuntime = 106,
         RenamingNotSupportedByRuntime = 107,
-        ChangingNonCustomAttribute = 108
+        ChangingNonCustomAttribute = 108,
+        ChangingNamespace = 109,
     }
 }
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index 12d576bdf9d5d..fc7589604d2b9 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -2857,6 +2857,9 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Changing_pseudo_custom_attribute_0_of_1_requires_restarting_th_application" xml:space="preserve">
     <value>Changing pseudo-custom attribute '{0}' of {1} requires restarting the application</value>
   </data>
+  <data name="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application" xml:space="preserve">
+    <value>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</value>
+  </data>
   <data name="ChangesRequiredSynthesizedType" xml:space="preserve">
     <value>One or more changes result in a new type being created by the compiler, which requires restarting the application because it is not supported by the runtime</value>
   </data>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index b236cbc35f805..c44629034349a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -455,6 +455,11 @@ Ujistěte se, že specifikátor tt použijete pro jazyky, pro které je nezbytn
         <target state="translated">Změna pseudovlastního atributu {0} u {1} vyžaduje restartování aplikace.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Změna oboru deklarace zachycené proměnné {0} vyžaduje restartování aplikace.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index bbd9fd75fcd15..85f465783d9c4 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -455,6 +455,11 @@ Stellen Sie sicher, dass Sie den Bezeichner "tt" für Sprachen verwenden, für d
         <target state="translated">Das Ändern des pseudobenutzerdefinierten Attributs „{0}“ von {1} erfordert einen Neustart der Anwendung.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Das Ändern des Deklarationsbereichs einer erfassten Variablen „{0}“ erfordert einen Neustart der Anwendung.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index e2feb760ae980..52c710527dabd 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -455,6 +455,11 @@ Asegúrese de usar el especificador "tt" para los idiomas para los que es necesa
         <target state="translated">Para cambiar el atributo pseudo-personalizado "{0}" de {1} se requiere reiniciar la aplicación</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Para cambiar el ámbito de declaración de una variable capturada "{0}" es necesario reiniciar la aplicación.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index 7c1a84da5f7f1..884c982976d69 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -455,6 +455,11 @@ Veillez à utiliser le spécificateur "tt" pour les langues où il est nécessai
         <target state="translated">La modification de l’attribut pseudo-personnalisé « {0} » de {1} requiert le redémarrage de l’application</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">La modification de la portée de la déclaration d’une variable capturée « {0} » requiert le redémarrage de l’application.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index 55cad3071dc20..89f4f39550147 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -455,6 +455,11 @@ Assicurarsi di usare l'identificatore "tt" per le lingue per le quali è necessa
         <target state="translated">Se si modifica l'attributo pseudo-personalizzato '{0}' di {1}, è necessario riavviare l'applicazione</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Se si modifica l'ambito di dichiarazione di una variabile catturata '{0}', è necessario riavviare l'applicazione.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index 61657a853bc33..c50e21d8a53e1 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -455,6 +455,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">{0} の擬似カスタム属性 '{1}' を変更するには、アプリケーションを再起動する必要があります</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">キャプチャした変数 '{0}' の宣言スコープを変更するには、アプリケーションを再起動する必要があります。</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index be8a0dd17da50..dde0abc33dfdd 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -455,6 +455,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">{1}의 허위 사용자 지정 특성 '{0}'을(를) 변경하려면 애플리케이션을 다시 시작해야 합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">캡처된 변수 '{0}'의 선언 범위를 변경하려면 응용 프로그램을 다시 시작해야 합니다.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index bd6f1249248e2..9ab649e95fddf 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -455,6 +455,11 @@ Pamiętaj, aby nie używać specyfikatora „tt” dla wszystkich języków, w k
         <target state="translated">Zmiana atrybutu pseudoniestandardowego elementu „{0}” z {1} wymaga ponownego uruchomienia aplikacji</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Zmienianie zakresu deklaracji przechwyconej zmiennej "{0}" wymaga ponownego uruchomienia aplikacji.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index b4c48a0936f70..5f20d0381607f 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -455,6 +455,11 @@ Verifique se o especificador "tt" foi usado para idiomas para os quais é necess
         <target state="translated">Alterar o atributo pseudo-personalizado '{0}' de {1} requer o reinício do aplicativo</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Alterar o escopo de declaração de uma variável capturada '{0}' requer a reinicialização do aplicativo.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 37d16622c8633..f5c2d43801186 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -455,6 +455,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">Для изменения псевдонастраиваемого атрибута "{0}" для {1} требуется перезапустить приложение.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Для изменения области объявления зафиксированной переменной "{0}" требуется перезапустить приложение.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 556c1600e8048..bfe1a1cadb440 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -455,6 +455,11 @@ AM ve PM arasındaki farkın korunmasının gerekli olduğu diller için "tt" be
         <target state="translated">{1} öğesinin '{0}' sahte özel özniteliğinin değiştirilmesi, uygulamanın yeniden başlatılmasını gerektirir</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">Yakalanan bir '{0}' değişkeninin bildirim kapsamının değiştirilmesi uygulamanın yeniden başlatılmasını gerektir.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index 528e191e5356c..a02cfacf8e7b9 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -455,6 +455,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">更改 {1} 的伪自定义属性“{0}”需要重启应用程序</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">更改捕获的变量“{0}”的声明范围需要重新启动应用程序。</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index d2cb7daaf433f..048ceab0602d7 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -455,6 +455,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">變更 {1} 的虛擬自訂屬性 '{0}' 需要重新啟動應用程式</target>
         <note />
       </trans-unit>
+      <trans-unit id="Changing_the_containing_namespace_of_0_from_1_to_2_requires_restarting_th_application">
+        <source>Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</source>
+        <target state="new">Changing the containing namespace of '{0}' from '{1}' to '{2}' requires restarting the application</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Changing_the_declaration_scope_of_a_captured_variable_0_requires_restarting_the_application">
         <source>Changing the declaration scope of a captured variable '{0}' requires restarting the application.</source>
         <target state="translated">變更擷取到的變數 '{0}' 的宣告範圍需要重新啟動應用程式。</target>
diff --git a/src/Features/VisualBasic/Portable/EditAndContinue/VisualBasicEditAndContinueAnalyzer.vb b/src/Features/VisualBasic/Portable/EditAndContinue/VisualBasicEditAndContinueAnalyzer.vb
index c3842995804ac..1e9eddee2ea70 100644
--- a/src/Features/VisualBasic/Portable/EditAndContinue/VisualBasicEditAndContinueAnalyzer.vb
+++ b/src/Features/VisualBasic/Portable/EditAndContinue/VisualBasicEditAndContinueAnalyzer.vb
@@ -798,6 +798,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
 #End Region
 
 #Region "Syntax And Semantic Utils"
+        Protected Overrides Function IsNamespaceDeclaration(node As SyntaxNode) As Boolean
+            ' An edit can operate on either just the statement (update) or the whole block (move, insert, delete).
+            Return node.IsKind(SyntaxKind.NamespaceStatement, SyntaxKind.NamespaceBlock)
+        End Function
+
+        Private Shared Function IsTypeDeclaration(node As SyntaxNode) As Boolean
+            Return TypeOf node Is TypeBlockSyntax OrElse TypeOf node Is DelegateStatementSyntax OrElse TypeOf node Is EnumBlockSyntax
+        End Function
+
         Protected Overrides Function IsCompilationUnitWithGlobalStatements(node As SyntaxNode) As Boolean
             Return False
         End Function
@@ -810,6 +819,28 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
             Return Nothing
         End Function
 
+        Protected Overrides Iterator Function GetTopLevelTypeDeclarations(compilationUnit As SyntaxNode) As IEnumerable(Of SyntaxNode)
+            Dim stack = ArrayBuilder(Of SyntaxList(Of StatementSyntax)).GetInstance()
+
+            stack.Add(DirectCast(compilationUnit, CompilationUnitSyntax).Members)
+
+            While stack.Count > 0
+                Dim members = stack.Last()
+                stack.RemoveLast()
+
+                For Each member In members
+                    If IsTypeDeclaration(member) Then
+                        Yield member
+                    End If
+
+                    Dim namespaceBlock = TryCast(member, NamespaceBlockSyntax)
+                    If namespaceBlock IsNot Nothing Then
+                        stack.Add(namespaceBlock.Members)
+                    End If
+                Next
+            End While
+        End Function
+
         Protected Overrides ReadOnly Property LineDirectiveKeyword As String
             Get
                 Return "ExternalSource"
@@ -1237,45 +1268,58 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
             Dim oldSymbols As OneOrMany(Of ISymbol) = Nothing
             Dim newSymbols As OneOrMany(Of ISymbol) = Nothing
 
-            If editKind = EditKind.Delete Then
-                If Not TryGetSyntaxNodesForEdit(editKind, oldNode, oldModel, oldSymbols, cancellationToken) Then
-                    Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
-                End If
+            Select Case editKind
+                Case EditKind.Delete
+                    If Not TryGetSyntaxNodesForEdit(editKind, oldNode, oldModel, oldSymbols, cancellationToken) Then
+                        Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
+                    End If
 
-                Return oldSymbols.Select(Function(s) New ValueTuple(Of ISymbol, ISymbol, EditKind)(s, Nothing, editKind))
-            End If
+                    Return oldSymbols.Select(Function(s) New ValueTuple(Of ISymbol, ISymbol, EditKind)(s, Nothing, editKind))
 
-            If editKind = EditKind.Insert Then
-                If Not TryGetSyntaxNodesForEdit(editKind, newNode, newModel, newSymbols, cancellationToken) Then
-                    Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
-                End If
+                Case EditKind.Insert
+                    If Not TryGetSyntaxNodesForEdit(editKind, newNode, newModel, newSymbols, cancellationToken) Then
+                        Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
+                    End If
 
-                Return newSymbols.Select(Function(s) New ValueTuple(Of ISymbol, ISymbol, EditKind)(Nothing, s, editKind))
-            End If
+                    Return newSymbols.Select(Function(s) New ValueTuple(Of ISymbol, ISymbol, EditKind)(Nothing, s, editKind))
 
-            If editKind = EditKind.Update Then
-                If Not TryGetSyntaxNodesForEdit(editKind, oldNode, oldModel, oldSymbols, cancellationToken) OrElse
-                   Not TryGetSyntaxNodesForEdit(editKind, newNode, newModel, newSymbols, cancellationToken) Then
-                    Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
-                End If
+                Case EditKind.Update
+                    If Not TryGetSyntaxNodesForEdit(editKind, oldNode, oldModel, oldSymbols, cancellationToken) OrElse
+                       Not TryGetSyntaxNodesForEdit(editKind, newNode, newModel, newSymbols, cancellationToken) Then
+                        Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
+                    End If
 
-                If oldSymbols.Count = 1 AndAlso newSymbols.Count = 1 Then
-                    Return OneOrMany.Create((oldSymbols(0), newSymbols(0), editKind))
-                End If
+                    If oldSymbols.Count = 1 AndAlso newSymbols.Count = 1 Then
+                        Return OneOrMany.Create((oldSymbols(0), newSymbols(0), editKind))
+                    End If
 
-                ' This only occurs when field identifiers are deleted/inserted/reordered from/to/within their variable declarator list,
-                ' or their shared initializer is updated. The particular inserted and deleted fields will be represented by separate edits,
-                ' but the AsNew clause of the declarator may have been updated as well, which needs to update the remaining (matching) fields.
-                Dim builder = ArrayBuilder(Of (ISymbol, ISymbol, EditKind)).GetInstance()
-                For Each oldSymbol In oldSymbols
-                    Dim newSymbol = newSymbols.FirstOrDefault(Function(s, o) CaseInsensitiveComparison.Equals(s.Name, o.Name), oldSymbol)
-                    If newSymbol IsNot Nothing Then
-                        builder.Add((oldSymbol, newSymbol, editKind))
+                    ' This only occurs when field identifiers are deleted/inserted/reordered from/to/within their variable declarator list,
+                    ' or their shared initializer is updated. The particular inserted and deleted fields will be represented by separate edits,
+                    ' but the AsNew clause of the declarator may have been updated as well, which needs to update the remaining (matching) fields.
+                    Dim builder = ArrayBuilder(Of (ISymbol, ISymbol, EditKind)).GetInstance()
+                    For Each oldSymbol In oldSymbols
+                        Dim newSymbol = newSymbols.FirstOrDefault(Function(s, o) CaseInsensitiveComparison.Equals(s.Name, o.Name), oldSymbol)
+                        If newSymbol IsNot Nothing Then
+                            builder.Add((oldSymbol, newSymbol, editKind))
+                        End If
+                    Next
+
+                    Return OneOrMany.Create(builder.ToImmutableAndFree())
+
+                Case EditKind.Move
+                    Contract.ThrowIfNull(oldNode)
+                    Contract.ThrowIfNull(newNode)
+                    Contract.ThrowIfNull(oldModel)
+
+                    Debug.Assert(oldNode.RawKind = newNode.RawKind)
+                    If Not IsTypeDeclaration(oldNode) Then
+                        Return OneOrMany(Of (ISymbol, ISymbol, EditKind)).Empty
                     End If
-                Next
 
-                Return OneOrMany.Create(builder.ToImmutableAndFree())
-            End If
+                    Dim oldSymbol = oldModel.GetDeclaredSymbol(oldNode, cancellationToken)
+                    Dim newSymbol = newModel.GetDeclaredSymbol(newNode, cancellationToken)
+                    Return OneOrMany.Create((oldSymbol, newSymbol, editKind))
+            End Select
 
             Throw ExceptionUtilities.UnexpectedValue(editKind)
         End Function
@@ -1289,8 +1333,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
 
             Select Case node.Kind()
                 Case SyntaxKind.ImportsStatement,
-                     SyntaxKind.NamespaceStatement,
-                     SyntaxKind.NamespaceBlock
+                     SyntaxKind.NamespaceBlock,
+                     SyntaxKind.NamespaceStatement
                     Return False
 
                 Case SyntaxKind.VariableDeclarator
@@ -2113,7 +2157,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
                         Return
 
                     Case EditKind.Update
-                        ClassifyUpdate(_oldNode, _newNode)
+                        ClassifyUpdate(_newNode)
                         Return
 
                     Case EditKind.Move
@@ -2142,6 +2186,16 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
                         ' Determine validity of such change in semantic analysis.
                         Return
 
+                    Case SyntaxKind.NamespaceBlock,
+                         SyntaxKind.ClassBlock,
+                         SyntaxKind.StructureBlock,
+                         SyntaxKind.InterfaceBlock,
+                         SyntaxKind.ModuleBlock,
+                         SyntaxKind.EnumBlock,
+                         SyntaxKind.DelegateFunctionStatement,
+                         SyntaxKind.DelegateSubStatement
+                        Return
+
                     Case Else
                         ReportError(RudeEditKind.Move)
                 End Select
@@ -2224,8 +2278,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
 #Region "Insert"
             Private Sub ClassifyInsert(node As SyntaxNode)
                 Select Case node.Kind
-                    Case SyntaxKind.OptionStatement,
-                         SyntaxKind.NamespaceBlock
+                    Case SyntaxKind.OptionStatement
                         ReportError(RudeEditKind.Insert)
                         Return
 
@@ -2258,7 +2311,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
             Private Sub ClassifyDelete(oldNode As SyntaxNode)
                 Select Case oldNode.Kind
                     Case SyntaxKind.OptionStatement,
-                         SyntaxKind.NamespaceBlock,
                          SyntaxKind.AttributesStatement
                         ReportError(RudeEditKind.Delete)
                         Return
@@ -2283,16 +2335,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
 #End Region
 
 #Region "Update"
-            Private Sub ClassifyUpdate(oldNode As SyntaxNode, newNode As SyntaxNode)
+            Private Sub ClassifyUpdate(newNode As SyntaxNode)
                 Select Case newNode.Kind
                     Case SyntaxKind.OptionStatement
                         ReportError(RudeEditKind.Update)
                         Return
 
-                    Case SyntaxKind.NamespaceStatement
-                        ClassifyUpdate(DirectCast(oldNode, NamespaceStatementSyntax), DirectCast(newNode, NamespaceStatementSyntax))
-                        Return
-
                     Case SyntaxKind.AttributesStatement
                         ReportError(RudeEditKind.Update)
                         Return
@@ -2307,11 +2355,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
                 End Select
             End Sub
 
-            Private Sub ClassifyUpdate(oldNode As NamespaceStatementSyntax, newNode As NamespaceStatementSyntax)
-                Debug.Assert(Not SyntaxFactory.AreEquivalent(oldNode.Name, newNode.Name))
-                ReportError(RudeEditKind.Renamed)
-            End Sub
-
             Public Sub ClassifyDeclarationBodyRudeUpdates(newDeclarationOrBody As SyntaxNode)
                 For Each node In newDeclarationOrBody.DescendantNodesAndSelf()
                     Select Case node.Kind

From 0d290ed6100c99bfdcb2fa7a7d11d60c6335eeef Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 10 May 2022 00:52:11 +0200
Subject: [PATCH 358/413] Add explicit IsOverride check when reporting
 `ERR_AutoPropertyMustOverrideSet` (#61125)

---
 .../CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs
index 37f3654bc2ca2..04bb8b08419f5 100644
--- a/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs
+++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs
@@ -700,7 +700,7 @@ internal override void AfterAddingTypeMembersChecks(ConversionsBase conversions,
                 }
 
                 // get-only auto property should not override settable properties
-                if (SetMethod is null && !this.IsReadOnly)
+                if (this.IsOverride && SetMethod is null && !this.IsReadOnly)
                 {
                     diagnostics.Add(ErrorCode.ERR_AutoPropertyMustOverrideSet, Location);
                 }

From 3311ae2d16f7352b41c9e49b4457e6c420d17fda Mon Sep 17 00:00:00 2001
From: Rikki Gibson <rigibson@microsoft.com>
Date: Mon, 9 May 2022 16:18:11 -0700
Subject: [PATCH 359/413] Update file types reviewers (#61192)

---
 docs/Language Feature Status.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Language Feature Status.md b/docs/Language Feature Status.md
index 2ce5dee119dbf..f4beddde0c9b6 100644
--- a/docs/Language Feature Status.md	
+++ b/docs/Language Feature Status.md	
@@ -33,7 +33,7 @@ efforts behind them.
 | [nameof accessing instance members](https://github.com/dotnet/roslyn/issues/40229) | main | [In Progress](https://github.com/dotnet/roslyn/pull/48754) | [YairHalberstadt ](https://github.com/YairHalberstadt) | [333fred](https://github.com/333fred), [AlekseyTs](https://github.com/AlekseyTs)  | [333fred](https://github.com/333fred) |
 | [ref fields](https://github.com/dotnet/csharplang/blob/main/proposals/low-level-struct-improvements.md) | [ref-fields](https://github.com/dotnet/roslyn/tree/features/ref-fields) | [In Progress](https://github.com/dotnet/roslyn/issues/59194) | [cston](https://github.com/cston) | [RikkiGibson](https://github.com/RikkiGibson), [AlekseyTs](https://github.com/AlekseyTs) | [jaredpar](https://github.com/jaredpar) | 
 | [Numeric IntPtr](https://github.com/dotnet/csharplang/issues/6065) | [numeric-intptr](https://github.com/dotnet/roslyn/tree/features/numeric-intptr) | [In Progress](https://github.com/dotnet/roslyn/issues/60578) | [jcouv](https://github.com/jcouv) | [cston](https://github.com/cston), [333fred](https://github.com/333fred) | [jcouv](https://github.com/jcouv) | 
-| [File types](https://github.com/dotnet/csharplang/issues/6011) | [file-types](https://github.com/dotnet/roslyn/tree/features/file-types) | [In Progress](https://github.com/dotnet/roslyn/issues/60819) | [RikkiGibson](https://github.com/RikkiGibson) | [333fred](https://github.com/333fred), [cston](https://github.com/cston)  | [stephentoub](https://github.com/stephentoub) | 
+| [File types](https://github.com/dotnet/csharplang/issues/6011) | [file-types](https://github.com/dotnet/roslyn/tree/features/file-types) | [In Progress](https://github.com/dotnet/roslyn/issues/60819) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv), [cston](https://github.com/cston)  | [stephentoub](https://github.com/stephentoub) | 
 | [DIM for Static Members](https://github.com/dotnet/csharplang/issues/4436) | [DefaultInterfaceImplementation](https://github.com/dotnet/roslyn/tree/features/DefaultInterfaceImplementation) | [In Progress](https://github.com/dotnet/roslyn/issues/60968) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv)  | [MadsTorgersen](https://github.com/MadsTorgersen) | 
   
 # C# 10.0

From 321b4d6e7bdaba5f53630d7a7c206dc9ffab82ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Mon, 9 May 2022 16:21:30 -0700
Subject: [PATCH 360/413] RazorLineFormattingOptions (#61054)

* RazorLineFormattingOptions

* Fix
---
 .../ExternalAccess/Razor/Api/Extensions.cs    | 12 +---------
 ...IncrementalAnalyzer_IncrementalAnalyzer.cs |  2 +-
 .../RazorLineFormattingOptionsStorage.cs      | 22 +++++++++++++++++++
 .../Razor/RazorGlobalOptions.cs               | 12 ++++++++++
 .../Host/DocumentService/Extensions.cs        |  5 +++++
 5 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 src/Features/LanguageServer/Protocol/Features/Options/RazorLineFormattingOptionsStorage.cs

diff --git a/src/Features/Core/Portable/ExternalAccess/Razor/Api/Extensions.cs b/src/Features/Core/Portable/ExternalAccess/Razor/Api/Extensions.cs
index fa680b55e3df6..96911beb44aba 100644
--- a/src/Features/Core/Portable/ExternalAccess/Razor/Api/Extensions.cs
+++ b/src/Features/Core/Portable/ExternalAccess/Razor/Api/Extensions.cs
@@ -8,17 +8,7 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Api
 {
     internal static class Extensions
     {
-        private const string RazorCSharp = "RazorCSharp";
-
         public static bool IsRazorDocument(this Document document)
-        {
-            var documentPropertiesService = document.Services.GetService<DocumentPropertiesService>();
-            if (documentPropertiesService != null && documentPropertiesService.DiagnosticsLspClientName == RazorCSharp)
-            {
-                return true;
-            }
-
-            return false;
-        }
+            => Host.Extensions.IsRazorDocument(document);
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index bad20aa005ce6..bf2546750d42c 100644
--- a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -42,7 +42,7 @@ private async Task AnalyzeDocumentForKindAsync(TextDocument document, AnalysisKi
 
                 var isActiveDocument = _documentTrackingService.TryGetActiveDocument() == document.Id;
                 var isOpenDocument = document.IsOpen();
-                var isGeneratedRazorDocument = document.Services.GetService<DocumentPropertiesService>()?.DiagnosticsLspClientName != null;
+                var isGeneratedRazorDocument = document.IsRazorDocument();
 
                 // Only analyze open/active documents, unless it is a generated Razor document.
                 if (!isActiveDocument && !isOpenDocument && !isGeneratedRazorDocument)
diff --git a/src/Features/LanguageServer/Protocol/Features/Options/RazorLineFormattingOptionsStorage.cs b/src/Features/LanguageServer/Protocol/Features/Options/RazorLineFormattingOptionsStorage.cs
new file mode 100644
index 0000000000000..3d52ba5c63ae5
--- /dev/null
+++ b/src/Features/LanguageServer/Protocol/Features/Options/RazorLineFormattingOptionsStorage.cs
@@ -0,0 +1,22 @@
+// 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.Text;
+using Microsoft.CodeAnalysis.Options;
+
+namespace Microsoft.CodeAnalysis.Formatting;
+
+/// <summary>
+/// Formatting options for Razor design-time documents.
+/// </summary>
+internal class RazorLineFormattingOptionsStorage
+{
+    internal static readonly Option2<bool> UseTabs = new(
+        "RazorDesignTimeDocumentFormattingOptions", "UseTabs", LineFormattingOptions.Default.UseTabs);
+
+    internal static readonly Option2<int> TabSize = new(
+        "RazorDesignTimeDocumentFormattingOptions", "TabSize", LineFormattingOptions.Default.TabSize);
+}
diff --git a/src/Tools/ExternalAccess/Razor/RazorGlobalOptions.cs b/src/Tools/ExternalAccess/Razor/RazorGlobalOptions.cs
index b4c3d224223ff..82b6380a59716 100644
--- a/src/Tools/ExternalAccess/Razor/RazorGlobalOptions.cs
+++ b/src/Tools/ExternalAccess/Razor/RazorGlobalOptions.cs
@@ -29,6 +29,18 @@ public RazorGlobalOptions(IGlobalOptionService globalOptions)
         public RazorAutoFormattingOptions GetAutoFormattingOptions()
             => new(_globalOptions.GetAutoFormattingOptions(LanguageNames.CSharp));
 
+        public bool UseTabs
+        {
+            get => _globalOptions.GetOption(RazorLineFormattingOptionsStorage.UseTabs);
+            set => _globalOptions.SetGlobalOption(new OptionKey(RazorLineFormattingOptionsStorage.UseTabs), value);
+        }
+
+        public int TabSize
+        {
+            get => _globalOptions.GetOption(RazorLineFormattingOptionsStorage.TabSize);
+            set => _globalOptions.SetGlobalOption(new OptionKey(RazorLineFormattingOptionsStorage.TabSize), value);
+        }
+
 #pragma warning disable IDE0060 // Remove unused parameter
         /// <summary>
         /// For testing purposes only. Razor does not use MEF composition for host services so we need to return a mock.
diff --git a/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs b/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
index 89aa4449f6562..f28f82c91a99c 100644
--- a/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
@@ -8,6 +8,8 @@ namespace Microsoft.CodeAnalysis.Host
 {
     internal static class Extensions
     {
+        private const string RazorCSharp = "RazorCSharp";
+
         public static bool CanApplyChange([NotNullWhen(returnValue: true)] this TextDocument? document)
             => document?.State.CanApplyChange() ?? false;
 
@@ -19,5 +21,8 @@ public static bool SupportsDiagnostics([NotNullWhen(returnValue: true)] this Tex
 
         public static bool SupportsDiagnostics([NotNullWhen(returnValue: true)] this TextDocumentState? document)
             => document?.Services.GetService<IDocumentOperationService>()?.SupportDiagnostics ?? false;
+
+        public static bool IsRazorDocument(this TextDocument document)
+            => document.Services.GetService<DocumentPropertiesService>()?.DiagnosticsLspClientName == RazorCSharp;
     }
 }

From 364d3529e81cebf423d3dc8b11fbac4de0378580 Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Mon, 9 May 2022 16:34:49 -0700
Subject: [PATCH 361/413] Address review comments

---
 .../Portable/Completion/CompletionContext.cs  |  2 +-
 .../Portable/Completion/CompletionHelper.cs   |  6 ++--
 ...haredSyntaxContextsWithSpeculativeModel.cs | 29 ++++++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/Features/Core/Portable/Completion/CompletionContext.cs b/src/Features/Core/Portable/Completion/CompletionContext.cs
index b32c8920829b5..c5af8eeb1f893 100644
--- a/src/Features/Core/Portable/Completion/CompletionContext.cs
+++ b/src/Features/Core/Portable/Completion/CompletionContext.cs
@@ -215,7 +215,7 @@ public CompletionItem? SuggestionModeItem
             }
         }
 
-        internal Task<SyntaxContext?> GetSyntaxContextWithExistingSpeculativeModelAsync(Document document, CancellationToken cancellationToken)
+        internal Task<SyntaxContext> GetSyntaxContextWithExistingSpeculativeModelAsync(Document document, CancellationToken cancellationToken)
         {
             if (SharedSyntaxContextsWithSpeculativeModel is null)
                 return CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(document, Position, cancellationToken);
diff --git a/src/Features/Core/Portable/Completion/CompletionHelper.cs b/src/Features/Core/Portable/Completion/CompletionHelper.cs
index 24553970ae598..7b87af061de72 100644
--- a/src/Features/Core/Portable/Completion/CompletionHelper.cs
+++ b/src/Features/Core/Portable/Completion/CompletionHelper.cs
@@ -482,11 +482,9 @@ static bool KeepAllItemsInTheList(CompletionTriggerKind initialTriggerKind, stri
             }
         }
 
-        public static async Task<SyntaxContext?> CreateSyntaxContextWithExistingSpeculativeModelAsync(Document document, int position, CancellationToken cancellationToken)
+        public static async Task<SyntaxContext> CreateSyntaxContextWithExistingSpeculativeModelAsync(Document document, int position, CancellationToken cancellationToken)
         {
-            if (!document.SupportsSemanticModel)
-                return null;
-
+            Contract.ThrowIfFalse(document.SupportsSemanticModel, "Should only be called from C#/VB providers.");
             var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
 
             var service = document.GetRequiredLanguageService<ISyntaxContextService>();
diff --git a/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
index 18c7661b6ca59..888efbd984271 100644
--- a/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
+++ b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
@@ -14,37 +14,38 @@ namespace Microsoft.CodeAnalysis.Completion
 {
     internal sealed class SharedSyntaxContextsWithSpeculativeModel
     {
-        public Document Document { get; }
-        public int Position { get; }
+        private readonly Document _document;
+        private readonly int _position;
 
-        private readonly ConcurrentDictionary<Document, AsyncLazy<SyntaxContext?>> _cache;
+        private readonly ConcurrentDictionary<Document, AsyncLazy<SyntaxContext>> _cache;
         private readonly Lazy<ImmutableArray<DocumentId>> _lazyRelatedDocumentIds;
 
         public SharedSyntaxContextsWithSpeculativeModel(Document document, int position)
         {
-            Document = document;
-            Position = position;
+            _document = document;
+            _position = position;
             _cache = new();
-            _lazyRelatedDocumentIds = new(Document.GetLinkedDocumentIds, isThreadSafe: true);
+            _lazyRelatedDocumentIds = new(_document.GetLinkedDocumentIds, isThreadSafe: true);
         }
 
-        public Task<SyntaxContext?> GetSyntaxContextAsync(Document document, CancellationToken cancellationToken)
+        public Task<SyntaxContext> GetSyntaxContextAsync(Document document, CancellationToken cancellationToken)
         {
             if (!_cache.TryGetValue(document, out var lazyContext))
             {
-                if (Document.Id != document.Id || !_lazyRelatedDocumentIds.Value.Contains(document.Id))
+                if (_document.Id != document.Id && !_lazyRelatedDocumentIds.Value.Contains(document.Id))
                     throw new ArgumentException("Don't support getting SyntaxContext for document unrelated to the original document");
 
-                lazyContext = GetLazySyntaxContextWithSpeculativeModel(document, Position);
+                lazyContext = GetLazySyntaxContextWithSpeculativeModel(document);
             }
 
             return lazyContext.GetValueAsync(cancellationToken);
-        }
 
-        private AsyncLazy<SyntaxContext?> GetLazySyntaxContextWithSpeculativeModel(Document document, int position)
-        {
-            return _cache.GetOrAdd(document, d => AsyncLazy.Create(cancellationToken
-                => CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(document, position, cancellationToken), cacheResult: true));
+            // Extract a local function to avoid creating a closure for code path of cache hit.
+            AsyncLazy<SyntaxContext> GetLazySyntaxContextWithSpeculativeModel(Document document)
+            {
+                return _cache.GetOrAdd(document, d => AsyncLazy.Create(cancellationToken
+                    => CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(d, _position, cancellationToken), cacheResult: true));
+            }
         }
     }
 }

From 7be9fe7317b014f78be18c4a7c886a41657704c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Mon, 9 May 2022 17:44:06 -0700
Subject: [PATCH 362/413] Improve editorconfig options caching on ProjectState
 (#61131)

---
 .../DictionaryAnalyzerConfigOptionsTests.cs   |  29 ++++
 .../AnalyzerConfigOptions.cs                  |   8 +
 .../DictionaryAnalyzerConfigOptions.cs        |   6 +
 .../Core/Portable/PublicAPI.Unshipped.txt     |   1 +
 .../EditorConfigNamingStyleParserTests.cs     | 111 +++++++++++-
 .../DataProvider/SettingsProviderBase.cs      |  36 +++-
 ...nfigOptionSet+AnalyzerConfigOptionsImpl.cs |   6 +
 ...IncrementalAnalyzer_IncrementalAnalyzer.cs |   4 +-
 .../AnalyzersCommandHandler.cs                |   2 +-
 .../BaseDiagnosticAndGeneratorItemSource.cs   |   8 +-
 ...torConfigDocumentOptionsProviderFactory.cs |  19 ++-
 .../OptionSet+AnalyzerConfigOptionsImpl.cs    |   7 +
 .../Workspace/Solution/AnalyzerConfigData.cs  |  28 +++
 .../Portable/Workspace/Solution/Document.cs   |  13 +-
 .../Portable/Workspace/Solution/Project.cs    |   2 +-
 .../Workspace/Solution/ProjectState.cs        |  33 ++--
 .../EditorConfigCodeStyleParserTests.cs       |   9 +-
 ...ferenceEditorConfigStorageLocationTests.cs | 161 ++----------------
 .../Core/CompilerExtensions.projitems         |   4 +-
 .../StructuredAnalyzerConfigOptions.cs        |  97 +++++++++++
 .../Parsing/EditorConfigParser.cs             |  12 +-
 .../Parsing/IEditorConfigOptionAccumulator.cs |   3 +-
 .../NamingStyleOptionAccumulator.cs           |   8 +-
 .../AnalyzerConfigOptionsExtensions.cs        |   3 +-
 .../EditorConfigNamingStyleParser.cs          |  48 +-----
 ...ditorConfigNamingStyleParser_NamingRule.cs |   8 +-
 ...itorConfigNamingStyleParser_NamingStyle.cs |   6 +-
 ...ditorConfigNamingStyleParser_SymbolSpec.cs |   6 +-
 .../Serialization/NamingStylePreferences.cs   |   4 +
 .../Serialization/SymbolSpecification.cs      |   4 +
 .../EditorConfigStorageLocationExtensions.cs  |  34 ----
 .../EditorConfigStorageLocation`1.cs          |   7 +-
 .../IEditorConfigStorageLocation.cs           |   6 +-
 ...lePreferenceEditorConfigStorageLocation.cs |  26 +--
 34 files changed, 439 insertions(+), 320 deletions(-)
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
 create mode 100644 src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
 delete mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs

diff --git a/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
new file mode 100644
index 0000000000000..6e80809c66e6e
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
@@ -0,0 +1,29 @@
+// 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.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.UnitTests
+{
+    public class DictionaryAnalyzerConfigOptionsTests
+    {
+        [Fact]
+        public void BackwardCompatibility()
+        {
+            // Note: Older versions of analyzers access this field via reflection.
+            // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
+            Assert.Equal(
+                typeof(ImmutableDictionary<string, string>),
+                typeof(DictionaryAnalyzerConfigOptions).GetField("Options", BindingFlags.Instance | BindingFlags.NonPublic)?.FieldType);
+        }
+    }
+}
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
index 1e98c9cccb6ee..ea5f6b0944e4c 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
@@ -19,5 +20,12 @@ public abstract class AnalyzerConfigOptions
         /// Get an analyzer config value for the given key, using the <see cref="KeyComparer"/>.
         /// </summary>
         public abstract bool TryGetValue(string key, [NotNullWhen(true)] out string? value);
+
+        /// <summary>
+        /// Enumerates unique keys of all available options in no specific order.
+        /// </summary>
+        /// <exception cref="NotImplementedException">Not implemented by the derived type.</exception>
+        public virtual IEnumerable<string> Keys
+            => throw new NotImplementedException();
     }
 }
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
index 368b6c4176976..48ac671a064ee 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
@@ -2,6 +2,7 @@
 // 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.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 
@@ -13,6 +14,8 @@ internal sealed class DictionaryAnalyzerConfigOptions : AnalyzerConfigOptions
 
         public static DictionaryAnalyzerConfigOptions Empty { get; } = new DictionaryAnalyzerConfigOptions(EmptyDictionary);
 
+        // Note: Do not rename. Older versions of analyzers access this field via reflection.
+        // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
         internal readonly ImmutableDictionary<string, string> Options;
 
         public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
@@ -20,5 +23,8 @@ public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> optio
 
         public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
             => Options.TryGetValue(key, out value);
+
+        public override IEnumerable<string> Keys
+            => Options.Keys;
     }
 }
diff --git a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
index 54e2766c89e34..c2331cd21ec09 100644
--- a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
+++ b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
@@ -66,6 +66,7 @@ const Microsoft.CodeAnalysis.WellKnownMemberNames.CheckedExplicitConversionName
 Microsoft.CodeAnalysis.OperationKind.UTF8String = 124 -> Microsoft.CodeAnalysis.OperationKind
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation.Value.get -> string!
+virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions.Keys.get -> System.Collections.Generic.IEnumerable<string!>!
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation) -> void
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor<TArgument, TResult>.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation, TArgument argument) -> TResult?
 virtual Microsoft.CodeAnalysis.SymbolVisitor<TArgument, TResult>.DefaultVisit(Microsoft.CodeAnalysis.ISymbol! symbol, TArgument argument) -> TResult
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
index fff2e11b97eea..8fb3042f2c572 100644
--- a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
@@ -7,17 +7,20 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics.NamingStyles;
 using Roslyn.Test.Utilities;
 using Xunit;
-using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.SymbolSpecification;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics.NamingStyles
 {
     public class EditorConfigNamingStyleParserTests
     {
+        private static NamingStylePreferences ParseDictionary(Dictionary<string, string> options)
+            => EditorConfigNamingStyleParser.ParseDictionary(new DictionaryAnalyzerConfigOptions(options.ToImmutableDictionary()));
+
         [Fact]
         public static void TestPascalCaseRule()
         {
@@ -469,5 +472,111 @@ public static void TestEditorConfigParseForApplicableSymbolKinds()
                 Assert.True(!string.IsNullOrEmpty(editorConfigString));
             }
         }
+
+        [Theory]
+        [InlineData("a", "b", "a", "public", "public, private")]
+        [InlineData("b", "a", "a", "public, private", "public")]
+        [InlineData("b", "a", "b", "public", "public, private")]
+        [InlineData("a", "b", "b", "public, private", "public")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "static, readonly", "static")]
+        [InlineData("b", "a", "a", "static", "static, readonly")]
+        [InlineData("b", "a", "b", "static, readonly", "static")]
+        [InlineData("a", "b", "b", "static", "static, readonly")]
+        [InlineData("a", "b", "a", "", "")]
+        [InlineData("b", "a", "a", "", "")]
+        [InlineData("A", "b", "A", "", "")]
+        [InlineData("b", "A", "A", "", "")]
+        [InlineData("a", "B", "a", "", "")]
+        [InlineData("B", "a", "a", "", "")]
+        [InlineData("A", "B", "A", "", "")]
+        [InlineData("B", "A", "A", "", "")]
+        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "method", "method, property")]
+        [InlineData("b", "a", "a", "method, property", "method")]
+        [InlineData("b", "a", "b", "method", "method, property")]
+        [InlineData("a", "b", "b", "method, property", "method")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
     }
 }
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
index 1f137a0d8c170..64ec7898fe01e 100644
--- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
+++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
@@ -16,7 +16,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Utilities;
-using static Microsoft.CodeAnalysis.ProjectState;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider
 {
@@ -51,7 +51,7 @@ protected void Update()
                 return;
             }
 
-            var configOptionsProvider = new ProjectAnalyzerConfigOptionsProvider(project.State);
+            var configOptionsProvider = new ProjectState.ProjectAnalyzerConfigOptionsProvider(project.State);
             var workspaceOptions = configOptionsProvider.GetOptionsForSourcePath(givenFolder.FullName);
             var result = project.GetAnalyzerConfigOptions();
             var options = new CombinedAnalyzerConfigOptions(workspaceOptions, result);
@@ -93,9 +93,9 @@ public void RegisterViewModel(ISettingsEditorViewModel viewModel)
         private sealed class CombinedAnalyzerConfigOptions : AnalyzerConfigOptions
         {
             private readonly AnalyzerConfigOptions _workspaceOptions;
-            private readonly AnalyzerConfigOptionsResult? _result;
+            private readonly AnalyzerConfigData? _result;
 
-            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigOptionsResult? result)
+            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigData? result)
             {
                 _workspaceOptions = workspaceOptions;
                 _result = result;
@@ -131,6 +131,34 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = null;
                 return false;
             }
+
+            public override IEnumerable<string> Keys
+            {
+                get
+                {
+                    foreach (var key in _workspaceOptions.Keys)
+                        yield return key;
+
+                    if (!_result.HasValue)
+                        yield break;
+
+                    foreach (var key in _result.Value.AnalyzerOptions.Keys)
+                    {
+                        if (!_workspaceOptions.TryGetValue(key, out _))
+                            yield return key;
+                    }
+
+                    foreach (var (key, severity) in _result.Value.TreeOptions)
+                    {
+                        var diagnosticKey = "dotnet_diagnostic." + key + ".severity";
+                        if (!_workspaceOptions.TryGetValue(diagnosticKey, out _) &&
+                            !_result.Value.AnalyzerOptions.TryGetKey(diagnosticKey, out _))
+                        {
+                            yield return diagnosticKey;
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
index 3fec7795a0148..19a21b395b96f 100644
--- a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,7 +2,10 @@
 // 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.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
@@ -28,6 +31,9 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
 
                 return _fallbackOptions.TryGetValue(key, out value);
             }
+
+            public override IEnumerable<string> Keys
+                => _options.Keys.Concat(_fallbackOptions.Keys.Where(key => !_options.TryGetValue(key, out _)));
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index bf2546750d42c..034940b2462f6 100644
--- a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -381,7 +381,7 @@ private IReadOnlyList<StateSet> GetStateSetsForFullSolutionAnalysis(IEnumerable<
             return stateSets.Where(s => IsCandidateForFullSolutionAnalysis(s.Analyzer, project, analyzerConfigOptions)).ToList();
         }
 
-        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigOptionsResult? analyzerConfigOptions)
+        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigData? analyzerConfigOptions)
         {
             // PERF: Don't query descriptors for compiler analyzer or workspace load analyzer, always execute them.
             if (analyzer == FileContentLoadAnalyzer.Instance ||
@@ -413,7 +413,7 @@ private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Pro
 
             // For most of analyzers, the number of diagnostic descriptors is small, so this should be cheap.
             var descriptors = DiagnosticAnalyzerInfoCache.GetDiagnosticDescriptors(analyzer);
-            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions) != ReportDiagnostic.Hidden);
+            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions?.Result) != ReportDiagnostic.Hidden);
         }
 
         private void RaiseProjectDiagnosticsIfNeeded(
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
index a2f36a1e8df05..89101c51cfdba 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
@@ -296,7 +296,7 @@ private void UpdateSeverityMenuItemsChecked()
 
                 foreach (var diagnosticItem in group)
                 {
-                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions);
+                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions?.Result);
                     selectedItemSeverities.Add(severity);
                 }
             }
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
index 621c689c63e31..114541cfd6522 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
@@ -26,7 +26,7 @@ internal abstract partial class BaseDiagnosticAndGeneratorItemSource : IAttached
         private BulkObservableCollection<BaseItem>? _items;
         private ReportDiagnostic _generalDiagnosticOption;
         private ImmutableDictionary<string, ReportDiagnostic>? _specificDiagnosticOptions;
-        private AnalyzerConfigOptionsResult? _analyzerConfigOptions;
+        private AnalyzerConfigData? _analyzerConfigOptions;
 
         public BaseDiagnosticAndGeneratorItemSource(Workspace workspace, ProjectId projectId, IAnalyzersCommandHandler commandHandler, IDiagnosticAnalyzerService diagnosticAnalyzerService)
         {
@@ -95,7 +95,7 @@ public IEnumerable Items
             }
         }
 
-        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigOptionsResult? analyzerConfigOptions)
+        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigData? analyzerConfigOptions)
         {
             // Within an analyzer assembly, an individual analyzer may report multiple different diagnostics
             // with the same ID. Or, multiple analyzers may report diagnostics with the same ID. Or a
@@ -117,7 +117,7 @@ private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(Pro
                 .Select(g =>
                 {
                     var selectedDiagnostic = g.OrderBy(d => d, s_comparer).First();
-                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions);
+                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions?.Result);
                     return new DiagnosticItem(projectId, AnalyzerReference, selectedDiagnostic, effectiveSeverity, CommandHandler);
                 }));
 
@@ -183,7 +183,7 @@ void OnProjectConfigurationChanged()
 
                     foreach (var item in _items.OfType<DiagnosticItem>())
                     {
-                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions);
+                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions?.Result);
                         item.UpdateEffectiveSeverity(effectiveSeverity);
                     }
                 }
diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
index 0148466ebcc7e..bacb11927cb04 100644
--- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
+++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options.EditorConfig
 {
@@ -21,19 +22,25 @@ private sealed class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvi
         {
             public async Task<IDocumentOptions?> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken)
             {
-                var options = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
-
-                return new DocumentOptions(options);
+                var data = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
+                return new DocumentOptions(data?.AnalyzerConfigOptions);
             }
 
             private sealed class DocumentOptions : IDocumentOptions
             {
-                private readonly ImmutableDictionary<string, string> _options;
-                public DocumentOptions(ImmutableDictionary<string, string> options)
+                private readonly StructuredAnalyzerConfigOptions? _options;
+
+                public DocumentOptions(StructuredAnalyzerConfigOptions? options)
                     => _options = options;
 
                 public bool TryGetDocumentOption(OptionKey option, out object? value)
                 {
+                    if (_options == null)
+                    {
+                        value = null;
+                        return false;
+                    }
+
                     var editorConfigPersistence = (IEditorConfigStorageLocation?)option.Option.StorageLocations.SingleOrDefault(static location => location is IEditorConfigStorageLocation);
                     if (editorConfigPersistence == null)
                     {
@@ -43,7 +50,7 @@ public bool TryGetDocumentOption(OptionKey option, out object? value)
 
                     try
                     {
-                        return editorConfigPersistence.TryGetOption(_options.AsNullable(), option.Option.Type, out value);
+                        return editorConfigPersistence.TryGetOption(_options, option.Option.Type, out value);
                     }
                     catch (Exception e) when (FatalError.ReportAndCatch(e))
                     {
diff --git a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
index 4e0d139840cb3..6e52e3a5db884 100644
--- a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,8 +2,11 @@
 // 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.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options
@@ -39,6 +42,10 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = storageLocation.GetEditorConfigStringValue(typedValue, _optionSet);
                 return true;
             }
+
+            // no way to enumerate OptionSet
+            public override IEnumerable<string> Keys
+                => throw new NotImplementedException();
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
new file mode 100644
index 0000000000000..c417192872bb6
--- /dev/null
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
@@ -0,0 +1,28 @@
+// 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.Diagnostics;
+
+namespace Microsoft.CodeAnalysis;
+
+/// <summary>
+/// Aggregate analyzer config options for a specific path.
+/// </summary>
+internal readonly struct AnalyzerConfigData
+{
+    private readonly AnalyzerConfigOptionsResult _result;
+    private readonly StructuredAnalyzerConfigOptions _configOptions;
+
+    public AnalyzerConfigData(AnalyzerConfigOptionsResult result)
+    {
+        _result = result;
+        _configOptions = new StructuredAnalyzerConfigOptions(result.AnalyzerOptions);
+    }
+
+    public AnalyzerConfigOptionsResult Result => _result;
+    public StructuredAnalyzerConfigOptions AnalyzerConfigOptions => _configOptions;
+    public ImmutableDictionary<string, string> AnalyzerOptions => _result.AnalyzerOptions;
+    public ImmutableDictionary<string, ReportDiagnostic> TreeOptions => _result.TreeOptions;
+}
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
index c64163a5a1277..7f4f520e8d25a 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
@@ -513,7 +513,7 @@ private void InitializeCachedOptions(OptionSet solutionOptions)
             Interlocked.CompareExchange(ref _cachedOptions, newAsyncLazy, comparand: null);
         }
 
-        internal Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
+        internal async Task<AnalyzerConfigData?> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
         {
             var projectFilePath = Project.FilePath;
             // We need to work out path to this document. Documents may not have a "real" file path if they're something created
@@ -535,15 +535,12 @@ internal Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsAsync(Cance
                 }
             }
 
-            if (effectiveFilePath != null)
+            if (effectiveFilePath == null)
             {
-                return Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken);
-            }
-            else
-            {
-                // Really no idea where this is going, so bail
-                return Task.FromResult(DictionaryAnalyzerConfigOptions.EmptyDictionary);
+                return null;
             }
+
+            return await Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
index fa20f2786d59a..5ec37f9535f0e 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
@@ -774,7 +774,7 @@ private void CheckIdsContainedInProject(ImmutableArray<DocumentId> documentIds)
             }
         }
 
-        internal AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
+        internal AnalyzerConfigData? GetAnalyzerConfigOptions()
             => _projectState.GetAnalyzerConfigOptions();
 
         private string GetDebuggerDisplay()
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
index d36dd5f83160d..9370c87f3b2c6 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
@@ -248,15 +248,13 @@ public AnalyzerOptions AnalyzerOptions
                 additionalFiles: AdditionalDocumentStates.SelectAsArray(static documentState => documentState.AdditionalText),
                 optionsProvider: new ProjectAnalyzerConfigOptionsProvider(this));
 
-        public async Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsForPathAsync(
-            string path,
-            CancellationToken cancellationToken)
+        public async Task<AnalyzerConfigData> GetAnalyzerOptionsForPathAsync(string path, CancellationToken cancellationToken)
         {
-            var configSet = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
-            return configSet.GetOptionsForSourcePath(path).AnalyzerOptions;
+            var cache = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
+            return cache.GetOptionsForSourcePath(path);
         }
 
-        public AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
+        public AnalyzerConfigData? GetAnalyzerConfigOptions()
         {
             // We need to find the analyzer config options at the root of the project.
             // Currently, there is no compiler API to query analyzer config options for a directory in a language agnostic fashion.
@@ -296,8 +294,11 @@ internal sealed class ProjectAnalyzerConfigOptionsProvider : AnalyzerConfigOptio
             public ProjectAnalyzerConfigOptionsProvider(ProjectState projectState)
                 => _projectState = projectState;
 
+            private AnalyzerConfigOptionsCache GetCache()
+                => _projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None);
+
             public override AnalyzerConfigOptions GlobalOptions
-                => GetOptionsForSourcePath(string.Empty);
+                => GetCache().GlobalConfigOptions.AnalyzerConfigOptions;
 
             public override AnalyzerConfigOptions GetOptions(SyntaxTree tree)
                 => GetOptionsForSourcePath(tree.FilePath);
@@ -309,7 +310,7 @@ public override AnalyzerConfigOptions GetOptions(AdditionalText textFile)
             }
 
             public AnalyzerConfigOptions GetOptionsForSourcePath(string path)
-                => new DictionaryAnalyzerConfigOptions(_projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None).GetOptionsForSourcePath(path).AnalyzerOptions);
+                => GetCache().GetOptionsForSourcePath(path).AnalyzerConfigOptions;
         }
 
         private sealed class ProjectSyntaxTreeOptionsProvider : SyntaxTreeOptionsProvider
@@ -371,20 +372,20 @@ private static ValueSource<AnalyzerConfigOptionsCache> ComputeAnalyzerConfigOpti
 
         private readonly struct AnalyzerConfigOptionsCache
         {
-            private readonly ConcurrentDictionary<string, AnalyzerConfigOptionsResult> _sourcePathToResult = new();
-            private readonly Func<string, AnalyzerConfigOptionsResult> _computeFunction;
-            private readonly AnalyzerConfigSet _configSet;
+            private readonly ConcurrentDictionary<string, AnalyzerConfigData> _sourcePathToResult = new();
+            private readonly Func<string, AnalyzerConfigData> _computeFunction;
+            private readonly Lazy<AnalyzerConfigData> _global;
 
             public AnalyzerConfigOptionsCache(AnalyzerConfigSet configSet)
             {
-                _configSet = configSet;
-                _computeFunction = _configSet.GetOptionsForSourcePath;
+                _global = new Lazy<AnalyzerConfigData>(() => new AnalyzerConfigData(configSet.GlobalConfigOptions));
+                _computeFunction = path => new AnalyzerConfigData(configSet.GetOptionsForSourcePath(path));
             }
 
-            public AnalyzerConfigOptionsResult GlobalConfigOptions
-                => _configSet.GlobalConfigOptions;
+            public AnalyzerConfigData GlobalConfigOptions
+                => _global.Value;
 
-            public AnalyzerConfigOptionsResult GetOptionsForSourcePath(string sourcePath)
+            public AnalyzerConfigData GetOptionsForSourcePath(string sourcePath)
                 => _sourcePathToResult.GetOrAdd(sourcePath, _computeFunction);
         }
 
diff --git a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
index 6985c5d8ccbcb..fa91961a9e6ac 100644
--- a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
+++ b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
@@ -3,11 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Options;
 using Roslyn.Test.Utilities;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.CodeStyle
@@ -62,7 +67,7 @@ public void TestParseEditorConfigAccessibilityModifiers(string args, int value,
             var storageLocation = CodeStyleOptions2.RequireAccessibilityModifiers.StorageLocations
                 .OfType<EditorConfigStorageLocation<CodeStyleOption2<AccessibilityModifiersRequired>>>()
                 .Single();
-            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, args } };
+            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, args));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(CodeStyleOption2<AccessibilityModifiersRequired>), out var parsedCodeStyleOption));
             var codeStyleOption = (CodeStyleOption2<AccessibilityModifiersRequired>)parsedCodeStyleOption!;
@@ -84,7 +89,7 @@ public void TestParseEditorConfigEndOfLine(string configurationString, string ne
             var storageLocation = FormattingOptions.NewLine.StorageLocations
                 .OfType<EditorConfigStorageLocation<string>>()
                 .Single();
-            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, configurationString } };
+            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, configurationString));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(string), out var parsedNewLine));
             Assert.Equal(newLine, (string?)parsedNewLine);
diff --git a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
index 7e74d51ac4cb4..2fd9b59b756f7 100644
--- a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
+++ b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
@@ -6,8 +6,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Options;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.EditorConfig.StorageLocation
@@ -18,19 +22,7 @@ public class NamingStylePreferenceEditorConfigStorageLocationTests
         public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturnsFalse()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(NamingStylePreferences), out _);
-            Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
-        }
-
-        [Fact]
-        public static void TestEmptyDictionaryDefaultNamingStylePreferencesObjectReturnsFalse()
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(
-                new Dictionary<string, string>(),
-                typeof(NamingStylePreferences),
-                out _);
-
+            var result = editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(NamingStylePreferences), out _);
             Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
         }
 
@@ -38,7 +30,7 @@ public static void TestEmptyDictionaryDefaultNamingStylePreferencesObjectReturns
         public static void TestNonEmptyDictionaryReturnsTrue()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
+            var options = new StructuredAnalyzerConfigOptions(new Dictionary<string, string>()
             {
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity"] = "error",
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols"] = "method_and_property_symbols",
@@ -46,155 +38,22 @@ public static void TestNonEmptyDictionaryReturnsTrue()
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_kinds"] = "method,property",
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities"] = "*",
                 ["dotnet_naming_style.pascal_case_style.capitalization"] = "pascal_case"
-            };
+            }.ToImmutableDictionary(AnalyzerConfigOptions.KeyComparer));
 
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
+            var result = editorConfigStorageLocation.TryGetOption(options, typeof(NamingStylePreferences), out var value);
 
             Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(value);
             Assert.Equal(ReportDiagnostic.Error, namingStylePreferences.Rules.NamingRules[0].EnforcementLevel);
         }
 
-        [Theory]
-        [InlineData("a", "b", "a", "public", "public, private")]
-        [InlineData("b", "a", "a", "public, private", "public")]
-        [InlineData("b", "a", "b", "public", "public, private")]
-        [InlineData("a", "b", "b", "public, private", "public")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "static, readonly", "static")]
-        [InlineData("b", "a", "a", "static", "static, readonly")]
-        [InlineData("b", "a", "b", "static, readonly", "static")]
-        [InlineData("a", "b", "b", "static", "static, readonly")]
-        [InlineData("a", "b", "a", "", "")]
-        [InlineData("b", "a", "a", "", "")]
-        [InlineData("A", "b", "A", "", "")]
-        [InlineData("b", "A", "A", "", "")]
-        [InlineData("a", "B", "a", "", "")]
-        [InlineData("B", "a", "a", "", "")]
-        [InlineData("A", "B", "A", "", "")]
-        [InlineData("B", "A", "A", "", "")]
-        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "method", "method, property")]
-        [InlineData("b", "a", "a", "method, property", "method")]
-        [InlineData("b", "a", "b", "method", "method, property")]
-        [InlineData("a", "b", "b", "method, property", "method")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
         [Fact]
         public static void TestObjectTypeThrowsInvalidOperationException()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
             Assert.Throws<InvalidOperationException>(() =>
             {
-                editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(object), out var @object);
+                editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(object), out var @object);
             });
         }
     }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
index b3c2638f021c2..c17730357f3ff 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
@@ -193,6 +193,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)CodeStyle\ParenthesesPreference.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArray`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\StructuredAnalyzerConfigOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\Language.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageExtensions.cs" />
@@ -371,7 +372,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)NamingStyles\Serialization\SymbolSpecification.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObjectPools\PooledDictionary.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation2.cs" />
@@ -575,7 +575,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IBuiltInAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IPragmaSuppressionsAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\Core\Portable\DiagnosticAnalyzer\DictionaryAnalyzerConfigOptions.cs">
-      <Link>Diagnostics\AnalyzerConfigOptionsDictionary.cs</Link>
+      <Link>Diagnostics\DictionaryAnalyzerConfigOptions.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
new file mode 100644
index 0000000000000..6fb0cb022c226
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
@@ -0,0 +1,97 @@
+// 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.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Diagnostics;
+
+/// <summary>
+/// <see cref="AnalyzerConfigOptions"/> that memoize structured (parsed) form of certain complex options to avoid parsing them multiple times.
+/// Storages of these complex options may directly call the specialized getters to reuse the cached values.
+/// </summary>
+internal sealed class StructuredAnalyzerConfigOptions : AnalyzerConfigOptions
+{
+    private readonly AnalyzerConfigOptions _options;
+    private readonly Lazy<NamingStylePreferences> _lazyNamingStylePreferences;
+
+    public StructuredAnalyzerConfigOptions(AnalyzerConfigOptions options)
+    {
+        _options = options;
+        _lazyNamingStylePreferences = new Lazy<NamingStylePreferences>(() => EditorConfigNamingStyleParser.ParseDictionary(_options));
+    }
+
+    public StructuredAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
+        : this(new DictionaryAnalyzerConfigOptions(options))
+    {
+        Contract.ThrowIfFalse(options.KeyComparer == KeyComparer);
+    }
+
+    public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+        => _options.TryGetValue(key, out value);
+
+    public override IEnumerable<string> Keys
+        => _options.Keys;
+
+    public NamingStylePreferences GetNamingStylePreferences()
+        => _lazyNamingStylePreferences.Value;
+
+    public static bool TryGetStructuredOptions(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
+    {
+        if (configOptions is StructuredAnalyzerConfigOptions structuredOptions)
+        {
+            options = structuredOptions;
+            return true;
+        }
+
+#if CODE_STYLE
+        if (TryGetCorrespondingCodeStyleInstance(configOptions, out options))
+        {
+            return true;
+        }
+#endif
+
+        options = null;
+        return false;
+    }
+
+#if CODE_STYLE
+    // StructuredAnalyzerConfigOptions is defined in both Worksapce and Code Style layers. It is not public and thus can't be shared between these two.
+    // However, Code Style layer is compiled against the shared Workspace APIs. The ProjectState creates and holds onto an instance
+    // of Workspace layer's version of StructuredAnalyzerConfigOptions. This version of the type is not directly usable by Code Style code.
+    // We create a clone of this instance typed to the Code Style's version of StructuredAnalyzerConfigOptions.
+    // The conditional weak table maintains 1:1 correspondence between these instances.
+    // 
+    // In addition, we also map Compiler created DictionaryAnalyzerConfigOptions to StructuredAnalyzerConfigOptions for analyzers that are invoked
+    // from command line build.
+
+    private static readonly ConditionalWeakTable<AnalyzerConfigOptions, StructuredAnalyzerConfigOptions> s_codeStyleStructuredOptions = new();
+    private static readonly object s_codeStyleStructuredOptionsLock = new();
+
+    private static bool TryGetCorrespondingCodeStyleInstance(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
+    {
+        if (s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
+        {
+            return true;
+        }
+
+        lock (s_codeStyleStructuredOptionsLock)
+        {
+            if (!s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
+            {
+                options = new StructuredAnalyzerConfigOptions(configOptions);
+                s_codeStyleStructuredOptions.Add(configOptions, options);
+            }
+        }
+
+        return true;
+    }
+#endif
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
index 51386f9495f64..b48bb5a04538c 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.EditorConfig.Parsing
@@ -15,8 +16,9 @@ internal static class EditorConfigParser
         private static readonly Regex s_sectionMatcher = new(@"^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$", RegexOptions.Compiled);
         // Matches EditorConfig property such as "indent_style = space", see https://editorconfig.org for details
         private static readonly Regex s_propertyMatcher = new(@"^\s*([\w\.\-_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$", RegexOptions.Compiled);
+
         private static ImmutableHashSet<string> ReservedKeys { get; }
-            = ImmutableHashSet.CreateRange(CaseInsensitiveComparison.Comparer, new[] {
+            = ImmutableHashSet.CreateRange(AnalyzerConfigOptions.KeyComparer, new[] {
                 "root",
                 "indent_style",
                 "indent_size",
@@ -43,8 +45,7 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
             where TEditorConfigFile : EditorConfigFile<TEditorConfigOption>
             where TEditorConfigOption : EditorConfigOption
         {
-            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
-                CaseInsensitiveComparison.Comparer);
+            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(AnalyzerConfigOptions.KeyComparer);
             var activeSectionName = "";
             var activeSectionStart = 0;
             var activeSectionEnd = 0;
@@ -74,8 +75,7 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
                     activeSectionStart = textLine.Start;
                     activeSectionName = sectionName;
                     activeSectionEnd = textLine.End;
-                    activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
-                        CaseInsensitiveComparison.Comparer);
+                    activeSectionProperties.Clear();
                     continue;
                 }
 
@@ -121,7 +121,7 @@ void ProcessActiveSection()
                 var fullText = activeLine.ToString();
                 var sectionSpan = new TextSpan(activeSectionStart, activeSectionEnd);
                 var previousSection = new Section(pathToFile, isGlobal, sectionSpan, activeSectionName, fullText);
-                accumulator.ProcessSection(previousSection, activeSectionProperties.ToImmutable());
+                accumulator.ProcessSection(previousSection, activeSectionProperties);
             }
 
             static bool IsComment(string line)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
index c750a40f155fc..1b103e4b8a3e5 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
@@ -2,6 +2,7 @@
 // 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.Collections.Immutable;
 using Microsoft.CodeAnalysis.Text;
 
@@ -11,7 +12,7 @@ internal interface IEditorConfigOptionAccumulator<TResults, TResult>
         where TResults : EditorConfigFile<TResult>
         where TResult : EditorConfigOption
     {
-        void ProcessSection(Section section, ImmutableDictionary<string, (string value, TextLine? line)> properties);
+        void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties);
         TResults Complete(string? filePath);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
index 51bae3ea22c83..d873387893390 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
@@ -2,7 +2,9 @@
 // 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.Collections.Immutable;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
@@ -20,11 +22,9 @@ public EditorConfigNamingStyles Complete(string? fileName)
             return editorConfigNamingStyles;
         }
 
-        public void ProcessSection(
-            Section section,
-            ImmutableDictionary<string, (string value, TextLine? line)> properties)
+        public void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties)
         {
-            foreach (var ruleTitle in GetRuleTitles(TrimDictionary(properties)))
+            foreach (var ruleTitle in GetRuleTitles(properties))
             {
                 if (TryGetSymbolSpec(section, ruleTitle, properties, out var applicableSymbolInfo) &&
                     TryGetNamingStyleData(section, ruleTitle, properties, out var namingScheme) &&
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
index 31d34a2ff238f..9006335cb9933 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
@@ -84,7 +84,8 @@ private static bool TryGetEditorConfigOption<T>(this AnalyzerConfigOptions analy
                 // This option has .editorconfig storage defined, even if the current configuration does not provide a
                 // value for it.
                 hasEditorConfigStorage = true;
-                if (configStorageLocation.TryGetOption(analyzerConfigOptions, option.Type, out var objectValue))
+                if (StructuredAnalyzerConfigOptions.TryGetStructuredOptions(analyzerConfigOptions, out var structuredOptions) &&
+                    configStorageLocation.TryGetOption(structuredOptions, option.Type, out var objectValue))
                 {
                     value = (T?)objectValue;
                     return true;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
index 567882578d52f..f63d5d5684323 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.NamingStyles;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Utilities;
 
@@ -14,43 +15,15 @@ namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     internal static partial class EditorConfigNamingStyleParser
     {
-        /// <remarks>
-        /// The dictionary we get from the VS editorconfig API uses the same dictionary object if there are no changes, so we can cache based on dictionary
-        /// </remarks>
-        // TODO: revisit this cache. The assumption that the dictionary doesn't change in the exact instance is terribly fragile,
-        // and with the new .editorconfig support won't hold as well as we'd like: a single tree will have a stable instance but
-        // that won't necessarily be the same across files and projects.
-        private static readonly ConditionalWeakTable<IReadOnlyDictionary<string, string?>, NamingStylePreferences> _cache = new();
-        private static readonly object _cacheLock = new();
-
-        public static NamingStylePreferences GetNamingStylesFromDictionary(IReadOnlyDictionary<string, string?> rawOptions)
+        public static NamingStylePreferences ParseDictionary(AnalyzerConfigOptions allRawConventions)
         {
-            if (_cache.TryGetValue(rawOptions, out var value))
-            {
-                return value;
-            }
-
-            lock (_cacheLock)
-            {
-                if (!_cache.TryGetValue(rawOptions, out value))
-                {
-                    value = ParseDictionary(rawOptions);
-                    _cache.Add(rawOptions, value);
-                }
-
-                return value;
-            }
-        }
+            var trimmedDictionary = TrimDictionary(allRawConventions);
 
-        public static NamingStylePreferences ParseDictionary(IReadOnlyDictionary<string, string?> allRawConventions)
-        {
             var symbolSpecifications = ArrayBuilder<SymbolSpecification>.GetInstance();
             var namingStyles = ArrayBuilder<NamingStyle>.GetInstance();
             var namingRules = ArrayBuilder<SerializableNamingRule>.GetInstance();
             var ruleNames = new Dictionary<(Guid symbolSpecificationID, Guid namingStyleID, ReportDiagnostic enforcementLevel), string>();
 
-            var trimmedDictionary = TrimDictionary(allRawConventions);
-
             foreach (var namingRuleTitle in GetRuleTitles(trimmedDictionary))
             {
                 if (TryGetSymbolSpec(namingRuleTitle, trimmedDictionary, out var symbolSpec) &&
@@ -127,19 +100,12 @@ public static NamingStylePreferences ParseDictionary(IReadOnlyDictionary<string,
                     }));
         }
 
-        internal static Dictionary<string, T> TrimDictionary<T>(IReadOnlyDictionary<string, T> allRawConventions)
+        internal static Dictionary<string, string> TrimDictionary(AnalyzerConfigOptions allRawConventions)
         {
-            // Keys have been lowercased, but values have not. Because values here reference key
-            // names we need any comparisons to ignore case.
-            // For example, to make a naming style called "Pascal_Case_style" match up correctly
-            // with the key "dotnet_naming_style.pascal_case_style.capitalization", we have to
-            // ignore casing for that lookup.
-            var trimmedDictionary = new Dictionary<string, T>(allRawConventions.Count, AnalyzerConfigOptions.KeyComparer);
-            foreach (var item in allRawConventions)
+            var trimmedDictionary = new Dictionary<string, string>(AnalyzerConfigOptions.KeyComparer);
+            foreach (var key in allRawConventions.Keys)
             {
-                var key = item.Key.Trim();
-                var value = item.Value;
-                trimmedDictionary[key] = value;
+                trimmedDictionary[key.Trim()] = allRawConventions.TryGetValue(key, out var value) ? value : throw new InvalidOperationException();
             }
 
             return trimmedDictionary;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
index 894beddc04a6e..4b0d78792aae8 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
@@ -16,7 +16,7 @@ private static bool TryGetSerializableNamingRule(
             string namingRuleTitle,
             SymbolSpecification symbolSpec,
             NamingStyle namingStyle,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             [NotNullWhen(true)] out SerializableNamingRule? serializableNamingRule)
         {
             if (!TryGetRuleSeverity(namingRuleTitle, conventionsDictionary, out var severity))
@@ -43,13 +43,13 @@ internal static bool TryGetRuleSeverity(
 
         private static bool TryGetRuleSeverity(
             string namingRuleName,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             out ReportDiagnostic severity)
         {
-            var result = TryGetRuleSeverity<string?, object?>(
+            var result = TryGetRuleSeverity<string, object?>(
                 namingRuleName,
                 conventionsDictionary,
-                x => x!,
+                x => x,
                 x => null, // we don't have a tuple
                 out var tuple);
             severity = tuple.severity;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
index 80099a64b1c3a..50e5e709b87c4 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
@@ -47,13 +47,13 @@ internal static bool TryGetNamingStyleData(
 
         private static bool TryGetNamingStyleData(
             string namingRuleName,
-            IReadOnlyDictionary<string, string?> rawOptions,
+            IReadOnlyDictionary<string, string> rawOptions,
             out NamingStyle namingStyle)
         {
-            return TryGetNamingStyleData<string?, object?, NamingStyle>(
+            return TryGetNamingStyleData<string, object?, NamingStyle>(
                 namingRuleName,
                 rawOptions,
-                s => s ?? string.Empty,
+                s => s,
                 x => null,
                 s => (s ?? string.Empty, null),
                 (nameTuple, prefixTuple, suffixTuple, wordSeparatorTuple, capitalizationTuple) =>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
index 67e3176c0cd5c..a299f9e7fe7a6 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
@@ -46,13 +46,13 @@ internal static bool TryGetSymbolSpec(
 
         private static bool TryGetSymbolSpec(
             string namingRuleTitle,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             [NotNullWhen(true)] out SymbolSpecification? symbolSpec)
         {
-            return TryGetSymbolSpec<string?, object?, SymbolSpecification>(
+            return TryGetSymbolSpec<string, object?, SymbolSpecification>(
                 namingRuleTitle,
                 conventionsDictionary,
-                s => (s ?? string.Empty, null),
+                s => (s, null),
                 () => null,
                 (t0, t1, t2, t3) => new SymbolSpecification(
                         Guid.NewGuid(),
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
index bf1d0e1124e80..980a1801b3be1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
@@ -56,9 +56,13 @@ public NamingStylePreferences(
         }
 
         public static NamingStylePreferences Default => FromXElement(XElement.Parse(DefaultNamingPreferencesString));
+        public static NamingStylePreferences Empty => new(ImmutableArray<SymbolSpecification>.Empty, ImmutableArray<NamingStyle>.Empty, ImmutableArray<SerializableNamingRule>.Empty);
 
         public static string DefaultNamingPreferencesString => _defaultNamingPreferencesString;
 
+        public bool IsEmpty
+            => SymbolSpecifications.IsEmpty && NamingStyles.IsEmpty && NamingRules.IsEmpty;
+
         internal NamingStyle GetNamingStyle(Guid namingStyleID)
             => NamingStyles.Single(s => s.ID == namingStyleID);
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
index c2cb04b627680..0463567afcbc3 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
@@ -24,6 +24,7 @@
 namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     [DataContract]
+    [DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
     internal sealed class SymbolSpecification : IEquatable<SymbolSpecification>, IObjectWritable
     {
         private static readonly SymbolSpecification DefaultSymbolSpecificationTemplate = CreateDefaultSymbolSpecification();
@@ -57,6 +58,9 @@ public SymbolSpecification(
             RequiredModifierList = modifiers.IsDefault ? DefaultSymbolSpecificationTemplate.RequiredModifierList : modifiers;
         }
 
+        private string GetDebuggerDisplay()
+            => Name;
+
         public static SymbolSpecification CreateDefaultSymbolSpecification()
         {
             // This is used to create new, empty symbol specifications for users to then customize.
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
deleted file mode 100644
index a850af2038898..0000000000000
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.Reflection;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Roslyn.Utilities;
-
-namespace Microsoft.CodeAnalysis.Options
-{
-    internal static class EditorConfigStorageLocationExtensions
-    {
-        public static bool TryGetOption(this IEditorConfigStorageLocation editorConfigStorageLocation, AnalyzerConfigOptions analyzerConfigOptions, Type type, out object? value)
-        {
-            // This is a workaround until we have an API for enumeratings AnalyzerConfigOptions. See https://github.com/dotnet/roslyn/issues/41840
-            if (analyzerConfigOptions.GetType().FullName == typeof(DictionaryAnalyzerConfigOptions).FullName)
-            {
-                var optionsField = analyzerConfigOptions.GetType().GetField(nameof(DictionaryAnalyzerConfigOptions.Options), BindingFlags.NonPublic | BindingFlags.Instance);
-                Contract.ThrowIfNull(optionsField);
-
-                var options = optionsField.GetValue(analyzerConfigOptions);
-                Contract.ThrowIfNull(options);
-
-                return editorConfigStorageLocation.TryGetOption((ImmutableDictionary<string, string?>)options, type, out value);
-            }
-
-            value = null;
-            return false;
-        }
-    }
-}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
index fe92fbb888eff..0e349c86bd476 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
@@ -8,6 +8,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
 #if CODE_STYLE
@@ -59,10 +61,9 @@ public EditorConfigStorageLocation(string keyName, Func<string, Optional<T>> par
             _getEditorConfigStringForValue = getEditorConfigStringForValue ?? throw new ArgumentNullException(nameof(getEditorConfigStringForValue));
         }
 
-        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? result)
+        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? result)
         {
-            if (rawOptions.TryGetValue(KeyName, out var value)
-                && value is object)
+            if (options.TryGetValue(KeyName, out var value))
             {
                 var ret = TryGetOption(value, type, out var typedResult);
                 result = typedResult;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
index fdaca1ff999d2..9d6d0521f2b27 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
@@ -4,11 +4,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 
 namespace Microsoft.CodeAnalysis.Options
 {
     internal interface IEditorConfigStorageLocation
     {
-        bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? value);
+        bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? value);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
index e3dd6c3e96ae9..650356dd5b95d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
@@ -12,30 +13,13 @@ namespace Microsoft.CodeAnalysis.Options
 {
     internal sealed class NamingStylePreferenceEditorConfigStorageLocation : OptionStorageLocation2, IEditorConfigStorageLocation
     {
-        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object result)
-        {
-            var tuple = ParseDictionary(rawOptions, type);
-            result = tuple.result;
-            return tuple.succeeded;
-        }
-
-        private static (object result, bool succeeded) ParseDictionary(
-            IReadOnlyDictionary<string, string?> allRawConventions, Type type)
+        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object result)
         {
             if (type == typeof(NamingStylePreferences))
             {
-                var editorconfigNamingStylePreferences = EditorConfigNamingStyleParser.GetNamingStylesFromDictionary(allRawConventions);
-
-                if (!editorconfigNamingStylePreferences.NamingRules.Any() &&
-                    !editorconfigNamingStylePreferences.NamingStyles.Any() &&
-                    !editorconfigNamingStylePreferences.SymbolSpecifications.Any())
-                {
-                    // We were not able to parse any rules from editorconfig, tell the caller that the parse failed
-                    return (result: editorconfigNamingStylePreferences, succeeded: false);
-                }
-
-                // no existing naming styles were passed so just return the set of styles that were parsed from editorconfig
-                return (result: editorconfigNamingStylePreferences, succeeded: true);
+                var preferences = options.GetNamingStylePreferences();
+                result = preferences;
+                return !preferences.IsEmpty;
             }
 
             throw ExceptionUtilities.UnexpectedValue(type);

From 98f478b3f0d62b99200c1b63b03d1513b12e3e13 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <mapmyp03@gmail.com>
Date: Tue, 10 May 2022 17:43:04 +0300
Subject: [PATCH 363/413] Restore warning suppression

---
 .../Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
index 792758531ba93..19804a4a3c83f 100644
--- a/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
+++ b/src/Analyzers/Core/Analyzers/AbstractCodeQualityDiagnosticAnalyzer.cs
@@ -48,7 +48,9 @@ protected static DiagnosticDescriptor CreateDescriptor(
             bool isUnnecessary,
             bool isEnabledByDefault = true,
             bool isConfigurable = true,
-            LocalizableString? description = null) => new(
+            LocalizableString? description = null)
+#pragma warning disable RS0030 // Do not use banned APIs
+            => new(
                     id, title, messageFormat,
                     DiagnosticCategory.CodeQuality,
                     DiagnosticSeverity.Info,
@@ -56,5 +58,6 @@ protected static DiagnosticDescriptor CreateDescriptor(
                     description,
                     helpLinkUri: DiagnosticHelper.GetHelpLinkForDiagnosticId(id),
                     customTags: DiagnosticCustomTags.Create(isUnnecessary, isConfigurable, enforceOnBuild));
+#pragma warning restore RS0030 // Do not use banned APIs
     }
 }

From b47d68dc80e9c907773ecca342cbd7716b39a773 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Wed, 11 May 2022 00:56:17 +1000
Subject: [PATCH 364/413] Add the full VS Mac IVTs to match existing projects
 (#61203)

---
 ...soft.CodeAnalysis.LanguageServer.Protocol.csproj | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
index 9a0315ead235b..8098a28ba3a80 100644
--- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
+++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
@@ -72,8 +72,19 @@
     <InternalsVisibleTo Include="IdeBenchmarks" />
     <InternalsVisibleTo Include="AnalyzerRunner" />
     <InternalsVisibleTo Include="Microsoft.CSharp.VSCode.Extension" Key="$(VisualStudioKey)" />
+    <!-- BEGIN MONODEVELOP
+    These MonoDevelop dependencies don't ship with Visual Studio, so can't break our
+    binary insertions and are exempted from the ExternalAccess adapter assembly policies.
+    -->
     <InternalsVisibleTo Include="MonoDevelop.Ide" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
-    <InternalsVisibleTo Include="MonoDevelop.Ide" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.Refactoring" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.VBNetBinding" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.Ide.Tests" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.Refactoring.Tests" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding.Tests" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <InternalsVisibleTo Include="MonoDevelop.VBNetBinding.Tests" Key="$(MonoDevelopKey)" LoadsWithinVisualStudio="false" />
+    <!-- END MONODEVELOP -->
   </ItemGroup>
 
   <ItemGroup>

From 4c4df4d7d79a58ddbd7c519b6e3be2919a68bd32 Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Tue, 10 May 2022 09:25:05 -0700
Subject: [PATCH 365/413] Record read of ref local even if value is discarded
 (#60910)

---
 .../CSharp/Portable/CodeGen/Optimizer.cs      |   6 +
 .../Test/Emit/CodeGen/CodeGenRefLocalTests.cs | 257 ++++++++++++++++++
 2 files changed, 263 insertions(+)

diff --git a/src/Compilers/CSharp/Portable/CodeGen/Optimizer.cs b/src/Compilers/CSharp/Portable/CodeGen/Optimizer.cs
index 72df455b901df..3bdf68c24b54e 100644
--- a/src/Compilers/CSharp/Portable/CodeGen/Optimizer.cs
+++ b/src/Compilers/CSharp/Portable/CodeGen/Optimizer.cs
@@ -874,6 +874,12 @@ public override BoundNode VisitLocal(BoundLocal node)
                         break;
 
                     case ExprContext.Sideeffects:
+                        if (node.LocalSymbol.RefKind != RefKind.None)
+                        {
+                            // Reading from a ref has a side effect since the read
+                            // may result in a NullReferenceException.
+                            RecordVarRead(node.LocalSymbol);
+                        }
                         break;
 
                     case ExprContext.Value:
diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenRefLocalTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenRefLocalTests.cs
index 0e13045b73e20..f5cb76b9ddf2d 100644
--- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenRefLocalTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenRefLocalTests.cs
@@ -3710,5 +3710,262 @@ void verify(CSharpCompilationOptions options, Verification verify, string expect
                 verifier.VerifyIL("<top-level-statements-entry-point>", expectedIL);
             }
         }
+
+        [Fact]
+        [WorkItem(60905, "https://github.com/dotnet/roslyn/issues/60905")]
+        public void ReadValueAndDiscard_01()
+        {
+            var source =
+@"struct S { }
+class Program
+{
+    static void Main()
+    {
+        F(new S[1]);
+    }
+    static void F(S[] a)
+    {
+        ref var b = ref a[0];
+        _ = b;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F",
+@"{
+  // Code size       11 (0xb)
+  .maxstack  2
+  .locals init (S& V_0) //b
+  IL_0000:  nop
+  IL_0001:  ldarg.0
+  IL_0002:  ldc.i4.0
+  IL_0003:  ldelema    ""S""
+  IL_0008:  stloc.0
+  IL_0009:  nop
+  IL_000a:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F",
+@"{
+  // Code size        9 (0x9)
+  .maxstack  2
+  IL_0000:  ldarg.0
+  IL_0001:  ldc.i4.0
+  IL_0002:  ldelema    ""S""
+  IL_0007:  pop
+  IL_0008:  ret
+}");
+        }
+
+        [Fact]
+        [WorkItem(60905, "https://github.com/dotnet/roslyn/issues/60905")]
+        public void ReadValueAndDiscard_02()
+        {
+            var source =
+@"struct S<T>
+{
+    public T F;
+}
+class Program
+{
+    static void Main()
+    {
+        F(new S<int>());
+    }
+    static void F<T>(S<T> s)
+    {
+        ref T t = ref s.F;
+        _ = t;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size       11 (0xb)
+  .maxstack  1
+  .locals init (T& V_0) //t
+  IL_0000:  nop
+  IL_0001:  ldarga.s   V_0
+  IL_0003:  ldflda     ""T S<T>.F""
+  IL_0008:  stloc.0
+  IL_0009:  nop
+  IL_000a:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        9 (0x9)
+  .maxstack  1
+  IL_0000:  ldarga.s   V_0
+  IL_0002:  ldflda     ""T S<T>.F""
+  IL_0007:  pop
+  IL_0008:  ret
+}");
+        }
+
+        [Fact]
+        [WorkItem(60905, "https://github.com/dotnet/roslyn/issues/60905")]
+        public void ReadValueAndDiscard_03()
+        {
+            var source =
+@"struct S<T>
+{
+    public T F;
+}
+class Program
+{
+    static void Main()
+    {
+        var s = new S<int>();
+        F(ref s);
+    }
+    static void F<T>(ref S<T> s)
+    {
+        ref T t = ref s.F;
+        _ = t;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size       10 (0xa)
+  .maxstack  1
+  .locals init (T& V_0) //t
+  IL_0000:  nop
+  IL_0001:  ldarg.0
+  IL_0002:  ldflda     ""T S<T>.F""
+  IL_0007:  stloc.0
+  IL_0008:  nop
+  IL_0009:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        8 (0x8)
+  .maxstack  1
+  IL_0000:  ldarg.0
+  IL_0001:  ldflda     ""T S<T>.F""
+  IL_0006:  pop
+  IL_0007:  ret
+}");
+        }
+
+        [Fact]
+        [WorkItem(60905, "https://github.com/dotnet/roslyn/issues/60905")]
+        public void ReadValueAndDiscard_04()
+        {
+            var source =
+@"struct S<T>
+{
+    public T F;
+}
+class Program
+{
+    static void Main()
+    {
+        F(new S<int>());
+    }
+    static void F<T>(in S<T> s)
+    {
+        ref readonly T t = ref s.F;
+        _ = t;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size       10 (0xa)
+  .maxstack  1
+  .locals init (T& V_0) //t
+  IL_0000:  nop
+  IL_0001:  ldarg.0
+  IL_0002:  ldflda     ""T S<T>.F""
+  IL_0007:  stloc.0
+  IL_0008:  nop
+  IL_0009:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        8 (0x8)
+  .maxstack  1
+  IL_0000:  ldarg.0
+  IL_0001:  ldflda     ""T S<T>.F""
+  IL_0006:  pop
+  IL_0007:  ret
+}");
+        }
+
+        [Fact]
+        public void ReadValueAndDiscard_05()
+        {
+            var source =
+@"struct S<T>
+{
+}
+class Program
+{
+    static void Main()
+    {
+        var s = new S<int>();
+        F(ref s);
+    }
+    static void F<T>(ref S<T> s)
+    {
+        _ = s;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        3 (0x3)
+  .maxstack  0
+  IL_0000:  nop
+  IL_0001:  nop
+  IL_0002:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        1 (0x1)
+  .maxstack  0
+  IL_0000:  ret
+}");
+        }
+
+        [Fact]
+        public void ReadValueAndDiscard_06()
+        {
+            var source =
+@"struct S<T>
+{
+}
+class Program
+{
+    static void Main()
+    {
+        F(new S<int>());
+    }
+    static void F<T>(in S<T> s)
+    {
+        _ = s;
+    }
+}";
+            var verifier = CompileAndVerify(source, options: TestOptions.DebugExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        3 (0x3)
+  .maxstack  0
+  IL_0000:  nop
+  IL_0001:  nop
+  IL_0002:  ret
+}");
+            verifier = CompileAndVerify(source, options: TestOptions.ReleaseExe, expectedOutput: "");
+            verifier.VerifyIL("Program.F<T>",
+@"{
+  // Code size        1 (0x1)
+  .maxstack  0
+  IL_0000:  ret
+}");
+        }
     }
 }

From ab741991bc466204c2433ab5d32c25b8c0614552 Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Tue, 10 May 2022 12:36:32 -0700
Subject: [PATCH 366/413] More SyntaxContext sharing for completion

---
 .../DeclarationNameCompletionProvider.cs            |  7 ++++---
 .../EnumAndCompletionListTagCompletionProvider.cs   |  4 ++--
 .../SnippetCompletionProvider.cs                    | 10 ++++++----
 .../SpeculativeTCompletionProvider.cs               | 13 ++++++-------
 .../TupleNameCompletionProvider.cs                  |  7 ++++---
 .../Providers/AbstractAwaitCompletionProvider.cs    |  3 +--
 .../Providers/AbstractKeywordCompletionProvider.cs  | 10 +++++-----
 .../AbstractPreprocessorCompletionProvider.cs       |  5 +----
 .../SharedSyntaxContextsWithSpeculativeModel.cs     |  8 ++++----
 .../Impl/Snippets/SnippetCompletionProvider.vb      |  3 +--
 10 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
index d18b025f07732..7395f923599a7 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
@@ -53,14 +53,15 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                 var position = completionContext.Position;
                 var document = completionContext.Document;
                 var cancellationToken = completionContext.CancellationToken;
-                var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
 
                 if (!completionContext.CompletionOptions.ShowNameSuggestions)
                 {
                     return;
                 }
 
-                var context = CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
+                var context = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as CSharpSyntaxContext;
+                Contract.ThrowIfNull(context);
+
                 if (context.IsInNonUserCode)
                 {
                     return;
@@ -77,7 +78,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                         AddNamesFromExistingOverloads(context, partialSemanticModel, result, cancellationToken);
                 }
 
-                var baseNames = GetBaseNames(semanticModel, nameInfo);
+                var baseNames = GetBaseNames(context.SemanticModel, nameInfo);
                 if (baseNames != default)
                 {
                     await GetRecommendedNamesAsync(baseNames, nameInfo, context, document, result, cancellationToken).ConfigureAwait(false);
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
index 35cd8755be451..e40458a90feeb 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
@@ -69,8 +69,8 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                 if (tree.IsInNonUserCode(position, cancellationToken))
                     return;
 
-                var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-                var syntaxContext = CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
+                var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
+                var semanticModel = syntaxContext.SemanticModel;
 
                 if (syntaxContext.IsInTaskLikeTypeContext)
                     return;
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
index c7f4aa577c010..2487f578a9f89 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/SnippetCompletionProvider.cs
@@ -65,7 +65,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
 
                     context.AddItems(await document.GetUnionItemsFromDocumentAndLinkedDocumentsAsync(
                         UnionCompletionItemComparer.Instance,
-                        d => GetSnippetsForDocumentAsync(d, position, cancellationToken)).ConfigureAwait(false));
+                        d => GetSnippetsForDocumentAsync(d, context, cancellationToken)).ConfigureAwait(false));
                 }
             }
             catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e, ErrorSeverity.General))
@@ -75,8 +75,9 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
         }
 
         private static async Task<ImmutableArray<CompletionItem>> GetSnippetsForDocumentAsync(
-            Document document, int position, CancellationToken cancellationToken)
+            Document document, CompletionContext completionContext, CancellationToken cancellationToken)
         {
+            var position = completionContext.Position;
             var syntaxTree = await document.GetRequiredSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
             var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
             var semanticFacts = document.GetRequiredLanguageService<ISemanticFactsService>();
@@ -93,8 +94,9 @@ private static async Task<ImmutableArray<CompletionItem>> GetSnippetsForDocument
                 return ImmutableArray<CompletionItem>.Empty;
             }
 
-            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-            var context = CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
+            var context = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
+            var semanticModel = context.SemanticModel;
+
             if (context.IsInTaskLikeTypeContext)
                 return ImmutableArray<CompletionItem>.Empty;
 
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
index 6683678142149..3a4c0bccc7421 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/SpeculativeTCompletionProvider.cs
@@ -17,6 +17,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.Providers
 {
@@ -43,11 +44,10 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
             try
             {
                 var document = context.Document;
-                var position = context.Position;
                 var cancellationToken = context.CancellationToken;
 
                 var showSpeculativeT = await document.IsValidContextForDocumentOrLinkedDocumentsAsync(
-                    (doc, ct) => ShouldShowSpeculativeTCompletionItemAsync(doc, position, ct),
+                    (doc, ct) => ShouldShowSpeculativeTCompletionItemAsync(doc, context, ct),
                     cancellationToken).ConfigureAwait(false);
 
                 if (showSpeculativeT)
@@ -63,8 +63,9 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
             }
         }
 
-        private static async Task<bool> ShouldShowSpeculativeTCompletionItemAsync(Document document, int position, CancellationToken cancellationToken)
+        private static async Task<bool> ShouldShowSpeculativeTCompletionItemAsync(Document document, CompletionContext completionContext, CancellationToken cancellationToken)
         {
+            var position = completionContext.Position;
             var syntaxTree = await document.GetRequiredSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
             if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
                 syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
@@ -75,10 +76,8 @@ private static async Task<bool> ShouldShowSpeculativeTCompletionItemAsync(Docume
             // We could be in the middle of a ref/generic/tuple type, instead of a simple T case.
             // If we managed to walk out and get a different SpanStart, we treat it as a simple $$T case.
 
-            var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
-            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(token.Parent, cancellationToken).ConfigureAwait(false);
+            var context = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
 
-            var context = CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
             if (context.IsInTaskLikeTypeContext)
                 return false;
 
@@ -87,7 +86,7 @@ private static async Task<bool> ShouldShowSpeculativeTCompletionItemAsync(Docume
             {
                 var oldSpanStart = spanStart;
 
-                spanStart = WalkOutOfGenericType(syntaxTree, spanStart, semanticModel, cancellationToken);
+                spanStart = WalkOutOfGenericType(syntaxTree, spanStart, context.SemanticModel, cancellationToken);
                 spanStart = WalkOutOfTupleType(syntaxTree, spanStart, cancellationToken);
                 spanStart = WalkOutOfRefType(syntaxTree, spanStart, cancellationToken);
 
diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
index 74049eb26f8b2..ddf523d620b1a 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/TupleNameCompletionProvider.cs
@@ -18,6 +18,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CSharp.Completion.Providers
 {
@@ -41,12 +42,12 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
             try
             {
                 var document = completionContext.Document;
-                var position = completionContext.Position;
                 var cancellationToken = completionContext.CancellationToken;
 
-                var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
+                var context = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as CSharpSyntaxContext;
+                Contract.ThrowIfNull(context);
 
-                var context = CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
+                var semanticModel = context.SemanticModel;
 
                 var index = GetElementIndex(context);
                 if (index == null)
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractAwaitCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractAwaitCompletionProvider.cs
index b80cd734385f5..e72f3b6b18ee5 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractAwaitCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractAwaitCompletionProvider.cs
@@ -88,8 +88,7 @@ public sealed override async Task ProvideCompletionsAsync(CompletionContext cont
             if (syntaxFacts.IsInNonUserCode(syntaxTree, position, cancellationToken))
                 return;
 
-            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-            var syntaxContext = document.GetRequiredLanguageService<ISyntaxContextService>().CreateContext(document, semanticModel, position, cancellationToken);
+            var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
 
             var isAwaitKeywordContext = IsAwaitKeywordContext(syntaxContext);
             var dotAwaitContext = GetDotAwaitKeywordContext(syntaxContext, cancellationToken);
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
index df0f01226be69..3bc5daf253762 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
@@ -36,15 +36,15 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
             {
                 context.AddItems(await context.Document.GetUnionItemsFromDocumentAndLinkedDocumentsAsync(
                     s_comparer,
-                    d => RecommendCompletionItemsAsync(d, context.Position, cancellationToken)).ConfigureAwait(false));
+                    d => RecommendCompletionItemsAsync(d, context, cancellationToken)).ConfigureAwait(false));
             }
         }
 
-        private async Task<ImmutableArray<CompletionItem>> RecommendCompletionItemsAsync(Document document, int position, CancellationToken cancellationToken)
+        private async Task<ImmutableArray<CompletionItem>> RecommendCompletionItemsAsync(Document document, CompletionContext context, CancellationToken cancellationToken)
         {
-            var syntaxContextService = document.GetRequiredLanguageService<ISyntaxContextService>();
-            var semanticModel = await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-            var syntaxContext = (TContext)syntaxContextService.CreateContext(document, semanticModel, position, cancellationToken);
+            var position = context.Position;
+            var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as TContext;
+            Contract.ThrowIfNull(syntaxContext);
             var keywords = await RecommendKeywordsAsync(document, position, syntaxContext, cancellationToken).ConfigureAwait(false);
             return keywords.SelectAsArray(k => CreateItem(k, syntaxContext, cancellationToken));
         }
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractPreprocessorCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractPreprocessorCompletionProvider.cs
index c1e64e5635016..f039c9496605a 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractPreprocessorCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractPreprocessorCompletionProvider.cs
@@ -20,11 +20,8 @@ public sealed override async Task ProvideCompletionsAsync(CompletionContext cont
             var cancellationToken = context.CancellationToken;
             var originatingDocument = context.Document;
             var position = context.Position;
-
-            var semanticModel = await originatingDocument.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(false);
-            var service = originatingDocument.GetRequiredLanguageService<ISyntaxContextService>();
             var solution = originatingDocument.Project.Solution;
-            var syntaxContext = service.CreateContext(originatingDocument, semanticModel, position, cancellationToken);
+            var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(originatingDocument, cancellationToken).ConfigureAwait(false);
             if (!syntaxContext.IsPreProcessorExpressionContext)
                 return;
 
diff --git a/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
index 888efbd984271..011b60958d0ed 100644
--- a/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
+++ b/src/Features/Core/Portable/Completion/SharedSyntaxContextsWithSpeculativeModel.cs
@@ -35,16 +35,16 @@ public Task<SyntaxContext> GetSyntaxContextAsync(Document document, Cancellation
                 if (_document.Id != document.Id && !_lazyRelatedDocumentIds.Value.Contains(document.Id))
                     throw new ArgumentException("Don't support getting SyntaxContext for document unrelated to the original document");
 
-                lazyContext = GetLazySyntaxContextWithSpeculativeModel(document);
+                lazyContext = GetLazySyntaxContextWithSpeculativeModel(document, this);
             }
 
             return lazyContext.GetValueAsync(cancellationToken);
 
             // Extract a local function to avoid creating a closure for code path of cache hit.
-            AsyncLazy<SyntaxContext> GetLazySyntaxContextWithSpeculativeModel(Document document)
+            static AsyncLazy<SyntaxContext> GetLazySyntaxContextWithSpeculativeModel(Document document, SharedSyntaxContextsWithSpeculativeModel self)
             {
-                return _cache.GetOrAdd(document, d => AsyncLazy.Create(cancellationToken
-                    => CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(d, _position, cancellationToken), cacheResult: true));
+                return self._cache.GetOrAdd(document, d => AsyncLazy.Create(cancellationToken
+                    => CompletionHelper.CreateSyntaxContextWithExistingSpeculativeModelAsync(d, self._position, cancellationToken), cacheResult: true));
             }
         }
     }
diff --git a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetCompletionProvider.vb b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetCompletionProvider.vb
index 685882e3d63db..53916c54a9c40 100644
--- a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetCompletionProvider.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetCompletionProvider.vb
@@ -89,8 +89,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Snippets
                 Return
             End If
 
-            Dim semanticModel = Await document.ReuseExistingSpeculativeModelAsync(position, cancellationToken).ConfigureAwait(False)
-            Dim syntaxContext = VisualBasicSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken)
+            Dim syntaxContext = Await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(False)
             If syntaxContext.IsInTaskLikeTypeContext Then
                 Return
             End If

From 79abb57568933445ab63be4be1710c12dfa469dc Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Tue, 10 May 2022 12:59:04 -0700
Subject: [PATCH 367/413] Share SyntaxContext for recommender based completion
 providers

---
 .../UnnamedSymbolCompletionProvider.cs                 |  6 +++---
 ...ractRecommendationServiceBasedCompletionProvider.cs |  2 +-
 .../Recommendations/AbstractRecommendationService.cs   | 10 ++++++++--
 .../Portable/Recommendations/IRecommendationService.cs |  6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/OperatorsAndIndexer/UnnamedSymbolCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/OperatorsAndIndexer/UnnamedSymbolCompletionProvider.cs
index 31206cffa7622..fe3c85da6775d 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/OperatorsAndIndexer/UnnamedSymbolCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/OperatorsAndIndexer/UnnamedSymbolCompletionProvider.cs
@@ -111,11 +111,11 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
                 return;
 
             var recommender = document.GetRequiredLanguageService<IRecommendationService>();
-
-            var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+            var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
+            var semanticModel = syntaxContext.SemanticModel;
 
             var options = context.CompletionOptions.ToRecommendationServiceOptions();
-            var recommendedSymbols = recommender.GetRecommendedSymbolsAtPosition(document, semanticModel, position, options, cancellationToken);
+            var recommendedSymbols = recommender.GetRecommendedSymbolsInContext(syntaxContext, options, cancellationToken);
 
             AddUnnamedSymbols(context, position, semanticModel, recommendedSymbols.UnnamedSymbols, cancellationToken);
         }
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
index f70eaaae6409d..a030f435b8f13 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractRecommendationServiceBasedCompletionProvider.cs
@@ -34,7 +34,7 @@ internal abstract class AbstractRecommendationServiceBasedCompletionProvider<TSy
         {
             var recommendationOptions = options.ToRecommendationServiceOptions();
             var recommender = context.GetRequiredLanguageService<IRecommendationService>();
-            var recommendedSymbols = recommender.GetRecommendedSymbolsAtPosition(context.Document, context.SemanticModel, position, recommendationOptions, cancellationToken);
+            var recommendedSymbols = recommender.GetRecommendedSymbolsInContext(context, recommendationOptions, cancellationToken);
 
             if (context.IsInTaskLikeTypeContext)
             {
diff --git a/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs b/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
index 8dea60dbbf689..c76c2a62ad3ea 100644
--- a/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
+++ b/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
@@ -26,7 +26,13 @@ protected abstract AbstractRecommendationServiceRunner CreateRunner(
         public RecommendedSymbols GetRecommendedSymbolsAtPosition(Document document, SemanticModel semanticModel, int position, RecommendationServiceOptions options, CancellationToken cancellationToken)
         {
             var context = CreateContext(document, semanticModel, position, cancellationToken);
-            var result = CreateRunner(context, options.FilterOutOfScopeLocals, cancellationToken).GetRecommendedSymbols();
+            return GetRecommendedSymbolsInContext(context, options, cancellationToken);
+        }
+
+        public RecommendedSymbols GetRecommendedSymbolsInContext(SyntaxContext syntaxContext, RecommendationServiceOptions options, CancellationToken cancellationToken)
+        {
+            var semanticModel = syntaxContext.SemanticModel;
+            var result = CreateRunner((TSyntaxContext)syntaxContext, options.FilterOutOfScopeLocals, cancellationToken).GetRecommendedSymbols();
 
             var namedSymbols = result.NamedSymbols;
             var unnamedSymbols = result.UnnamedSymbols;
@@ -34,7 +40,7 @@ public RecommendedSymbols GetRecommendedSymbolsAtPosition(Document document, Sem
             namedSymbols = namedSymbols.FilterToVisibleAndBrowsableSymbols(options.HideAdvancedMembers, semanticModel.Compilation);
             unnamedSymbols = unnamedSymbols.FilterToVisibleAndBrowsableSymbols(options.HideAdvancedMembers, semanticModel.Compilation);
 
-            var shouldIncludeSymbolContext = new ShouldIncludeSymbolContext(context, cancellationToken);
+            var shouldIncludeSymbolContext = new ShouldIncludeSymbolContext(syntaxContext, cancellationToken);
             namedSymbols = namedSymbols.WhereAsArray(shouldIncludeSymbolContext.ShouldIncludeSymbol);
             unnamedSymbols = unnamedSymbols.WhereAsArray(shouldIncludeSymbolContext.ShouldIncludeSymbol);
 
diff --git a/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs b/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
index 3f98c0059c492..b9a26a066cff8 100644
--- a/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
+++ b/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Threading;
 using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 
 namespace Microsoft.CodeAnalysis.Recommendations
 {
@@ -16,6 +17,11 @@ RecommendedSymbols GetRecommendedSymbolsAtPosition(
             int position,
             RecommendationServiceOptions options,
             CancellationToken cancellationToken);
+
+        RecommendedSymbols GetRecommendedSymbolsInContext(
+            SyntaxContext syntaxContext,
+            RecommendationServiceOptions options,
+            CancellationToken cancellationToken);
     }
 
     internal readonly struct RecommendedSymbols

From 8fd7a375c2ae6fe2d51f41af350ef66a9c6f2024 Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Tue, 10 May 2022 16:34:25 -0700
Subject: [PATCH 368/413] API consolidation

---
 .../DeclarationNameCompletionProvider.cs                 | 4 +---
 .../ChangeSignature/AbstractChangeSignatureService.cs    | 5 ++++-
 .../Providers/AbstractKeywordCompletionProvider.cs       | 3 +--
 .../Recommendations/CSharpRecommendationService.cs       | 3 ---
 .../Recommendations/AbstractRecommendationService.cs     | 9 ---------
 .../Portable/Recommendations/IRecommendationService.cs   | 7 -------
 .../Core/Portable/Recommendations/Recommender.cs         | 8 ++++++--
 .../Recommendations/VisualBasicRecommendationService.vb  | 4 ----
 8 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
index 7395f923599a7..f925da91abc72 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
@@ -59,9 +59,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                     return;
                 }
 
-                var context = await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as CSharpSyntaxContext;
-                Contract.ThrowIfNull(context);
-
+                var context = (CSharpSyntaxContext)await completionContext.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
                 if (context.IsInNonUserCode)
                 {
                     return;
diff --git a/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs b/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
index 238c8ca820e82..899e5425f85a0 100644
--- a/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
+++ b/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
@@ -24,6 +24,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Recommendations;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
@@ -916,7 +917,9 @@ private async Task<SyntaxNode> GenerateInferredCallsiteExpressionAsync(
             var recommender = document.GetRequiredLanguageService<IRecommendationService>();
 
             var options = RecommendationServiceOptions.From(document.Project);
-            var recommendations = recommender.GetRecommendedSymbolsAtPosition(document, semanticModel, position, options, cancellationToken).NamedSymbols;
+
+            var context = document.GetRequiredLanguageService<ISyntaxContextService>().CreateContext(document, semanticModel, position, cancellationToken);
+            var recommendations = recommender.GetRecommendedSymbolsInContext(context, options, cancellationToken).NamedSymbols;
 
             var sourceSymbols = recommendations.Where(r => r.IsNonImplicitAndFromSource());
 
diff --git a/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
index 3bc5daf253762..7caf809dfa7c3 100644
--- a/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
+++ b/src/Features/Core/Portable/Completion/Providers/AbstractKeywordCompletionProvider.cs
@@ -43,8 +43,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
         private async Task<ImmutableArray<CompletionItem>> RecommendCompletionItemsAsync(Document document, CompletionContext context, CancellationToken cancellationToken)
         {
             var position = context.Position;
-            var syntaxContext = await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false) as TContext;
-            Contract.ThrowIfNull(syntaxContext);
+            var syntaxContext = (TContext)await context.GetSyntaxContextWithExistingSpeculativeModelAsync(document, cancellationToken).ConfigureAwait(false);
             var keywords = await RecommendKeywordsAsync(document, position, syntaxContext, cancellationToken).ConfigureAwait(false);
             return keywords.SelectAsArray(k => CreateItem(k, syntaxContext, cancellationToken));
         }
diff --git a/src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs b/src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs
index 031295d9d0434..7c493ae409783 100644
--- a/src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs
+++ b/src/Workspaces/CSharp/Portable/Recommendations/CSharpRecommendationService.cs
@@ -20,9 +20,6 @@ public CSharpRecommendationService()
         {
         }
 
-        protected override CSharpSyntaxContext CreateContext(Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
-            => CSharpSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken);
-
         protected override AbstractRecommendationServiceRunner CreateRunner(CSharpSyntaxContext context, bool filterOutOfScopeLocals, CancellationToken cancellationToken)
             => new CSharpRecommendationServiceRunner(context, filterOutOfScopeLocals, cancellationToken);
     }
diff --git a/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs b/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
index c76c2a62ad3ea..29afdff7ab0f8 100644
--- a/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
+++ b/src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
@@ -17,18 +17,9 @@ namespace Microsoft.CodeAnalysis.Recommendations
     internal abstract partial class AbstractRecommendationService<TSyntaxContext> : IRecommendationService
         where TSyntaxContext : SyntaxContext
     {
-        protected abstract TSyntaxContext CreateContext(
-            Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken);
-
         protected abstract AbstractRecommendationServiceRunner CreateRunner(
             TSyntaxContext context, bool filterOutOfScopeLocals, CancellationToken cancellationToken);
 
-        public RecommendedSymbols GetRecommendedSymbolsAtPosition(Document document, SemanticModel semanticModel, int position, RecommendationServiceOptions options, CancellationToken cancellationToken)
-        {
-            var context = CreateContext(document, semanticModel, position, cancellationToken);
-            return GetRecommendedSymbolsInContext(context, options, cancellationToken);
-        }
-
         public RecommendedSymbols GetRecommendedSymbolsInContext(SyntaxContext syntaxContext, RecommendationServiceOptions options, CancellationToken cancellationToken)
         {
             var semanticModel = syntaxContext.SemanticModel;
diff --git a/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs b/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
index b9a26a066cff8..9227fe209690c 100644
--- a/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
+++ b/src/Workspaces/Core/Portable/Recommendations/IRecommendationService.cs
@@ -11,13 +11,6 @@ namespace Microsoft.CodeAnalysis.Recommendations
 {
     internal interface IRecommendationService : ILanguageService
     {
-        RecommendedSymbols GetRecommendedSymbolsAtPosition(
-            Document document,
-            SemanticModel semanticModel,
-            int position,
-            RecommendationServiceOptions options,
-            CancellationToken cancellationToken);
-
         RecommendedSymbols GetRecommendedSymbolsInContext(
             SyntaxContext syntaxContext,
             RecommendationServiceOptions options,
diff --git a/src/Workspaces/Core/Portable/Recommendations/Recommender.cs b/src/Workspaces/Core/Portable/Recommendations/Recommender.cs
index 63c8a351e2c27..153534b40fec3 100644
--- a/src/Workspaces/Core/Portable/Recommendations/Recommender.cs
+++ b/src/Workspaces/Core/Portable/Recommendations/Recommender.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery;
 
 namespace Microsoft.CodeAnalysis.Recommendations
 {
@@ -25,8 +26,10 @@ public static IEnumerable<ISymbol> GetRecommendedSymbolsAtPosition(
             var solution = workspace.CurrentSolution;
             options ??= solution.Options;
             var document = solution.GetRequiredDocument(semanticModel.SyntaxTree);
+            var context = document.GetRequiredLanguageService<ISyntaxContextService>().CreateContext(document, semanticModel, position, cancellationToken);
+
             var languageRecommender = document.GetRequiredLanguageService<IRecommendationService>();
-            return languageRecommender.GetRecommendedSymbolsAtPosition(document, semanticModel, position, RecommendationServiceOptions.From(options, document.Project.Language), cancellationToken).NamedSymbols;
+            return languageRecommender.GetRecommendedSymbolsInContext(context, RecommendationServiceOptions.From(options, document.Project.Language), cancellationToken).NamedSymbols;
         }
 
         [Obsolete("Use GetRecommendedSymbolsAtPositionAsync(Document, ...)")]
@@ -49,8 +52,9 @@ public static async Task<ImmutableArray<ISymbol>> GetRecommendedSymbolsAtPositio
             var solution = document.Project.Solution;
             var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             options ??= solution.Options;
+            var context = document.GetRequiredLanguageService<ISyntaxContextService>().CreateContext(document, semanticModel, position, cancellationToken);
             var languageRecommender = document.GetRequiredLanguageService<IRecommendationService>();
-            return languageRecommender.GetRecommendedSymbolsAtPosition(document, semanticModel, position, RecommendationServiceOptions.From(options, document.Project.Language), cancellationToken).NamedSymbols;
+            return languageRecommender.GetRecommendedSymbolsInContext(context, RecommendationServiceOptions.From(options, document.Project.Language), cancellationToken).NamedSymbols;
         }
     }
 }
diff --git a/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb b/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb
index 4e8f0c5ebc35b..e1caff2aef8c8 100644
--- a/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb
+++ b/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb
@@ -18,10 +18,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Recommendations
         Public Sub New()
         End Sub
 
-        Protected Overrides Function CreateContext(document As Document, semanticModel As SemanticModel, position As Integer, cancellationToken As CancellationToken) As VisualBasicSyntaxContext
-            Return VisualBasicSyntaxContext.CreateContext(document, semanticModel, position, cancellationToken)
-        End Function
-
         Protected Overrides Function CreateRunner(context As VisualBasicSyntaxContext, filterOutOfScopeLocals As Boolean, cancellationToken As CancellationToken) As AbstractRecommendationServiceRunner
             Return New VisualBasicRecommendationServiceRunner(context, filterOutOfScopeLocals, cancellationToken)
         End Function

From ef25bafb4639312ab17eb0f45c0a796156cb60b9 Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Tue, 10 May 2022 16:50:21 +0530
Subject: [PATCH 369/413] Add FixAll in Project and Solution support for
 AddFileBanner refactoring

---
 .../AddFileBannerTests_FixAll.cs              | 329 ++++++++++++++++++
 .../CodeActions/AbstractCodeActionTest.cs     |   6 +-
 ...actAddFileBannerCodeRefactoringProvider.cs |  66 +++-
 3 files changed, 391 insertions(+), 10 deletions(-)
 create mode 100644 src/EditorFeatures/CSharpTest/AddFileBanner/AddFileBannerTests_FixAll.cs

diff --git a/src/EditorFeatures/CSharpTest/AddFileBanner/AddFileBannerTests_FixAll.cs b/src/EditorFeatures/CSharpTest/AddFileBanner/AddFileBannerTests_FixAll.cs
new file mode 100644
index 0000000000000..2ce455a0486f0
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/AddFileBanner/AddFileBannerTests_FixAll.cs
@@ -0,0 +1,329 @@
+// 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.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddFileBanner
+{
+    [Trait(Traits.Feature, Traits.Features.CodeActionsAddFileBanner)]
+    public partial class AddFileBannerTests : AbstractCSharpCodeActionTest
+    {
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInProject()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>{|FixAllInProject:|}using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+        <Document>
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>// This is the banner
+
+using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+        <Document>// This is the banner
+
+
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAllInSolution()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>{|FixAllInSolution:|}using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>// This is the banner
+
+using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+    </Project>
+    <Project Language=""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
+        <Document>// This is the banner
+
+
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAll_AlreadyHasBanner()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>{|FixAllInProject:|}using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+        <Document>
+class Program3
+{
+}
+        </Document>
+        <Document>// This is the banner
+// It goes over multiple lines
+
+class Program4
+{
+}
+        </Document>
+        <Document>/** This is the banner
+* It goes over multiple lines
+*/
+
+class Program5
+{
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>// This is the banner
+
+using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{
+}
+        </Document>
+        <Document>// This is the banner
+
+
+class Program3
+{
+}
+        </Document>
+        <Document>// This is the banner
+// It goes over multiple lines
+
+class Program4
+{
+}
+        </Document>
+        <Document>/** This is the banner
+* It goes over multiple lines
+*/
+
+class Program5
+{
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        public async Task FixAll_UpdatedFileNameInBanner()
+        {
+            await TestInRegularAndScriptAsync(
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document FilePath=""Bar1.cs"">{|FixAllInProject:|}using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Bar2.cs"">// This is the banner in Bar2.cs
+// It goes over multiple lines.  This line has Baz.cs
+// The last line includes Bar2.cs
+
+class Program2
+{
+}
+        </Document>
+        <Document FilePath=""Bar3.cs"">
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>",
+@"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document FilePath=""Bar1.cs"">// This is the banner in Bar1.cs
+// It goes over multiple lines.  This line has Baz.cs
+// The last line includes Bar1.cs
+
+using System;
+
+class Program1
+{
+    static void Main()
+    {
+    }
+}
+        </Document>
+        <Document FilePath=""Bar2.cs"">// This is the banner in Bar2.cs
+// It goes over multiple lines.  This line has Baz.cs
+// The last line includes Bar2.cs
+
+class Program2
+{
+}
+        </Document>
+        <Document FilePath=""Bar3.cs"">// This is the banner in Bar3.cs
+// It goes over multiple lines.  This line has Baz.cs
+// The last line includes Bar3.cs
+
+
+class Program3
+{
+}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+
+        [Theory, Trait(Traits.Feature, Traits.Features.CodeActionsFixAllOccurrences)]
+        [InlineData(FixAllScope.ContainingMember)]
+        [InlineData(FixAllScope.ContainingType)]
+        [InlineData(FixAllScope.Document)]
+        public async Task FixAllScopes_NotApplicable(FixAllScope fixAllScope)
+        {
+            var fixAllScopeString = $"FixAllIn{fixAllScope}";
+
+            await TestMissingInRegularAndScriptAsync(
+@$"
+<Workspace>
+    <Project Language=""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
+        <Document>{{|{fixAllScopeString}:|}}using System;
+
+class Program1
+{{
+    static void Main()
+    {{
+    }}
+}}
+        </Document>
+        <Document>// This is the banner
+
+class Program2
+{{
+}}
+        </Document>
+    </Project>
+</Workspace>");
+        }
+    }
+}
diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
index c7171dcc969a3..0cc536d9d6345 100644
--- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
+++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/AbstractCodeActionTest.cs
@@ -66,6 +66,9 @@ protected abstract CodeRefactoringProvider CreateCodeRefactoringProvider(
 
             var fixAllCodeAction = await GetFixAllFixAsync(actionToInvoke,
                 refactoring.Provider, refactoring.CodeActionOptionsProvider, document, span, fixAllScope.Value).ConfigureAwait(false);
+            if (fixAllCodeAction == null)
+                return (ImmutableArray<CodeAction>.Empty, null);
+
             return (ImmutableArray.Create(fixAllCodeAction), fixAllCodeAction);
         }
 
@@ -78,7 +81,8 @@ private static async Task<CodeAction> GetFixAllFixAsync(
             FixAllScope scope)
         {
             var fixAllProvider = provider.GetFixAllProvider();
-            Assert.NotNull(fixAllProvider);
+            if (fixAllProvider == null || !fixAllProvider.GetSupportedFixAllScopes().Contains(scope))
+                return null;
 
             var fixAllState = new FixAllState(fixAllProvider, document, selectionSpan, provider, optionsProvider, scope, originalCodeAction);
             var fixAllContext = new FixAllContext(fixAllState, new ProgressTracker(), CancellationToken.None);
diff --git a/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs b/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
index abea0ab575aea..ae02421ad45f7 100644
--- a/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
+++ b/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
@@ -2,30 +2,36 @@
 // 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.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.AddFileBanner
 {
-    internal abstract class AbstractAddFileBannerCodeRefactoringProvider : CodeRefactoringProvider
+    internal abstract class AbstractAddFileBannerCodeRefactoringProvider : SyntaxEditorBasedCodeRefactoringProvider
     {
         protected abstract bool IsCommentStartCharacter(char ch);
 
         protected abstract SyntaxTrivia CreateTrivia(SyntaxTrivia trivia, string text);
 
+        protected sealed override ImmutableArray<FixAllScope> SupportedFixAllScopes { get; }
+            = ImmutableArray.Create(FixAllScope.Project, FixAllScope.Solution);
+
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
             var (document, span, cancellationToken) = context;
@@ -52,10 +58,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                 return;
             }
 
-            var bannerService = document.GetRequiredLanguageService<IFileBannerFactsService>();
-            var banner = bannerService.GetFileBanner(root);
-
-            if (banner.Length > 0)
+            if (HasExistingBanner(document, root))
             {
                 // Already has a banner.
                 return;
@@ -85,21 +88,35 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                         CodeAction.Create(
                             CodeFixesResources.Add_file_header,
                             _ => AddBannerAsync(document, root, siblingDocument, siblingBanner),
-                            nameof(CodeFixesResources.Add_file_header)),
+                            equivalenceKey: siblingDocument.FilePath),
                         new Text.TextSpan(position, length: 0));
                     return;
                 }
             }
         }
 
+        private static bool HasExistingBanner(Document document, SyntaxNode root)
+        {
+            var bannerService = document.GetRequiredLanguageService<IFileBannerFactsService>();
+            var banner = bannerService.GetFileBanner(root);
+            return banner.Length > 0;
+        }
+
         private Task<Document> AddBannerAsync(
             Document document, SyntaxNode root,
             Document siblingDocument, ImmutableArray<SyntaxTrivia> banner)
+        {
+            var newRoot = GetRootWithAddedBanner(document, root, siblingDocument, banner);
+            return Task.FromResult(document.WithSyntaxRoot(newRoot));
+        }
+
+        private SyntaxNode GetRootWithAddedBanner(
+            Document document, SyntaxNode root,
+            Document siblingDocument, ImmutableArray<SyntaxTrivia> banner)
         {
             banner = UpdateEmbeddedFileNames(siblingDocument, document, banner);
 
-            var newRoot = root.WithPrependedLeadingTrivia(new SyntaxTriviaList(banner));
-            return Task.FromResult(document.WithSyntaxRoot(newRoot));
+            return root.WithPrependedLeadingTrivia(new SyntaxTriviaList(banner));
         }
 
         /// <summary>
@@ -151,5 +168,36 @@ private async Task<ImmutableArray<SyntaxTrivia>> TryGetBannerAsync(
             var token = syntaxFacts.ParseToken(text.ToString());
             return bannerService.GetFileBanner(token);
         }
+
+        protected sealed override async Task FixAllAsync(
+            Document document,
+            ImmutableArray<TextSpan> fixAllSpans,
+            SyntaxEditor editor,
+            CodeActionOptionsProvider optionsProvider,
+            string? equivalenceKey,
+            CancellationToken cancellationToken)
+        {
+            // Bail out if the document to fix already has an existing banner.
+            var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            if (HasExistingBanner(document, root))
+                return;
+
+            // Get the source document ID with existing banner.
+            // This banner will be added to the document to be fixed.
+            // Equivalence key is the file path to this source document.
+            var sourceDocumentId = document.Project.Solution.GetDocumentIdsWithFilePath(equivalenceKey).FirstOrDefault();
+            if (sourceDocumentId == null)
+                return;
+
+            // Get the existing banner from the source document.
+            var sourceDocument = document.Project.Solution.GetRequiredDocument(sourceDocumentId);
+            var sourceRoot = await sourceDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var banner = await TryGetBannerAsync(sourceDocument, sourceRoot, cancellationToken).ConfigureAwait(false);
+            Debug.Assert(banner.Length > 0);
+
+            // Finally add the banner to the document to be fixed.
+            var newRoot = GetRootWithAddedBanner(document, root, sourceDocument, banner);
+            editor.ReplaceNode(editor.OriginalRoot, newRoot);
+        }
     }
 }

From f666eef0acac4bee1ef2e8f4ac81f1b421e835a2 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Wed, 11 May 2022 08:25:36 -0400
Subject: [PATCH 370/413] Simplify RegexCharClass.IsWordChar

Roslyn contains a copy of RegexCharClass code from several years ago; it's been overhauled since, and the implementation of IsWordChar (now renamed to IsBoundaryWordChar to better reflect what it is) was improved; since Roslyn doesn't actually need all of the character set processing code, which IsBoundaryWordChar no longer uses, we can remove a bunch of unnecessary stuff.  This will now be simpler and faster.
---
 .../RegularExpressions/RegexCharClass.cs      | 225 +++---------------
 .../RegularExpressions/RegexLexer.cs          |   2 +-
 .../RegularExpressions/RegexParser.cs         |   2 +-
 3 files changed, 30 insertions(+), 199 deletions(-)

diff --git a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexCharClass.cs b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexCharClass.cs
index b2f4259abd21a..8132d6186e339 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexCharClass.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexCharClass.cs
@@ -6,8 +6,9 @@
 
 // LICENSING NOTE: The license for this file is from the originating 
 // source and not the general https://github.com/dotnet/roslyn license.
-// See https://github.com/dotnet/corefx/blob/68b76c30eafb3647c11e3f766a2645b130ca1448/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs
+// See https://github.com/dotnet/runtime/blob/5b5bd46c03c86f8545f2c4c8628ac25d875210fe/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCharClass.cs
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -23,19 +24,6 @@ namespace Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions
     /// </summary>
     internal static class RegexCharClass
     {
-        private const int FLAGS = 0;
-        private const int SETLENGTH = 1;
-        private const int CATEGORYLENGTH = 2;
-        private const int SETSTART = 3;
-
-        private const short SpaceConst = 100;
-        private const short NotSpaceConst = -100;
-
-        private const char ZeroWidthJoiner = '\u200D';
-        private const char ZeroWidthNonJoiner = '\u200C';
-
-        private const string WordClass = "\u0000\u0000\u000A\u0000\u0002\u0004\u0005\u0003\u0001\u0006\u0009\u0013\u0000";
-
         public static readonly Dictionary<string, (string shortDescription, string longDescription)> EscapeCategories =
             new()
             {
@@ -201,7 +189,7 @@ internal static class RegexCharClass
         public static bool IsEscapeCategory(string value)
             => EscapeCategories.ContainsKey(value);
 
-        public static bool IsWordChar(VirtualChar r)
+        public static bool IsBoundaryWordChar(VirtualChar r)
         {
             // unicode characters that do not fit in 16bits are not supported by 
             // .net regex system.
@@ -209,198 +197,41 @@ public static bool IsWordChar(VirtualChar r)
                 return false;
 
             var ch = (char)r.Value;
+
             // According to UTS#18 Unicode Regular Expressions (http://www.unicode.org/reports/tr18/)
             // RL 1.4 Simple Word Boundaries  The class of <word_character> includes all Alphabetic
             // values from the Unicode character database, from UnicodeData.txt [UData], plus the U+200C
             // ZERO WIDTH NON-JOINER and U+200D ZERO WIDTH JOINER.
-            return CharInClass(ch, WordClass) || ch == ZeroWidthJoiner || ch == ZeroWidthNonJoiner;
-        }
-
-        internal static bool CharInClass(char ch, string set)
-            => CharInClassRecursive(ch, set, 0);
 
-        internal static bool CharInClassRecursive(char ch, string set, int start)
-        {
-            int mySetLength = set[start + SETLENGTH];
-            int myCategoryLength = set[start + CATEGORYLENGTH];
-            var myEndPosition = start + SETSTART + mySetLength + myCategoryLength;
-
-            var subtracted = false;
-
-            if (set.Length > myEndPosition)
+            // Fast lookup in our lookup table for ASCII characters.  This is purely an optimization, and has the
+            // behavior as if we fell through to the switch below (which was actually used to produce the lookup table).
+            ReadOnlySpan<byte> asciiLookup = new byte[]
             {
-                subtracted = CharInClassRecursive(ch, set, myEndPosition);
-            }
-
-            var b = CharInClassInternal(ch, set, start, mySetLength, myCategoryLength);
-
-            // Note that we apply the negation *before* performing the subtraction.  This is because
-            // the negation only applies to the first char class, not the entire subtraction.
-            if (set[start + FLAGS] == 1)
-                b = !b;
-
-            return b && !subtracted;
-        }
-
-        /// <summary>
-        /// Determines a character's membership in a character class (via the
-        /// string representation of the class).
-        /// </summary>
-        private static bool CharInClassInternal(char ch, string set, int start, int mySetLength, int myCategoryLength)
-        {
-            int min;
-            int max;
-            int mid;
-            min = start + SETSTART;
-            max = min + mySetLength;
-
-            while (min != max)
-            {
-                mid = (min + max) / 2;
-                if (ch < set[mid])
-                    max = mid;
-                else
-                    min = mid + 1;
-            }
-
-            // The starting position of the set within the character class determines
-            // whether what an odd or even ending position means.  If the start is odd,
-            // an *even* ending position means the character was in the set.  With recursive
-            // subtractions in the mix, the starting position = start+SETSTART.  Since we know that
-            // SETSTART is odd, we can simplify it out of the equation.  But if it changes we need to
-            // reverse this check.
-            Debug.Assert((SETSTART & 0x1) == 1, "If SETSTART is not odd, the calculation below this will be reversed");
-            if ((min & 0x1) == (start & 0x1))
-            {
-                return true;
-            }
-            else
-            {
-                if (myCategoryLength == 0)
-                    return false;
-
-                return CharInCategory(ch, set, start, mySetLength, myCategoryLength);
-            }
-        }
-
-        private static bool CharInCategory(char ch, string set, int start, int mySetLength, int myCategoryLength)
-        {
-            var chcategory = CharUnicodeInfo.GetUnicodeCategory(ch);
-
-            var i = start + SETSTART + mySetLength;
-            var end = i + myCategoryLength;
-            while (i < end)
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
+                0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07
+            };
+            var chDiv8 = ch >> 3;
+            if ((uint)chDiv8 < (uint)asciiLookup.Length)
             {
-                int curcat = unchecked((short)set[i]);
-
-                if (curcat == 0)
-                {
-                    // zero is our marker for a group of categories - treated as a unit
-                    if (CharInCategoryGroup(chcategory, set, ref i))
-                        return true;
-                }
-                else if (curcat > 0)
-                {
-                    // greater than zero is a positive case
-
-                    if (curcat == SpaceConst)
-                    {
-                        if (char.IsWhiteSpace(ch))
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            i++;
-                            continue;
-                        }
-                    }
-
-                    --curcat;
-
-                    if (chcategory == (UnicodeCategory)curcat)
-                        return true;
-                }
-                else
-                {
-                    // less than zero is a negative case
-                    if (curcat == NotSpaceConst)
-                    {
-                        if (!char.IsWhiteSpace(ch))
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            i++;
-                            continue;
-                        }
-                    }
-
-                    //curcat = -curcat;
-                    //--curcat;
-                    curcat = -1 - curcat;
-
-                    if (chcategory != (UnicodeCategory)curcat)
-                        return true;
-                }
-
-                i++;
+                return (asciiLookup[chDiv8] & (1 << (ch & 0x7))) != 0;
             }
 
-            return false;
-        }
-
-        /// <summary>
-        /// This is used for categories which are composed of other categories - L, N, Z, W...
-        /// These groups need special treatment when they are negated
-        /// </summary>
-        private static bool CharInCategoryGroup(UnicodeCategory chcategory, string category, ref int i)
-        {
-            i++;
-
-            int curcat = unchecked((short)category[i]);
-            if (curcat > 0)
-            {
-                // positive case - the character must be in ANY of the categories in the group
-                var answer = false;
-
-                while (curcat != 0)
-                {
-                    if (!answer)
-                    {
-                        --curcat;
-                        if (chcategory == (UnicodeCategory)curcat)
-                            answer = true;
-                    }
-
-                    i++;
-                    curcat = (short)category[i];
-                }
-
-                return answer;
-            }
-            else
+            // For non-ASCII, fall back to checking the Unicode category.
+            switch (CharUnicodeInfo.GetUnicodeCategory(ch))
             {
-                // negative case - the character must be in NONE of the categories in the group
-                var answer = true;
-
-                while (curcat != 0)
-                {
-                    if (answer)
-                    {
-                        //curcat = -curcat;
-                        //--curcat;
-                        curcat = -1 - curcat;
-                        if (chcategory == (UnicodeCategory)curcat)
-                            answer = false;
-                    }
-
-                    i++;
-                    curcat = unchecked((short)category[i]);
-                }
-
-                return answer;
+                case UnicodeCategory.UppercaseLetter:
+                case UnicodeCategory.LowercaseLetter:
+                case UnicodeCategory.TitlecaseLetter:
+                case UnicodeCategory.ModifierLetter:
+                case UnicodeCategory.OtherLetter:
+                case UnicodeCategory.NonSpacingMark:
+                case UnicodeCategory.DecimalDigitNumber:
+                case UnicodeCategory.ConnectorPunctuation:
+                    return true;
+
+                default:
+                    const char ZeroWidthNonJoiner = '\u200C', ZeroWidthJoiner = '\u200D';
+                    return ch == ZeroWidthJoiner | ch == ZeroWidthNonJoiner;
             }
         }
     }
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexLexer.cs b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexLexer.cs
index 67d8857a39fc9..bae99dcd9acb1 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexLexer.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexLexer.cs
@@ -318,7 +318,7 @@ private static bool IsEscapeCategoryChar(VirtualChar ch)
             }
 
             var start = Position;
-            while (Position < Text.Length && RegexCharClass.IsWordChar(this.CurrentChar))
+            while (Position < Text.Length && RegexCharClass.IsBoundaryWordChar(this.CurrentChar))
             {
                 Position++;
             }
diff --git a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexParser.cs b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexParser.cs
index 5cdb192796e59..eec8285e4eaba 100644
--- a/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexParser.cs
+++ b/src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexParser.cs
@@ -1877,7 +1877,7 @@ private RegexEscapeNode ParseCharEscape(RegexToken backslashToken, bool allowTri
                 default:
                     var typeToken = ConsumeCurrentToken(allowTrivia: allowTriviaAfterEnd).With(kind: RegexKind.TextToken);
 
-                    if (!HasOption(_options, RegexOptions.ECMAScript) && RegexCharClass.IsWordChar(ch))
+                    if (!HasOption(_options, RegexOptions.ECMAScript) && RegexCharClass.IsBoundaryWordChar(ch))
                     {
                         typeToken = typeToken.AddDiagnosticIfNone(new EmbeddedDiagnostic(
                             string.Format(FeaturesResources.Unrecognized_escape_sequence_0, ch),

From b743a2a6d659116386adfb0aace4146ae5170a7f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 08:57:22 -0700
Subject: [PATCH 371/413] Update FindRefs API to support searching for multiple
 symbols at the same time

---
 ...encesSearchEngine.NonCascadingSymbolSet.cs |  6 +--
 .../FindReferencesSearchEngine.SymbolSet.cs   | 37 ++++++++++++-------
 .../FindReferencesSearchEngine.cs             | 11 +++++-
 .../FindSymbols/StreamingProgressCollector.cs |  3 +-
 .../SymbolFinder_FindRenamableReferences.cs   | 10 ++++-
 .../Core/Portable/Rename/RenameLocations.cs   |  3 +-
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.NonCascadingSymbolSet.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.NonCascadingSymbolSet.cs
index ede3c3df2bb7b..1b2de9b3250bd 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.NonCascadingSymbolSet.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.NonCascadingSymbolSet.cs
@@ -18,10 +18,8 @@ private sealed class NonCascadingSymbolSet : SymbolSet
         {
             private readonly ImmutableArray<ISymbol> _symbols;
 
-            public NonCascadingSymbolSet(FindReferencesSearchEngine engine, ISymbol searchSymbol) : base(engine)
-            {
-                _symbols = ImmutableArray.Create(searchSymbol);
-            }
+            public NonCascadingSymbolSet(FindReferencesSearchEngine engine, MetadataUnifyingSymbolHashSet searchSymbols) : base(engine)
+                => _symbols = searchSymbols.ToImmutableArray();
 
             public override ImmutableArray<ISymbol> GetAllSymbols()
                 => _symbols;
diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.SymbolSet.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.SymbolSet.cs
index 7728bd2e81297..8500841c42669 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.SymbolSet.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.SymbolSet.cs
@@ -33,9 +33,7 @@ private abstract class SymbolSet
             protected readonly FindReferencesSearchEngine Engine;
 
             protected SymbolSet(FindReferencesSearchEngine engine)
-            {
-                Engine = engine;
-            }
+                => Engine = engine;
 
             protected Solution Solution => Engine._solution;
 
@@ -53,8 +51,8 @@ protected SymbolSet(FindReferencesSearchEngine engine)
             /// will add Goo.Goo is added to the set as well so that references to it can be found.
             /// </summary>
             /// <remarks>
-            /// This method is non threadsafe as it mutates the symbol set instance.  As such, it should only be
-            /// called serially.  <see cref="GetAllSymbols"/> should not be called concurrently with this.
+            /// This method is non thread-safe as it mutates the symbol set instance.  As such, it should only be called
+            /// serially.  <see cref="GetAllSymbols"/> should not be called concurrently with this.
             /// </remarks>
             public abstract Task InheritanceCascadeAsync(Project project, CancellationToken cancellationToken);
 
@@ -62,26 +60,26 @@ private static bool InvolvesInheritance(ISymbol symbol)
                 => symbol.Kind is SymbolKind.Method or SymbolKind.Property or SymbolKind.Event;
 
             public static async Task<SymbolSet> CreateAsync(
-                FindReferencesSearchEngine engine, ISymbol symbol, CancellationToken cancellationToken)
+                FindReferencesSearchEngine engine, MetadataUnifyingSymbolHashSet symbols, CancellationToken cancellationToken)
             {
                 var solution = engine._solution;
                 var options = engine._options;
 
                 // Start by mapping the initial symbol to the appropriate source symbol in originating project if possible.
-                var searchSymbol = await MapToAppropriateSymbolAsync(solution, symbol, cancellationToken).ConfigureAwait(false);
+                var searchSymbols = await MapToAppropriateSymbolsAsync(solution, symbols, cancellationToken).ConfigureAwait(false);
 
                 // If the caller doesn't want any cascading then just return an appropriate set that will just point at
                 // only the search symbol and won't cascade to any related symbols, linked symbols, or inheritance
                 // symbols.
                 if (!options.Cascade)
-                    return new NonCascadingSymbolSet(engine, searchSymbol);
+                    return new NonCascadingSymbolSet(engine, searchSymbols);
 
                 // Keep track of the initial symbol group corresponding to search-symbol.  Any references to this group
                 // will always be reported.
                 //
                 // Depending on what type of search we're doing, return an appropriate set that will have those
                 // inheritance cascading semantics.
-                var initialSymbols = await DetermineInitialSearchSymbolsAsync(engine, searchSymbol, cancellationToken).ConfigureAwait(false);
+                var initialSymbols = await DetermineInitialSearchSymbolsAsync(engine, searchSymbols, cancellationToken).ConfigureAwait(false);
 
                 // Walk and find all the symbols above the starting symbol set. 
                 var upSymbols = await DetermineInitialUpSymbolsAsync(engine, initialSymbols, cancellationToken).ConfigureAwait(false);
@@ -91,6 +89,16 @@ public static async Task<SymbolSet> CreateAsync(
                     : new BidirectionalSymbolSet(engine, initialSymbols, upSymbols);
             }
 
+            private static async Task<MetadataUnifyingSymbolHashSet> MapToAppropriateSymbolsAsync(
+                Solution solution, MetadataUnifyingSymbolHashSet symbols, CancellationToken cancellationToken)
+            {
+                var result = new MetadataUnifyingSymbolHashSet();
+                foreach (var symbol in symbols)
+                    result.Add(await MapToAppropriateSymbolAsync(solution, symbol, cancellationToken).ConfigureAwait(false));
+
+                return result;
+            }
+
             private static async Task<ISymbol> MapToAppropriateSymbolAsync(
                 Solution solution, ISymbol symbol, CancellationToken cancellationToken)
             {
@@ -121,19 +129,20 @@ private static async Task<ISymbol> MapToAppropriateSymbolAsync(
 
             /// <summary>
             /// Determines the initial set of symbols that we should actually be finding references for given a request
-            /// to find refs to <paramref name="symbol"/>.  This will include any symbols that a specific <see
+            /// to find refs to <paramref name="symbols"/>.  This will include any symbols that a specific <see
             /// cref="IReferenceFinder"/> cascades to, as well as all the linked symbols to those across any
-            /// multi-targetting/shared-project documents.  This will not include symbols up or down the inheritance
+            /// multi-targeting/shared-project documents.  This will not include symbols up or down the inheritance
             /// hierarchy.
             /// </summary>
             private static async Task<MetadataUnifyingSymbolHashSet> DetermineInitialSearchSymbolsAsync(
-                FindReferencesSearchEngine engine, ISymbol symbol, CancellationToken cancellationToken)
+                FindReferencesSearchEngine engine, MetadataUnifyingSymbolHashSet symbols, CancellationToken cancellationToken)
             {
                 var result = new MetadataUnifyingSymbolHashSet();
                 var workQueue = new Stack<ISymbol>();
 
-                // Start with the initial symbol we're searching for.
-                workQueue.Push(symbol);
+                // Start with the initial symbols we're searching for.
+                foreach (var symbol in symbols)
+                    workQueue.Push(symbol);
 
                 // As long as there's work in the queue, keep going.
                 while (workQueue.Count > 0)
diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
index 2b38a4078d551..7b64153454387 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
@@ -63,8 +63,15 @@ public FindReferencesSearchEngine(
             _scheduler = _options.Explicit ? TaskScheduler.Default : s_exclusiveScheduler;
         }
 
-        public async Task FindReferencesAsync(ISymbol symbol, CancellationToken cancellationToken)
+        public Task FindReferencesAsync(ISymbol symbol, CancellationToken cancellationToken)
+            => FindReferencesAsync(ImmutableArray.Create(symbol), cancellationToken);
+
+        public async Task FindReferencesAsync(
+            ImmutableArray<ISymbol> symbols, CancellationToken cancellationToken)
         {
+            var unifiedSymbols = new MetadataUnifyingSymbolHashSet();
+            unifiedSymbols.AddRange(symbols);
+
             await _progress.OnStartedAsync(cancellationToken).ConfigureAwait(false);
             try
             {
@@ -73,7 +80,7 @@ public async Task FindReferencesAsync(ISymbol symbol, CancellationToken cancella
 
                 // Create the initial set of symbols to search for.  As we walk the appropriate projects in the solution
                 // we'll expand this set as we dicover new symbols to search for in each project.
-                var symbolSet = await SymbolSet.CreateAsync(this, symbol, cancellationToken).ConfigureAwait(false);
+                var symbolSet = await SymbolSet.CreateAsync(this, unifiedSymbols, cancellationToken).ConfigureAwait(false);
 
                 // Report the initial set of symbols to the caller.
                 var allSymbols = symbolSet.GetAllSymbols();
diff --git a/src/Workspaces/Core/Portable/FindSymbols/StreamingProgressCollector.cs b/src/Workspaces/Core/Portable/FindSymbols/StreamingProgressCollector.cs
index c39bf95521b3d..092a4bb0f8546 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/StreamingProgressCollector.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/StreamingProgressCollector.cs
@@ -28,8 +28,7 @@ internal class StreamingProgressCollector : IStreamingFindReferencesProgress
         private readonly object _gate = new();
         private readonly IStreamingFindReferencesProgress _underlyingProgress;
 
-        private readonly Dictionary<ISymbol, List<ReferenceLocation>> _symbolToLocations =
-            new();
+        private readonly Dictionary<ISymbol, List<ReferenceLocation>> _symbolToLocations = new();
 
         public IStreamingProgressTracker ProgressTracker => _underlyingProgress.ProgressTracker;
 
diff --git a/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs b/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
index 058cdb47c58c5..1ff6c99a3a5c5 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
@@ -12,8 +12,14 @@ namespace Microsoft.CodeAnalysis.FindSymbols
 {
     public static partial class SymbolFinder
     {
+        internal static Task<ImmutableArray<ReferencedSymbol>> FindRenamableReferencesAsync(
+            ISymbol symbol, Solution solution, CancellationToken cancellationToken)
+        {
+            return FindRenamableReferencesAsync(ImmutableArray.Create(symbol), solution, cancellationToken);
+        }
+
         internal static async Task<ImmutableArray<ReferencedSymbol>> FindRenamableReferencesAsync(
-            ISymbol symbol,
+            ImmutableArray<ISymbol> symbols,
             Solution solution,
             CancellationToken cancellationToken)
         {
@@ -28,7 +34,7 @@ internal static async Task<ImmutableArray<ReferencedSymbol>> FindRenamableRefere
                     streamingProgress,
                     FindReferencesSearchOptions.Default);
 
-                await engine.FindReferencesAsync(symbol, cancellationToken).ConfigureAwait(false);
+                await engine.FindReferencesAsync(symbols, cancellationToken).ConfigureAwait(false);
                 return streamingProgress.GetReferencedSymbols();
             }
         }
diff --git a/src/Workspaces/Core/Portable/Rename/RenameLocations.cs b/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
index 839e01c328760..37fdaa82e7425 100644
--- a/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
+++ b/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
@@ -199,8 +199,7 @@ private static async Task<SearchResult> AddLocationsReferenceSymbolsAsync(
             CancellationToken cancellationToken)
         {
             var locations = ImmutableHashSet.CreateBuilder<RenameLocation>();
-            var referenceSymbols = await SymbolFinder.FindRenamableReferencesAsync(
-                symbol, solution, cancellationToken).ConfigureAwait(false);
+            var referenceSymbols = await SymbolFinder.FindRenamableReferencesAsync(symbol, solution, cancellationToken).ConfigureAwait(false);
 
             foreach (var referencedSymbol in referenceSymbols)
             {

From f33b6575c133c55d849906041096601ef4b1730a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 09:51:56 -0700
Subject: [PATCH 372/413] compute dependent projects all at once as well

---
 .../FindReferences/DependentProjectsFinder.cs | 99 +++++++++++--------
 .../FindReferences/DependentTypeFinder.cs     |  2 +-
 .../FindReferencesSearchEngine.cs             | 29 ++----
 3 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
index c931a2114f2f8..31b560552dfad 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Roslyn.Utilities;
@@ -22,70 +23,84 @@ namespace Microsoft.CodeAnalysis.FindSymbols
     internal static partial class DependentProjectsFinder
     {
         public static async Task<ImmutableArray<Project>> GetDependentProjectsAsync(
-            Solution solution, ISymbol symbol, IImmutableSet<Project>? projects, CancellationToken cancellationToken)
+            Solution solution, ImmutableArray<ISymbol> symbols, IImmutableSet<Project> projects, CancellationToken cancellationToken)
         {
-            if (symbol.Kind == SymbolKind.Namespace)
-            {
-                // namespaces are visible in all projects.
-                return projects != null
-                    ? projects.ToImmutableArray()
-                    : solution.Projects.ToImmutableArray();
-            }
-            else
-            {
-                var dependentProjects = await GetDependentProjectsWorkerAsync(solution, symbol, cancellationToken).ConfigureAwait(false);
-                return projects != null
-                    ? dependentProjects.WhereAsArray(projects.Contains)
-                    : dependentProjects;
-            }
+            // namespaces are visible in all projects.
+            if (symbols.Any(s => s.Kind == SymbolKind.Namespace))
+                return projects.ToImmutableArray();
+
+            var dependentProjects = await GetDependentProjectsWorkerAsync(solution, symbols, cancellationToken).ConfigureAwait(false);
+            return dependentProjects.WhereAsArray(projects.Contains);
         }
 
         /// <summary>
-        /// This method computes the dependent projects that need to be searched for references of the given <paramref name="symbol"/>.
+        /// This method computes the dependent projects that need to be searched for references of the given <paramref
+        /// name="symbols"/>.
+        /// <para/>
         /// This computation depends on the given symbol's visibility:
-        ///     1) Public: Dependent projects include the symbol definition project and all the referencing projects.
-        ///     2) Internal: Dependent projects include the symbol definition project and all the referencing projects that have internals access to the definition project.
-        ///     3) Private: Dependent projects include the symbol definition project and all the referencing submission projects (which are special and can reference private fields of the previous submission).
-        /// 
+        /// <list type="number">
+        /// <item>Public: Dependent projects include the symbol definition project and all the referencing
+        /// projects.</item>
+        /// <item>Internal: Dependent projects include the symbol definition project and all the referencing projects
+        /// that have internals access to the definition project..</item>
+        /// <item>Private: Dependent projects include the symbol definition project and all the referencing submission
+        /// projects (which are special and can reference private fields of the previous submission).</item>
+        /// </list>
         /// We perform this computation in two stages:
-        ///     1) Compute all the dependent projects (submission + non-submission) and their InternalsVisibleTo semantics to the definition project.
-        ///     2) Filter the above computed dependent projects based on symbol visibility.
+        /// <list type="number">
+        /// <item>Compute all the dependent projects (submission + non-submission) and their InternalsVisibleTo semantics to the definition project.</item>
+        /// <item>Filter the above computed dependent projects based on symbol visibility.</item>
         /// Dependent projects computed in stage (1) are cached to avoid recomputation.
+        /// </list>
         /// </summary>
         private static async Task<ImmutableArray<Project>> GetDependentProjectsWorkerAsync(
-            Solution solution, ISymbol symbol, CancellationToken cancellationToken)
+            Solution solution, ImmutableArray<ISymbol> symbols, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var symbolOrigination = GetSymbolOrigination(solution, symbol, cancellationToken);
+            var symbolOriginations = GetSymbolOriginations(solution, symbols, cancellationToken);
 
-            // If we can't find where the symbol came from, we can't determine what projects to search for references to it.
-            if (symbolOrigination.assembly == null)
-                return ImmutableArray<Project>.Empty;
+            using var _ = PooledHashSet<Project>.GetInstance(out var result);
 
-            // 1) Compute all the dependent projects (submission + non-submission) and their InternalsVisibleTo semantics to the definition project.
-            var symbolVisibility = symbol.GetResultantVisibility();
-            var dependentProjects = await ComputeDependentProjectsAsync(
-                solution, symbolOrigination, symbolVisibility, cancellationToken).ConfigureAwait(false);
+            foreach (var (assembly, (sourceProject, maxVisibility)) in symbolOriginations)
+            {
+                // 1) Compute all the dependent projects (submission + non-submission) and their InternalsVisibleTo semantics to the definition project.
+                var dependentProjects = await ComputeDependentProjectsAsync(
+                    solution, (assembly, sourceProject), maxVisibility, cancellationToken).ConfigureAwait(false);
 
-            // 2) Filter the above computed dependent projects based on symbol visibility.
-            var filteredProjects = symbolVisibility == SymbolVisibility.Internal
-                ? dependentProjects.WhereAsArray(dp => dp.hasInternalsAccess)
-                : dependentProjects;
+                // 2) Filter the above computed dependent projects based on symbol visibility.
+                var filteredProjects = maxVisibility == SymbolVisibility.Internal
+                    ? dependentProjects.WhereAsArray(dp => dp.hasInternalsAccess)
+                    : dependentProjects;
 
-            return filteredProjects.SelectAsArray(t => t.project);
+                result.AddRange(filteredProjects.Select(p => p.project));
+            }
+
+            return result.ToImmutableArray();
         }
 
         /// <summary>
-        /// Returns a pair of data bout where <paramref name="symbol"/> originates from.  It's <see
+        /// Returns information about where <paramref name="symbols"/> originate from.  It's <see
         /// cref="IAssemblySymbol"/> for both source and metadata symbols, and an optional <see cref="Project"/> if this
-        /// was a symbol from source.
+        /// was a symbol from source. 
         /// </summary>
-        private static (IAssemblySymbol assembly, Project? sourceProject) GetSymbolOrigination(
-            Solution solution, ISymbol symbol, CancellationToken cancellationToken)
+        private static Dictionary<IAssemblySymbol, (Project? sourceProject, SymbolVisibility maxVisibility)> GetSymbolOriginations(
+            Solution solution, ImmutableArray<ISymbol> symbols, CancellationToken cancellationToken)
         {
-            var assembly = symbol.OriginalDefinition.ContainingAssembly;
-            return assembly == null ? default : (assembly, solution.GetProject(assembly, cancellationToken));
+            var result = new Dictionary<IAssemblySymbol, (Project? sourceProject, SymbolVisibility visibility)>();
+
+            foreach (var symbol in symbols)
+            {
+                var assembly = symbol.OriginalDefinition.ContainingAssembly;
+                if (!result.TryGetValue(assembly, out var projectAndVisibility))
+                    projectAndVisibility = (solution.GetProject(assembly, cancellationToken), symbol.GetResultantVisibility());
+
+                // Visibility enum has higher visibility as a lower number, so choose the minimum of both.
+                projectAndVisibility.visibility = (SymbolVisibility)Math.Min((int)projectAndVisibility.visibility, (int)symbol.GetResultantVisibility());
+                result[assembly] = projectAndVisibility;
+            }
+
+            return result;
         }
 
         private static async Task<ImmutableArray<(Project project, bool hasInternalsAccess)>> ComputeDependentProjectsAsync(
diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentTypeFinder.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentTypeFinder.cs
index 5a513e4cae2ac..b9961d8297383 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentTypeFinder.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentTypeFinder.cs
@@ -262,7 +262,7 @@ private static async Task<ISet<ProjectId>> GetProjectsThatCouldReferenceTypeAsyn
                 // Need to find all the possible projects that contain this metadata.
                 var projectsThatReferenceMetadataAssembly =
                     await DependentProjectsFinder.GetDependentProjectsAsync(
-                        solution, type, projects: null, cancellationToken: cancellationToken).ConfigureAwait(false);
+                        solution, ImmutableArray.Create<ISymbol>(type), solution.Projects.ToImmutableHashSet(), cancellationToken).ConfigureAwait(false);
 
                 // Now collect all the dependent projects as well.
                 var projectsThatCouldReferenceType =
diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
index 7b64153454387..7d1a794395b43 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
@@ -79,7 +79,7 @@ public async Task FindReferencesAsync(
                 await using var _ = disposable.ConfigureAwait(false);
 
                 // Create the initial set of symbols to search for.  As we walk the appropriate projects in the solution
-                // we'll expand this set as we dicover new symbols to search for in each project.
+                // we'll expand this set as we discover new symbols to search for in each project.
                 var symbolSet = await SymbolSet.CreateAsync(this, unifiedSymbols, cancellationToken).ConfigureAwait(false);
 
                 // Report the initial set of symbols to the caller.
@@ -88,7 +88,7 @@ public async Task FindReferencesAsync(
 
                 // Determine the set of projects we actually have to walk to find results in.  If the caller provided a
                 // set of documents to search, we only bother with those.
-                var projectsToSearch = await GetProjectIdsToSearchAsync(allSymbols, cancellationToken).ConfigureAwait(false);
+                var projectsToSearch = await GetProjectToSearchAsync(allSymbols, cancellationToken).ConfigureAwait(false);
 
                 // We need to process projects in order when updating our symbol set.  Say we have three projects (A, B
                 // and C), we cannot necessarily find inherited symbols in C until we have searched B.  Importantly,
@@ -96,16 +96,15 @@ public async Task FindReferencesAsync(
                 // then process the projects in parallel once we know the set of symbols we're searching for in that
                 // project.
                 var dependencyGraph = _solution.GetProjectDependencyGraph();
-                await _progressTracker.AddItemsAsync(projectsToSearch.Count, cancellationToken).ConfigureAwait(false);
+                await _progressTracker.AddItemsAsync(projectsToSearch.Length, cancellationToken).ConfigureAwait(false);
 
                 using var _1 = ArrayBuilder<Task>.GetInstance(out var tasks);
 
                 foreach (var projectId in dependencyGraph.GetTopologicallySortedProjects(cancellationToken))
                 {
-                    if (!projectsToSearch.Contains(projectId))
-                        continue;
-
                     var currentProject = _solution.GetRequiredProject(projectId);
+                    if (!projectsToSearch.Contains(currentProject))
+                        continue;
 
                     // As we walk each project, attempt to grow the search set appropriately up and down the inheritance
                     // hierarchy and grab a copy of the symbols to be processed.  Note: this has to happen serially
@@ -142,7 +141,7 @@ private async Task ReportGroupsAsync(ImmutableArray<ISymbol> symbols, Cancellati
             foreach (var symbol in symbols)
             {
                 // See if this is the first time we're running across this symbol.  Note: no locks are needed
-                // here betwen checking and then adding because this is only ever called serially from within
+                // here between checking and then adding because this is only ever called serially from within
                 // FindReferencesAsync above (though we still need a ConcurrentDictionary as reads of these 
                 // symbols will happen later in ProcessDocumentAsync.  However, those reads will only happen
                 // after the dependent symbol values were written in, so it will be safe to blindly read them
@@ -160,24 +159,14 @@ private async Task ReportGroupsAsync(ImmutableArray<ISymbol> symbols, Cancellati
             }
         }
 
-        private async Task<HashSet<ProjectId>> GetProjectIdsToSearchAsync(
+        private Task<ImmutableArray<Project>> GetProjectToSearchAsync(
             ImmutableArray<ISymbol> symbols, CancellationToken cancellationToken)
         {
             var projects = _documents != null
                 ? _documents.Select(d => d.Project).ToImmutableHashSet()
                 : _solution.Projects.ToImmutableHashSet();
 
-            var result = new HashSet<ProjectId>();
-
-            foreach (var symbol in symbols)
-            {
-                var dependentProjects = await DependentProjectsFinder.GetDependentProjectsAsync(
-                    _solution, symbol, projects, cancellationToken).ConfigureAwait(false);
-                foreach (var project in dependentProjects)
-                    result.Add(project.Id);
-            }
-
-            return result;
+            return DependentProjectsFinder.GetDependentProjectsAsync(_solution, symbols, projects, cancellationToken);
         }
 
         private async Task ProcessProjectAsync(Project project, ImmutableArray<ISymbol> allSymbols, CancellationToken cancellationToken)
@@ -288,7 +277,7 @@ private async Task ProcessDocumentAsync(
             using (Logger.LogBlock(FunctionId.FindReference_ProcessDocumentAsync, cancellationToken))
             {
                 // This is safe to just blindly read. We can only ever get here after the call to ReportGroupsAsync
-                // happened.  So tehre must be a group for this symbol in our map.
+                // happened.  So there must be a group for this symbol in our map.
                 var group = _symbolToGroup[symbol];
                 foreach (var finder in _finders)
                 {

From 9e30ebc5205bf088ddcd089f8deeebe7495879be Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 09:53:14 -0700
Subject: [PATCH 373/413] Delete helper

---
 .../AbstractMakeMethodSynchronousCodeFixProvider.cs         | 2 +-
 .../FindSymbols/SymbolFinder_FindRenamableReferences.cs     | 6 ------
 src/Workspaces/Core/Portable/Rename/RenameLocations.cs      | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Features/Core/Portable/MakeMethodSynchronous/AbstractMakeMethodSynchronousCodeFixProvider.cs b/src/Features/Core/Portable/MakeMethodSynchronous/AbstractMakeMethodSynchronousCodeFixProvider.cs
index 674f90dbdd260..fa992de4336e9 100644
--- a/src/Features/Core/Portable/MakeMethodSynchronous/AbstractMakeMethodSynchronousCodeFixProvider.cs
+++ b/src/Features/Core/Portable/MakeMethodSynchronous/AbstractMakeMethodSynchronousCodeFixProvider.cs
@@ -128,7 +128,7 @@ private static async Task<Solution> RemoveAwaitFromCallersAsync(
                 if (semanticModel.GetDeclaredSymbol(methodDeclaration, cancellationToken) is IMethodSymbol methodSymbol)
                 {
                     var references = await SymbolFinder.FindRenamableReferencesAsync(
-                        methodSymbol, document.Project.Solution, cancellationToken).ConfigureAwait(false);
+                        ImmutableArray.Create<ISymbol>(methodSymbol), document.Project.Solution, cancellationToken).ConfigureAwait(false);
 
                     var referencedSymbol = references.FirstOrDefault(r => Equals(r.Definition, methodSymbol));
                     if (referencedSymbol != null)
diff --git a/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs b/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
index 1ff6c99a3a5c5..adffbb4c0df2b 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/SymbolFinder_FindRenamableReferences.cs
@@ -12,12 +12,6 @@ namespace Microsoft.CodeAnalysis.FindSymbols
 {
     public static partial class SymbolFinder
     {
-        internal static Task<ImmutableArray<ReferencedSymbol>> FindRenamableReferencesAsync(
-            ISymbol symbol, Solution solution, CancellationToken cancellationToken)
-        {
-            return FindRenamableReferencesAsync(ImmutableArray.Create(symbol), solution, cancellationToken);
-        }
-
         internal static async Task<ImmutableArray<ReferencedSymbol>> FindRenamableReferencesAsync(
             ImmutableArray<ISymbol> symbols,
             Solution solution,
diff --git a/src/Workspaces/Core/Portable/Rename/RenameLocations.cs b/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
index 37fdaa82e7425..b9114cc0b035f 100644
--- a/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
+++ b/src/Workspaces/Core/Portable/Rename/RenameLocations.cs
@@ -199,7 +199,8 @@ private static async Task<SearchResult> AddLocationsReferenceSymbolsAsync(
             CancellationToken cancellationToken)
         {
             var locations = ImmutableHashSet.CreateBuilder<RenameLocation>();
-            var referenceSymbols = await SymbolFinder.FindRenamableReferencesAsync(symbol, solution, cancellationToken).ConfigureAwait(false);
+            var referenceSymbols = await SymbolFinder.FindRenamableReferencesAsync(
+                ImmutableArray.Create(symbol), solution, cancellationToken).ConfigureAwait(false);
 
             foreach (var referencedSymbol in referenceSymbols)
             {

From 49b0071ce13fc2dd97e3f4e63ae85a06222614b3 Mon Sep 17 00:00:00 2001
From: Fred Silberberg <frsilb@microsoft.com>
Date: Wed, 11 May 2022 11:11:46 -0700
Subject: [PATCH 374/413] Revert "Improve editorconfig options caching on
 ProjectState (#61131)" (#61216)

This reverts commit 7be9fe7317b014f78be18c4a7c886a41657704c4.
---
 .../DictionaryAnalyzerConfigOptionsTests.cs   |  29 ----
 .../AnalyzerConfigOptions.cs                  |   8 -
 .../DictionaryAnalyzerConfigOptions.cs        |   6 -
 .../Core/Portable/PublicAPI.Unshipped.txt     |   1 -
 .../EditorConfigNamingStyleParserTests.cs     | 111 +-----------
 .../DataProvider/SettingsProviderBase.cs      |  36 +---
 ...nfigOptionSet+AnalyzerConfigOptionsImpl.cs |   6 -
 ...IncrementalAnalyzer_IncrementalAnalyzer.cs |   4 +-
 .../AnalyzersCommandHandler.cs                |   2 +-
 .../BaseDiagnosticAndGeneratorItemSource.cs   |   8 +-
 ...torConfigDocumentOptionsProviderFactory.cs |  19 +--
 .../OptionSet+AnalyzerConfigOptionsImpl.cs    |   7 -
 .../Workspace/Solution/AnalyzerConfigData.cs  |  28 ---
 .../Portable/Workspace/Solution/Document.cs   |  13 +-
 .../Portable/Workspace/Solution/Project.cs    |   2 +-
 .../Workspace/Solution/ProjectState.cs        |  33 ++--
 .../EditorConfigCodeStyleParserTests.cs       |   9 +-
 ...ferenceEditorConfigStorageLocationTests.cs | 161 ++++++++++++++++--
 .../Core/CompilerExtensions.projitems         |   4 +-
 .../StructuredAnalyzerConfigOptions.cs        |  97 -----------
 .../Parsing/EditorConfigParser.cs             |  12 +-
 .../Parsing/IEditorConfigOptionAccumulator.cs |   3 +-
 .../NamingStyleOptionAccumulator.cs           |   8 +-
 .../AnalyzerConfigOptionsExtensions.cs        |   3 +-
 .../EditorConfigNamingStyleParser.cs          |  48 +++++-
 ...ditorConfigNamingStyleParser_NamingRule.cs |   8 +-
 ...itorConfigNamingStyleParser_NamingStyle.cs |   6 +-
 ...ditorConfigNamingStyleParser_SymbolSpec.cs |   6 +-
 .../Serialization/NamingStylePreferences.cs   |   4 -
 .../Serialization/SymbolSpecification.cs      |   4 -
 .../EditorConfigStorageLocationExtensions.cs  |  34 ++++
 .../EditorConfigStorageLocation`1.cs          |   7 +-
 .../IEditorConfigStorageLocation.cs           |   6 +-
 ...lePreferenceEditorConfigStorageLocation.cs |  26 ++-
 34 files changed, 320 insertions(+), 439 deletions(-)
 delete mode 100644 src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
 delete mode 100644 src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
 delete mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs

diff --git a/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
deleted file mode 100644
index 6e80809c66e6e..0000000000000
--- a/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.UnitTests
-{
-    public class DictionaryAnalyzerConfigOptionsTests
-    {
-        [Fact]
-        public void BackwardCompatibility()
-        {
-            // Note: Older versions of analyzers access this field via reflection.
-            // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
-            Assert.Equal(
-                typeof(ImmutableDictionary<string, string>),
-                typeof(DictionaryAnalyzerConfigOptions).GetField("Options", BindingFlags.Instance | BindingFlags.NonPublic)?.FieldType);
-        }
-    }
-}
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
index ea5f6b0944e4c..1e98c9cccb6ee 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
@@ -20,12 +19,5 @@ public abstract class AnalyzerConfigOptions
         /// Get an analyzer config value for the given key, using the <see cref="KeyComparer"/>.
         /// </summary>
         public abstract bool TryGetValue(string key, [NotNullWhen(true)] out string? value);
-
-        /// <summary>
-        /// Enumerates unique keys of all available options in no specific order.
-        /// </summary>
-        /// <exception cref="NotImplementedException">Not implemented by the derived type.</exception>
-        public virtual IEnumerable<string> Keys
-            => throw new NotImplementedException();
     }
 }
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
index 48ac671a064ee..368b6c4176976 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
@@ -2,7 +2,6 @@
 // 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.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 
@@ -14,8 +13,6 @@ internal sealed class DictionaryAnalyzerConfigOptions : AnalyzerConfigOptions
 
         public static DictionaryAnalyzerConfigOptions Empty { get; } = new DictionaryAnalyzerConfigOptions(EmptyDictionary);
 
-        // Note: Do not rename. Older versions of analyzers access this field via reflection.
-        // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
         internal readonly ImmutableDictionary<string, string> Options;
 
         public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
@@ -23,8 +20,5 @@ public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> optio
 
         public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
             => Options.TryGetValue(key, out value);
-
-        public override IEnumerable<string> Keys
-            => Options.Keys;
     }
 }
diff --git a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
index c2331cd21ec09..54e2766c89e34 100644
--- a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
+++ b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
@@ -66,7 +66,6 @@ const Microsoft.CodeAnalysis.WellKnownMemberNames.CheckedExplicitConversionName
 Microsoft.CodeAnalysis.OperationKind.UTF8String = 124 -> Microsoft.CodeAnalysis.OperationKind
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation.Value.get -> string!
-virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions.Keys.get -> System.Collections.Generic.IEnumerable<string!>!
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation) -> void
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor<TArgument, TResult>.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation, TArgument argument) -> TResult?
 virtual Microsoft.CodeAnalysis.SymbolVisitor<TArgument, TResult>.DefaultVisit(Microsoft.CodeAnalysis.ISymbol! symbol, TArgument argument) -> TResult
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
index 8fb3042f2c572..fff2e11b97eea 100644
--- a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
@@ -7,20 +7,17 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics.NamingStyles;
 using Roslyn.Test.Utilities;
 using Xunit;
+using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.SymbolSpecification;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics.NamingStyles
 {
     public class EditorConfigNamingStyleParserTests
     {
-        private static NamingStylePreferences ParseDictionary(Dictionary<string, string> options)
-            => EditorConfigNamingStyleParser.ParseDictionary(new DictionaryAnalyzerConfigOptions(options.ToImmutableDictionary()));
-
         [Fact]
         public static void TestPascalCaseRule()
         {
@@ -472,111 +469,5 @@ public static void TestEditorConfigParseForApplicableSymbolKinds()
                 Assert.True(!string.IsNullOrEmpty(editorConfigString));
             }
         }
-
-        [Theory]
-        [InlineData("a", "b", "a", "public", "public, private")]
-        [InlineData("b", "a", "a", "public, private", "public")]
-        [InlineData("b", "a", "b", "public", "public, private")]
-        [InlineData("a", "b", "b", "public, private", "public")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
-        {
-            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
-            });
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "static, readonly", "static")]
-        [InlineData("b", "a", "a", "static", "static, readonly")]
-        [InlineData("b", "a", "b", "static, readonly", "static")]
-        [InlineData("a", "b", "b", "static", "static, readonly")]
-        [InlineData("a", "b", "a", "", "")]
-        [InlineData("b", "a", "a", "", "")]
-        [InlineData("A", "b", "A", "", "")]
-        [InlineData("b", "A", "A", "", "")]
-        [InlineData("a", "B", "a", "", "")]
-        [InlineData("B", "a", "a", "", "")]
-        [InlineData("A", "B", "A", "", "")]
-        [InlineData("B", "A", "A", "", "")]
-        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
-        {
-            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
-            });
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "method", "method, property")]
-        [InlineData("b", "a", "a", "method, property", "method")]
-        [InlineData("b", "a", "b", "method", "method, property")]
-        [InlineData("a", "b", "b", "method, property", "method")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
-        {
-            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
-            });
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
     }
 }
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
index 64ec7898fe01e..1f137a0d8c170 100644
--- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
+++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
@@ -16,7 +16,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Utilities;
-using Roslyn.Utilities;
+using static Microsoft.CodeAnalysis.ProjectState;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider
 {
@@ -51,7 +51,7 @@ protected void Update()
                 return;
             }
 
-            var configOptionsProvider = new ProjectState.ProjectAnalyzerConfigOptionsProvider(project.State);
+            var configOptionsProvider = new ProjectAnalyzerConfigOptionsProvider(project.State);
             var workspaceOptions = configOptionsProvider.GetOptionsForSourcePath(givenFolder.FullName);
             var result = project.GetAnalyzerConfigOptions();
             var options = new CombinedAnalyzerConfigOptions(workspaceOptions, result);
@@ -93,9 +93,9 @@ public void RegisterViewModel(ISettingsEditorViewModel viewModel)
         private sealed class CombinedAnalyzerConfigOptions : AnalyzerConfigOptions
         {
             private readonly AnalyzerConfigOptions _workspaceOptions;
-            private readonly AnalyzerConfigData? _result;
+            private readonly AnalyzerConfigOptionsResult? _result;
 
-            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigData? result)
+            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigOptionsResult? result)
             {
                 _workspaceOptions = workspaceOptions;
                 _result = result;
@@ -131,34 +131,6 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = null;
                 return false;
             }
-
-            public override IEnumerable<string> Keys
-            {
-                get
-                {
-                    foreach (var key in _workspaceOptions.Keys)
-                        yield return key;
-
-                    if (!_result.HasValue)
-                        yield break;
-
-                    foreach (var key in _result.Value.AnalyzerOptions.Keys)
-                    {
-                        if (!_workspaceOptions.TryGetValue(key, out _))
-                            yield return key;
-                    }
-
-                    foreach (var (key, severity) in _result.Value.TreeOptions)
-                    {
-                        var diagnosticKey = "dotnet_diagnostic." + key + ".severity";
-                        if (!_workspaceOptions.TryGetValue(diagnosticKey, out _) &&
-                            !_result.Value.AnalyzerOptions.TryGetKey(diagnosticKey, out _))
-                        {
-                            yield return diagnosticKey;
-                        }
-                    }
-                }
-            }
         }
     }
 }
diff --git a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
index 19a21b395b96f..3fec7795a0148 100644
--- a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,10 +2,7 @@
 // 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.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
@@ -31,9 +28,6 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
 
                 return _fallbackOptions.TryGetValue(key, out value);
             }
-
-            public override IEnumerable<string> Keys
-                => _options.Keys.Concat(_fallbackOptions.Keys.Where(key => !_options.TryGetValue(key, out _)));
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index 034940b2462f6..bf2546750d42c 100644
--- a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -381,7 +381,7 @@ private IReadOnlyList<StateSet> GetStateSetsForFullSolutionAnalysis(IEnumerable<
             return stateSets.Where(s => IsCandidateForFullSolutionAnalysis(s.Analyzer, project, analyzerConfigOptions)).ToList();
         }
 
-        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigData? analyzerConfigOptions)
+        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigOptionsResult? analyzerConfigOptions)
         {
             // PERF: Don't query descriptors for compiler analyzer or workspace load analyzer, always execute them.
             if (analyzer == FileContentLoadAnalyzer.Instance ||
@@ -413,7 +413,7 @@ private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Pro
 
             // For most of analyzers, the number of diagnostic descriptors is small, so this should be cheap.
             var descriptors = DiagnosticAnalyzerInfoCache.GetDiagnosticDescriptors(analyzer);
-            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions?.Result) != ReportDiagnostic.Hidden);
+            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions) != ReportDiagnostic.Hidden);
         }
 
         private void RaiseProjectDiagnosticsIfNeeded(
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
index 89101c51cfdba..a2f36a1e8df05 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
@@ -296,7 +296,7 @@ private void UpdateSeverityMenuItemsChecked()
 
                 foreach (var diagnosticItem in group)
                 {
-                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions?.Result);
+                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions);
                     selectedItemSeverities.Add(severity);
                 }
             }
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
index 114541cfd6522..621c689c63e31 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
@@ -26,7 +26,7 @@ internal abstract partial class BaseDiagnosticAndGeneratorItemSource : IAttached
         private BulkObservableCollection<BaseItem>? _items;
         private ReportDiagnostic _generalDiagnosticOption;
         private ImmutableDictionary<string, ReportDiagnostic>? _specificDiagnosticOptions;
-        private AnalyzerConfigData? _analyzerConfigOptions;
+        private AnalyzerConfigOptionsResult? _analyzerConfigOptions;
 
         public BaseDiagnosticAndGeneratorItemSource(Workspace workspace, ProjectId projectId, IAnalyzersCommandHandler commandHandler, IDiagnosticAnalyzerService diagnosticAnalyzerService)
         {
@@ -95,7 +95,7 @@ public IEnumerable Items
             }
         }
 
-        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigData? analyzerConfigOptions)
+        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigOptionsResult? analyzerConfigOptions)
         {
             // Within an analyzer assembly, an individual analyzer may report multiple different diagnostics
             // with the same ID. Or, multiple analyzers may report diagnostics with the same ID. Or a
@@ -117,7 +117,7 @@ private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(Pro
                 .Select(g =>
                 {
                     var selectedDiagnostic = g.OrderBy(d => d, s_comparer).First();
-                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions?.Result);
+                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions);
                     return new DiagnosticItem(projectId, AnalyzerReference, selectedDiagnostic, effectiveSeverity, CommandHandler);
                 }));
 
@@ -183,7 +183,7 @@ void OnProjectConfigurationChanged()
 
                     foreach (var item in _items.OfType<DiagnosticItem>())
                     {
-                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions?.Result);
+                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions);
                         item.UpdateEffectiveSeverity(effectiveSeverity);
                     }
                 }
diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
index bacb11927cb04..0148466ebcc7e 100644
--- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
+++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
-using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options.EditorConfig
 {
@@ -22,25 +21,19 @@ private sealed class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvi
         {
             public async Task<IDocumentOptions?> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken)
             {
-                var data = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
-                return new DocumentOptions(data?.AnalyzerConfigOptions);
+                var options = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
+
+                return new DocumentOptions(options);
             }
 
             private sealed class DocumentOptions : IDocumentOptions
             {
-                private readonly StructuredAnalyzerConfigOptions? _options;
-
-                public DocumentOptions(StructuredAnalyzerConfigOptions? options)
+                private readonly ImmutableDictionary<string, string> _options;
+                public DocumentOptions(ImmutableDictionary<string, string> options)
                     => _options = options;
 
                 public bool TryGetDocumentOption(OptionKey option, out object? value)
                 {
-                    if (_options == null)
-                    {
-                        value = null;
-                        return false;
-                    }
-
                     var editorConfigPersistence = (IEditorConfigStorageLocation?)option.Option.StorageLocations.SingleOrDefault(static location => location is IEditorConfigStorageLocation);
                     if (editorConfigPersistence == null)
                     {
@@ -50,7 +43,7 @@ public bool TryGetDocumentOption(OptionKey option, out object? value)
 
                     try
                     {
-                        return editorConfigPersistence.TryGetOption(_options, option.Option.Type, out value);
+                        return editorConfigPersistence.TryGetOption(_options.AsNullable(), option.Option.Type, out value);
                     }
                     catch (Exception e) when (FatalError.ReportAndCatch(e))
                     {
diff --git a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
index 6e52e3a5db884..4e0d139840cb3 100644
--- a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,11 +2,8 @@
 // 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.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options
@@ -42,10 +39,6 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = storageLocation.GetEditorConfigStringValue(typedValue, _optionSet);
                 return true;
             }
-
-            // no way to enumerate OptionSet
-            public override IEnumerable<string> Keys
-                => throw new NotImplementedException();
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
deleted file mode 100644
index c417192872bb6..0000000000000
--- a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.Diagnostics;
-
-namespace Microsoft.CodeAnalysis;
-
-/// <summary>
-/// Aggregate analyzer config options for a specific path.
-/// </summary>
-internal readonly struct AnalyzerConfigData
-{
-    private readonly AnalyzerConfigOptionsResult _result;
-    private readonly StructuredAnalyzerConfigOptions _configOptions;
-
-    public AnalyzerConfigData(AnalyzerConfigOptionsResult result)
-    {
-        _result = result;
-        _configOptions = new StructuredAnalyzerConfigOptions(result.AnalyzerOptions);
-    }
-
-    public AnalyzerConfigOptionsResult Result => _result;
-    public StructuredAnalyzerConfigOptions AnalyzerConfigOptions => _configOptions;
-    public ImmutableDictionary<string, string> AnalyzerOptions => _result.AnalyzerOptions;
-    public ImmutableDictionary<string, ReportDiagnostic> TreeOptions => _result.TreeOptions;
-}
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
index 7f4f520e8d25a..c64163a5a1277 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
@@ -513,7 +513,7 @@ private void InitializeCachedOptions(OptionSet solutionOptions)
             Interlocked.CompareExchange(ref _cachedOptions, newAsyncLazy, comparand: null);
         }
 
-        internal async Task<AnalyzerConfigData?> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
+        internal Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
         {
             var projectFilePath = Project.FilePath;
             // We need to work out path to this document. Documents may not have a "real" file path if they're something created
@@ -535,12 +535,15 @@ private void InitializeCachedOptions(OptionSet solutionOptions)
                 }
             }
 
-            if (effectiveFilePath == null)
+            if (effectiveFilePath != null)
             {
-                return null;
+                return Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken);
+            }
+            else
+            {
+                // Really no idea where this is going, so bail
+                return Task.FromResult(DictionaryAnalyzerConfigOptions.EmptyDictionary);
             }
-
-            return await Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
index 5ec37f9535f0e..fa20f2786d59a 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
@@ -774,7 +774,7 @@ private void CheckIdsContainedInProject(ImmutableArray<DocumentId> documentIds)
             }
         }
 
-        internal AnalyzerConfigData? GetAnalyzerConfigOptions()
+        internal AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
             => _projectState.GetAnalyzerConfigOptions();
 
         private string GetDebuggerDisplay()
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
index 9370c87f3b2c6..d36dd5f83160d 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
@@ -248,13 +248,15 @@ public AnalyzerOptions AnalyzerOptions
                 additionalFiles: AdditionalDocumentStates.SelectAsArray(static documentState => documentState.AdditionalText),
                 optionsProvider: new ProjectAnalyzerConfigOptionsProvider(this));
 
-        public async Task<AnalyzerConfigData> GetAnalyzerOptionsForPathAsync(string path, CancellationToken cancellationToken)
+        public async Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsForPathAsync(
+            string path,
+            CancellationToken cancellationToken)
         {
-            var cache = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
-            return cache.GetOptionsForSourcePath(path);
+            var configSet = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
+            return configSet.GetOptionsForSourcePath(path).AnalyzerOptions;
         }
 
-        public AnalyzerConfigData? GetAnalyzerConfigOptions()
+        public AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
         {
             // We need to find the analyzer config options at the root of the project.
             // Currently, there is no compiler API to query analyzer config options for a directory in a language agnostic fashion.
@@ -294,11 +296,8 @@ internal sealed class ProjectAnalyzerConfigOptionsProvider : AnalyzerConfigOptio
             public ProjectAnalyzerConfigOptionsProvider(ProjectState projectState)
                 => _projectState = projectState;
 
-            private AnalyzerConfigOptionsCache GetCache()
-                => _projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None);
-
             public override AnalyzerConfigOptions GlobalOptions
-                => GetCache().GlobalConfigOptions.AnalyzerConfigOptions;
+                => GetOptionsForSourcePath(string.Empty);
 
             public override AnalyzerConfigOptions GetOptions(SyntaxTree tree)
                 => GetOptionsForSourcePath(tree.FilePath);
@@ -310,7 +309,7 @@ public override AnalyzerConfigOptions GetOptions(AdditionalText textFile)
             }
 
             public AnalyzerConfigOptions GetOptionsForSourcePath(string path)
-                => GetCache().GetOptionsForSourcePath(path).AnalyzerConfigOptions;
+                => new DictionaryAnalyzerConfigOptions(_projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None).GetOptionsForSourcePath(path).AnalyzerOptions);
         }
 
         private sealed class ProjectSyntaxTreeOptionsProvider : SyntaxTreeOptionsProvider
@@ -372,20 +371,20 @@ private static ValueSource<AnalyzerConfigOptionsCache> ComputeAnalyzerConfigOpti
 
         private readonly struct AnalyzerConfigOptionsCache
         {
-            private readonly ConcurrentDictionary<string, AnalyzerConfigData> _sourcePathToResult = new();
-            private readonly Func<string, AnalyzerConfigData> _computeFunction;
-            private readonly Lazy<AnalyzerConfigData> _global;
+            private readonly ConcurrentDictionary<string, AnalyzerConfigOptionsResult> _sourcePathToResult = new();
+            private readonly Func<string, AnalyzerConfigOptionsResult> _computeFunction;
+            private readonly AnalyzerConfigSet _configSet;
 
             public AnalyzerConfigOptionsCache(AnalyzerConfigSet configSet)
             {
-                _global = new Lazy<AnalyzerConfigData>(() => new AnalyzerConfigData(configSet.GlobalConfigOptions));
-                _computeFunction = path => new AnalyzerConfigData(configSet.GetOptionsForSourcePath(path));
+                _configSet = configSet;
+                _computeFunction = _configSet.GetOptionsForSourcePath;
             }
 
-            public AnalyzerConfigData GlobalConfigOptions
-                => _global.Value;
+            public AnalyzerConfigOptionsResult GlobalConfigOptions
+                => _configSet.GlobalConfigOptions;
 
-            public AnalyzerConfigData GetOptionsForSourcePath(string sourcePath)
+            public AnalyzerConfigOptionsResult GetOptionsForSourcePath(string sourcePath)
                 => _sourcePathToResult.GetOrAdd(sourcePath, _computeFunction);
         }
 
diff --git a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
index fa91961a9e6ac..6985c5d8ccbcb 100644
--- a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
+++ b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
@@ -3,16 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Options;
 using Roslyn.Test.Utilities;
-using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.CodeStyle
@@ -67,7 +62,7 @@ public void TestParseEditorConfigAccessibilityModifiers(string args, int value,
             var storageLocation = CodeStyleOptions2.RequireAccessibilityModifiers.StorageLocations
                 .OfType<EditorConfigStorageLocation<CodeStyleOption2<AccessibilityModifiersRequired>>>()
                 .Single();
-            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, args));
+            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, args } };
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(CodeStyleOption2<AccessibilityModifiersRequired>), out var parsedCodeStyleOption));
             var codeStyleOption = (CodeStyleOption2<AccessibilityModifiersRequired>)parsedCodeStyleOption!;
@@ -89,7 +84,7 @@ public void TestParseEditorConfigEndOfLine(string configurationString, string ne
             var storageLocation = FormattingOptions.NewLine.StorageLocations
                 .OfType<EditorConfigStorageLocation<string>>()
                 .Single();
-            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, configurationString));
+            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, configurationString } };
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(string), out var parsedNewLine));
             Assert.Equal(newLine, (string?)parsedNewLine);
diff --git a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
index 2fd9b59b756f7..7e74d51ac4cb4 100644
--- a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
+++ b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
@@ -6,12 +6,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Options;
-using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.EditorConfig.StorageLocation
@@ -22,7 +18,19 @@ public class NamingStylePreferenceEditorConfigStorageLocationTests
         public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturnsFalse()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(NamingStylePreferences), out _);
+            var result = editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(NamingStylePreferences), out _);
+            Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
+        }
+
+        [Fact]
+        public static void TestEmptyDictionaryDefaultNamingStylePreferencesObjectReturnsFalse()
+        {
+            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
+            var result = editorConfigStorageLocation.TryGetOption(
+                new Dictionary<string, string>(),
+                typeof(NamingStylePreferences),
+                out _);
+
             Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
         }
 
@@ -30,7 +38,7 @@ public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturn
         public static void TestNonEmptyDictionaryReturnsTrue()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var options = new StructuredAnalyzerConfigOptions(new Dictionary<string, string>()
+            var newDictionary = new Dictionary<string, string>()
             {
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity"] = "error",
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols"] = "method_and_property_symbols",
@@ -38,22 +46,155 @@ public static void TestNonEmptyDictionaryReturnsTrue()
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_kinds"] = "method,property",
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities"] = "*",
                 ["dotnet_naming_style.pascal_case_style.capitalization"] = "pascal_case"
-            }.ToImmutableDictionary(AnalyzerConfigOptions.KeyComparer));
+            };
 
-            var result = editorConfigStorageLocation.TryGetOption(options, typeof(NamingStylePreferences), out var value);
+            var result = editorConfigStorageLocation.TryGetOption(
+                newDictionary,
+                typeof(NamingStylePreferences),
+                out var combinedNamingStyles);
 
             Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(value);
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
             Assert.Equal(ReportDiagnostic.Error, namingStylePreferences.Rules.NamingRules[0].EnforcementLevel);
         }
 
+        [Theory]
+        [InlineData("a", "b", "a", "public", "public, private")]
+        [InlineData("b", "a", "a", "public, private", "public")]
+        [InlineData("b", "a", "b", "public", "public, private")]
+        [InlineData("a", "b", "b", "public, private", "public")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
+        {
+            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
+            var newDictionary = new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
+            };
+
+            var result = editorConfigStorageLocation.TryGetOption(
+                newDictionary,
+                typeof(NamingStylePreferences),
+                out var combinedNamingStyles);
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.True(result, "Expected non-empty dictionary to return true");
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "static, readonly", "static")]
+        [InlineData("b", "a", "a", "static", "static, readonly")]
+        [InlineData("b", "a", "b", "static, readonly", "static")]
+        [InlineData("a", "b", "b", "static", "static, readonly")]
+        [InlineData("a", "b", "a", "", "")]
+        [InlineData("b", "a", "a", "", "")]
+        [InlineData("A", "b", "A", "", "")]
+        [InlineData("b", "A", "A", "", "")]
+        [InlineData("a", "B", "a", "", "")]
+        [InlineData("B", "a", "a", "", "")]
+        [InlineData("A", "B", "A", "", "")]
+        [InlineData("B", "A", "A", "", "")]
+        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
+        {
+            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
+            var newDictionary = new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
+            };
+
+            var result = editorConfigStorageLocation.TryGetOption(
+                newDictionary,
+                typeof(NamingStylePreferences),
+                out var combinedNamingStyles);
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.True(result, "Expected non-empty dictionary to return true");
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "method", "method, property")]
+        [InlineData("b", "a", "a", "method, property", "method")]
+        [InlineData("b", "a", "b", "method", "method, property")]
+        [InlineData("a", "b", "b", "method, property", "method")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
+        {
+            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
+            var newDictionary = new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
+            };
+
+            var result = editorConfigStorageLocation.TryGetOption(
+                newDictionary,
+                typeof(NamingStylePreferences),
+                out var combinedNamingStyles);
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.True(result, "Expected non-empty dictionary to return true");
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
         [Fact]
         public static void TestObjectTypeThrowsInvalidOperationException()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
             Assert.Throws<InvalidOperationException>(() =>
             {
-                editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(object), out var @object);
+                editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(object), out var @object);
             });
         }
     }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
index c17730357f3ff..b3c2638f021c2 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
@@ -193,7 +193,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)CodeStyle\ParenthesesPreference.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArray`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\StructuredAnalyzerConfigOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\Language.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageExtensions.cs" />
@@ -372,6 +371,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)NamingStyles\Serialization\SymbolSpecification.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObjectPools\PooledDictionary.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation2.cs" />
@@ -575,7 +575,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IBuiltInAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IPragmaSuppressionsAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\Core\Portable\DiagnosticAnalyzer\DictionaryAnalyzerConfigOptions.cs">
-      <Link>Diagnostics\DictionaryAnalyzerConfigOptions.cs</Link>
+      <Link>Diagnostics\AnalyzerConfigOptionsDictionary.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
deleted file mode 100644
index 6fb0cb022c226..0000000000000
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 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.CodeAnalysis;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
-using Roslyn.Utilities;
-
-namespace Microsoft.CodeAnalysis.Diagnostics;
-
-/// <summary>
-/// <see cref="AnalyzerConfigOptions"/> that memoize structured (parsed) form of certain complex options to avoid parsing them multiple times.
-/// Storages of these complex options may directly call the specialized getters to reuse the cached values.
-/// </summary>
-internal sealed class StructuredAnalyzerConfigOptions : AnalyzerConfigOptions
-{
-    private readonly AnalyzerConfigOptions _options;
-    private readonly Lazy<NamingStylePreferences> _lazyNamingStylePreferences;
-
-    public StructuredAnalyzerConfigOptions(AnalyzerConfigOptions options)
-    {
-        _options = options;
-        _lazyNamingStylePreferences = new Lazy<NamingStylePreferences>(() => EditorConfigNamingStyleParser.ParseDictionary(_options));
-    }
-
-    public StructuredAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
-        : this(new DictionaryAnalyzerConfigOptions(options))
-    {
-        Contract.ThrowIfFalse(options.KeyComparer == KeyComparer);
-    }
-
-    public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
-        => _options.TryGetValue(key, out value);
-
-    public override IEnumerable<string> Keys
-        => _options.Keys;
-
-    public NamingStylePreferences GetNamingStylePreferences()
-        => _lazyNamingStylePreferences.Value;
-
-    public static bool TryGetStructuredOptions(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
-    {
-        if (configOptions is StructuredAnalyzerConfigOptions structuredOptions)
-        {
-            options = structuredOptions;
-            return true;
-        }
-
-#if CODE_STYLE
-        if (TryGetCorrespondingCodeStyleInstance(configOptions, out options))
-        {
-            return true;
-        }
-#endif
-
-        options = null;
-        return false;
-    }
-
-#if CODE_STYLE
-    // StructuredAnalyzerConfigOptions is defined in both Worksapce and Code Style layers. It is not public and thus can't be shared between these two.
-    // However, Code Style layer is compiled against the shared Workspace APIs. The ProjectState creates and holds onto an instance
-    // of Workspace layer's version of StructuredAnalyzerConfigOptions. This version of the type is not directly usable by Code Style code.
-    // We create a clone of this instance typed to the Code Style's version of StructuredAnalyzerConfigOptions.
-    // The conditional weak table maintains 1:1 correspondence between these instances.
-    // 
-    // In addition, we also map Compiler created DictionaryAnalyzerConfigOptions to StructuredAnalyzerConfigOptions for analyzers that are invoked
-    // from command line build.
-
-    private static readonly ConditionalWeakTable<AnalyzerConfigOptions, StructuredAnalyzerConfigOptions> s_codeStyleStructuredOptions = new();
-    private static readonly object s_codeStyleStructuredOptionsLock = new();
-
-    private static bool TryGetCorrespondingCodeStyleInstance(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
-    {
-        if (s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
-        {
-            return true;
-        }
-
-        lock (s_codeStyleStructuredOptionsLock)
-        {
-            if (!s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
-            {
-                options = new StructuredAnalyzerConfigOptions(configOptions);
-                s_codeStyleStructuredOptions.Add(configOptions, options);
-            }
-        }
-
-        return true;
-    }
-#endif
-}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
index b48bb5a04538c..51386f9495f64 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
@@ -5,7 +5,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.EditorConfig.Parsing
@@ -16,9 +15,8 @@ internal static class EditorConfigParser
         private static readonly Regex s_sectionMatcher = new(@"^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$", RegexOptions.Compiled);
         // Matches EditorConfig property such as "indent_style = space", see https://editorconfig.org for details
         private static readonly Regex s_propertyMatcher = new(@"^\s*([\w\.\-_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$", RegexOptions.Compiled);
-
         private static ImmutableHashSet<string> ReservedKeys { get; }
-            = ImmutableHashSet.CreateRange(AnalyzerConfigOptions.KeyComparer, new[] {
+            = ImmutableHashSet.CreateRange(CaseInsensitiveComparison.Comparer, new[] {
                 "root",
                 "indent_style",
                 "indent_size",
@@ -45,7 +43,8 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
             where TEditorConfigFile : EditorConfigFile<TEditorConfigOption>
             where TEditorConfigOption : EditorConfigOption
         {
-            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(AnalyzerConfigOptions.KeyComparer);
+            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
+                CaseInsensitiveComparison.Comparer);
             var activeSectionName = "";
             var activeSectionStart = 0;
             var activeSectionEnd = 0;
@@ -75,7 +74,8 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
                     activeSectionStart = textLine.Start;
                     activeSectionName = sectionName;
                     activeSectionEnd = textLine.End;
-                    activeSectionProperties.Clear();
+                    activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
+                        CaseInsensitiveComparison.Comparer);
                     continue;
                 }
 
@@ -121,7 +121,7 @@ void ProcessActiveSection()
                 var fullText = activeLine.ToString();
                 var sectionSpan = new TextSpan(activeSectionStart, activeSectionEnd);
                 var previousSection = new Section(pathToFile, isGlobal, sectionSpan, activeSectionName, fullText);
-                accumulator.ProcessSection(previousSection, activeSectionProperties);
+                accumulator.ProcessSection(previousSection, activeSectionProperties.ToImmutable());
             }
 
             static bool IsComment(string line)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
index 1b103e4b8a3e5..c750a40f155fc 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
@@ -2,7 +2,6 @@
 // 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.Collections.Immutable;
 using Microsoft.CodeAnalysis.Text;
 
@@ -12,7 +11,7 @@ internal interface IEditorConfigOptionAccumulator<TResults, TResult>
         where TResults : EditorConfigFile<TResult>
         where TResult : EditorConfigOption
     {
-        void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties);
+        void ProcessSection(Section section, ImmutableDictionary<string, (string value, TextLine? line)> properties);
         TResults Complete(string? filePath);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
index d873387893390..51bae3ea22c83 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
@@ -2,9 +2,7 @@
 // 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.Collections.Immutable;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
@@ -22,9 +20,11 @@ public EditorConfigNamingStyles Complete(string? fileName)
             return editorConfigNamingStyles;
         }
 
-        public void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties)
+        public void ProcessSection(
+            Section section,
+            ImmutableDictionary<string, (string value, TextLine? line)> properties)
         {
-            foreach (var ruleTitle in GetRuleTitles(properties))
+            foreach (var ruleTitle in GetRuleTitles(TrimDictionary(properties)))
             {
                 if (TryGetSymbolSpec(section, ruleTitle, properties, out var applicableSymbolInfo) &&
                     TryGetNamingStyleData(section, ruleTitle, properties, out var namingScheme) &&
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
index 9006335cb9933..31d34a2ff238f 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
@@ -84,8 +84,7 @@ private static bool TryGetEditorConfigOption<T>(this AnalyzerConfigOptions analy
                 // This option has .editorconfig storage defined, even if the current configuration does not provide a
                 // value for it.
                 hasEditorConfigStorage = true;
-                if (StructuredAnalyzerConfigOptions.TryGetStructuredOptions(analyzerConfigOptions, out var structuredOptions) &&
-                    configStorageLocation.TryGetOption(structuredOptions, option.Type, out var objectValue))
+                if (configStorageLocation.TryGetOption(analyzerConfigOptions, option.Type, out var objectValue))
                 {
                     value = (T?)objectValue;
                     return true;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
index f63d5d5684323..567882578d52f 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.NamingStyles;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Utilities;
 
@@ -15,15 +14,43 @@ namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     internal static partial class EditorConfigNamingStyleParser
     {
-        public static NamingStylePreferences ParseDictionary(AnalyzerConfigOptions allRawConventions)
+        /// <remarks>
+        /// The dictionary we get from the VS editorconfig API uses the same dictionary object if there are no changes, so we can cache based on dictionary
+        /// </remarks>
+        // TODO: revisit this cache. The assumption that the dictionary doesn't change in the exact instance is terribly fragile,
+        // and with the new .editorconfig support won't hold as well as we'd like: a single tree will have a stable instance but
+        // that won't necessarily be the same across files and projects.
+        private static readonly ConditionalWeakTable<IReadOnlyDictionary<string, string?>, NamingStylePreferences> _cache = new();
+        private static readonly object _cacheLock = new();
+
+        public static NamingStylePreferences GetNamingStylesFromDictionary(IReadOnlyDictionary<string, string?> rawOptions)
         {
-            var trimmedDictionary = TrimDictionary(allRawConventions);
+            if (_cache.TryGetValue(rawOptions, out var value))
+            {
+                return value;
+            }
+
+            lock (_cacheLock)
+            {
+                if (!_cache.TryGetValue(rawOptions, out value))
+                {
+                    value = ParseDictionary(rawOptions);
+                    _cache.Add(rawOptions, value);
+                }
+
+                return value;
+            }
+        }
 
+        public static NamingStylePreferences ParseDictionary(IReadOnlyDictionary<string, string?> allRawConventions)
+        {
             var symbolSpecifications = ArrayBuilder<SymbolSpecification>.GetInstance();
             var namingStyles = ArrayBuilder<NamingStyle>.GetInstance();
             var namingRules = ArrayBuilder<SerializableNamingRule>.GetInstance();
             var ruleNames = new Dictionary<(Guid symbolSpecificationID, Guid namingStyleID, ReportDiagnostic enforcementLevel), string>();
 
+            var trimmedDictionary = TrimDictionary(allRawConventions);
+
             foreach (var namingRuleTitle in GetRuleTitles(trimmedDictionary))
             {
                 if (TryGetSymbolSpec(namingRuleTitle, trimmedDictionary, out var symbolSpec) &&
@@ -100,12 +127,19 @@ public static NamingStylePreferences ParseDictionary(AnalyzerConfigOptions allRa
                     }));
         }
 
-        internal static Dictionary<string, string> TrimDictionary(AnalyzerConfigOptions allRawConventions)
+        internal static Dictionary<string, T> TrimDictionary<T>(IReadOnlyDictionary<string, T> allRawConventions)
         {
-            var trimmedDictionary = new Dictionary<string, string>(AnalyzerConfigOptions.KeyComparer);
-            foreach (var key in allRawConventions.Keys)
+            // Keys have been lowercased, but values have not. Because values here reference key
+            // names we need any comparisons to ignore case.
+            // For example, to make a naming style called "Pascal_Case_style" match up correctly
+            // with the key "dotnet_naming_style.pascal_case_style.capitalization", we have to
+            // ignore casing for that lookup.
+            var trimmedDictionary = new Dictionary<string, T>(allRawConventions.Count, AnalyzerConfigOptions.KeyComparer);
+            foreach (var item in allRawConventions)
             {
-                trimmedDictionary[key.Trim()] = allRawConventions.TryGetValue(key, out var value) ? value : throw new InvalidOperationException();
+                var key = item.Key.Trim();
+                var value = item.Value;
+                trimmedDictionary[key] = value;
             }
 
             return trimmedDictionary;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
index 4b0d78792aae8..894beddc04a6e 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
@@ -16,7 +16,7 @@ private static bool TryGetSerializableNamingRule(
             string namingRuleTitle,
             SymbolSpecification symbolSpec,
             NamingStyle namingStyle,
-            IReadOnlyDictionary<string, string> conventionsDictionary,
+            IReadOnlyDictionary<string, string?> conventionsDictionary,
             [NotNullWhen(true)] out SerializableNamingRule? serializableNamingRule)
         {
             if (!TryGetRuleSeverity(namingRuleTitle, conventionsDictionary, out var severity))
@@ -43,13 +43,13 @@ internal static bool TryGetRuleSeverity(
 
         private static bool TryGetRuleSeverity(
             string namingRuleName,
-            IReadOnlyDictionary<string, string> conventionsDictionary,
+            IReadOnlyDictionary<string, string?> conventionsDictionary,
             out ReportDiagnostic severity)
         {
-            var result = TryGetRuleSeverity<string, object?>(
+            var result = TryGetRuleSeverity<string?, object?>(
                 namingRuleName,
                 conventionsDictionary,
-                x => x,
+                x => x!,
                 x => null, // we don't have a tuple
                 out var tuple);
             severity = tuple.severity;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
index 50e5e709b87c4..80099a64b1c3a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
@@ -47,13 +47,13 @@ internal static bool TryGetNamingStyleData(
 
         private static bool TryGetNamingStyleData(
             string namingRuleName,
-            IReadOnlyDictionary<string, string> rawOptions,
+            IReadOnlyDictionary<string, string?> rawOptions,
             out NamingStyle namingStyle)
         {
-            return TryGetNamingStyleData<string, object?, NamingStyle>(
+            return TryGetNamingStyleData<string?, object?, NamingStyle>(
                 namingRuleName,
                 rawOptions,
-                s => s,
+                s => s ?? string.Empty,
                 x => null,
                 s => (s ?? string.Empty, null),
                 (nameTuple, prefixTuple, suffixTuple, wordSeparatorTuple, capitalizationTuple) =>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
index a299f9e7fe7a6..67e3176c0cd5c 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
@@ -46,13 +46,13 @@ internal static bool TryGetSymbolSpec(
 
         private static bool TryGetSymbolSpec(
             string namingRuleTitle,
-            IReadOnlyDictionary<string, string> conventionsDictionary,
+            IReadOnlyDictionary<string, string?> conventionsDictionary,
             [NotNullWhen(true)] out SymbolSpecification? symbolSpec)
         {
-            return TryGetSymbolSpec<string, object?, SymbolSpecification>(
+            return TryGetSymbolSpec<string?, object?, SymbolSpecification>(
                 namingRuleTitle,
                 conventionsDictionary,
-                s => (s, null),
+                s => (s ?? string.Empty, null),
                 () => null,
                 (t0, t1, t2, t3) => new SymbolSpecification(
                         Guid.NewGuid(),
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
index 980a1801b3be1..bf1d0e1124e80 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
@@ -56,13 +56,9 @@ public NamingStylePreferences(
         }
 
         public static NamingStylePreferences Default => FromXElement(XElement.Parse(DefaultNamingPreferencesString));
-        public static NamingStylePreferences Empty => new(ImmutableArray<SymbolSpecification>.Empty, ImmutableArray<NamingStyle>.Empty, ImmutableArray<SerializableNamingRule>.Empty);
 
         public static string DefaultNamingPreferencesString => _defaultNamingPreferencesString;
 
-        public bool IsEmpty
-            => SymbolSpecifications.IsEmpty && NamingStyles.IsEmpty && NamingRules.IsEmpty;
-
         internal NamingStyle GetNamingStyle(Guid namingStyleID)
             => NamingStyles.Single(s => s.ID == namingStyleID);
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
index 0463567afcbc3..c2cb04b627680 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
@@ -24,7 +24,6 @@
 namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     [DataContract]
-    [DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
     internal sealed class SymbolSpecification : IEquatable<SymbolSpecification>, IObjectWritable
     {
         private static readonly SymbolSpecification DefaultSymbolSpecificationTemplate = CreateDefaultSymbolSpecification();
@@ -58,9 +57,6 @@ public SymbolSpecification(
             RequiredModifierList = modifiers.IsDefault ? DefaultSymbolSpecificationTemplate.RequiredModifierList : modifiers;
         }
 
-        private string GetDebuggerDisplay()
-            => Name;
-
         public static SymbolSpecification CreateDefaultSymbolSpecification()
         {
             // This is used to create new, empty symbol specifications for users to then customize.
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
new file mode 100644
index 0000000000000..a850af2038898
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
@@ -0,0 +1,34 @@
+// 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.Reflection;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Options
+{
+    internal static class EditorConfigStorageLocationExtensions
+    {
+        public static bool TryGetOption(this IEditorConfigStorageLocation editorConfigStorageLocation, AnalyzerConfigOptions analyzerConfigOptions, Type type, out object? value)
+        {
+            // This is a workaround until we have an API for enumeratings AnalyzerConfigOptions. See https://github.com/dotnet/roslyn/issues/41840
+            if (analyzerConfigOptions.GetType().FullName == typeof(DictionaryAnalyzerConfigOptions).FullName)
+            {
+                var optionsField = analyzerConfigOptions.GetType().GetField(nameof(DictionaryAnalyzerConfigOptions.Options), BindingFlags.NonPublic | BindingFlags.Instance);
+                Contract.ThrowIfNull(optionsField);
+
+                var options = optionsField.GetValue(analyzerConfigOptions);
+                Contract.ThrowIfNull(options);
+
+                return editorConfigStorageLocation.TryGetOption((ImmutableDictionary<string, string?>)options, type, out value);
+            }
+
+            value = null;
+            return false;
+        }
+    }
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
index 0e349c86bd476..fe92fbb888eff 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
@@ -8,8 +8,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
 #if CODE_STYLE
@@ -61,9 +59,10 @@ public EditorConfigStorageLocation(string keyName, Func<string, Optional<T>> par
             _getEditorConfigStringForValue = getEditorConfigStringForValue ?? throw new ArgumentNullException(nameof(getEditorConfigStringForValue));
         }
 
-        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? result)
+        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? result)
         {
-            if (options.TryGetValue(KeyName, out var value))
+            if (rawOptions.TryGetValue(KeyName, out var value)
+                && value is object)
             {
                 var ret = TryGetOption(value, type, out var typedResult);
                 result = typedResult;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
index 9d6d0521f2b27..fdaca1ff999d2 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
@@ -4,15 +4,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 
 namespace Microsoft.CodeAnalysis.Options
 {
     internal interface IEditorConfigStorageLocation
     {
-        bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? value);
+        bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? value);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
index 650356dd5b95d..e3dd6c3e96ae9 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
@@ -13,13 +12,30 @@ namespace Microsoft.CodeAnalysis.Options
 {
     internal sealed class NamingStylePreferenceEditorConfigStorageLocation : OptionStorageLocation2, IEditorConfigStorageLocation
     {
-        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object result)
+        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object result)
+        {
+            var tuple = ParseDictionary(rawOptions, type);
+            result = tuple.result;
+            return tuple.succeeded;
+        }
+
+        private static (object result, bool succeeded) ParseDictionary(
+            IReadOnlyDictionary<string, string?> allRawConventions, Type type)
         {
             if (type == typeof(NamingStylePreferences))
             {
-                var preferences = options.GetNamingStylePreferences();
-                result = preferences;
-                return !preferences.IsEmpty;
+                var editorconfigNamingStylePreferences = EditorConfigNamingStyleParser.GetNamingStylesFromDictionary(allRawConventions);
+
+                if (!editorconfigNamingStylePreferences.NamingRules.Any() &&
+                    !editorconfigNamingStylePreferences.NamingStyles.Any() &&
+                    !editorconfigNamingStylePreferences.SymbolSpecifications.Any())
+                {
+                    // We were not able to parse any rules from editorconfig, tell the caller that the parse failed
+                    return (result: editorconfigNamingStylePreferences, succeeded: false);
+                }
+
+                // no existing naming styles were passed so just return the set of styles that were parsed from editorconfig
+                return (result: editorconfigNamingStylePreferences, succeeded: true);
             }
 
             throw ExceptionUtilities.UnexpectedValue(type);

From de252d8225d17e8e940764e441929cdd89770040 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Wed, 11 May 2022 11:43:31 -0700
Subject: [PATCH 375/413] Work around project system bug (#61247)

The project system is not handling `<CopyToOutputDirectory>` correctly
when it comes from a shared project. This is causing us to overbuild
when building from VS (up to date check always fails). Working around
that by moving the items to the normal project files

https://github.com/dotnet/project-system/issues/8157
---
 src/Compilers/CSharp/CommandLine/CscCommandLine.projitems | 4 ----
 src/Compilers/CSharp/csc-arm64/csc-arm64.csproj           | 8 ++++++++
 src/Compilers/CSharp/csc/csc.csproj                       | 8 ++++++++
 .../VisualBasic/CommandLine/VbcCommandLine.projitems      | 3 ---
 src/Compilers/VisualBasic/vbc-arm64/vbc-arm64.csproj      | 8 ++++++++
 src/Compilers/VisualBasic/vbc/vbc.csproj                  | 8 ++++++++
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems b/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
index ece1eb52ca424..1e6d177bbbcb9 100644
--- a/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
+++ b/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
@@ -31,10 +31,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
 
     <None Include="$(MSBuildThisFileDirectory)App.config" />
-    <None Include="$(MSBuildThisFileDirectory)csc.rsp" Condition="'$(TargetFramework)' == 'net472'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests" />
     
     <ProjectReference Include="..\..\Core\Portable\Microsoft.CodeAnalysis.csproj" />
diff --git a/src/Compilers/CSharp/csc-arm64/csc-arm64.csproj b/src/Compilers/CSharp/csc-arm64/csc-arm64.csproj
index 6dbfa43a1079c..c23b70f12c053 100644
--- a/src/Compilers/CSharp/csc-arm64/csc-arm64.csproj
+++ b/src/Compilers/CSharp/csc-arm64/csc-arm64.csproj
@@ -10,5 +10,13 @@
     <TargetFramework>net472</TargetFramework>
     <DisableNullableWarnings>true</DisableNullableWarnings>
   </PropertyGroup>
+
+  <!-- Can't put this in shared project due to https://github.com/dotnet/project-system/issues/8157 -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\CommandLine\csc.rsp" Condition="'$(TargetFramework)' == 'net472'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\CommandLine\CscCommandLine.projitems" Label="Shared" />
 </Project>
diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj
index ae445687ed0d4..5be61f81b33d1 100644
--- a/src/Compilers/CSharp/csc/csc.csproj
+++ b/src/Compilers/CSharp/csc/csc.csproj
@@ -6,5 +6,13 @@
     <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <UseAppHost>false</UseAppHost>
   </PropertyGroup>
+  
+  <!-- Can't put this in shared project due to https://github.com/dotnet/project-system/issues/8157 -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\CommandLine\csc.rsp" Condition="'$(TargetFramework)' == 'net472'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\CommandLine\CscCommandLine.projitems" Label="Shared" />
 </Project>
diff --git a/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems b/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
index 0843c17089e97..d0cbdd3f76b0e 100644
--- a/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
+++ b/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
@@ -31,9 +31,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
 
     <None Include="$(MSBuildThisFileDirectory)App.config" />
-    <None Include="$(MSBuildThisFileDirectory)vbc.rsp" Condition="'$(TargetFramework)' == 'net472'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
 
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests" />
 
diff --git a/src/Compilers/VisualBasic/vbc-arm64/vbc-arm64.csproj b/src/Compilers/VisualBasic/vbc-arm64/vbc-arm64.csproj
index 6e1d2a09937f7..9c6157119e705 100644
--- a/src/Compilers/VisualBasic/vbc-arm64/vbc-arm64.csproj
+++ b/src/Compilers/VisualBasic/vbc-arm64/vbc-arm64.csproj
@@ -10,5 +10,13 @@
     <AssemblyName>vbc</AssemblyName>
     <DisableNullableWarnings>true</DisableNullableWarnings>
   </PropertyGroup>
+  
+  <!-- Can't put this in shared project due to https://github.com/dotnet/project-system/issues/8157 -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\CommandLine\vbc.rsp" Condition="'$(TargetFramework)' == 'net472'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\CommandLine\VbcCommandLine.projitems" Label="Shared" />
 </Project>
diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj
index ddc653e2e7446..7583cd3989bf2 100644
--- a/src/Compilers/VisualBasic/vbc/vbc.csproj
+++ b/src/Compilers/VisualBasic/vbc/vbc.csproj
@@ -6,5 +6,13 @@
     <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <UseAppHost>false</UseAppHost>
   </PropertyGroup>
+  
+  <!-- Can't put this in shared project due to https://github.com/dotnet/project-system/issues/8157 -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\CommandLine\vbc.rsp" Condition="'$(TargetFramework)' == 'net472'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\CommandLine\VbcCommandLine.projitems" Label="Shared" />
 </Project>

From 9aaecf6fca46587053960d5142afefa5ce0f2f67 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 14:26:25 -0700
Subject: [PATCH 376/413] Null check

---
 .../FindSymbols/FindReferences/DependentProjectsFinder.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
index 31b560552dfad..73706d6b43737 100644
--- a/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
+++ b/src/Workspaces/Core/Portable/FindSymbols/FindReferences/DependentProjectsFinder.cs
@@ -92,6 +92,9 @@ private static async Task<ImmutableArray<Project>> GetDependentProjectsWorkerAsy
             foreach (var symbol in symbols)
             {
                 var assembly = symbol.OriginalDefinition.ContainingAssembly;
+                if (assembly == null)
+                    continue;
+
                 if (!result.TryGetValue(assembly, out var projectAndVisibility))
                     projectAndVisibility = (solution.GetProject(assembly, cancellationToken), symbol.GetResultantVisibility());
 

From 2266b302341581fa9a836014422b1a8dd31c49c6 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 16:10:59 -0700
Subject: [PATCH 377/413] Move off of IOperation in speculation analyzer.

---
 .../CSharp/Utilities/SpeculationAnalyzer.cs   |  5 ++
 .../Utilities/AbstractSpeculationAnalyzer.cs  | 73 ++++++++++++++++---
 .../Utilities/SpeculationAnalyzer.vb          |  4 +
 3 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
index d6a05777d3a1d..fa9dc8681a32a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
@@ -9,7 +9,9 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using System.Xml.Serialization;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.LanguageServices;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
@@ -31,6 +33,7 @@ internal class SpeculationAnalyzer : AbstractSpeculationAnalyzer<
         ArgumentSyntax,
         CommonForEachStatementSyntax,
         ThrowStatementSyntax,
+        InvocationExpressionSyntax,
         Conversion>
     {
         /// <summary>
@@ -59,6 +62,8 @@ public SpeculationAnalyzer(
         {
         }
 
+        protected override CodeAnalysis.LanguageServices.ISyntaxFacts SyntaxFactsService { get; } = CSharpSyntaxFacts.Instance;
+
         protected override SyntaxNode GetSemanticRootForSpeculation(ExpressionSyntax expression)
         {
             Debug.Assert(expression != null);
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index 11017adb018d1..009a9640894fe 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
@@ -30,6 +31,7 @@ internal abstract class AbstractSpeculationAnalyzer<
             TArgumentSyntax,
             TForEachStatementSyntax,
             TThrowStatementSyntax,
+            TInvocationExpressionSyntax,
             TConversion> : ISpeculationAnalyzer
         where TExpressionSyntax : SyntaxNode
         where TTypeSyntax : TExpressionSyntax
@@ -37,6 +39,7 @@ internal abstract class AbstractSpeculationAnalyzer<
         where TArgumentSyntax : SyntaxNode
         where TForEachStatementSyntax : SyntaxNode
         where TThrowStatementSyntax : SyntaxNode
+        where TInvocationExpressionSyntax : TExpressionSyntax
         where TConversion : struct
     {
         private readonly TExpressionSyntax _expression;
@@ -88,6 +91,8 @@ public AbstractSpeculationAnalyzer(
             _lazySpeculativeSemanticModel = null;
         }
 
+        protected abstract ISyntaxFacts SyntaxFactsService { get; }
+
         /// <summary>
         /// Original expression to be replaced.
         /// </summary>
@@ -507,7 +512,10 @@ private bool ReplacementChangesSemanticsForNode(SyntaxNode currentOriginalNode,
             Debug.Assert(previousOriginalNode == null || previousOriginalNode.Parent == currentOriginalNode);
             Debug.Assert(previousReplacedNode == null || previousReplacedNode.Parent == currentReplacedNode);
 
-            if (!OperationsAreCompatible(currentOriginalNode, currentReplacedNode))
+            if (!MemberAccessesAreCompatible(currentOriginalNode as TExpressionSyntax, currentReplacedNode as TExpressionSyntax))
+                return true;
+
+            if (!InvocationsAreCompatible(currentOriginalNode as TInvocationExpressionSyntax, currentReplacedNode as TInvocationExpressionSyntax))
                 return true;
 
             if (ExpressionMightReferenceMember(currentOriginalNode))
@@ -565,19 +573,65 @@ private bool ReplacementChangesSemanticsForNode(SyntaxNode currentOriginalNode,
             return false;
         }
 
-        private bool OperationsAreCompatible(SyntaxNode currentOriginalNode, SyntaxNode currentReplacedNode)
+        private bool MemberAccessesAreCompatible(TExpressionSyntax? originalExpression, TExpressionSyntax? newExpression)
+        {
+            // If not expressions, nothing to do here.
+            if (originalExpression is null && newExpression is null)
+                return true;
+
+            var syntaxFacts = this.SyntaxFactsService;
+            if (syntaxFacts.IsSimpleMemberAccessExpression(originalExpression) &&
+                !syntaxFacts.IsSimpleMemberAccessExpression(newExpression))
+            {
+                if (!syntaxFacts.IsSimpleName(newExpression))
+                    return false;
+
+                if (!SymbolsAreCompatible(originalExpression, newExpression))
+                    return false;
+
+                var originalExpressionOfMemberAccess = syntaxFacts.GetExpressionOfMemberAccessExpression(originalExpression);
+                if (originalExpressionOfMemberAccess != null)
+                {
+                    var originalSymbol = _semanticModel.GetSymbolInfo(originalExpression, CancellationToken).Symbol;
+
+                    // When binding expr.A, if we didn't bind 'expr' binding to a type, namespace, or other static
+                    // thing, then we bound to an instance symbol. It's then only ok to remove 'expr' if 'expr' is
+                    // this/base.
+                    if (originalSymbol != null &&
+                        originalSymbol is not INamespaceOrTypeSymbol &&
+                        !originalSymbol.IsStatic)
+                    {
+                        if (!syntaxFacts.IsThisExpression(originalExpressionOfMemberAccess) &&
+                            !syntaxFacts.IsBaseExpression(originalExpressionOfMemberAccess))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        private bool InvocationsAreCompatible(TInvocationExpressionSyntax? originalInvocation, TInvocationExpressionSyntax? newInvocation)
         {
-            var originalOperation = this._semanticModel.GetOperation(currentOriginalNode, CancellationToken);
-            var currentOperation = this.SpeculativeSemanticModel.GetOperation(currentReplacedNode, CancellationToken);
+            // If not invocations, nothing to do here.
+            if (originalInvocation is null && newInvocation is null)
+                return true;
 
-            if (originalOperation is IInvocationOperation originalInvocation)
+            // Invocations must stay invocations after update.
+            if (originalInvocation is not null)
             {
                 // Invocations must stay invocations after update.
-                if (currentOperation is not IInvocationOperation currentInvocation)
+                if (newInvocation is null)
                     return false;
 
-                // An instance call must stay an instance call (and a static call must stay a static call).
-                if (IsNullOrNone(originalInvocation.Instance) != IsNullOrNone(currentInvocation.Instance))
+                var originalInvokedExpr = this.SyntaxFactsService.GetExpressionOfInvocationExpression(originalInvocation);
+                var newInvokedExpr = this.SyntaxFactsService.GetExpressionOfInvocationExpression(newInvocation);
+
+                // Ensure we're still calling this off the same symbol.  If instance changed to static or vice/versa
+                // this will fail.
+                if (!SymbolsAreCompatible(originalInvokedExpr, newInvokedExpr, requireNonNullSymbols: false))
                     return false;
 
                 // Add more invocation tests here.
@@ -587,9 +641,6 @@ private bool OperationsAreCompatible(SyntaxNode currentOriginalNode, SyntaxNode
             return true;
         }
 
-        private static bool IsNullOrNone(IOperation? instance)
-            => instance is null || instance.Kind == OperationKind.None;
-
         /// <summary>
         /// Determine if removing the cast could cause the semantics of System.Object method call to change.
         /// E.g. Dim b = CStr(1).GetType() is necessary, but the GetType method symbol info resolves to the same with or without the cast.
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
index fd29aad0101d7..f80d9f9b1a991 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
@@ -4,6 +4,7 @@
 
 Imports System.Collections.Immutable
 Imports System.Threading
+Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Utilities
@@ -22,6 +23,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Utilities
             ArgumentSyntax,
             ForEachStatementSyntax,
             ThrowStatementSyntax,
+            InvocationExpressionSyntax,
             Conversion)
 
         ''' <summary>
@@ -43,6 +45,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Utilities
             MyBase.New(expression, newExpression, semanticModel, cancellationToken, skipVerificationForReplacedNode, failOnOverloadResolutionFailuresInOriginalCode)
         End Sub
 
+        Protected Overrides ReadOnly Property SyntaxFactsService As CodeAnalysis.LanguageServices.ISyntaxFacts = VisualBasicSyntaxFacts.Instance
+
         Protected Overrides Function GetSemanticRootForSpeculation(expression As ExpressionSyntax) As SyntaxNode
             Debug.Assert(expression IsNot Nothing)
 

From fa8e22d7bbffb44aaba352ce06088e36d78487fb Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 16:16:35 -0700
Subject: [PATCH 378/413] Simplify

---
 .../Utilities/AbstractSpeculationAnalyzer.cs  | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index 009a9640894fe..fcf7f30142b6d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -580,32 +580,39 @@ private bool MemberAccessesAreCompatible(TExpressionSyntax? originalExpression,
                 return true;
 
             var syntaxFacts = this.SyntaxFactsService;
+
+            // it is legal to go from expr.X to X if expr is either used for static-lookup (e.g.
+            // `MyNs.MyType.MyStaticMember` -> `MyStaticMember`), or if it's used for instance lookup, but only if expr
+            // is `this` or `base`.  We will ensure that the 'X' binds to the same symbol.  If so, the static case is
+            // fine, as as long as the member is available without issue (e.g. accessibility etc.) then it doesn't
+            // change meaning when switching.  The same holds true for an instance method with this/base as that is
+            // allowed to be implicit if it binds to the same exact member.
+
             if (syntaxFacts.IsSimpleMemberAccessExpression(originalExpression) &&
                 !syntaxFacts.IsSimpleMemberAccessExpression(newExpression))
             {
+                // if we don't even have a name after simplification, this is never ok.
                 if (!syntaxFacts.IsSimpleName(newExpression))
                     return false;
 
+                // The symbols before/after must be exactly the same (this also ensures that a base access of some
+                // overridden method will be preserved as otherwise the symbols are different).
                 if (!SymbolsAreCompatible(originalExpression, newExpression))
                     return false;
 
-                var originalExpressionOfMemberAccess = syntaxFacts.GetExpressionOfMemberAccessExpression(originalExpression);
-                if (originalExpressionOfMemberAccess != null)
+                // When binding expr.A, if we didn't bind 'expr' binding to a type, namespace, or other static
+                // thing, then we bound to an instance symbol. It's then only ok to remove 'expr' if 'expr' is
+                // this/base.
+                var originalSymbol = _semanticModel.GetSymbolInfo(originalExpression, CancellationToken).Symbol;
+                if (originalSymbol != null &&
+                    originalSymbol is not INamespaceOrTypeSymbol &&
+                    !originalSymbol.IsStatic)
                 {
-                    var originalSymbol = _semanticModel.GetSymbolInfo(originalExpression, CancellationToken).Symbol;
-
-                    // When binding expr.A, if we didn't bind 'expr' binding to a type, namespace, or other static
-                    // thing, then we bound to an instance symbol. It's then only ok to remove 'expr' if 'expr' is
-                    // this/base.
-                    if (originalSymbol != null &&
-                        originalSymbol is not INamespaceOrTypeSymbol &&
-                        !originalSymbol.IsStatic)
-                    {
-                        if (!syntaxFacts.IsThisExpression(originalExpressionOfMemberAccess) &&
+                    var originalExpressionOfMemberAccess = syntaxFacts.GetExpressionOfMemberAccessExpression(originalExpression);
+                    if (!syntaxFacts.IsThisExpression(originalExpressionOfMemberAccess) &&
                             !syntaxFacts.IsBaseExpression(originalExpressionOfMemberAccess))
-                        {
-                            return false;
-                        }
+                    {
+                        return false;
                     }
                 }
             }

From ceab57c4748ef50d4396d661d7da5197e91bd31a Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 16:19:58 -0700
Subject: [PATCH 379/413] Simplify

---
 .../Core/Utilities/AbstractSpeculationAnalyzer.cs        | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index fcf7f30142b6d..155171a21aa89 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -626,21 +626,12 @@ private bool InvocationsAreCompatible(TInvocationExpressionSyntax? originalInvoc
             if (originalInvocation is null && newInvocation is null)
                 return true;
 
-            // Invocations must stay invocations after update.
             if (originalInvocation is not null)
             {
                 // Invocations must stay invocations after update.
                 if (newInvocation is null)
                     return false;
 
-                var originalInvokedExpr = this.SyntaxFactsService.GetExpressionOfInvocationExpression(originalInvocation);
-                var newInvokedExpr = this.SyntaxFactsService.GetExpressionOfInvocationExpression(newInvocation);
-
-                // Ensure we're still calling this off the same symbol.  If instance changed to static or vice/versa
-                // this will fail.
-                if (!SymbolsAreCompatible(originalInvokedExpr, newInvokedExpr, requireNonNullSymbols: false))
-                    return false;
-
                 // Add more invocation tests here.
             }
 

From 9201b7f9e4e7805923de664678fd980906d9d113 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Wed, 11 May 2022 16:29:42 -0700
Subject: [PATCH 380/413] Handle VB and C#

---
 .../Compiler/CSharp/Utilities/SpeculationAnalyzer.cs        | 3 +++
 .../Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs  | 6 ++----
 .../Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb   | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
index fa9dc8681a32a..c814c68dfab7a 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/SpeculationAnalyzer.cs
@@ -64,6 +64,9 @@ public SpeculationAnalyzer(
 
         protected override CodeAnalysis.LanguageServices.ISyntaxFacts SyntaxFactsService { get; } = CSharpSyntaxFacts.Instance;
 
+        protected override bool CanAccessInstanceMemberThrough(ExpressionSyntax expression)
+            => expression.Kind() is SyntaxKind.ThisExpression or SyntaxKind.BaseExpression;
+
         protected override SyntaxNode GetSemanticRootForSpeculation(ExpressionSyntax expression)
         {
             Debug.Assert(expression != null);
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index 155171a21aa89..c6e517abe0668 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -92,6 +92,7 @@ public AbstractSpeculationAnalyzer(
         }
 
         protected abstract ISyntaxFacts SyntaxFactsService { get; }
+        protected abstract bool CanAccessInstanceMemberThrough(TExpressionSyntax expression);
 
         /// <summary>
         /// Original expression to be replaced.
@@ -609,11 +610,8 @@ originalSymbol is not INamespaceOrTypeSymbol &&
                     !originalSymbol.IsStatic)
                 {
                     var originalExpressionOfMemberAccess = syntaxFacts.GetExpressionOfMemberAccessExpression(originalExpression);
-                    if (!syntaxFacts.IsThisExpression(originalExpressionOfMemberAccess) &&
-                            !syntaxFacts.IsBaseExpression(originalExpressionOfMemberAccess))
-                    {
+                    if (!CanAccessInstanceMemberThrough((TExpressionSyntax?)originalExpressionOfMemberAccess))
                         return false;
-                    }
                 }
             }
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
index f80d9f9b1a991..3e945bfdd23a2 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Utilities/SpeculationAnalyzer.vb
@@ -46,6 +46,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Utilities
         End Sub
 
         Protected Overrides ReadOnly Property SyntaxFactsService As CodeAnalysis.LanguageServices.ISyntaxFacts = VisualBasicSyntaxFacts.Instance
+        Protected Overrides Function CanAccessInstanceMemberThrough(expression As ExpressionSyntax) As Boolean
+            ' vb can reference an instance member by just writing `.X` (when in a 'with' block), or by writing Me.X,
+            ' MyBase.X and MyClass.X (the latter is not just for accessing static members).
+            Return expression Is Nothing OrElse expression.IsKind(SyntaxKind.MeExpression, SyntaxKind.MyBaseExpression, SyntaxKind.MyClassExpression)
+        End Function
 
         Protected Overrides Function GetSemanticRootForSpeculation(expression As ExpressionSyntax) As SyntaxNode
             Debug.Assert(expression IsNot Nothing)

From 9ebd02c183aa9498623682de3d626d908fc00bec Mon Sep 17 00:00:00 2001
From: "gel@microsoft.com" <gel@microsoft.com>
Date: Wed, 11 May 2022 16:34:40 -0700
Subject: [PATCH 381/413] Fix merge

---
 .../CompletionProviders/DeclarationNameCompletionProvider.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
index 6946b3f6c5b4a..b4275f66224d0 100644
--- a/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
+++ b/src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
@@ -68,7 +68,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
                 // Do not show name suggestions for unbound "async" identifier.
                 // Most likely user is writing an async method, so name suggestion will just interfere him
                 if (context.TargetToken.IsKindOrHasMatchingText(SyntaxKind.AsyncKeyword) &&
-                    semanticModel.GetSymbolInfo(context.TargetToken).GetAnySymbol() is null)
+                    context.SemanticModel.GetSymbolInfo(context.TargetToken).GetAnySymbol() is null)
                 {
                     return;
                 }

From 07579dd435b4132aef4c65299309c1aee188adba Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Wed, 11 May 2022 16:58:16 -0700
Subject: [PATCH 382/413] Fix WPF issue with indeterminate progress bar
 (#61254)

Fixes #61186 . See issue for details on fix
---
 src/VisualStudio/Core/Def/ValueTracking/ValueTrackingTree.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingTree.xaml b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingTree.xaml
index f43299938b512..d7986f75defb8 100644
--- a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingTree.xaml
+++ b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingTree.xaml
@@ -30,7 +30,7 @@
             Grid.Row="0"
             Grid.ColumnSpan="3"
             Grid.Column="0"
-            IsIndeterminate="True"
+            IsIndeterminate="{Binding RelativeSource={RelativeSource Self}, Path=IsVisible}"
             Panel.ZIndex="10000"
             Minimum="0"
             Maximum="100"

From 2e5caf9e782651e43bc17182246e860d315944f6 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Wed, 11 May 2022 17:23:50 -0700
Subject: [PATCH 383/413] Update dependency versions for 4.2.0 publishing

Updates our nuget versions for 4.2.0, so that all published binaries will depend on publicly-available non-prerelease packages. As part of this, I had to break add multiple versions of MSBuild, as Microsoft.VisualStudio.Shell.15.0 is now advertising their dependency on MSBuild 17.1.0. There was always an indirect dependency there, but it was not included in their nuspec.
---
 eng/Versions.props                            | 45 ++++++++++++-------
 .../Roslyn.Compilers.Extension.csproj         |  6 +--
 src/Tools/IdeBenchmarks/IdeBenchmarks.csproj  |  2 +-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index c0e9538db2359..d6350bf64ae1a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,18 +25,25 @@
     <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.132-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.1.0</CodeStyleAnalyzerVersion>
-    <VisualStudioEditorPackagesVersion>17.2.178-preview</VisualStudioEditorPackagesVersion>
+    <VisualStudioEditorPackagesVersion>17.2.3194</VisualStudioEditorPackagesVersion>
     <ILAsmPackageVersion>5.0.0-alpha1.19409.1</ILAsmPackageVersion>
     <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
     <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.2.8</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
-    <MicrosoftVisualStudioShellPackagesVersion>17.2.0-preview-1-32131-009</MicrosoftVisualStudioShellPackagesVersion>
+    <MicrosoftVisualStudioShellPackagesVersion>17.2.32505.113</MicrosoftVisualStudioShellPackagesVersion>
     <RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>
+    <!--
+      Microsoft.VisualStudio.Shell.15.0 has a ref to MSBuild 17.1.0, so for those projects that depend on both we 
+      need a new MSBuild version.
+    -->
+    <RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>17.1.0</RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>
     <!-- The version of Roslyn we build Source Generators against that are built in this
          repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
          but not higher than our minimum dogfoodable Visual Studio version, or else
          the generators we build would load on the command line but not load in IDEs. -->
     <SourceGeneratorMicrosoftCodeAnalysisVersion>3.8.0</SourceGeneratorMicrosoftCodeAnalysisVersion>
     <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
+    <MicrosoftServiceHubVersion>3.1.4097</MicrosoftServiceHubVersion>
+    <MicrosoftVisualStudioThreadingVersion>17.2.32</MicrosoftVisualStudioThreadingVersion>
   </PropertyGroup>
   <!--
     Dependency versions
@@ -65,8 +72,12 @@
     <RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
     <RefOnlyMicrosoftBuildRuntimeVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildRuntimeVersion>
     <RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
+    <RefOnlyMicrosoftBuildVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildVersion_WithShellDependency>
+    <RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>
+    <RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>
+    <RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>
     <NuGetVisualStudioContractsVersion>6.0.0-preview.0.15</NuGetVisualStudioContractsVersion>
-    <MicrosoftVisualStudioRpcContractsVersion>17.2.22-alpha</MicrosoftVisualStudioRpcContractsVersion>
+    <MicrosoftVisualStudioRpcContractsVersion>17.2.31</MicrosoftVisualStudioRpcContractsVersion>
     <!--
       Since the Microsoft.CodeAnalysis.Analyzers package is a public dependency of our NuGet
       packages we will keep it untied to the RoslynDiagnosticsNugetPackageVersion we use for
@@ -78,7 +89,7 @@
     <MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
     <MicrosoftCodeAnalysisCSharpCodeRefactoringTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisCSharpCodeRefactoringTestingXUnitVersion>
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>$(CodeStyleAnalyzerVersion)</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
-    <MicrosoftCodeAnalysisElfieVersion>1.0.0-rc14</MicrosoftCodeAnalysisElfieVersion>
+    <MicrosoftCodeAnalysisElfieVersion>1.0.0</MicrosoftCodeAnalysisElfieVersion>
     <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.44</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
     <MicrosoftCodeAnalysisVisualBasicAnalyzerTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisVisualBasicAnalyzerTestingXUnitVersion>
     <MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>
@@ -115,14 +126,14 @@
     <MicrosoftNetSdkVersion>2.0.0-alpha-20170405-2</MicrosoftNetSdkVersion>
     <MicrosoftNuGetBuildTasksVersion>0.1.0</MicrosoftNuGetBuildTasksVersion>
     <MicrosoftPortableTargetsVersion>0.1.2-dev</MicrosoftPortableTargetsVersion>
-    <MicrosoftServiceHubClientVersion>3.1.3058</MicrosoftServiceHubClientVersion>
-    <MicrosoftServiceHubFrameworkVersion>3.1.3058</MicrosoftServiceHubFrameworkVersion>
+    <MicrosoftServiceHubClientVersion>$(MicrosoftServiceHubVersion)</MicrosoftServiceHubClientVersion>
+    <MicrosoftServiceHubFrameworkVersion>$(MicrosoftServiceHubVersion)</MicrosoftServiceHubFrameworkVersion>
     <MicrosoftSourceLinkToolsVersion>1.1.1-beta-21566-01</MicrosoftSourceLinkToolsVersion>
     <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
     <MicrosoftVisualStudioCacheVersion>17.2.41-alpha</MicrosoftVisualStudioCacheVersion>
     <MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.8.27812-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
     <MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
-    <MicrosoftVisualStudioComponentModelHostVersion>17.2.140-preview-ga1e1777dca</MicrosoftVisualStudioComponentModelHostVersion>
+    <MicrosoftVisualStudioComponentModelHostVersion>17.2.3194</MicrosoftVisualStudioComponentModelHostVersion>
     <MicrosoftVisualStudioCompositionVersion>16.9.20</MicrosoftVisualStudioCompositionVersion>
     <MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
     <MicrosoftVisualStudioDebuggerUIInterfacesVersion>17.2.0-beta.21616.2</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
@@ -147,11 +158,11 @@
     <MicrosoftVisualStudioLanguageVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageVersion>
     <MicrosoftVisualStudioLanguageCallHierarchyVersion>15.8.27812-alpha</MicrosoftVisualStudioLanguageCallHierarchyVersion>
     <MicrosoftVisualStudioLanguageIntellisenseVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageIntellisenseVersion>
-    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>17.0.25-g975cd8c52c</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
+    <MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>17.0.491</MicrosoftVisualStudioLanguageNavigateToInterfacesVersion>
     <MicrosoftVisualStudioLanguageServerProtocolVersion>$(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion)</MicrosoftVisualStudioLanguageServerProtocolVersion>
     <MicrosoftVisualStudioLanguageServerProtocolExtensionsVersion>$(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion)</MicrosoftVisualStudioLanguageServerProtocolExtensionsVersion>
     <MicrosoftVisualStudioLanguageServerProtocolInternalVersion>$(MicrosoftVisualStudioLanguageServerProtocolPackagesVersion)</MicrosoftVisualStudioLanguageServerProtocolInternalVersion>
-    <MicrosoftVisualStudioLanguageServerClientVersion>17.0.5139-g7b8c8bd49d</MicrosoftVisualStudioLanguageServerClientVersion>
+    <MicrosoftVisualStudioLanguageServerClientVersion>17.0.5165</MicrosoftVisualStudioLanguageServerClientVersion>
     <MicrosoftVisualStudioLanguageStandardClassificationVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
     <MicrosoftVisualStudioLiveShareVersion>2.18.6</MicrosoftVisualStudioLiveShareVersion>
     <MicrosoftVisualStudioLiveShareLanguageServicesVersion>3.0.6</MicrosoftVisualStudioLiveShareLanguageServicesVersion>
@@ -165,11 +176,11 @@
     <MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
     <MicrosoftVisualStudioRemoteControlVersion>16.3.44</MicrosoftVisualStudioRemoteControlVersion>
     <MicrosoftVisualStudioSDKAnalyzersVersion>16.10.10</MicrosoftVisualStudioSDKAnalyzersVersion>
-    <MicrosoftVisualStudioSetupConfigurationInteropVersion>1.16.30</MicrosoftVisualStudioSetupConfigurationInteropVersion>
+    <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4492</MicrosoftVisualStudioSetupConfigurationInteropVersion>
     <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
     <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
     <MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
-    <MicrosoftVisualStudioTelemetryVersion>16.4.37</MicrosoftVisualStudioTelemetryVersion>
+    <MicrosoftVisualStudioTelemetryVersion>16.4.56</MicrosoftVisualStudioTelemetryVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
     <MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
     <MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
@@ -177,12 +188,12 @@
     <MicrosoftVisualStudioTextUIVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIVersion>
     <MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
     <MicrosoftVisualStudioTextUICocoaVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUICocoaVersion>
-    <MicrosoftVisualStudioThreadingAnalyzersVersion>17.2.10-alpha</MicrosoftVisualStudioThreadingAnalyzersVersion>
-    <MicrosoftVisualStudioThreadingVersion>17.2.10-alpha</MicrosoftVisualStudioThreadingVersion>
+    <MicrosoftVisualStudioThreadingAnalyzersVersion>$(MicrosoftVisualStudioThreadingVersion)</MicrosoftVisualStudioThreadingAnalyzersVersion>
+    <MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingVersion)</MicrosoftVisualStudioThreadingVersion>
     <MicrosoftVisualStudioUtilitiesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
-    <MicrosoftVisualStudioValidationVersion>17.0.46</MicrosoftVisualStudioValidationVersion>
-    <MicrosoftVisualStudioInteractiveWindowVersion>4.0.0-beta.21267.2</MicrosoftVisualStudioInteractiveWindowVersion>
-    <MicrosoftVisualStudioVsInteractiveWindowVersion>4.0.0-beta.21267.2</MicrosoftVisualStudioVsInteractiveWindowVersion>
+    <MicrosoftVisualStudioValidationVersion>17.0.53</MicrosoftVisualStudioValidationVersion>
+    <MicrosoftVisualStudioInteractiveWindowVersion>4.0.0</MicrosoftVisualStudioInteractiveWindowVersion>
+    <MicrosoftVisualStudioVsInteractiveWindowVersion>4.0.0</MicrosoftVisualStudioVsInteractiveWindowVersion>
     <MicrosoftVisualStudioWinFormsInterfacesVersion>17.0.0-previews-4-31709-430</MicrosoftVisualStudioWinFormsInterfacesVersion>
     <MicrosoftVisualStudioWorkspaceVSIntegrationVersion>16.3.43</MicrosoftVisualStudioWorkspaceVSIntegrationVersion>
     <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
@@ -269,7 +280,7 @@
       create a test insertion in Visual Studio to validate.
     -->
     <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
-    <StreamJsonRpcVersion>2.11.16-alpha</StreamJsonRpcVersion>
+    <StreamJsonRpcVersion>2.11.35</StreamJsonRpcVersion>
     <!--
       When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they
       can update to the same version. Version changes require a VS test insertion for validation.
diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
index ed4259ec61bd6..dd22cbd054af3 100644
--- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
+++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
@@ -115,9 +115,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
-    <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" />
+    <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion_WithShellDependency)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency)" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationVersion)" />
diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
index f4886c8715543..7eb917e8fe349 100644
--- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />

From d55d73b59fc1b0957964de96ab4c79803da317e9 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramesh <ramkumar.ramesh.8@live.com>
Date: Thu, 12 May 2022 07:36:54 +0530
Subject: [PATCH 384/413] Fix for Issue #55606: [EE] Format IAsyncEnumerable
 method names correctly. (#61211)

Co-authored-by: Ramkumar Ramesh <ramram@microsoft.com>
---
 .../Attributes/AttributeDescription.cs        |  1 +
 .../CompilationExtensions.cs                  |  3 +-
 .../Test/ExpressionCompiler/LocalsTests.cs    | 37 +++++++++++++++++++
 .../CompilationExtensions.vb                  |  3 +-
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs
index 4dc73d5a53282..83af6b8d78120 100644
--- a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs
+++ b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs
@@ -435,6 +435,7 @@ static AttributeDescription()
         internal static readonly AttributeDescription AsyncMethodBuilderAttribute = new AttributeDescription("System.Runtime.CompilerServices", "AsyncMethodBuilderAttribute", s_signatures_HasThis_Void_Type_Only);
         internal static readonly AttributeDescription AsyncStateMachineAttribute = new AttributeDescription("System.Runtime.CompilerServices", "AsyncStateMachineAttribute", s_signatures_HasThis_Void_Type_Only);
         internal static readonly AttributeDescription IteratorStateMachineAttribute = new AttributeDescription("System.Runtime.CompilerServices", "IteratorStateMachineAttribute", s_signatures_HasThis_Void_Type_Only);
+        internal static readonly AttributeDescription AsyncIteratorStateMachineAttribute = new AttributeDescription("System.Runtime.CompilerServices", "AsyncIteratorStateMachineAttribute", s_signatures_HasThis_Void_Type_Only);
         internal static readonly AttributeDescription CompilationRelaxationsAttribute = new AttributeDescription("System.Runtime.CompilerServices", "CompilationRelaxationsAttribute", s_signaturesOfCompilationRelaxationsAttribute);
         internal static readonly AttributeDescription ReferenceAssemblyAttribute = new AttributeDescription("System.Runtime.CompilerServices", "ReferenceAssemblyAttribute", s_signatures_HasThis_Void_Only);
         internal static readonly AttributeDescription RuntimeCompatibilityAttribute = new AttributeDescription("System.Runtime.CompilerServices", "RuntimeCompatibilityAttribute", s_signatures_HasThis_Void_Only);
diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationExtensions.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationExtensions.cs
index aaf83151e1c36..4401a643f5afd 100644
--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationExtensions.cs
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationExtensions.cs
@@ -44,7 +44,8 @@ internal static PEMethodSymbol GetSourceMethod(this CSharpCompilation compilatio
                         methodHandle = candidateMethod.Handle;
                         string stateMachineTypeName;
                         if (module.HasStringValuedAttribute(methodHandle, AttributeDescription.AsyncStateMachineAttribute, out stateMachineTypeName) ||
-                            module.HasStringValuedAttribute(methodHandle, AttributeDescription.IteratorStateMachineAttribute, out stateMachineTypeName))
+                            module.HasStringValuedAttribute(methodHandle, AttributeDescription.IteratorStateMachineAttribute, out stateMachineTypeName) ||
+                            module.HasStringValuedAttribute(methodHandle, AttributeDescription.AsyncIteratorStateMachineAttribute, out stateMachineTypeName))
                         {
                             if (metadataDecoder.GetTypeSymbolForSerializedType(stateMachineTypeName).OriginalDefinition.Equals(containingType))
                             {
diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
index 253f980fff5f5..c7640f94ce20e 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
@@ -3842,6 +3842,43 @@ static void DummySequencePoint()
             });
         }
 
+        [WorkItem(55606, "https://github.com/dotnet/roslyn/issues/55606")]
+        [Fact]
+        public void OrderOfArguments_ArgumentsOnly_Async()
+        {
+            var source =
+@"using System.Collections.Generic;
+using System.Threading.Tasks;
+class C
+{
+    static async IAsyncEnumerable<object> F(object y, object x)
+    {
+        Task.Yield();
+        yield return x;
+#line 500
+        DummySequencePoint();
+        yield return y;
+    }
+    static void DummySequencePoint()
+    {
+    }
+}";
+            var references = TargetFrameworkUtil.Mscorlib461ExtendedReferences.Concat(new[] { TestMetadata.Net461.SystemThreadingTasks, TestMetadata.SystemThreadingTasksExtensions.PortableLib });
+            var comp = CreateEmptyCompilation(new[] { source, AsyncStreamsTypes }, references: references);
+            WithRuntimeInstance(comp, references, runtime =>
+            {
+                EvaluationContext context;
+                context = CreateMethodContext(runtime, "C.<F>d__0.MoveNext", atLineNumber: 500);
+                string unused;
+                var locals = new ArrayBuilder<LocalAndMethod>();
+                context.CompileGetLocals(locals, argumentsOnly: true, typeName: out unused, testData: null);
+                var names = locals.Select(l => l.LocalName).ToArray();
+                // The order must confirm the order of the arguments in the method signature.
+                Assert.Equal(names, new[] { "y", "x" });
+                locals.Free();
+            });
+        }
+
         /// <summary>
         /// CompileGetLocals should skip locals with errors.
         /// </summary>
diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/CompilationExtensions.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/CompilationExtensions.vb
index 0bd19ecd958db..90096eaf0d461 100644
--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/CompilationExtensions.vb
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/CompilationExtensions.vb
@@ -39,7 +39,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
                         methodHandle = candidateMethod.Handle
                         Dim stateMachineTypeName As String = Nothing
                         If [module].HasStringValuedAttribute(methodHandle, AttributeDescription.AsyncStateMachineAttribute, stateMachineTypeName) OrElse
-                            [module].HasStringValuedAttribute(methodHandle, AttributeDescription.IteratorStateMachineAttribute, stateMachineTypeName) _
+                            [module].HasStringValuedAttribute(methodHandle, AttributeDescription.IteratorStateMachineAttribute, stateMachineTypeName) OrElse
+                            [module].HasStringValuedAttribute(methodHandle, AttributeDescription.AsyncIteratorStateMachineAttribute, stateMachineTypeName) _
                         Then
                             If metadataDecoder.GetTypeSymbolForSerializedType(stateMachineTypeName).OriginalDefinition.Equals(containingType) Then
                                 Return candidateMethod

From b139cdb275b0ebc0d50692e884d9b39afd927a3e Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Wed, 11 May 2022 19:20:26 -0700
Subject: [PATCH 385/413] Support adding multiple parameters on new lines past
 the original last parameter (#61048)

---
 ...ddConstructorParametersFromMembersTests.cs | 58 +++++++++++++++++++
 .../Portable/Editing/AddParameterEditor.cs    |  7 ++-
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs b/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs
index 8bd5bac97f162..007abc7a60911 100644
--- a/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs
+++ b/src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs
@@ -2464,5 +2464,63 @@ public C(int v = 0)
                 CodeActionIndex = 1
             }.RunAsync();
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)]
+        [WorkItem(60816, "https://github.com/dotnet/roslyn/issues/60816")]
+        public async Task TestAddMultipleParametersWithWrapping()
+        {
+            await new VerifyCS.Test
+            {
+                TestCode =
+@"namespace M
+{
+    public class C
+    {
+        public int original { get; }
+
+        public int original2 { get; }
+
+        [|public int a1 { get; }
+
+        public int a2 { get; }|]
+
+        public C(
+            int original,
+            int original2)
+        {
+            this.original = original;
+            this.original2 = original2;
+        }
+    }
+}",
+                FixedCode =
+@"namespace M
+{
+    public class C
+    {
+        public int original { get; }
+
+        public int original2 { get; }
+
+        public int a1 { get; }
+
+        public int a2 { get; }
+
+        public C(
+            int original,
+            int original2,
+            int a1,
+            int a2)
+        {
+            this.original = original;
+            this.original2 = original2;
+            this.a1 = a1;
+            this.a2 = a2;
+        }
+    }
+}",
+                CodeActionVerifier = (codeAction, verifier) => verifier.Equal(string.Format(FeaturesResources.Add_parameters_to_0, "C(int, int)"), codeAction.Title)
+            }.RunAsync();
+        }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Editing/AddParameterEditor.cs b/src/Workspaces/Core/Portable/Editing/AddParameterEditor.cs
index 0bc9c41c0fc47..4d24796612ab4 100644
--- a/src/Workspaces/Core/Portable/Editing/AddParameterEditor.cs
+++ b/src/Workspaces/Core/Portable/Editing/AddParameterEditor.cs
@@ -35,10 +35,11 @@ public static void AddParameter(
                 return;
             }
 
-            if (insertionIndex == existingParameters.Count)
+            if (insertionIndex >= existingParameters.Count)
             {
-                // Placing the last parameter on its own line.  Get the indentation of the 
-                // curent last parameter and give the new last parameter the same indentation.
+                // The parameter is being added after the last parameter and needs to be placed on a new line.
+                // Get the indentation of the original last parameter and give the new parameter the same indentation.
+                // Even if we're adding multiple parameters past the original last parameter, we can give them all the identation of the original 'last' parameter.
                 var leadingIndentation = GetDesiredLeadingIndentation(
                     generator, syntaxFacts, existingParameters[existingParameters.Count - 1], includeLeadingNewLine: true);
                 parameterDeclaration = parameterDeclaration.WithPrependedLeadingTrivia(leadingIndentation)

From 683fe79084be1e36055bb85f14bcddac76276c57 Mon Sep 17 00:00:00 2001
From: Manish Vasani <mavasani@microsoft.com>
Date: Thu, 12 May 2022 09:07:04 +0530
Subject: [PATCH 386/413] Address feedback

---
 ...actAddFileBannerCodeRefactoringProvider.cs | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs b/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
index ae02421ad45f7..28e7dd07d03b0 100644
--- a/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
+++ b/src/Features/Core/Portable/AddFileBanner/AbstractAddFileBannerCodeRefactoringProvider.cs
@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -25,6 +26,8 @@ namespace Microsoft.CodeAnalysis.AddFileBanner
 {
     internal abstract class AbstractAddFileBannerCodeRefactoringProvider : SyntaxEditorBasedCodeRefactoringProvider
     {
+        private const string BannerFileNamePlaceholder = "{filename}";
+
         protected abstract bool IsCommentStartCharacter(char ch);
 
         protected abstract SyntaxTrivia CreateTrivia(SyntaxTrivia trivia, string text);
@@ -88,7 +91,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                         CodeAction.Create(
                             CodeFixesResources.Add_file_header,
                             _ => AddBannerAsync(document, root, siblingDocument, siblingBanner),
-                            equivalenceKey: siblingDocument.FilePath),
+                            equivalenceKey: GetEquivalenceKey(siblingDocument, siblingBanner)),
                         new Text.TextSpan(position, length: 0));
                     return;
                 }
@@ -102,21 +105,38 @@ private static bool HasExistingBanner(Document document, SyntaxNode root)
             return banner.Length > 0;
         }
 
-        private Task<Document> AddBannerAsync(
-            Document document, SyntaxNode root,
-            Document siblingDocument, ImmutableArray<SyntaxTrivia> banner)
+        private static string GetEquivalenceKey(Document document, ImmutableArray<SyntaxTrivia> banner)
         {
-            var newRoot = GetRootWithAddedBanner(document, root, siblingDocument, banner);
-            return Task.FromResult(document.WithSyntaxRoot(newRoot));
+            var bannerText = banner.Select(trivia => trivia.ToFullString()).Join(string.Empty);
+
+            var fileName = IOUtilities.PerformIO(() => Path.GetFileName(document.FilePath));
+            if (!string.IsNullOrEmpty(fileName))
+                bannerText = bannerText.Replace(fileName, BannerFileNamePlaceholder);
+
+            return bannerText;
+        }
+
+        private static ImmutableArray<SyntaxTrivia> GetBannerFromEquivalenceKey(string equivalenceKey, Document document)
+        {
+            var fileName = IOUtilities.PerformIO(() => Path.GetFileName(document.FilePath));
+            if (!string.IsNullOrEmpty(fileName))
+                equivalenceKey = equivalenceKey.Replace(BannerFileNamePlaceholder, fileName);
+
+            var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
+            var token = syntaxFacts.ParseToken(equivalenceKey);
+
+            var bannerService = document.GetRequiredLanguageService<IFileBannerFactsService>();
+            return bannerService.GetFileBanner(token);
         }
 
-        private SyntaxNode GetRootWithAddedBanner(
+        private Task<Document> AddBannerAsync(
             Document document, SyntaxNode root,
             Document siblingDocument, ImmutableArray<SyntaxTrivia> banner)
         {
             banner = UpdateEmbeddedFileNames(siblingDocument, document, banner);
 
-            return root.WithPrependedLeadingTrivia(new SyntaxTriviaList(banner));
+            var newRoot = root.WithPrependedLeadingTrivia(new SyntaxTriviaList(banner));
+            return Task.FromResult(document.WithSyntaxRoot(newRoot));
         }
 
         /// <summary>
@@ -177,26 +197,19 @@ protected sealed override async Task FixAllAsync(
             string? equivalenceKey,
             CancellationToken cancellationToken)
         {
+            Debug.Assert(equivalenceKey != null);
+
             // Bail out if the document to fix already has an existing banner.
             var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             if (HasExistingBanner(document, root))
                 return;
 
-            // Get the source document ID with existing banner.
-            // This banner will be added to the document to be fixed.
-            // Equivalence key is the file path to this source document.
-            var sourceDocumentId = document.Project.Solution.GetDocumentIdsWithFilePath(equivalenceKey).FirstOrDefault();
-            if (sourceDocumentId == null)
-                return;
-
-            // Get the existing banner from the source document.
-            var sourceDocument = document.Project.Solution.GetRequiredDocument(sourceDocumentId);
-            var sourceRoot = await sourceDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
-            var banner = await TryGetBannerAsync(sourceDocument, sourceRoot, cancellationToken).ConfigureAwait(false);
+            // Get banner from the equivalence key.
+            var banner = GetBannerFromEquivalenceKey(equivalenceKey, document);
             Debug.Assert(banner.Length > 0);
 
             // Finally add the banner to the document to be fixed.
-            var newRoot = GetRootWithAddedBanner(document, root, sourceDocument, banner);
+            var newRoot = root.WithPrependedLeadingTrivia(new SyntaxTriviaList(banner));
             editor.ReplaceNode(editor.OriginalRoot, newRoot);
         }
     }

From ff93309641194af65261610aab5f1e0e2e1c795d Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Thu, 12 May 2022 07:15:41 -0700
Subject: [PATCH 387/413] Add link to runtime bug regarding non-symmetry of set
 comparer

See https://github.com/dotnet/runtime/issues/69218
---
 .../Collections/Internal/SegmentedHashSetEqualityComparer`1.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
index 1dfbce88e090a..b9f5dea2e357f 100644
--- a/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
+++ b/src/Dependencies/Collections/Internal/SegmentedHashSetEqualityComparer`1.cs
@@ -39,6 +39,7 @@ public bool Equals(SegmentedHashSet<T>? x, SegmentedHashSet<T>? y)
             }
 
             // Otherwise, do an O(N^2) match.
+            // 🐛 This is non-symmetrical, but matches original: https://github.com/dotnet/runtime/issues/69218
             foreach (var yi in y)
             {
                 var found = false;

From a3f5a478cc03969d3339e6ad54d6b721cd03d1fe Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 10:24:22 -0700
Subject: [PATCH 388/413] Don't use the same name for the shared package
 version and the real package version.

---
 eng/Versions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d6350bf64ae1a..8f34ca7600b99 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,7 +43,7 @@
     <SourceGeneratorMicrosoftCodeAnalysisVersion>3.8.0</SourceGeneratorMicrosoftCodeAnalysisVersion>
     <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
     <MicrosoftServiceHubVersion>3.1.4097</MicrosoftServiceHubVersion>
-    <MicrosoftVisualStudioThreadingVersion>17.2.32</MicrosoftVisualStudioThreadingVersion>
+    <MicrosoftVisualStudioThreadingPackagesVersion>17.2.32</MicrosoftVisualStudioThreadingPackagesVersion>
   </PropertyGroup>
   <!--
     Dependency versions
@@ -188,8 +188,8 @@
     <MicrosoftVisualStudioTextUIVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIVersion>
     <MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
     <MicrosoftVisualStudioTextUICocoaVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUICocoaVersion>
-    <MicrosoftVisualStudioThreadingAnalyzersVersion>$(MicrosoftVisualStudioThreadingVersion)</MicrosoftVisualStudioThreadingAnalyzersVersion>
-    <MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingVersion)</MicrosoftVisualStudioThreadingVersion>
+    <MicrosoftVisualStudioThreadingAnalyzersVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingAnalyzersVersion>
+    <MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
     <MicrosoftVisualStudioUtilitiesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
     <MicrosoftVisualStudioValidationVersion>17.0.53</MicrosoftVisualStudioValidationVersion>
     <MicrosoftVisualStudioInteractiveWindowVersion>4.0.0</MicrosoftVisualStudioInteractiveWindowVersion>

From a262f14082e405618a7931a67d1043d26c2bb0c5 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 10:42:20 -0700
Subject: [PATCH 389/413] Update BuildBoss to handle the new msbuild
 references.

---
 src/Tools/BuildBoss/ProjectCheckerUtil.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
index c7b907afdef00..25272c88c054c 100644
--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs
+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -133,7 +133,7 @@ private bool CheckPackageReferences(TextWriter textWriter)
                 if (!allowedPackageVersions.Contains(packageRef.Version))
                 {
                     textWriter.WriteLine($"PackageReference {packageRef.Name} has incorrect version {packageRef.Version}");
-                    textWriter.WriteLine($"Allowed values are " + string.Join(" or", allowedPackageVersions));
+                    textWriter.WriteLine($"Allowed values are " + string.Join(" or ", allowedPackageVersions));
                     allGood = false;
                 }
             }
@@ -158,6 +158,13 @@ private IEnumerable<string> GetAllowedPackageReferenceVersions(PackageReference
                 yield return $"$({name}Version)";
                 yield return $"$({name}FixedVersion)";
                 yield return $"$(RefOnly{name}Version)";
+
+                // These two projects have a direct or indirect dependency on both MSBuild and MS.VS.Shell.15.0. Our normal MSBuild
+                // version is 16.5.0, but MS.VS.Shell has a dependency on 17.1.0. For these projects, we allow an additional version.
+                if (name.StartsWith("MicrosoftBuild") && (ProjectFilePath.Contains("Roslyn.Compilers.Extension.csproj") || ProjectFilePath.Contains("IdeBenchmarks.csproj")))
+                {
+                    yield return $"$(RefOnly{name}Version_WithShellDependency)";
+                }
             }
         }
 

From 9f6cf4aeb14fd104e6be67bdb99122a326876d79 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 10:49:09 -0700
Subject: [PATCH 390/413] Revert "Update BuildBoss to handle the new msbuild
 references."

This reverts commit a262f14082e405618a7931a67d1043d26c2bb0c5.
---
 src/Tools/BuildBoss/ProjectCheckerUtil.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
index 25272c88c054c..c7b907afdef00 100644
--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs
+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -133,7 +133,7 @@ private bool CheckPackageReferences(TextWriter textWriter)
                 if (!allowedPackageVersions.Contains(packageRef.Version))
                 {
                     textWriter.WriteLine($"PackageReference {packageRef.Name} has incorrect version {packageRef.Version}");
-                    textWriter.WriteLine($"Allowed values are " + string.Join(" or ", allowedPackageVersions));
+                    textWriter.WriteLine($"Allowed values are " + string.Join(" or", allowedPackageVersions));
                     allGood = false;
                 }
             }
@@ -158,13 +158,6 @@ private IEnumerable<string> GetAllowedPackageReferenceVersions(PackageReference
                 yield return $"$({name}Version)";
                 yield return $"$({name}FixedVersion)";
                 yield return $"$(RefOnly{name}Version)";
-
-                // These two projects have a direct or indirect dependency on both MSBuild and MS.VS.Shell.15.0. Our normal MSBuild
-                // version is 16.5.0, but MS.VS.Shell has a dependency on 17.1.0. For these projects, we allow an additional version.
-                if (name.StartsWith("MicrosoftBuild") && (ProjectFilePath.Contains("Roslyn.Compilers.Extension.csproj") || ProjectFilePath.Contains("IdeBenchmarks.csproj")))
-                {
-                    yield return $"$(RefOnly{name}Version_WithShellDependency)";
-                }
             }
         }
 

From 21045ed7043da14ec464d29caa2f8f9bc8afc3c1 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 12 May 2022 11:07:38 -0700
Subject: [PATCH 391/413] Bring things in C# in line with VB>

---
 .../Semantics/SpeculationAnalyzerTests.cs     |  2 +-
 .../Utilities/AbstractSpeculationAnalyzer.cs  | 32 ++++++++++++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs b/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
index af4327c4e735a..d69e1f868e28c 100644
--- a/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
+++ b/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
@@ -47,7 +47,7 @@ static void Main()
     {
         [|5.Vain()|];
     }
-}           ", "Vain(5)", false);
+}           ", "Vain(5)", semanticChanges: true);
         }
 
         [Fact]
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index c6e517abe0668..785c765a2d9f7 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -92,7 +92,7 @@ public AbstractSpeculationAnalyzer(
         }
 
         protected abstract ISyntaxFacts SyntaxFactsService { get; }
-        protected abstract bool CanAccessInstanceMemberThrough(TExpressionSyntax expression);
+        protected abstract bool CanAccessInstanceMemberThrough(TExpressionSyntax? expression);
 
         /// <summary>
         /// Original expression to be replaced.
@@ -513,9 +513,6 @@ private bool ReplacementChangesSemanticsForNode(SyntaxNode currentOriginalNode,
             Debug.Assert(previousOriginalNode == null || previousOriginalNode.Parent == currentOriginalNode);
             Debug.Assert(previousReplacedNode == null || previousReplacedNode.Parent == currentReplacedNode);
 
-            if (!MemberAccessesAreCompatible(currentOriginalNode as TExpressionSyntax, currentReplacedNode as TExpressionSyntax))
-                return true;
-
             if (!InvocationsAreCompatible(currentOriginalNode as TInvocationExpressionSyntax, currentReplacedNode as TInvocationExpressionSyntax))
                 return true;
 
@@ -601,13 +598,20 @@ private bool MemberAccessesAreCompatible(TExpressionSyntax? originalExpression,
                 if (!SymbolsAreCompatible(originalExpression, newExpression))
                     return false;
 
+                // If static became instance or instance became static, consider that a change in semantics.  Note: this
+                // does mean a change from extension->instance call (or vice versa) will be seen as a change in
+                // semantics.  We could potentially support this, but we'd have to do the analysis the instance invoked
+                // on and the instance passed as the first parameter are identical.
+
+                var originalIsStaticAccess = IsStaticAccess(_semanticModel.GetSymbolInfo(originalExpression, CancellationToken).Symbol);
+                var replacedIsStaticAccess = IsStaticAccess(this.SpeculativeSemanticModel.GetSymbolInfo(newExpression, CancellationToken).Symbol);
+                if (originalIsStaticAccess != replacedIsStaticAccess)
+                    return false;
+
                 // When binding expr.A, if we didn't bind 'expr' binding to a type, namespace, or other static
                 // thing, then we bound to an instance symbol. It's then only ok to remove 'expr' if 'expr' is
                 // this/base.
-                var originalSymbol = _semanticModel.GetSymbolInfo(originalExpression, CancellationToken).Symbol;
-                if (originalSymbol != null &&
-                    originalSymbol is not INamespaceOrTypeSymbol &&
-                    !originalSymbol.IsStatic)
+                if (!originalIsStaticAccess)
                 {
                     var originalExpressionOfMemberAccess = syntaxFacts.GetExpressionOfMemberAccessExpression(originalExpression);
                     if (!CanAccessInstanceMemberThrough((TExpressionSyntax?)originalExpressionOfMemberAccess))
@@ -618,18 +622,30 @@ originalSymbol is not INamespaceOrTypeSymbol &&
             return true;
         }
 
+        private static bool IsStaticAccess(ISymbol symbol)
+            => symbol is INamespaceOrTypeSymbol or { IsStatic: true };
+
         private bool InvocationsAreCompatible(TInvocationExpressionSyntax? originalInvocation, TInvocationExpressionSyntax? newInvocation)
         {
             // If not invocations, nothing to do here.
             if (originalInvocation is null && newInvocation is null)
                 return true;
 
+
             if (originalInvocation is not null)
             {
                 // Invocations must stay invocations after update.
                 if (newInvocation is null)
                     return false;
 
+                var syntaxFacts = this.SyntaxFactsService;
+                if (!MemberAccessesAreCompatible(
+                        syntaxFacts.GetExpressionOfInvocationExpression(originalInvocation) as TExpressionSyntax,
+                        syntaxFacts.GetExpressionOfInvocationExpression(newInvocation) as TExpressionSyntax))
+                {
+                    return false;
+                }
+
                 // Add more invocation tests here.
             }
 

From 67adc4ae7347d723a2412c3123aa3f674973dffe Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 12 May 2022 11:10:06 -0700
Subject: [PATCH 392/413] Add comment

---
 .../CSharpTest/Semantics/SpeculationAnalyzerTests.cs          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs b/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
index d69e1f868e28c..25adbe33decb8 100644
--- a/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
+++ b/src/EditorFeatures/CSharpTest/Semantics/SpeculationAnalyzerTests.cs
@@ -39,6 +39,10 @@ void Main()
         [Fact, WorkItem(672396, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/672396")]
         public void SpeculationAnalyzerExtensionMethodExplicitInvocation()
         {
+            // We consider a change here to be a change in semantics as an instance call became a static call. In
+            // practice this is fine as the only thing that makes this change is complexification, and we don't test for
+            // semantics changed after that as the purpose of complexification is to put us in a safe place to make
+            // changes that won't break semantics.
             Test(@"
 static class Program
 {

From 74c6ccfeffb7fbb8f1981b963de0faf7d5f553ab Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 11:22:58 -0700
Subject: [PATCH 393/413] Remove conditional msbuild references, update
 MS.CA.Workspaces.MSBuild to net6.0.

---
 eng/Versions.props                                    | 11 +----------
 .../Extension/Roslyn.Compilers.Extension.csproj       |  6 +++---
 src/Tools/IdeBenchmarks/IdeBenchmarks.csproj          |  2 +-
 .../Core/MSBuild/MSBuild/MSBuildWorkspace.cs          |  1 +
 .../MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs  |  2 +-
 .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj  |  2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8f34ca7600b99..b5122af0d3f7f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,12 +30,7 @@
     <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
     <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.2.8</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.2.32505.113</MicrosoftVisualStudioShellPackagesVersion>
-    <RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>
-    <!--
-      Microsoft.VisualStudio.Shell.15.0 has a ref to MSBuild 17.1.0, so for those projects that depend on both we 
-      need a new MSBuild version.
-    -->
-    <RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>17.1.0</RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>
+    <RefOnlyMicrosoftBuildPackagesVersion>17.1.0</RefOnlyMicrosoftBuildPackagesVersion>
     <!-- The version of Roslyn we build Source Generators against that are built in this
          repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
          but not higher than our minimum dogfoodable Visual Studio version, or else
@@ -72,10 +67,6 @@
     <RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
     <RefOnlyMicrosoftBuildRuntimeVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildRuntimeVersion>
     <RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
-    <RefOnlyMicrosoftBuildVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildVersion_WithShellDependency>
-    <RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>
-    <RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>
-    <RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>
     <NuGetVisualStudioContractsVersion>6.0.0-preview.0.15</NuGetVisualStudioContractsVersion>
     <MicrosoftVisualStudioRpcContractsVersion>17.2.31</MicrosoftVisualStudioRpcContractsVersion>
     <!--
diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
index dd22cbd054af3..ed4259ec61bd6 100644
--- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
+++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
@@ -115,9 +115,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
-    <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion_WithShellDependency)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency)" />
+    <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationVersion)" />
diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
index 7eb917e8fe349..f4886c8715543 100644
--- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />
diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
index dba94bbc991dd..e6aae7e231244 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
@@ -473,6 +473,7 @@ private void SaveDocumentText(DocumentId id, string fullPath, SourceText newText
             try
             {
                 var dir = Path.GetDirectoryName(fullPath);
+                Debug.Assert(dir != null);
                 if (!Directory.Exists(dir))
                 {
                     Directory.CreateDirectory(dir);
diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
index d6a0a6fe61c90..8ff0c60f729da 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
@@ -34,7 +34,7 @@ public async Task<IProjectFile> LoadProjectFileAsync(string path, ProjectBuildMa
             return this.CreateProjectFile(project, buildManager, log);
         }
 
-        public static IProjectFileLoader GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
+        public static IProjectFileLoader? GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
         {
             return workspaceServices.FindLanguageServices<IProjectFileLoader>(
                 d => d.GetEnumerableMetadata<string>("ProjectFileExtension").Any(e => string.Equals(e, extension, StringComparison.OrdinalIgnoreCase)))
diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
index a65fc35f1c3bb..a2803ae3ba28f 100644
--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
@@ -5,7 +5,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <DefineConstants>$(DefineConstants);WORKSPACE_MSBUILD</DefineConstants>
     <!-- NuGet -->
     <IsPackable>true</IsPackable>

From bbb3ec2004448a17bceca3799428402e838646a0 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 12 May 2022 11:24:40 -0700
Subject: [PATCH 394/413] NRT

---
 .../Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index 785c765a2d9f7..eca9f45722156 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -622,7 +622,7 @@ private bool MemberAccessesAreCompatible(TExpressionSyntax? originalExpression,
             return true;
         }
 
-        private static bool IsStaticAccess(ISymbol symbol)
+        private static bool IsStaticAccess(ISymbol? symbol)
             => symbol is INamespaceOrTypeSymbol or { IsStatic: true };
 
         private bool InvocationsAreCompatible(TInvocationExpressionSyntax? originalInvocation, TInvocationExpressionSyntax? newInvocation)

From 8ff1b19c736cb22f8d2d974aa31b97e840f57937 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 11 May 2022 12:53:43 -0700
Subject: [PATCH 395/413] Use SegmentedHashSet<T> to eliminate LOH allocations
 in AsyncBatchingWorkQueue

---
 .../Portable/Shared/Utilities/AsyncBatchingWorkQueue`2.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Workspaces/Core/Portable/Shared/Utilities/AsyncBatchingWorkQueue`2.cs b/src/Workspaces/Core/Portable/Shared/Utilities/AsyncBatchingWorkQueue`2.cs
index 1e71da0a4f1e0..a1c3954a96780 100644
--- a/src/Workspaces/Core/Portable/Shared/Utilities/AsyncBatchingWorkQueue`2.cs
+++ b/src/Workspaces/Core/Portable/Shared/Utilities/AsyncBatchingWorkQueue`2.cs
@@ -56,7 +56,7 @@ internal class AsyncBatchingWorkQueue<TItem, TResult>
         /// Used if <see cref="_equalityComparer"/> is present to ensure only unique items are added to <see
         /// cref="_nextBatch"/>.
         /// </summary>
-        private readonly HashSet<TItem> _uniqueItems;
+        private readonly SegmentedHashSet<TItem> _uniqueItems;
 
         /// <summary>
         /// Task kicked off to do the next batch of processing of <see cref="_nextBatch"/>. These
@@ -86,7 +86,7 @@ public AsyncBatchingWorkQueue(
             _asyncListener = asyncListener;
             _cancellationToken = cancellationToken;
 
-            _uniqueItems = new HashSet<TItem>(equalityComparer);
+            _uniqueItems = new SegmentedHashSet<TItem>(equalityComparer);
         }
 
         public void AddWork(TItem item)

From 1d765807bbc61563eefe8ed02cba99ec430faaef Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 11:58:29 -0700
Subject: [PATCH 396/413] Revert workspaces msbuild changes.

---
 src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs         | 1 -
 .../Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs       | 2 +-
 .../MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
index e6aae7e231244..dba94bbc991dd 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildWorkspace.cs
@@ -473,7 +473,6 @@ private void SaveDocumentText(DocumentId id, string fullPath, SourceText newText
             try
             {
                 var dir = Path.GetDirectoryName(fullPath);
-                Debug.Assert(dir != null);
                 if (!Directory.Exists(dir))
                 {
                     Directory.CreateDirectory(dir);
diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
index 8ff0c60f729da..d6a0a6fe61c90 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/ProjectFileLoader.cs
@@ -34,7 +34,7 @@ public async Task<IProjectFile> LoadProjectFileAsync(string path, ProjectBuildMa
             return this.CreateProjectFile(project, buildManager, log);
         }
 
-        public static IProjectFileLoader? GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
+        public static IProjectFileLoader GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
         {
             return workspaceServices.FindLanguageServices<IProjectFileLoader>(
                 d => d.GetEnumerableMetadata<string>("ProjectFileExtension").Any(e => string.Equals(e, extension, StringComparison.OrdinalIgnoreCase)))
diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
index a2803ae3ba28f..a65fc35f1c3bb 100644
--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
@@ -5,7 +5,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <DefineConstants>$(DefineConstants);WORKSPACE_MSBUILD</DefineConstants>
     <!-- NuGet -->
     <IsPackable>true</IsPackable>

From 08a016f4fa2f8f477540b95c12bc55d2f10dc37f Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 12 May 2022 13:45:28 -0700
Subject: [PATCH 397/413] lint

---
 .../Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
index eca9f45722156..7bb86dfb36dc4 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/AbstractSpeculationAnalyzer.cs
@@ -631,7 +631,6 @@ private bool InvocationsAreCompatible(TInvocationExpressionSyntax? originalInvoc
             if (originalInvocation is null && newInvocation is null)
                 return true;
 
-
             if (originalInvocation is not null)
             {
                 // Invocations must stay invocations after update.

From 3fb5c86d88bf9e40247dcd5f74a53d59464b156e Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Thu, 12 May 2022 14:14:18 -0700
Subject: [PATCH 398/413] Fix a few build and package issues (#61273)

* Package work

This breaks up the compiler packages into a few variants

* NuPkg fixes

* Fix build verification

This updates our build verification logic to handle all the new packages
that we've created.

* Stop generating app.config for build tasks

Work around issue that is auto generating our app.config files for our
build tasks. This is not consumed by MSBuild hence it's presence is
confusing the situation

https://github.com/dotnet/arcade/issues/9305

* PR feedback

* Fix bootstrap issue
---
 .gitignore                                    |   1 -
 Compilers.sln                                 |   2 +-
 Roslyn.sln                                    |  49 +-
 eng/Versions.props                            |   2 +-
 eng/build-utils.ps1                           |   2 +-
 eng/config/OptProf.json                       |  96 +++-
 .../CommandLine/CscCommandLine.projitems      |   3 +-
 .../Microsoft.Build.Tasks.CodeAnalysis.csproj |   9 +
 .../VBCSCompilerCommandLine.projitems         |   2 +-
 .../CommandLine/VbcCommandLine.projitems      |   2 +-
 ...osoft.Net.Compilers.Toolset.Package.csproj |  14 +-
 .../Microsoft.Net.Compilers.Toolset.props     |   0
 .../Microsoft.Net.Compilers.Toolset.props     |   0
 .../CoreClrCompilerArtifacts.targets          |   1 +
 .../DesktopCompilerArtifacts.targets          |  26 +-
 ...Net.Compilers.Toolset.Package.Arm64.csproj |  58 ++
 ...icrosoft.Net.Compilers.Toolset.Arm64.props |  17 +
 ...icrosoft.Net.Compilers.Toolset.Arm64.props |   4 +
 ....Setup.csproj => CompilersPackage.targets} |  33 +-
 ....CodeAnalysis.Compilers.Setup.arm64.csproj |  21 +
 ...ft.CodeAnalysis.Compilers.Setup.x64.csproj |  21 +
 ...ft.CodeAnalysis.Compilers.Setup.x86.csproj |  21 +
 .../BuildBoss/CompilerNuGetCheckerUtil.cs     | 504 ++++++++----------
 23 files changed, 546 insertions(+), 342 deletions(-)
 rename src/NuGet/Microsoft.Net.Compilers.Toolset/{ => AnyCpu}/Microsoft.Net.Compilers.Toolset.Package.csproj (81%)
 rename src/NuGet/Microsoft.Net.Compilers.Toolset/{ => AnyCpu}/build/Microsoft.Net.Compilers.Toolset.props (100%)
 rename src/NuGet/Microsoft.Net.Compilers.Toolset/{ => AnyCpu}/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props (100%)
 create mode 100644 src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/Microsoft.Net.Compilers.Toolset.Package.Arm64.csproj
 create mode 100644 src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/build/Microsoft.Net.Compilers.Toolset.Arm64.props
 create mode 100644 src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.Arm64.props
 rename src/Setup/DevDivVsix/CompilersPackage/{Microsoft.CodeAnalysis.Compilers.Setup.csproj => CompilersPackage.targets} (87%)
 create mode 100644 src/Setup/DevDivVsix/CompilersPackage/arm64/Microsoft.CodeAnalysis.Compilers.Setup.arm64.csproj
 create mode 100644 src/Setup/DevDivVsix/CompilersPackage/x64/Microsoft.CodeAnalysis.Compilers.Setup.x64.csproj
 create mode 100644 src/Setup/DevDivVsix/CompilersPackage/x86/Microsoft.CodeAnalysis.Compilers.Setup.x86.csproj

diff --git a/.gitignore b/.gitignore
index d677e3842d3ef..1b5de22f73c67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@
 [Dd]ebug/
 [Rr]elease/
 [Bb]inaries/
-x64/
 [Bb]in/
 [Oo]bj/
 .dotnet/
diff --git a/Compilers.sln b/Compilers.sln
index 3d1e3c201fc01..15a164a927af0 100644
--- a/Compilers.sln
+++ b/Compilers.sln
@@ -130,7 +130,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Pack
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildBoss", "src\Tools\BuildBoss\BuildBoss.csproj", "{8A02AFAF-F622-4E3E-9E1A-8CFDACC7C7E1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Toolset.Package", "src\NuGet\Microsoft.Net.Compilers.Toolset\Microsoft.Net.Compilers.Toolset.Package.csproj", "{6D407402-CC4A-4125-9B00-C70562A636A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Toolset.Package", "src\NuGet\Microsoft.Net.Compilers.Toolset\AnyCpu\Microsoft.Net.Compilers.Toolset.Package.csproj", "{6D407402-CC4A-4125-9B00-C70562A636A5}"
 EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "vbi", "src\Interactive\vbi\vbi.vbproj", "{706CFC25-B6E0-4DAA-BCC4-F6FAAFEEDF87}"
 EndProject
diff --git a/Roslyn.sln b/Roslyn.sln
index f1e1cec0fb53a..af5b28b27d6ef 100644
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -354,8 +354,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Tools.Roslyn.Package", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Package", "src\NuGet\Microsoft.CodeAnalysis.Package.csproj", "{B9843F65-262E-4F40-A0BC-2CBEF7563A44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup", "src\Setup\DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.Setup.csproj", "{03607817-6800-40B6-BEAA-D6F437CD62B7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Package", "src\Setup\Installer\Installer.Package.csproj", "{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Insertion", "Insertion", "{AFA5F921-0650-45E8-B293-51A0BB89DEA0}"
@@ -370,8 +368,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Exte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.CodeLens", "src\VisualStudio\CodeLens\Microsoft.VisualStudio.LanguageServices.CodeLens.csproj", "{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Toolset.Package", "src\NuGet\Microsoft.Net.Compilers.Toolset\Microsoft.Net.Compilers.Toolset.Package.csproj", "{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.LanguageServer.Protocol", "src\Features\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", "{686BF57E-A6FF-467B-AAB3-44DE916A9772}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests", "src\Features\LanguageServer\ProtocolUnitTests\Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj", "{1DDE89EE-5819-441F-A060-2FF4A986F372}"
@@ -503,6 +499,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VBCSCompiler-arm64", "src\C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore", "src\Tools\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj", "{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup.x64", "src\Setup\DevDivVsix\CompilersPackage\x64\Microsoft.CodeAnalysis.Compilers.Setup.x64.csproj", "{DA7378DB-1FF2-48A0-994D-7F71E8191308}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup.arm64", "src\Setup\DevDivVsix\CompilersPackage\arm64\Microsoft.CodeAnalysis.Compilers.Setup.arm64.csproj", "{A80077D1-D911-4238-9367-0E790C475814}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup.x86", "src\Setup\DevDivVsix\CompilersPackage\x86\Microsoft.CodeAnalysis.Compilers.Setup.x86.csproj", "{46429C41-0733-4568-9BA6-3F52CB47C4ED}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Toolset.Package", "src\NuGet\Microsoft.Net.Compilers.Toolset\AnyCpu\Microsoft.Net.Compilers.Toolset.Package.csproj", "{6131713D-DFB4-49B5-8010-50071FED3E85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Toolset.Package.Arm64", "src\NuGet\Microsoft.Net.Compilers.Toolset\arm64\Microsoft.Net.Compilers.Toolset.Package.Arm64.csproj", "{A9A8ADE5-F123-4109-9FA4-4B92F1657043}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1033,10 +1039,6 @@ Global
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1057,10 +1059,6 @@ Global
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1217,6 +1215,26 @@ Global
 		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA7378DB-1FF2-48A0-994D-7F71E8191308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA7378DB-1FF2-48A0-994D-7F71E8191308}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA7378DB-1FF2-48A0-994D-7F71E8191308}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA7378DB-1FF2-48A0-994D-7F71E8191308}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A80077D1-D911-4238-9367-0E790C475814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A80077D1-D911-4238-9367-0E790C475814}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A80077D1-D911-4238-9367-0E790C475814}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A80077D1-D911-4238-9367-0E790C475814}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46429C41-0733-4568-9BA6-3F52CB47C4ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46429C41-0733-4568-9BA6-3F52CB47C4ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46429C41-0733-4568-9BA6-3F52CB47C4ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46429C41-0733-4568-9BA6-3F52CB47C4ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6131713D-DFB4-49B5-8010-50071FED3E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6131713D-DFB4-49B5-8010-50071FED3E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6131713D-DFB4-49B5-8010-50071FED3E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6131713D-DFB4-49B5-8010-50071FED3E85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9A8ADE5-F123-4109-9FA4-4B92F1657043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9A8ADE5-F123-4109-9FA4-4B92F1657043}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9A8ADE5-F123-4109-9FA4-4B92F1657043}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9A8ADE5-F123-4109-9FA4-4B92F1657043}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1375,7 +1393,6 @@ Global
 		{0EB22BD1-B8B1-417D-8276-F475C2E190FF} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{3636D3E2-E3EF-4815-B020-819F382204CD} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
-		{03607817-6800-40B6-BEAA-D6F437CD62B7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{AFA5F921-0650-45E8-B293-51A0BB89DEA0} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{6362616E-6A47-48F0-9EE0-27800B306ACB} = {AFA5F921-0650-45E8-B293-51A0BB89DEA0}
@@ -1383,7 +1400,6 @@ Global
 		{BD8CE303-5F04-45EC-8DCF-73C9164CD614} = {8977A560-45C2-4EC2-A849-97335B382C74}
 		{2FB6C157-DF91-4B1C-9827-A4D1C08C73EC} = {8977A560-45C2-4EC2-A849-97335B382C74}
 		{5E6E9184-DEC5-4EC5-B0A4-77CFDC8CDEBE} = {8DBA5174-B0AA-4561-82B1-A46607697753}
-		{A74C7D2E-92FA-490A-B80A-28BEF56B56FC} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
 		{686BF57E-A6FF-467B-AAB3-44DE916A9772} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
 		{1DDE89EE-5819-441F-A060-2FF4A986F372} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
 		{655A5B07-39B8-48CD-8590-8AC0C2B708D8} = {8977A560-45C2-4EC2-A849-97335B382C74}
@@ -1445,6 +1461,11 @@ Global
 		{D8EF0777-9D65-4849-A7D6-AC81E58E2317} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
 		{DC8C78CC-B6FE-47BF-93B1-B65A1C67C08D} = {7E907718-0B33-45C8-851F-396CEFDC1AB6}
 		{8C21FF08-8BB5-43E4-AC10-74BD2CBEBC24} = {8977A560-45C2-4EC2-A849-97335B382C74}
+		{DA7378DB-1FF2-48A0-994D-7F71E8191308} = {BE25E872-1667-4649-9D19-96B83E75A44E}
+		{A80077D1-D911-4238-9367-0E790C475814} = {BE25E872-1667-4649-9D19-96B83E75A44E}
+		{46429C41-0733-4568-9BA6-3F52CB47C4ED} = {BE25E872-1667-4649-9D19-96B83E75A44E}
+		{6131713D-DFB4-49B5-8010-50071FED3E85} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
+		{A9A8ADE5-F123-4109-9FA4-4B92F1657043} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
diff --git a/eng/Versions.props b/eng/Versions.props
index 974c804464fac..9760d3c6320c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -241,7 +241,7 @@
     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
     <SQLitePCLRawbundle_greenVersion>2.0.7</SQLitePCLRawbundle_greenVersion>
     <UIAComWrapperVersion>1.1.0.14</UIAComWrapperVersion>
-    <MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
+    <MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.0.1056-Dev17PIAs-g9dffd635</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftVSSDKVSDConfigToolVersion>16.0.2032702</MicrosoftVSSDKVSDConfigToolVersion>
     <VsWebsiteInteropVersion>8.0.50727</VsWebsiteInteropVersion>
diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
index 925a9a9e4fdc0..2b7db4c5a709d 100644
--- a/eng/build-utils.ps1
+++ b/eng/build-utils.ps1
@@ -328,7 +328,7 @@ function Make-BootstrapBuild([switch]$force32 = $false) {
   Create-Directory $dir
 
   $packageName = "Microsoft.Net.Compilers.Toolset"
-  $projectPath = "src\NuGet\$packageName\$packageName.Package.csproj"
+  $projectPath = "src\NuGet\$packageName\AnyCpu\$packageName.Package.csproj"
   $force32Flag = if ($force32) { " /p:BOOTSTRAP32=true" } else { "" }
 
   Run-MSBuild $projectPath "/restore /t:Pack /p:RoslynEnforceCodeStyle=false /p:RunAnalyzersDuringBuild=false /p:DotNetUseShippingVersions=true /p:InitialDefineConstants=BOOTSTRAP /p:PackageOutputPath=`"$dir`" /p:EnableNgenOptimization=false /p:PublishWindowsPdb=false $force32Flag" -logFileName "Bootstrap" -configuration $bootstrapConfiguration -runAnalyzers
diff --git a/eng/config/OptProf.json b/eng/config/OptProf.json
index e0af50ae0726d..cc10a99203cf9 100644
--- a/eng/config/OptProf.json
+++ b/eng/config/OptProf.json
@@ -247,7 +247,101 @@
       ]
     },
     {
-      "name": "Microsoft.CodeAnalysis.Compilers.vsix",
+      "name": "Microsoft.CodeAnalysis.Compilers.x86.vsix",
+      "tests": [
+        {
+          "container": "TeamEng",
+          "filteredTestCases": [
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            }
+          ]
+        },
+        {
+          "container": "VSPE",
+          "filteredTestCases": [
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Microsoft.CodeAnalysis.Compilers.x64.vsix",
+      "tests": [
+        {
+          "container": "TeamEng",
+          "filteredTestCases": [
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
+              "testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
+            }
+          ]
+        },
+        {
+          "container": "VSPE",
+          "filteredTestCases": [
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            },
+            {
+              "filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
+              "testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Microsoft.CodeAnalysis.Compilers.arm64.vsix",
       "tests": [
         {
           "container": "TeamEng",
diff --git a/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems b/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
index 1e6d177bbbcb9..7dfb667a288bc 100644
--- a/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
+++ b/src/Compilers/CSharp/CommandLine/CscCommandLine.projitems
@@ -30,7 +30,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\Csc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
 
-    <None Include="$(MSBuildThisFileDirectory)App.config" />
+    <None Include="$(MSBuildThisFileDirectory)App.config" Condition="'$(TargetFramework)' == 'net472'" />
+
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests" />
     
     <ProjectReference Include="..\..\Core\Portable\Microsoft.CodeAnalysis.csproj" />
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
index 8c8ccac7dd031..9f2d181d8eade 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
@@ -8,6 +8,15 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
+
+    <!--
+      Prevent the generation of binding redirects as they are not respected by 
+      MSBuild. At the moment it's on by default due to arcade settings that we
+      need to override here
+
+      https://github.com/dotnet/arcade/issues/9305
+     -->
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <AssemblyVersion/>
     <!-- CA1819 (Properties should not return arrays) disabled as it is very common across this project. -->
     <NoWarn>$(NoWarn);CA1819</NoWarn>
diff --git a/src/Compilers/Server/CommandLine/VBCSCompilerCommandLine.projitems b/src/Compilers/Server/CommandLine/VBCSCompilerCommandLine.projitems
index dccaad397b010..2d6cecad95c30 100644
--- a/src/Compilers/Server/CommandLine/VBCSCompilerCommandLine.projitems
+++ b/src/Compilers/Server/CommandLine/VBCSCompilerCommandLine.projitems
@@ -47,7 +47,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)VBCSCompiler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)VisualBasicCompilerServer.cs" />
 
-    <None Include="$(MSBuildThisFileDirectory)App.config" />
+    <None Include="$(MSBuildThisFileDirectory)App.config" Condition="'$(TargetFramework)' == 'net472'" />
 
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests" />
diff --git a/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems b/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
index d0cbdd3f76b0e..a0c4b1686814f 100644
--- a/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
+++ b/src/Compilers/VisualBasic/CommandLine/VbcCommandLine.projitems
@@ -30,7 +30,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\Vbc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
 
-    <None Include="$(MSBuildThisFileDirectory)App.config" />
+    <None Include="$(MSBuildThisFileDirectory)App.config" Condition="'$(TargetFramework)' == 'net472'" />
 
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests" />
 
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
similarity index 81%
rename from src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
rename to src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
index 5347eebe10eb3..97839ec299ab6 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/Microsoft.Net.Compilers.Toolset.Package.csproj
@@ -28,11 +28,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Compilers\CSharp\csc\csc.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\Compilers\VisualBasic\vbc\vbc.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\CSharp\csc\csc.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\VisualBasic\vbc\vbc.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" PrivateAssets="All"/>
 
     <ProjectReference Update="@(ProjectReference)"
                       Targets="Publish"
@@ -58,6 +58,6 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="DesktopCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'net472'" />
-  <Import Project="CoreClrCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'net6.0'" />
+  <Import Project="..\DesktopCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'net472'" />
+  <Import Project="..\CoreClrCompilerArtifacts.targets" Condition="'$(TargetFramework)' == 'net6.0'" />
 </Project>
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/build/Microsoft.Net.Compilers.Toolset.props
similarity index 100%
rename from src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props
rename to src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/build/Microsoft.Net.Compilers.Toolset.props
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props b/src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props
similarity index 100%
rename from src/NuGet/Microsoft.Net.Compilers.Toolset/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props
rename to src/NuGet/Microsoft.Net.Compilers.Toolset/AnyCpu/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.props
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets
index 4bba65e560005..5f1ae0d08a669 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets
@@ -5,6 +5,7 @@
     <ItemGroup>
       <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net6.0\publish\*.targets" />
       <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net6.0\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" />
+      <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net6.0\publish\Microsoft.Build.Tasks.CodeAnalysis.deps.json" />
       <CoreClrCompilerToolsArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net6.0\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" />
 
       <CoreClrCompilerBinArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis\$(Configuration)\netcoreapp3.1\Microsoft.CodeAnalysis.dll" />
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
index 662558690350a..b99e993370284 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
@@ -2,6 +2,10 @@
 <!-- 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. -->
 <Project>
 
+  <PropertyGroup>
+    <_ExeDirSuffix Condition="'$(RoslynPackageArch)' == 'arm64'">-arm64</_ExeDirSuffix>
+  </PropertyGroup>
+
   <!--
     The CompilerArtifact list is used to generate Microsoft.Net.Compilers package, VS.Toolset.Roslyn CoreXT package and Microsoft.CodeAnalysis.Compilers Willow VSIX.
     Keeping the list in central location allows us to make sure that these packages include the same files.
@@ -29,20 +33,20 @@
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Scripting\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll" NgenArchitecture="all" NgenApplication="csi.exe"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.Scripting\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll" NgenArchitecture="all" NgenApplication="csi.exe"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.dll" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\Microsoft.DiaSymReader.Native.amd64.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\Microsoft.DiaSymReader.Native.arm64.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\Microsoft.DiaSymReader.Native.x86.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.exe" NgenArchitecture="all" NgenApplication="csc.exe" NgenPriority="2"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.exe.config"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc\$(Configuration)\net472\csc.rsp"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\Microsoft.DiaSymReader.Native.amd64.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\Microsoft.DiaSymReader.Native.arm64.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\Microsoft.DiaSymReader.Native.x86.dll" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\csc.exe" NgenArchitecture="all" NgenApplication="csc.exe" NgenPriority="2"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\csc.exe.config"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csc$(_ExeDirSuffix)\$(Configuration)\net472\csc.rsp"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.exe" NgenArchitecture="all" NgenApplication="csi.exe" NgenPriority="2"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.exe.config"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\csi.rsp"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.exe" NgenArchitecture="all" NgenApplication="vbc.exe" NgenPriority="2"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.exe.config"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc\$(Configuration)\net472\vbc.rsp"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\net472\VBCSCompiler.exe" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" NgenPriority="1"/>
-      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler\$(Configuration)\net472\VBCSCompiler.exe.config"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc$(_ExeDirSuffix)\$(Configuration)\net472\vbc.exe" NgenArchitecture="all" NgenApplication="vbc.exe" NgenPriority="2"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc$(_ExeDirSuffix)\$(Configuration)\net472\vbc.exe.config"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)vbc$(_ExeDirSuffix)\$(Configuration)\net472\vbc.rsp"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler$(_ExeDirSuffix)\$(Configuration)\net472\VBCSCompiler.exe" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" NgenPriority="1"/>
+      <DesktopCompilerArtifact Include="$(ArtifactsBinDir)VBCSCompiler$(_ExeDirSuffix)\$(Configuration)\net472\VBCSCompiler.exe.config"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.Build.Tasks.CodeAnalysis.dll" NgenArchitecture="all" NgenPriority="1"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.Managed.Core.CurrentVersions.targets"/>
       <DesktopCompilerArtifact Include="$(ArtifactsBinDir)Microsoft.Build.Tasks.CodeAnalysis\$(Configuration)\net472\Microsoft.Managed.Core.targets"/>
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/Microsoft.Net.Compilers.Toolset.Package.Arm64.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/Microsoft.Net.Compilers.Toolset.Package.Arm64.csproj
new file mode 100644
index 0000000000000..86ad2b6b6fdb1
--- /dev/null
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/Microsoft.Net.Compilers.Toolset.Package.Arm64.csproj
@@ -0,0 +1,58 @@
+<!-- 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. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+
+    <RoslynPackageArch>arm64</RoslynPackageArch>
+    <IsPackable>true</IsPackable>
+    <NuspecPackageId>Microsoft.Net.Compilers.Toolset.Arm64</NuspecPackageId>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <PackageDescription>
+      .NET Compilers Toolset Package.
+      Referencing this package will cause the project to be built using the C# and Visual Basic compilers contained in the package, as opposed to the version installed with MSBuild.
+
+      This package is primarily intended as a method for rapidly shipping hotfixes to customers. Using it as a long term solution for providing newer compilers on older MSBuild installations is explicitly not supported. That can and will break on a regular basis.
+
+      The supported mechanism for providing new compilers in a build enviroment is updating to the newer .NET SDK or Visual Studio Build Tools SKU.
+
+      This package requires either MSBuild 16.3 and .NET Desktop 4.7.2+ or .NET Core 2.1+
+
+      $(RoslynPackageDescriptionDetails)
+    </PackageDescription>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
+    <!-- Remove NU5128 once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
+
+    <_DependsOn>InitializeDesktopCompilerArtifacts</_DependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Compilers\CSharp\csc-arm64\csc-arm64.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\VisualBasic\vbc-arm64\vbc-arm64.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\Compilers\Server\VBCSCompiler-arm64\VBCSCompiler-arm64.csproj" PrivateAssets="All"/>
+
+    <ProjectReference Update="@(ProjectReference)"
+                      Targets="Publish"
+                      ReferenceOutputAssembly="false"
+                      SkipGetTargetFrameworkProperties="true"
+                      Condition="'$(TargetFramework)' == 'net6.0'"
+                      SetTargetFramework="TargetFramework=net6.0" />
+  </ItemGroup>
+
+  <Target Name="_GetFilesToPackage" DependsOnTargets="$(_DependsOn)">
+    <ItemGroup>
+      <_File Include="@(DesktopCompilerArtifact)" TargetDir="tasks/net472"/>
+      <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tasks/net472"/>
+     
+      <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="build" />
+      <_File Include="$(MSBuildProjectDirectory)\buildMultiTargeting\**\*.*" Condition="'$(TargetFramework)' == 'net472'" TargetDir="buildMultiTargeting" />
+     
+      <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)/%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)" />
+    </ItemGroup>
+  </Target>
+
+  <Import Project="..\DesktopCompilerArtifacts.targets" />
+</Project>
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/build/Microsoft.Net.Compilers.Toolset.Arm64.props b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/build/Microsoft.Net.Compilers.Toolset.Arm64.props
new file mode 100644
index 0000000000000..4b771afb964cf
--- /dev/null
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/build/Microsoft.Net.Compilers.Toolset.Arm64.props
@@ -0,0 +1,17 @@
+<!-- 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. -->
+<Project>
+
+  <PropertyGroup>
+    <_RoslynTargetDirectoryName Condition="'$(MSBuildRuntimeType)' == 'Core'">net6.0</_RoslynTargetDirectoryName>   
+    <_RoslynTargetDirectoryName Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</_RoslynTargetDirectoryName>   
+    <_RoslynTasksDirectory>$(MSBuildThisFileDirectory)..\tasks\$(_RoslynTargetDirectoryName)\</_RoslynTasksDirectory>
+    <RoslynTasksAssembly>$(_RoslynTasksDirectory)Microsoft.Build.Tasks.CodeAnalysis.dll</RoslynTasksAssembly> 
+    <UseSharedCompilation Condition="'$(UseSharedCompilation)' == ''">true</UseSharedCompilation>
+    <CSharpCoreTargetsPath>$(_RoslynTasksDirectory)Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
+    <VisualBasicCoreTargetsPath>$(_RoslynTasksDirectory)Microsoft.VisualBasic.Core.targets</VisualBasicCoreTargetsPath>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc" AssemblyFile="$(RoslynTasksAssembly)" />
+  <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc" AssemblyFile="$(RoslynTasksAssembly)" />
+  <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.CopyRefAssembly" AssemblyFile="$(RoslynTasksAssembly)" />
+</Project>
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.Arm64.props b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.Arm64.props
new file mode 100644
index 0000000000000..1d5afc708a528
--- /dev/null
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/arm64/buildMultiTargeting/Microsoft.Net.Compilers.Toolset.Arm64.props
@@ -0,0 +1,4 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\build\$(MSBuildThisFile)" />
+</Project>
diff --git a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj b/src/Setup/DevDivVsix/CompilersPackage/CompilersPackage.targets
similarity index 87%
rename from src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj
rename to src/Setup/DevDivVsix/CompilersPackage/CompilersPackage.targets
index 47e8550ba14f9..2ee60d125d516 100644
--- a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj
+++ b/src/Setup/DevDivVsix/CompilersPackage/CompilersPackage.targets
@@ -1,29 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <ApplyNgenOptimization>full</ApplyNgenOptimization>
-
-    <!-- VS Insertion -->
-    <TargetVsixContainerName>Microsoft.CodeAnalysis.Compilers.vsix</TargetVsixContainerName>
-    <VisualStudioInsertionComponent>Microsoft.CodeAnalysis.Compilers</VisualStudioInsertionComponent>
-  </PropertyGroup>
+<Project>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compilers\CSharp\csc\csc.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\..\Compilers\VisualBasic\vbc\vbc.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\CSharp\csc\csc.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\CSharp\csc-arm64\csc-arm64.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\VisualBasic\vbc\vbc.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\VisualBasic\vbc-arm64\vbc-arm64.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Interactive\csi\csi.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" PrivateAssets="All"/>
+    <ProjectReference Include="..\..\..\..\Compilers\Server\VBCSCompiler-arm64\VBCSCompiler-arm64.csproj" PrivateAssets="All"/>
   </ItemGroup>
 
-  <Target Name="_SetSwrFilePath">
-    <PropertyGroup>
-      <_SwrFilePath>$(IntermediateOutputPath)Microsoft.CodeAnalysis.Compilers.swr</_SwrFilePath>
-    </PropertyGroup>
-  </Target>
-
   <!--
     Calculates which external dependencies included in the target VSIX need to be updated with optimization data.
   -->
@@ -138,7 +127,7 @@
 
 package name=$(VisualStudioInsertionComponent)
         version=$(VsixVersion)
-        vs.package.productArch=neutral
+        vs.package.machineArch=$(RoslynPackageArch)
 
 vs.nonCriticalProcesses
   vs.nonCriticalProcess name="VBCSCompiler"
@@ -147,7 +136,7 @@ folder InstallDir:\MSBuild\Current\Bin\Roslyn
   @(_FileEntries, '%0d%0a  ')
 
 folder InstallDir:\Common7\Tools\vsdevcmd\ext
-  file source="$(MSBuildProjectDirectory)\roslyn.bat"
+  file source="$(MSBuildThisFileDirectory)\roslyn.bat"
 
 folder InstallDir:\MSBuild\Current\Bin\Roslyn\cs
   @(_CsSatellite->'%(_FileEntries)', '%0d%0a  ')
diff --git a/src/Setup/DevDivVsix/CompilersPackage/arm64/Microsoft.CodeAnalysis.Compilers.Setup.arm64.csproj b/src/Setup/DevDivVsix/CompilersPackage/arm64/Microsoft.CodeAnalysis.Compilers.Setup.arm64.csproj
new file mode 100644
index 0000000000000..fa7029460c8d1
--- /dev/null
+++ b/src/Setup/DevDivVsix/CompilersPackage/arm64/Microsoft.CodeAnalysis.Compilers.Setup.arm64.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimization>full</ApplyNgenOptimization>
+    <RoslynPackageArch>arm64</RoslynPackageArch>
+
+    <!-- VS Insertion -->
+    <TargetVsixContainerName>Microsoft.CodeAnalysis.Compilers.arm64.vsix</TargetVsixContainerName>
+    <VisualStudioInsertionComponent>Microsoft.CodeAnalysis.Compilers</VisualStudioInsertionComponent>
+  </PropertyGroup>
+
+  <Target Name="_SetSwrFilePath">
+    <PropertyGroup>
+      <_SwrFilePath>$(IntermediateOutputPath)Microsoft.CodeAnalysis.Compilers.arm64.swr</_SwrFilePath>
+    </PropertyGroup>
+  </Target>
+
+  <Import Project="..\CompilersPackage.targets" />
+</Project>
diff --git a/src/Setup/DevDivVsix/CompilersPackage/x64/Microsoft.CodeAnalysis.Compilers.Setup.x64.csproj b/src/Setup/DevDivVsix/CompilersPackage/x64/Microsoft.CodeAnalysis.Compilers.Setup.x64.csproj
new file mode 100644
index 0000000000000..c9409375b55cc
--- /dev/null
+++ b/src/Setup/DevDivVsix/CompilersPackage/x64/Microsoft.CodeAnalysis.Compilers.Setup.x64.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimization>full</ApplyNgenOptimization>
+    <RoslynPackageArch>x64</RoslynPackageArch>
+
+    <!-- VS Insertion -->
+    <TargetVsixContainerName>Microsoft.CodeAnalysis.Compilers.x64.vsix</TargetVsixContainerName>
+    <VisualStudioInsertionComponent>Microsoft.CodeAnalysis.Compilers</VisualStudioInsertionComponent>
+  </PropertyGroup>
+
+  <Target Name="_SetSwrFilePath">
+    <PropertyGroup>
+      <_SwrFilePath>$(IntermediateOutputPath)Microsoft.CodeAnalysis.Compilers.x64.swr</_SwrFilePath>
+    </PropertyGroup>
+  </Target>
+
+  <Import Project="..\CompilersPackage.targets" />
+</Project>
diff --git a/src/Setup/DevDivVsix/CompilersPackage/x86/Microsoft.CodeAnalysis.Compilers.Setup.x86.csproj b/src/Setup/DevDivVsix/CompilersPackage/x86/Microsoft.CodeAnalysis.Compilers.Setup.x86.csproj
new file mode 100644
index 0000000000000..9b270030d9788
--- /dev/null
+++ b/src/Setup/DevDivVsix/CompilersPackage/x86/Microsoft.CodeAnalysis.Compilers.Setup.x86.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <ApplyNgenOptimization>full</ApplyNgenOptimization>
+    <RoslynPackageArch>x86</RoslynPackageArch>
+
+    <!-- VS Insertion -->
+    <TargetVsixContainerName>Microsoft.CodeAnalysis.Compilers.x86.vsix</TargetVsixContainerName>
+    <VisualStudioInsertionComponent>Microsoft.CodeAnalysis.Compilers</VisualStudioInsertionComponent>
+  </PropertyGroup>
+
+  <Target Name="_SetSwrFilePath">
+    <PropertyGroup>
+      <_SwrFilePath>$(IntermediateOutputPath)Microsoft.CodeAnalysis.Compilers.x86.swr</_SwrFilePath>
+    </PropertyGroup>
+  </Target>
+
+  <Import Project="..\CompilersPackage.targets" />
+</Project>
diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
index c1de5efa55634..06c2d9ecc1ffa 100644
--- a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
+++ b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs
@@ -11,6 +11,7 @@
 using System.IO.Packaging;
 using System.Linq;
 using System.Reflection.Metadata;
+using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
 using System.Security.Cryptography;
 using System.Text.RegularExpressions;
@@ -34,24 +35,22 @@ namespace BuildBoss
     /// </summary>
     internal sealed class PackageContentsChecker : ICheckerUtil
     {
-        private readonly struct PackageAsset
+        private sealed class PackagePartData
         {
-            public bool IsDesktop { get; }
-            public string FileRelativeName { get; }
+            public PackagePart PackagePart { get; }
+            public string Name { get; }
+            public string RelativeName { get; }
             public string Checksum { get; }
-            public bool IsCoreClr => !IsDesktop;
-            public string FileName => Path.GetFileName(FileRelativeName);
 
-            public PackageAsset(string fileRelativeName, string checksum, bool isDesktop)
+            public PackagePartData(PackagePart part, string checksum)
             {
-                FileRelativeName = fileRelativeName;
+                Name = part.GetName();
+                RelativeName = part.GetRelativeName();
+                PackagePart = part;
                 Checksum = checksum;
-                IsDesktop = isDesktop;
             }
 
-            public PackageAsset WithFileRelativeName(string fileRelativeName) => new PackageAsset(fileRelativeName, Checksum, IsDesktop);
-
-            public override string ToString() => FileRelativeName;
+            public override string ToString() => RelativeName;
         }
 
         internal static StringComparer PathComparer { get; } = StringComparer.OrdinalIgnoreCase;
@@ -72,19 +71,10 @@ public bool Check(TextWriter textWriter)
         {
             try
             {
-                var packageAssets = new List<PackageAsset>();
-                if (!GetPackageAssets(textWriter, packageAssets))
-                {
-                    return false;
-                }
-
                 var allGood = true;
-                allGood &= CheckDesktop(textWriter, filter(isDesktop: true));
-                allGood &= CheckCombined(textWriter, packageAssets);
+                allGood &= CheckPackages(textWriter);
                 allGood &= CheckExternalApis(textWriter);
                 return allGood;
-
-                IEnumerable<string> filter(bool isDesktop) => packageAssets.Where(x => x.IsDesktop == isDesktop).Select(x => x.FileRelativeName);
             }
             catch (Exception ex)
             {
@@ -94,35 +84,215 @@ public bool Check(TextWriter textWriter)
         }
 
         /// <summary>
-        /// Verify the contents of our desktop targeting compiler packages are correct.
+        /// Verify the contents of the compiler packages match the expected input
         /// </summary>
-        private bool CheckDesktop(TextWriter textWriter, IEnumerable<string> assetRelativeNames)
+        private bool CheckPackages(TextWriter textWriter)
         {
-            return VerifyNuPackage(
-                        textWriter,
-                        FindNuGetPackage(Path.Combine(ArtifactsDirectory, "VSSetup", Configuration, "DevDivPackages"), "VS.Tools.Roslyn"),
-                        string.Empty,
-                        assetRelativeNames);
+            var allGood = true;
+
+            // The VS.Tools.Roslyn package is a bit of a historical artifact from how our files used to 
+            // be laid out in the VS repository. The structure is flat which means the build assets are 
+            // mixed in with package artifacts and that makes the verification a bit more complicated and 
+            // more needs to be excluded
+            // 
+            // The one to call out is excluding csc.exe for validation. That is because it's custom stamped
+            // as an x86 exe to work around an issue in the VS build system
+            //
+            // https://github.com/dotnet/roslyn/issues/17864
+            allGood &= VerifyPackageCore(
+                textWriter,
+                FindNuGetPackage(Path.Combine(ArtifactsDirectory, "VSSetup", Configuration, "DevDivPackages"), "VS.Tools.Roslyn"),
+                excludeFunc: relativeFileName =>
+                    PathComparer.Equals(relativeFileName, "csc.exe") ||
+                    PathComparer.Equals(relativeFileName, "Icon.png") ||
+                    PathComparer.Equals(relativeFileName, "Init.cmd") ||
+                    PathComparer.Equals(relativeFileName, "VS.Tools.Roslyn.nuspec") ||
+                    PathComparer.Equals(relativeFileName, "csc.exe") ||
+                    relativeFileName.EndsWith(".resources.dll", PathComparison) ||
+                    relativeFileName.EndsWith(".rels", PathComparison) ||
+                    relativeFileName.EndsWith(".psmdcp", PathComparison),
+                ("", GetProjectOutputDirectory("csc", "net472")),
+                ("", GetProjectOutputDirectory("vbc", "net472")),
+                ("", GetProjectOutputDirectory("csi", "net472")),
+                ("", GetProjectOutputDirectory("VBCSCompiler", "net472")),
+                ("", GetProjectOutputDirectory("Microsoft.Build.Tasks.CodeAnalysis", "net472")));
+
+            allGood &= VerifyPackageCore(
+                textWriter,
+                FindNuGetPackage(Path.Combine(ArtifactsDirectory, "packages", Configuration, "Shipping"), "Microsoft.Net.Compilers.Toolset.Arm64"),
+                (@"tasks\net472", GetProjectOutputDirectory("csc-arm64", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("vbc-arm64", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("csi", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("VBCSCompiler-arm64", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("Microsoft.Build.Tasks.CodeAnalysis", "net472"))); ;
+
+            allGood &= VerifyPackageCore(
+                textWriter,
+                FindNuGetPackage(Path.Combine(ArtifactsDirectory, "packages", Configuration, "Shipping"), "Microsoft.Net.Compilers.Toolset"),
+                excludeFunc: relativeFileName => relativeFileName.StartsWith(@"tasks\net6.0\bincore\Microsoft.DiaSymReader.Native", PathComparison),
+                (@"tasks\net472", GetProjectOutputDirectory("csc", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("vbc", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("csi", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("VBCSCompiler", "net472")),
+                (@"tasks\net472", GetProjectOutputDirectory("Microsoft.Build.Tasks.CodeAnalysis", "net472")),
+                (@"tasks\net6.0\bincore", GetProjectPublishDirectory("csc", "net6.0")),
+                (@"tasks\net6.0\bincore", GetProjectPublishDirectory("vbc", "net6.0")),
+                (@"tasks\net6.0\bincore", GetProjectPublishDirectory("VBCSCompiler", "net6.0")),
+                (@"tasks\net6.0", GetProjectPublishDirectory("Microsoft.Build.Tasks.CodeAnalysis", "net6.0")));
+
+            foreach (var arch in new[] { "x86", "x64", "arm64" })
+            {
+                var suffix = arch == "arm64" ? "-arm64" : "";
+                allGood &= VerifyPackageCore(
+                    textWriter,
+                    FindVsix($"Microsoft.CodeAnalysis.Compilers.{arch}"),
+                    (@"Contents\MSBuild\Current\Bin\Roslyn", GetProjectOutputDirectory($"csc{suffix}", "net472")),
+                    (@"Contents\MSBuild\Current\Bin\Roslyn", GetProjectOutputDirectory($"vbc{suffix}", "net472")),
+                    (@"Contents\MSBuild\Current\Bin\Roslyn", GetProjectOutputDirectory("csi", "net472")),
+                    (@"Contents\MSBuild\Current\Bin\Roslyn", GetProjectOutputDirectory($"VBCSCompiler{suffix}", "net472")),
+                    (@"Contents\MSBuild\Current\Bin\Roslyn", GetProjectOutputDirectory("Microsoft.Build.Tasks.CodeAnalysis", "net472"))); ;
+            }
+
+            return allGood;
         }
 
-        /// <summary>
-        /// Verify the contents of our combinde toolset compiler packages are correct.
-        /// </summary>
-        private bool CheckCombined(TextWriter textWriter, IEnumerable<PackageAsset> packageAssets)
+        private string GetProjectOutputDirectory(string projectName, string tfm) =>
+            Path.Combine(ArtifactsDirectory, "bin", projectName, Configuration, tfm);
+
+        private string GetProjectPublishDirectory(string projectName, string tfm) =>
+            Path.Combine(ArtifactsDirectory, "bin", projectName, Configuration, tfm, "publish");
+
+        private static bool VerifyPackageCore(
+            TextWriter textWriter,
+            string packageFilePath,
+            params (string PackageFolderRelativePath, string BuildOutputFolder)[] packageInputs) =>
+            VerifyPackageCore(
+                textWriter,
+                packageFilePath,
+                static _ => false,
+                packageInputs);
+
+        private static bool VerifyPackageCore(
+            TextWriter textWriter,
+            string packageFilePath,
+            Func<string, bool> excludeFunc,
+            params (string PackageFolderRelativePath, string BuildOutputDirectory)[] packageInputs)
         {
-            var list = new List<string>();
-            foreach (var asset in packageAssets)
+            textWriter.WriteLine($"Verifying {packageFilePath}");
+            using var package = Package.Open(packageFilePath, FileMode.Open, FileAccess.Read);
+            var allGood = true;
+            var partList = GetPackagePartDataList(package);
+            var partMap = partList.ToDictionary(x => x.RelativeName);
+            var foundSet = new HashSet<string>(PathComparer);
+
+            // First ensure all of the files in the build output directories is included in the 
+            // correct folder in the package file
+            foreach (var tuple in packageInputs)
             {
-                var folder = asset.IsDesktop ? "net472" : "net6.0";
-                var fileRelativeName = Path.Combine(folder, asset.FileRelativeName);
-                list.Add(fileRelativeName);
+                var buildAssets = Directory
+                    .EnumerateFiles(tuple.BuildOutputDirectory, "*.*", SearchOption.AllDirectories)
+                    .Where(IsTrackedAsset);
+                var folderRelativePath = tuple.PackageFolderRelativePath;
+                foreach (var buildAssetFilePath in buildAssets)
+                {
+                    var buildAssetRelativePath = buildAssetFilePath.Substring(tuple.BuildOutputDirectory.Length + 1);
+                    buildAssetRelativePath = Path.Combine(folderRelativePath, buildAssetRelativePath);
+                    if (excludeFunc(buildAssetRelativePath))
+                    {
+                        continue;
+                    }
+
+                    if (!partMap.TryGetValue(buildAssetRelativePath, out var partData))
+                    {
+                        allGood = false;
+                        textWriter.WriteLine($"\tPart {buildAssetRelativePath} missing from package");
+                        continue;
+                    }
+
+                    foundSet.Add(buildAssetRelativePath);
+                    var buildAssetChecksum = GetChecksum(buildAssetFilePath);
+                    if (buildAssetChecksum != partData.Checksum)
+                    {
+                        allGood = false;
+                        textWriter.WriteLine($"\tPart {buildAssetFilePath} has wrong checksum in package");
+                        textWriter.WriteLine($"\t\tBuild output {buildAssetFilePath}");
+                        textWriter.WriteLine($"\t\tPackage part {partData.Checksum}");
+                        continue;
+                    }
+                }
             }
 
-            return VerifyNuPackage(
-                    textWriter,
-                    FindNuGetPackage(Path.Combine(ArtifactsDirectory, "packages", Configuration, "Shipping"), "Microsoft.Net.Compilers.Toolset"),
-                    @"tasks",
-                    list);
+            // Sanity check to make sure that we didn't accidentall include a series of empty directories
+            if (foundSet.Count < 5)
+            {
+                allGood = false;
+                textWriter.WriteLine($"Found {foundSet.Count} items in package which is far less than expected");
+            }
+
+            // Next ensure that all of the files in the package folders were expected (aka they 
+            // came from the build output)
+            foreach (var packageFolder in packageInputs.Select(x => x.PackageFolderRelativePath).Distinct().OrderBy(x => x))
+            {
+                foreach (var partData in partList)
+                {
+                    if (excludeFunc(partData.RelativeName))
+                    {
+                        continue;
+                    }
+
+                    if (partData.RelativeName.StartsWith(packageFolder, PathComparison) &&
+                        !foundSet.Contains(partData.RelativeName))
+                    {
+                        textWriter.WriteLine($"\tFound unexpected part {partData.RelativeName}");
+                        allGood = false;
+                    }
+                }
+            }
+
+            return allGood;
+        }
+
+        private static List<PackagePartData> GetPackagePartDataList(Package package)
+        {
+            var list = new List<PackagePartData>();
+            foreach (var part in package.GetParts())
+            {
+                var relativeName = part.GetRelativeName();
+                if (string.IsNullOrEmpty(relativeName))
+                {
+                    continue;
+                }
+
+                using var stream = part.GetStream(FileMode.Open, FileAccess.Read);
+                var checksum = GetChecksum(stream);
+                list.Add(new PackagePartData(part, checksum));
+            }
+
+            return list;
+        }
+
+        private static string GetChecksum(string filePath)
+        {
+            using var stream = File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            return GetChecksum(stream);
+        }
+
+        private static string GetChecksum(Stream stream)
+        {
+            using var md5 = MD5.Create();
+            return BitConverter.ToString(md5.ComputeHash(stream));
+        }
+
+        /// <summary>
+        /// Get all of the parts in the specified folder. Will exclude all items in child folders.
+        /// </summary>
+        private static IEnumerable<PackagePart> GetPartsInFolder(Package package, string folderRelativePath)
+        {
+            Debug.Assert(string.IsNullOrEmpty(folderRelativePath) || folderRelativePath[0] != '\\');
+            var list = GetPackagePartDataList(package);
+            return list
+                .Where(x => x.RelativeName.StartsWith(folderRelativePath, PathComparison))
+                .Select(x => x.PackagePart);
         }
 
         /// <summary>
@@ -153,7 +323,8 @@ void verifyFolder(string folderRelativeName)
             {
                 var foundDllNameSet = new HashSet<string>(PathComparer);
                 var neededDllNameSet = new HashSet<string>(PathComparer);
-                foreach (var part in GetPartsInFolder(packageFilePath, folderRelativeName))
+                using var package = Package.Open(packageFilePath, FileMode.Open, FileAccess.Read);
+                foreach (var part in GetPartsInFolder(package, folderRelativeName))
                 {
                     var name = part.GetName();
                     if (Path.GetExtension(name) != ".dll")
@@ -196,233 +367,6 @@ void verifyFolder(string folderRelativeName)
             }
         }
 
-        private bool GetPackageAssets(TextWriter textWriter, List<PackageAsset> packageAssets)
-        {
-            var allGood = true;
-            var desktopAssets = new List<PackageAsset>();
-            var coreClrAssets = new List<PackageAsset>();
-
-            allGood &= GetPackageAssetsCore(
-                textWriter,
-                isDesktop: true,
-                desktopAssets,
-                $@"csc\{Configuration}\net472",
-                $@"vbc\{Configuration}\net472",
-                $@"csi\{Configuration}\net472",
-                $@"VBCSCompiler\{Configuration}\net472",
-                $@"Microsoft.Build.Tasks.CodeAnalysis\{Configuration}\net472");
-
-            allGood &= GetPackageAssetsCore(
-                textWriter,
-                isDesktop: false,
-                coreClrAssets,
-                $@"csc\{Configuration}\net6.0\publish",
-                $@"vbc\{Configuration}\net6.0\publish",
-                $@"VBCSCompiler\{Configuration}\net6.0\publish");
-
-            // The native DLLs ship inside the runtime specific directories but build deploys it at the 
-            // root as well. That copy is unnecessary.
-            coreClrAssets.RemoveAll(asset =>
-                PathComparer.Equals("Microsoft.DiaSymReader.Native.amd64.dll", asset.FileRelativeName) ||
-                PathComparer.Equals("Microsoft.DiaSymReader.Native.arm64.dll", asset.FileRelativeName) ||
-                PathComparer.Equals("Microsoft.DiaSymReader.Native.x86.dll", asset.FileRelativeName));
-
-            // Move all of the assets into bincore as that is where the non-MSBuild task assets will go
-            coreClrAssets = coreClrAssets.Select(x => x.WithFileRelativeName(Path.Combine("bincore", x.FileRelativeName))).ToList();
-
-            allGood &= GetPackageAssetsCore(
-                textWriter,
-                isDesktop: false,
-                coreClrAssets,
-                $@"Microsoft.Build.Tasks.CodeAnalysis\{Configuration}\net6.0\publish");
-
-            packageAssets.AddRange(desktopAssets);
-            packageAssets.AddRange(coreClrAssets);
-            packageAssets.Sort((x, y) => x.FileRelativeName.CompareTo(y.FileRelativeName));
-            return allGood;
-        }
-
-        /// <summary>
-        /// Get all of the dependencies in the specified directory set. 
-        /// </summary>
-        private bool GetPackageAssetsCore(TextWriter textWriter, bool isDesktop, List<PackageAsset> packageAssets, params string[] directoryPaths)
-        {
-            var relativeNameMap = new Dictionary<string, (PackageAsset PackageAsset, string OriginalFilePath)>(PathComparer);
-            var allGood = true;
-
-            IEnumerable<string> enumerateAssets(string directory, SearchOption searchOption = SearchOption.TopDirectoryOnly)
-            {
-                return Directory
-                    .EnumerateFiles(directory, "*.*", searchOption)
-                    .Where(IsTrackedAsset);
-            }
-
-            // This will record all of the assets files in a directory. The name of the assets and the checksum of the contents will 
-            // be added to the map
-            void recordDependencies(MD5 md5, string directory)
-            {
-                // Need to consider the files in the immediate directory and those in the runtimes directory. The resource dlls
-                // are unique and simple to include hence we don't go through the process of verifying them.
-                IEnumerable<string> enumerateFiles()
-                {
-                    foreach (var filePath in enumerateAssets(directory))
-                    {
-                        yield return filePath;
-                    }
-
-                    var runtimeDirectory = Path.Combine(directory, "runtimes");
-                    if (Directory.Exists(runtimeDirectory))
-                    {
-                        foreach (var filePath in enumerateAssets(runtimeDirectory, SearchOption.AllDirectories))
-                        {
-                            yield return filePath;
-                        }
-                    }
-                }
-
-                var normalizedDirectoryName = (directory[directory.Length - 1] == '\\') ? directory : directory + @"\";
-                string getRelativeName(string filePath) => filePath.Substring(normalizedDirectoryName.Length);
-
-                var foundOne = false;
-                foreach (var assetFilePath in enumerateFiles())
-                {
-                    foundOne = true;
-                    using (var stream = File.Open(assetFilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
-                    {
-                        var assetRelativeName = getRelativeName(assetFilePath);
-                        var hash = md5.ComputeHash(stream);
-                        var hashString = BitConverter.ToString(hash);
-                        if (relativeNameMap.TryGetValue(assetRelativeName, out var tuple))
-                        {
-                            // Make sure that all copies of the DLL have the same contents. The DLLs are being merged into
-                            // a single directory in the resulting NuGet. If the contents are different then our merge is 
-                            // invalid.
-                            if (tuple.PackageAsset.Checksum != hashString)
-                            {
-                                textWriter.WriteLine($"Asset {assetRelativeName} exists at two different versions");
-                                textWriter.WriteLine($"\tFile Path 1: {tuple.OriginalFilePath}");
-                                textWriter.WriteLine($"\tHash 1: {tuple.PackageAsset.Checksum}");
-                                textWriter.WriteLine($"\tFile Path 2: {assetFilePath}");
-                                textWriter.WriteLine($"\tHash 2: {hashString}");
-                                allGood = false;
-                            }
-                        }
-                        else
-                        {
-                            var packageAsset = new PackageAsset(assetRelativeName, hashString, isDesktop);
-                            packageAssets.Add(packageAsset);
-                            relativeNameMap[assetRelativeName] = (packageAsset, assetFilePath);
-                        }
-                    }
-                }
-
-                if (!foundOne)
-                {
-                    textWriter.WriteLine($"Directory {directory} did not have any assets");
-                    allGood = false;
-                }
-            }
-
-            using (var md5 = MD5.Create())
-            {
-                foreach (var directory in directoryPaths)
-                {
-                    recordDependencies(md5, Path.Combine(ArtifactsDirectory, "bin", directory));
-                }
-            }
-
-            return allGood;
-        }
-
-        private static bool VerifyNuPackage(
-            TextWriter textWriter,
-            string nupkgFilePath,
-            string folderRelativePath,
-            IEnumerable<string> dllFileNames) => VerifyCore(textWriter, nupkgFilePath, folderRelativePath, dllFileNames);
-
-        private static bool VerifyVsix(
-            TextWriter textWriter,
-            string vsixFilePath,
-            IEnumerable<string> dllFileNames) => VerifyCore(textWriter, vsixFilePath, folderRelativePath: "", dllFileNames);
-
-        private static bool VerifyCore(
-            TextWriter textWriter,
-            string packageFilePath,
-            string folderRelativePath,
-            IEnumerable<string> dllFileNames)
-        {
-            var map = dllFileNames
-                .ToDictionary(
-                    keySelector: x => Path.Combine(folderRelativePath, x),
-                    elementSelector: _ => false,
-                    comparer: PathComparer);
-            var allGood = true;
-            var packageFileName = Path.GetFileName(packageFilePath);
-
-            textWriter.WriteLine($"Verifying {packageFileName}");
-            foreach (var part in GetPartsInFolder(packageFilePath, folderRelativePath))
-            {
-                var relativeName = part.GetRelativeName();
-                if (!IsTrackedAsset(relativeName))
-                {
-                    continue;
-                }
-
-                var name = Path.GetFileName(relativeName);
-                if (map.TryGetValue(relativeName, out var isFound))
-                {
-                    if (isFound)
-                    {
-                        textWriter.WriteLine($"\tFound duplicate part {relativeName}");
-                        allGood = false;
-                    }
-                    else
-                    {
-                        map[relativeName] = true;
-                    }
-                }
-                else
-                {
-                    textWriter.WriteLine($"\tFound unexpected asset {relativeName}");
-                    allGood = false;
-                }
-            }
-
-            foreach (var pair in map.Where(x => !x.Value))
-            {
-                textWriter.WriteLine($"\tAsset {pair.Key} not found");
-                allGood = false;
-            }
-
-            return allGood;
-        }
-
-        /// <summary>
-        /// Get all of the parts in the specified folder. Will exclude all items in child folders.
-        /// </summary>
-        private static IEnumerable<PackagePart> GetPartsInFolder(string packageFilePath, string folderRelativePath)
-        {
-            Debug.Assert(string.IsNullOrEmpty(folderRelativePath) || folderRelativePath[0] != '\\');
-
-            using (var package = Package.Open(packageFilePath, FileMode.Open, FileAccess.Read))
-            {
-                foreach (var part in package.GetParts())
-                {
-                    var relativeName = part.GetRelativeName();
-                    if (string.IsNullOrEmpty(relativeName))
-                    {
-                        continue;
-                    }
-
-                    if (!relativeName.StartsWith(folderRelativePath, PathComparison))
-                    {
-                        continue;
-                    }
-
-                    yield return part;
-                }
-            }
-        }
 
         private string FindNuGetPackage(string directory, string partialName)
         {
@@ -442,24 +386,24 @@ private string FindVsix(string fileName)
         {
             fileName = fileName + ".vsix";
             var directory = Path.Combine(ArtifactsDirectory, "VSSetup", Configuration);
-            var file = Directory.EnumerateFiles(directory, fileName).SingleOrDefault();
+            var file = Directory.EnumerateFiles(directory, fileName, SearchOption.AllDirectories).SingleOrDefault();
             return file ?? throw new Exception($"Unable to find '{fileName}' in '{directory}'");
         }
 
         /// <summary>
-        /// The set of files that we track as assets in the NuPkg file
+        /// The set of files that we track as assets in the NuPkg / VSIX files
         /// </summary>
         private static bool IsTrackedAsset(string filePath)
         {
-            if (filePath.EndsWith(".dll", PathComparison))
-            {
-                return !filePath.EndsWith(".resources.dll");
-            }
-
             return
-                filePath.EndsWith(".exe") ||
-                filePath.EndsWith(".targets") ||
-                filePath.EndsWith(".props");
+                filePath.EndsWith(".exe", PathComparison) ||
+                filePath.EndsWith(".dll", PathComparison) ||
+                filePath.EndsWith(".targets", PathComparison) ||
+                filePath.EndsWith(".config", PathComparison) ||
+                filePath.EndsWith(".rsp", PathComparison) ||
+                filePath.EndsWith(".deps.json", PathComparison) ||
+                filePath.EndsWith(".runtimeconfig.json", PathComparison) ||
+                filePath.EndsWith(".props", PathComparison);
         }
     }
 }

From b8577df0ee336919a85afb430898451dc686da69 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <frsilb@microsoft.com>
Date: Thu, 12 May 2022 14:52:57 -0700
Subject: [PATCH 399/413] Move MSBuild back to 16.5.0.

---
 eng/Versions.props                                        | 2 +-
 src/Compilers/Extension/Roslyn.Compilers.Extension.csproj | 2 --
 src/Tools/IdeBenchmarks/IdeBenchmarks.csproj              | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index b5122af0d3f7f..7eb332b757bc2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
     <ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
     <MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.2.8</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.2.32505.113</MicrosoftVisualStudioShellPackagesVersion>
-    <RefOnlyMicrosoftBuildPackagesVersion>17.1.0</RefOnlyMicrosoftBuildPackagesVersion>
+    <RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>
     <!-- The version of Roslyn we build Source Generators against that are built in this
          repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
          but not higher than our minimum dogfoodable Visual Studio version, or else
diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
index ed4259ec61bd6..31535e02ebffb 100644
--- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
+++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj
@@ -116,8 +116,6 @@
     <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
     <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationVersion)" />
diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
index f4886c8715543..28df8f7392000 100644
--- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
@@ -12,7 +12,6 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />

From 2c45437bec20ca2a44a1b26bd0e49e3f27f8c6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Thu, 12 May 2022 17:00:15 -0700
Subject: [PATCH 400/413] Revert "Revert "Improve editorconfig options caching
 on ProjectState (#61131)" (#61216)" (#61283)

This reverts commit 49b0071ce13fc2dd97e3f4e63ae85a06222614b3.
---
 .../DictionaryAnalyzerConfigOptionsTests.cs   |  29 ++++
 .../AnalyzerConfigOptions.cs                  |   8 +
 .../DictionaryAnalyzerConfigOptions.cs        |   6 +
 .../Core/Portable/PublicAPI.Unshipped.txt     |   1 +
 .../EditorConfigNamingStyleParserTests.cs     | 111 +++++++++++-
 .../DataProvider/SettingsProviderBase.cs      |  36 +++-
 ...nfigOptionSet+AnalyzerConfigOptionsImpl.cs |   6 +
 ...IncrementalAnalyzer_IncrementalAnalyzer.cs |   4 +-
 .../AnalyzersCommandHandler.cs                |   2 +-
 .../BaseDiagnosticAndGeneratorItemSource.cs   |   8 +-
 ...torConfigDocumentOptionsProviderFactory.cs |  19 ++-
 .../OptionSet+AnalyzerConfigOptionsImpl.cs    |   7 +
 .../Workspace/Solution/AnalyzerConfigData.cs  |  28 +++
 .../Portable/Workspace/Solution/Document.cs   |  13 +-
 .../Portable/Workspace/Solution/Project.cs    |   2 +-
 .../Workspace/Solution/ProjectState.cs        |  33 ++--
 .../EditorConfigCodeStyleParserTests.cs       |   9 +-
 ...ferenceEditorConfigStorageLocationTests.cs | 161 ++----------------
 .../Core/CompilerExtensions.projitems         |   4 +-
 .../StructuredAnalyzerConfigOptions.cs        |  97 +++++++++++
 .../Parsing/EditorConfigParser.cs             |  12 +-
 .../Parsing/IEditorConfigOptionAccumulator.cs |   3 +-
 .../NamingStyleOptionAccumulator.cs           |   8 +-
 .../AnalyzerConfigOptionsExtensions.cs        |   3 +-
 .../EditorConfigNamingStyleParser.cs          |  48 +-----
 ...ditorConfigNamingStyleParser_NamingRule.cs |   8 +-
 ...itorConfigNamingStyleParser_NamingStyle.cs |   6 +-
 ...ditorConfigNamingStyleParser_SymbolSpec.cs |   6 +-
 .../Serialization/NamingStylePreferences.cs   |   4 +
 .../Serialization/SymbolSpecification.cs      |   4 +
 .../EditorConfigStorageLocationExtensions.cs  |  34 ----
 .../EditorConfigStorageLocation`1.cs          |   7 +-
 .../IEditorConfigStorageLocation.cs           |   6 +-
 ...lePreferenceEditorConfigStorageLocation.cs |  26 +--
 34 files changed, 439 insertions(+), 320 deletions(-)
 create mode 100644 src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
 create mode 100644 src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
 create mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
 delete mode 100644 src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs

diff --git a/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
new file mode 100644
index 0000000000000..6e80809c66e6e
--- /dev/null
+++ b/src/Compilers/Core/CodeAnalysisTest/Analyzers/DictionaryAnalyzerConfigOptionsTests.cs
@@ -0,0 +1,29 @@
+// 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.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.UnitTests
+{
+    public class DictionaryAnalyzerConfigOptionsTests
+    {
+        [Fact]
+        public void BackwardCompatibility()
+        {
+            // Note: Older versions of analyzers access this field via reflection.
+            // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
+            Assert.Equal(
+                typeof(ImmutableDictionary<string, string>),
+                typeof(DictionaryAnalyzerConfigOptions).GetField("Options", BindingFlags.Instance | BindingFlags.NonPublic)?.FieldType);
+        }
+    }
+}
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
index 1e98c9cccb6ee..ea5f6b0944e4c 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerConfigOptions.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
@@ -19,5 +20,12 @@ public abstract class AnalyzerConfigOptions
         /// Get an analyzer config value for the given key, using the <see cref="KeyComparer"/>.
         /// </summary>
         public abstract bool TryGetValue(string key, [NotNullWhen(true)] out string? value);
+
+        /// <summary>
+        /// Enumerates unique keys of all available options in no specific order.
+        /// </summary>
+        /// <exception cref="NotImplementedException">Not implemented by the derived type.</exception>
+        public virtual IEnumerable<string> Keys
+            => throw new NotImplementedException();
     }
 }
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
index 368b6c4176976..48ac671a064ee 100644
--- a/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
+++ b/src/Compilers/Core/Portable/DiagnosticAnalyzer/DictionaryAnalyzerConfigOptions.cs
@@ -2,6 +2,7 @@
 // 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.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 
@@ -13,6 +14,8 @@ internal sealed class DictionaryAnalyzerConfigOptions : AnalyzerConfigOptions
 
         public static DictionaryAnalyzerConfigOptions Empty { get; } = new DictionaryAnalyzerConfigOptions(EmptyDictionary);
 
+        // Note: Do not rename. Older versions of analyzers access this field via reflection.
+        // https://github.com/dotnet/roslyn/blob/8e3d62a30b833631baaa4e84c5892298f16a8c9e/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs#L21
         internal readonly ImmutableDictionary<string, string> Options;
 
         public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
@@ -20,5 +23,8 @@ public DictionaryAnalyzerConfigOptions(ImmutableDictionary<string, string> optio
 
         public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
             => Options.TryGetValue(key, out value);
+
+        public override IEnumerable<string> Keys
+            => Options.Keys;
     }
 }
diff --git a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
index 54e2766c89e34..c2331cd21ec09 100644
--- a/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
+++ b/src/Compilers/Core/Portable/PublicAPI.Unshipped.txt
@@ -66,6 +66,7 @@ const Microsoft.CodeAnalysis.WellKnownMemberNames.CheckedExplicitConversionName
 Microsoft.CodeAnalysis.OperationKind.UTF8String = 124 -> Microsoft.CodeAnalysis.OperationKind
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation
 Microsoft.CodeAnalysis.Operations.IUTF8StringOperation.Value.get -> string!
+virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions.Keys.get -> System.Collections.Generic.IEnumerable<string!>!
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation) -> void
 virtual Microsoft.CodeAnalysis.Operations.OperationVisitor<TArgument, TResult>.VisitUTF8String(Microsoft.CodeAnalysis.Operations.IUTF8StringOperation! operation, TArgument argument) -> TResult?
 virtual Microsoft.CodeAnalysis.SymbolVisitor<TArgument, TResult>.DefaultVisit(Microsoft.CodeAnalysis.ISymbol! symbol, TArgument argument) -> TResult
diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
index fff2e11b97eea..8fb3042f2c572 100644
--- a/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/NamingStyles/EditorConfigNamingStyleParserTests.cs
@@ -7,17 +7,20 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics.NamingStyles;
 using Roslyn.Test.Utilities;
 using Xunit;
-using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.SymbolSpecification;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics.NamingStyles
 {
     public class EditorConfigNamingStyleParserTests
     {
+        private static NamingStylePreferences ParseDictionary(Dictionary<string, string> options)
+            => EditorConfigNamingStyleParser.ParseDictionary(new DictionaryAnalyzerConfigOptions(options.ToImmutableDictionary()));
+
         [Fact]
         public static void TestPascalCaseRule()
         {
@@ -469,5 +472,111 @@ public static void TestEditorConfigParseForApplicableSymbolKinds()
                 Assert.True(!string.IsNullOrEmpty(editorConfigString));
             }
         }
+
+        [Theory]
+        [InlineData("a", "b", "a", "public", "public, private")]
+        [InlineData("b", "a", "a", "public, private", "public")]
+        [InlineData("b", "a", "b", "public", "public, private")]
+        [InlineData("a", "b", "b", "public, private", "public")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "static, readonly", "static")]
+        [InlineData("b", "a", "a", "static", "static, readonly")]
+        [InlineData("b", "a", "b", "static, readonly", "static")]
+        [InlineData("a", "b", "b", "static", "static, readonly")]
+        [InlineData("a", "b", "a", "", "")]
+        [InlineData("b", "a", "a", "", "")]
+        [InlineData("A", "b", "A", "", "")]
+        [InlineData("b", "A", "A", "", "")]
+        [InlineData("a", "B", "a", "", "")]
+        [InlineData("B", "a", "a", "", "")]
+        [InlineData("A", "B", "A", "", "")]
+        [InlineData("B", "A", "A", "", "")]
+        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
+                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
+
+        [Theory]
+        [InlineData("a", "b", "a", "method", "method, property")]
+        [InlineData("b", "a", "a", "method, property", "method")]
+        [InlineData("b", "a", "b", "method", "method, property")]
+        [InlineData("a", "b", "b", "method, property", "method")]
+        [InlineData("a", "b", "a", "*", "*")]
+        [InlineData("b", "a", "a", "*", "*")]
+        [InlineData("A", "b", "A", "*", "*")]
+        [InlineData("b", "A", "A", "*", "*")]
+        [InlineData("a", "B", "a", "*", "*")]
+        [InlineData("B", "a", "a", "*", "*")]
+        [InlineData("A", "B", "A", "*", "*")]
+        [InlineData("B", "A", "A", "*", "*")]
+        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
+        {
+            var namingStylePreferences = ParseDictionary(new Dictionary<string, string>()
+            {
+                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
+                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
+                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
+                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
+                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
+                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
+                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
+                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
+                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
+                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
+            });
+
+            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
+            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
+            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
+        }
     }
 }
diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
index 1f137a0d8c170..64ec7898fe01e 100644
--- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
+++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
@@ -16,7 +16,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Utilities;
-using static Microsoft.CodeAnalysis.ProjectState;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider
 {
@@ -51,7 +51,7 @@ protected void Update()
                 return;
             }
 
-            var configOptionsProvider = new ProjectAnalyzerConfigOptionsProvider(project.State);
+            var configOptionsProvider = new ProjectState.ProjectAnalyzerConfigOptionsProvider(project.State);
             var workspaceOptions = configOptionsProvider.GetOptionsForSourcePath(givenFolder.FullName);
             var result = project.GetAnalyzerConfigOptions();
             var options = new CombinedAnalyzerConfigOptions(workspaceOptions, result);
@@ -93,9 +93,9 @@ public void RegisterViewModel(ISettingsEditorViewModel viewModel)
         private sealed class CombinedAnalyzerConfigOptions : AnalyzerConfigOptions
         {
             private readonly AnalyzerConfigOptions _workspaceOptions;
-            private readonly AnalyzerConfigOptionsResult? _result;
+            private readonly AnalyzerConfigData? _result;
 
-            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigOptionsResult? result)
+            public CombinedAnalyzerConfigOptions(AnalyzerConfigOptions workspaceOptions, AnalyzerConfigData? result)
             {
                 _workspaceOptions = workspaceOptions;
                 _result = result;
@@ -131,6 +131,34 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = null;
                 return false;
             }
+
+            public override IEnumerable<string> Keys
+            {
+                get
+                {
+                    foreach (var key in _workspaceOptions.Keys)
+                        yield return key;
+
+                    if (!_result.HasValue)
+                        yield break;
+
+                    foreach (var key in _result.Value.AnalyzerOptions.Keys)
+                    {
+                        if (!_workspaceOptions.TryGetValue(key, out _))
+                            yield return key;
+                    }
+
+                    foreach (var (key, severity) in _result.Value.TreeOptions)
+                    {
+                        var diagnosticKey = "dotnet_diagnostic." + key + ".severity";
+                        if (!_workspaceOptions.TryGetValue(diagnosticKey, out _) &&
+                            !_result.Value.AnalyzerOptions.TryGetKey(diagnosticKey, out _))
+                        {
+                            yield return diagnosticKey;
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
index 3fec7795a0148..19a21b395b96f 100644
--- a/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Features/Core/Portable/Diagnostics/AnalyzerConfigOptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,7 +2,10 @@
 // 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.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
@@ -28,6 +31,9 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
 
                 return _fallbackOptions.TryGetValue(key, out value);
             }
+
+            public override IEnumerable<string> Keys
+                => _options.Keys.Concat(_fallbackOptions.Keys.Where(key => !_options.TryGetValue(key, out _)));
         }
     }
 }
diff --git a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index bf2546750d42c..034940b2462f6 100644
--- a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -381,7 +381,7 @@ private IReadOnlyList<StateSet> GetStateSetsForFullSolutionAnalysis(IEnumerable<
             return stateSets.Where(s => IsCandidateForFullSolutionAnalysis(s.Analyzer, project, analyzerConfigOptions)).ToList();
         }
 
-        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigOptionsResult? analyzerConfigOptions)
+        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigData? analyzerConfigOptions)
         {
             // PERF: Don't query descriptors for compiler analyzer or workspace load analyzer, always execute them.
             if (analyzer == FileContentLoadAnalyzer.Instance ||
@@ -413,7 +413,7 @@ private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Pro
 
             // For most of analyzers, the number of diagnostic descriptors is small, so this should be cheap.
             var descriptors = DiagnosticAnalyzerInfoCache.GetDiagnosticDescriptors(analyzer);
-            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions) != ReportDiagnostic.Hidden);
+            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions?.Result) != ReportDiagnostic.Hidden);
         }
 
         private void RaiseProjectDiagnosticsIfNeeded(
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
index a2f36a1e8df05..89101c51cfdba 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
@@ -296,7 +296,7 @@ private void UpdateSeverityMenuItemsChecked()
 
                 foreach (var diagnosticItem in group)
                 {
-                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions);
+                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions?.Result);
                     selectedItemSeverities.Add(severity);
                 }
             }
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
index 621c689c63e31..114541cfd6522 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
@@ -26,7 +26,7 @@ internal abstract partial class BaseDiagnosticAndGeneratorItemSource : IAttached
         private BulkObservableCollection<BaseItem>? _items;
         private ReportDiagnostic _generalDiagnosticOption;
         private ImmutableDictionary<string, ReportDiagnostic>? _specificDiagnosticOptions;
-        private AnalyzerConfigOptionsResult? _analyzerConfigOptions;
+        private AnalyzerConfigData? _analyzerConfigOptions;
 
         public BaseDiagnosticAndGeneratorItemSource(Workspace workspace, ProjectId projectId, IAnalyzersCommandHandler commandHandler, IDiagnosticAnalyzerService diagnosticAnalyzerService)
         {
@@ -95,7 +95,7 @@ public IEnumerable Items
             }
         }
 
-        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigOptionsResult? analyzerConfigOptions)
+        private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(ProjectId projectId, string language, CompilationOptions options, AnalyzerConfigData? analyzerConfigOptions)
         {
             // Within an analyzer assembly, an individual analyzer may report multiple different diagnostics
             // with the same ID. Or, multiple analyzers may report diagnostics with the same ID. Or a
@@ -117,7 +117,7 @@ private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(Pro
                 .Select(g =>
                 {
                     var selectedDiagnostic = g.OrderBy(d => d, s_comparer).First();
-                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions);
+                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions?.Result);
                     return new DiagnosticItem(projectId, AnalyzerReference, selectedDiagnostic, effectiveSeverity, CommandHandler);
                 }));
 
@@ -183,7 +183,7 @@ void OnProjectConfigurationChanged()
 
                     foreach (var item in _items.OfType<DiagnosticItem>())
                     {
-                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions);
+                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions?.Result);
                         item.UpdateEffectiveSeverity(effectiveSeverity);
                     }
                 }
diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
index 0148466ebcc7e..bacb11927cb04 100644
--- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
+++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options.EditorConfig
 {
@@ -21,19 +22,25 @@ private sealed class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvi
         {
             public async Task<IDocumentOptions?> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken)
             {
-                var options = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
-
-                return new DocumentOptions(options);
+                var data = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
+                return new DocumentOptions(data?.AnalyzerConfigOptions);
             }
 
             private sealed class DocumentOptions : IDocumentOptions
             {
-                private readonly ImmutableDictionary<string, string> _options;
-                public DocumentOptions(ImmutableDictionary<string, string> options)
+                private readonly StructuredAnalyzerConfigOptions? _options;
+
+                public DocumentOptions(StructuredAnalyzerConfigOptions? options)
                     => _options = options;
 
                 public bool TryGetDocumentOption(OptionKey option, out object? value)
                 {
+                    if (_options == null)
+                    {
+                        value = null;
+                        return false;
+                    }
+
                     var editorConfigPersistence = (IEditorConfigStorageLocation?)option.Option.StorageLocations.SingleOrDefault(static location => location is IEditorConfigStorageLocation);
                     if (editorConfigPersistence == null)
                     {
@@ -43,7 +50,7 @@ public bool TryGetDocumentOption(OptionKey option, out object? value)
 
                     try
                     {
-                        return editorConfigPersistence.TryGetOption(_options.AsNullable(), option.Option.Type, out value);
+                        return editorConfigPersistence.TryGetOption(_options, option.Option.Type, out value);
                     }
                     catch (Exception e) when (FatalError.ReportAndCatch(e))
                     {
diff --git a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
index 4e0d139840cb3..6e52e3a5db884 100644
--- a/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
+++ b/src/Workspaces/Core/Portable/Options/OptionSet+AnalyzerConfigOptionsImpl.cs
@@ -2,8 +2,11 @@
 // 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.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.CodeAnalysis.Options
@@ -39,6 +42,10 @@ public override bool TryGetValue(string key, [NotNullWhen(true)] out string? val
                 value = storageLocation.GetEditorConfigStringValue(typedValue, _optionSet);
                 return true;
             }
+
+            // no way to enumerate OptionSet
+            public override IEnumerable<string> Keys
+                => throw new NotImplementedException();
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
new file mode 100644
index 0000000000000..c417192872bb6
--- /dev/null
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
@@ -0,0 +1,28 @@
+// 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.Diagnostics;
+
+namespace Microsoft.CodeAnalysis;
+
+/// <summary>
+/// Aggregate analyzer config options for a specific path.
+/// </summary>
+internal readonly struct AnalyzerConfigData
+{
+    private readonly AnalyzerConfigOptionsResult _result;
+    private readonly StructuredAnalyzerConfigOptions _configOptions;
+
+    public AnalyzerConfigData(AnalyzerConfigOptionsResult result)
+    {
+        _result = result;
+        _configOptions = new StructuredAnalyzerConfigOptions(result.AnalyzerOptions);
+    }
+
+    public AnalyzerConfigOptionsResult Result => _result;
+    public StructuredAnalyzerConfigOptions AnalyzerConfigOptions => _configOptions;
+    public ImmutableDictionary<string, string> AnalyzerOptions => _result.AnalyzerOptions;
+    public ImmutableDictionary<string, ReportDiagnostic> TreeOptions => _result.TreeOptions;
+}
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
index c64163a5a1277..7f4f520e8d25a 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
@@ -513,7 +513,7 @@ private void InitializeCachedOptions(OptionSet solutionOptions)
             Interlocked.CompareExchange(ref _cachedOptions, newAsyncLazy, comparand: null);
         }
 
-        internal Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
+        internal async Task<AnalyzerConfigData?> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
         {
             var projectFilePath = Project.FilePath;
             // We need to work out path to this document. Documents may not have a "real" file path if they're something created
@@ -535,15 +535,12 @@ internal Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsAsync(Cance
                 }
             }
 
-            if (effectiveFilePath != null)
+            if (effectiveFilePath == null)
             {
-                return Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken);
-            }
-            else
-            {
-                // Really no idea where this is going, so bail
-                return Task.FromResult(DictionaryAnalyzerConfigOptions.EmptyDictionary);
+                return null;
             }
+
+            return await Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
index fa20f2786d59a..5ec37f9535f0e 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Project.cs
@@ -774,7 +774,7 @@ private void CheckIdsContainedInProject(ImmutableArray<DocumentId> documentIds)
             }
         }
 
-        internal AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
+        internal AnalyzerConfigData? GetAnalyzerConfigOptions()
             => _projectState.GetAnalyzerConfigOptions();
 
         private string GetDebuggerDisplay()
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
index d36dd5f83160d..9370c87f3b2c6 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
@@ -248,15 +248,13 @@ public AnalyzerOptions AnalyzerOptions
                 additionalFiles: AdditionalDocumentStates.SelectAsArray(static documentState => documentState.AdditionalText),
                 optionsProvider: new ProjectAnalyzerConfigOptionsProvider(this));
 
-        public async Task<ImmutableDictionary<string, string>> GetAnalyzerOptionsForPathAsync(
-            string path,
-            CancellationToken cancellationToken)
+        public async Task<AnalyzerConfigData> GetAnalyzerOptionsForPathAsync(string path, CancellationToken cancellationToken)
         {
-            var configSet = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
-            return configSet.GetOptionsForSourcePath(path).AnalyzerOptions;
+            var cache = await _lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
+            return cache.GetOptionsForSourcePath(path);
         }
 
-        public AnalyzerConfigOptionsResult? GetAnalyzerConfigOptions()
+        public AnalyzerConfigData? GetAnalyzerConfigOptions()
         {
             // We need to find the analyzer config options at the root of the project.
             // Currently, there is no compiler API to query analyzer config options for a directory in a language agnostic fashion.
@@ -296,8 +294,11 @@ internal sealed class ProjectAnalyzerConfigOptionsProvider : AnalyzerConfigOptio
             public ProjectAnalyzerConfigOptionsProvider(ProjectState projectState)
                 => _projectState = projectState;
 
+            private AnalyzerConfigOptionsCache GetCache()
+                => _projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None);
+
             public override AnalyzerConfigOptions GlobalOptions
-                => GetOptionsForSourcePath(string.Empty);
+                => GetCache().GlobalConfigOptions.AnalyzerConfigOptions;
 
             public override AnalyzerConfigOptions GetOptions(SyntaxTree tree)
                 => GetOptionsForSourcePath(tree.FilePath);
@@ -309,7 +310,7 @@ public override AnalyzerConfigOptions GetOptions(AdditionalText textFile)
             }
 
             public AnalyzerConfigOptions GetOptionsForSourcePath(string path)
-                => new DictionaryAnalyzerConfigOptions(_projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None).GetOptionsForSourcePath(path).AnalyzerOptions);
+                => GetCache().GetOptionsForSourcePath(path).AnalyzerConfigOptions;
         }
 
         private sealed class ProjectSyntaxTreeOptionsProvider : SyntaxTreeOptionsProvider
@@ -371,20 +372,20 @@ private static ValueSource<AnalyzerConfigOptionsCache> ComputeAnalyzerConfigOpti
 
         private readonly struct AnalyzerConfigOptionsCache
         {
-            private readonly ConcurrentDictionary<string, AnalyzerConfigOptionsResult> _sourcePathToResult = new();
-            private readonly Func<string, AnalyzerConfigOptionsResult> _computeFunction;
-            private readonly AnalyzerConfigSet _configSet;
+            private readonly ConcurrentDictionary<string, AnalyzerConfigData> _sourcePathToResult = new();
+            private readonly Func<string, AnalyzerConfigData> _computeFunction;
+            private readonly Lazy<AnalyzerConfigData> _global;
 
             public AnalyzerConfigOptionsCache(AnalyzerConfigSet configSet)
             {
-                _configSet = configSet;
-                _computeFunction = _configSet.GetOptionsForSourcePath;
+                _global = new Lazy<AnalyzerConfigData>(() => new AnalyzerConfigData(configSet.GlobalConfigOptions));
+                _computeFunction = path => new AnalyzerConfigData(configSet.GetOptionsForSourcePath(path));
             }
 
-            public AnalyzerConfigOptionsResult GlobalConfigOptions
-                => _configSet.GlobalConfigOptions;
+            public AnalyzerConfigData GlobalConfigOptions
+                => _global.Value;
 
-            public AnalyzerConfigOptionsResult GetOptionsForSourcePath(string sourcePath)
+            public AnalyzerConfigData GetOptionsForSourcePath(string sourcePath)
                 => _sourcePathToResult.GetOrAdd(sourcePath, _computeFunction);
         }
 
diff --git a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
index 6985c5d8ccbcb..fa91961a9e6ac 100644
--- a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
+++ b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
@@ -3,11 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Options;
 using Roslyn.Test.Utilities;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.CodeStyle
@@ -62,7 +67,7 @@ public void TestParseEditorConfigAccessibilityModifiers(string args, int value,
             var storageLocation = CodeStyleOptions2.RequireAccessibilityModifiers.StorageLocations
                 .OfType<EditorConfigStorageLocation<CodeStyleOption2<AccessibilityModifiersRequired>>>()
                 .Single();
-            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, args } };
+            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, args));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(CodeStyleOption2<AccessibilityModifiersRequired>), out var parsedCodeStyleOption));
             var codeStyleOption = (CodeStyleOption2<AccessibilityModifiersRequired>)parsedCodeStyleOption!;
@@ -84,7 +89,7 @@ public void TestParseEditorConfigEndOfLine(string configurationString, string ne
             var storageLocation = FormattingOptions.NewLine.StorageLocations
                 .OfType<EditorConfigStorageLocation<string>>()
                 .Single();
-            var allRawConventions = new Dictionary<string, string?> { { storageLocation.KeyName, configurationString } };
+            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, configurationString));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(string), out var parsedNewLine));
             Assert.Equal(newLine, (string?)parsedNewLine);
diff --git a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
index 7e74d51ac4cb4..2fd9b59b756f7 100644
--- a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
+++ b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
@@ -6,8 +6,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Microsoft.CodeAnalysis.Options;
+using Roslyn.Utilities;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.UnitTests.EditorConfig.StorageLocation
@@ -18,19 +22,7 @@ public class NamingStylePreferenceEditorConfigStorageLocationTests
         public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturnsFalse()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(NamingStylePreferences), out _);
-            Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
-        }
-
-        [Fact]
-        public static void TestEmptyDictionaryDefaultNamingStylePreferencesObjectReturnsFalse()
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(
-                new Dictionary<string, string>(),
-                typeof(NamingStylePreferences),
-                out _);
-
+            var result = editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(NamingStylePreferences), out _);
             Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
         }
 
@@ -38,7 +30,7 @@ public static void TestEmptyDictionaryDefaultNamingStylePreferencesObjectReturns
         public static void TestNonEmptyDictionaryReturnsTrue()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
+            var options = new StructuredAnalyzerConfigOptions(new Dictionary<string, string>()
             {
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity"] = "error",
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols"] = "method_and_property_symbols",
@@ -46,155 +38,22 @@ public static void TestNonEmptyDictionaryReturnsTrue()
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_kinds"] = "method,property",
                 ["dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities"] = "*",
                 ["dotnet_naming_style.pascal_case_style.capitalization"] = "pascal_case"
-            };
+            }.ToImmutableDictionary(AnalyzerConfigOptions.KeyComparer));
 
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
+            var result = editorConfigStorageLocation.TryGetOption(options, typeof(NamingStylePreferences), out var value);
 
             Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
+            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(value);
             Assert.Equal(ReportDiagnostic.Error, namingStylePreferences.Rules.NamingRules[0].EnforcementLevel);
         }
 
-        [Theory]
-        [InlineData("a", "b", "a", "public", "public, private")]
-        [InlineData("b", "a", "a", "public, private", "public")]
-        [InlineData("b", "a", "b", "public", "public, private")]
-        [InlineData("a", "b", "b", "public, private", "public")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedByAccessibilityBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstAccessibility, string secondAccessibility)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.applicable_accessibilities"] = firstAccessibility,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.applicable_accessibilities"] = secondAccessibility,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "static, readonly", "static")]
-        [InlineData("b", "a", "a", "static", "static, readonly")]
-        [InlineData("b", "a", "b", "static, readonly", "static")]
-        [InlineData("a", "b", "b", "static", "static, readonly")]
-        [InlineData("a", "b", "a", "", "")]
-        [InlineData("b", "a", "a", "", "")]
-        [InlineData("A", "b", "A", "", "")]
-        [InlineData("b", "A", "A", "", "")]
-        [InlineData("a", "B", "a", "", "")]
-        [InlineData("B", "a", "a", "", "")]
-        [InlineData("A", "B", "A", "", "")]
-        [InlineData("B", "A", "A", "", "")]
-        public static void TestOrderedByModifiersBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstModifiers, string secondModifiers)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.first_symbols.required_modifiers"] = firstModifiers,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = "method,property",
-                ["dotnet_naming_symbols.second_symbols.required_modifiers"] = secondModifiers,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
-        [Theory]
-        [InlineData("a", "b", "a", "method", "method, property")]
-        [InlineData("b", "a", "a", "method, property", "method")]
-        [InlineData("b", "a", "b", "method", "method, property")]
-        [InlineData("a", "b", "b", "method, property", "method")]
-        [InlineData("a", "b", "a", "*", "*")]
-        [InlineData("b", "a", "a", "*", "*")]
-        [InlineData("A", "b", "A", "*", "*")]
-        [InlineData("b", "A", "A", "*", "*")]
-        [InlineData("a", "B", "a", "*", "*")]
-        [InlineData("B", "a", "a", "*", "*")]
-        [InlineData("A", "B", "A", "*", "*")]
-        [InlineData("B", "A", "A", "*", "*")]
-        public static void TestOrderedBySymbolsBeforeName(string firstName, string secondName, string firstNameAfterOrdering, string firstSymbols, string secondSymbols)
-        {
-            var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var newDictionary = new Dictionary<string, string>()
-            {
-                [$"dotnet_naming_rule.{firstName}.severity"] = "error",
-                [$"dotnet_naming_rule.{firstName}.symbols"] = "first_symbols",
-                [$"dotnet_naming_rule.{firstName}.style"] = $"{firstName}_style",
-                ["dotnet_naming_symbols.first_symbols.applicable_kinds"] = firstSymbols,
-                [$"dotnet_naming_style.{firstName}_style.capitalization"] = "pascal_case",
-                [$"dotnet_naming_style.{secondName}_style.capitalization"] = "camel_case",
-                [$"dotnet_naming_rule.{secondName}.severity"] = "error",
-                [$"dotnet_naming_rule.{secondName}.symbols"] = "second_symbols",
-                [$"dotnet_naming_rule.{secondName}.style"] = $"{secondName}_style",
-                ["dotnet_naming_symbols.second_symbols.applicable_kinds"] = secondSymbols,
-            };
-
-            var result = editorConfigStorageLocation.TryGetOption(
-                newDictionary,
-                typeof(NamingStylePreferences),
-                out var combinedNamingStyles);
-
-            var secondNameAfterOrdering = firstNameAfterOrdering == firstName ? secondName : firstName;
-            Assert.True(result, "Expected non-empty dictionary to return true");
-            var namingStylePreferences = Assert.IsAssignableFrom<NamingStylePreferences>(combinedNamingStyles);
-            Assert.Equal($"{firstNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[0].NamingStyle.Name);
-            Assert.Equal($"{secondNameAfterOrdering}_style", namingStylePreferences.Rules.NamingRules[1].NamingStyle.Name);
-        }
-
         [Fact]
         public static void TestObjectTypeThrowsInvalidOperationException()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
             Assert.Throws<InvalidOperationException>(() =>
             {
-                editorConfigStorageLocation.TryGetOption(new Dictionary<string, string>(), typeof(object), out var @object);
+                editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(object), out var @object);
             });
         }
     }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
index b3c2638f021c2..c17730357f3ff 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems
@@ -193,6 +193,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)CodeStyle\ParenthesesPreference.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArrayExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\TemporaryArray`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\StructuredAnalyzerConfigOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\Language.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EditorConfig\LanguageExtensions.cs" />
@@ -371,7 +372,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)NamingStyles\Serialization\SymbolSpecification.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObjectPools\PooledDictionary.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\EditorConfigStorageLocation`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\EditorConfig\IEditorConfigStorageLocation2.cs" />
@@ -575,7 +575,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IBuiltInAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IPragmaSuppressionsAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\Core\Portable\DiagnosticAnalyzer\DictionaryAnalyzerConfigOptions.cs">
-      <Link>Diagnostics\AnalyzerConfigOptionsDictionary.cs</Link>
+      <Link>Diagnostics\DictionaryAnalyzerConfigOptions.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
new file mode 100644
index 0000000000000..6fb0cb022c226
--- /dev/null
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
@@ -0,0 +1,97 @@
+// 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.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Diagnostics;
+
+/// <summary>
+/// <see cref="AnalyzerConfigOptions"/> that memoize structured (parsed) form of certain complex options to avoid parsing them multiple times.
+/// Storages of these complex options may directly call the specialized getters to reuse the cached values.
+/// </summary>
+internal sealed class StructuredAnalyzerConfigOptions : AnalyzerConfigOptions
+{
+    private readonly AnalyzerConfigOptions _options;
+    private readonly Lazy<NamingStylePreferences> _lazyNamingStylePreferences;
+
+    public StructuredAnalyzerConfigOptions(AnalyzerConfigOptions options)
+    {
+        _options = options;
+        _lazyNamingStylePreferences = new Lazy<NamingStylePreferences>(() => EditorConfigNamingStyleParser.ParseDictionary(_options));
+    }
+
+    public StructuredAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
+        : this(new DictionaryAnalyzerConfigOptions(options))
+    {
+        Contract.ThrowIfFalse(options.KeyComparer == KeyComparer);
+    }
+
+    public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+        => _options.TryGetValue(key, out value);
+
+    public override IEnumerable<string> Keys
+        => _options.Keys;
+
+    public NamingStylePreferences GetNamingStylePreferences()
+        => _lazyNamingStylePreferences.Value;
+
+    public static bool TryGetStructuredOptions(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
+    {
+        if (configOptions is StructuredAnalyzerConfigOptions structuredOptions)
+        {
+            options = structuredOptions;
+            return true;
+        }
+
+#if CODE_STYLE
+        if (TryGetCorrespondingCodeStyleInstance(configOptions, out options))
+        {
+            return true;
+        }
+#endif
+
+        options = null;
+        return false;
+    }
+
+#if CODE_STYLE
+    // StructuredAnalyzerConfigOptions is defined in both Worksapce and Code Style layers. It is not public and thus can't be shared between these two.
+    // However, Code Style layer is compiled against the shared Workspace APIs. The ProjectState creates and holds onto an instance
+    // of Workspace layer's version of StructuredAnalyzerConfigOptions. This version of the type is not directly usable by Code Style code.
+    // We create a clone of this instance typed to the Code Style's version of StructuredAnalyzerConfigOptions.
+    // The conditional weak table maintains 1:1 correspondence between these instances.
+    // 
+    // In addition, we also map Compiler created DictionaryAnalyzerConfigOptions to StructuredAnalyzerConfigOptions for analyzers that are invoked
+    // from command line build.
+
+    private static readonly ConditionalWeakTable<AnalyzerConfigOptions, StructuredAnalyzerConfigOptions> s_codeStyleStructuredOptions = new();
+    private static readonly object s_codeStyleStructuredOptionsLock = new();
+
+    private static bool TryGetCorrespondingCodeStyleInstance(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
+    {
+        if (s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
+        {
+            return true;
+        }
+
+        lock (s_codeStyleStructuredOptionsLock)
+        {
+            if (!s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
+            {
+                options = new StructuredAnalyzerConfigOptions(configOptions);
+                s_codeStyleStructuredOptions.Add(configOptions, options);
+            }
+        }
+
+        return true;
+    }
+#endif
+}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
index 51386f9495f64..b48bb5a04538c 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/EditorConfigParser.cs
@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.EditorConfig.Parsing
@@ -15,8 +16,9 @@ internal static class EditorConfigParser
         private static readonly Regex s_sectionMatcher = new(@"^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$", RegexOptions.Compiled);
         // Matches EditorConfig property such as "indent_style = space", see https://editorconfig.org for details
         private static readonly Regex s_propertyMatcher = new(@"^\s*([\w\.\-_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$", RegexOptions.Compiled);
+
         private static ImmutableHashSet<string> ReservedKeys { get; }
-            = ImmutableHashSet.CreateRange(CaseInsensitiveComparison.Comparer, new[] {
+            = ImmutableHashSet.CreateRange(AnalyzerConfigOptions.KeyComparer, new[] {
                 "root",
                 "indent_style",
                 "indent_size",
@@ -43,8 +45,7 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
             where TEditorConfigFile : EditorConfigFile<TEditorConfigOption>
             where TEditorConfigOption : EditorConfigOption
         {
-            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
-                CaseInsensitiveComparison.Comparer);
+            var activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(AnalyzerConfigOptions.KeyComparer);
             var activeSectionName = "";
             var activeSectionStart = 0;
             var activeSectionEnd = 0;
@@ -74,8 +75,7 @@ public static TEditorConfigFile Parse<TEditorConfigFile, TEditorConfigOption, TA
                     activeSectionStart = textLine.Start;
                     activeSectionName = sectionName;
                     activeSectionEnd = textLine.End;
-                    activeSectionProperties = ImmutableDictionary.CreateBuilder<string, (string value, TextLine? line)>(
-                        CaseInsensitiveComparison.Comparer);
+                    activeSectionProperties.Clear();
                     continue;
                 }
 
@@ -121,7 +121,7 @@ void ProcessActiveSection()
                 var fullText = activeLine.ToString();
                 var sectionSpan = new TextSpan(activeSectionStart, activeSectionEnd);
                 var previousSection = new Section(pathToFile, isGlobal, sectionSpan, activeSectionName, fullText);
-                accumulator.ProcessSection(previousSection, activeSectionProperties.ToImmutable());
+                accumulator.ProcessSection(previousSection, activeSectionProperties);
             }
 
             static bool IsComment(string line)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
index c750a40f155fc..1b103e4b8a3e5 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/IEditorConfigOptionAccumulator.cs
@@ -2,6 +2,7 @@
 // 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.Collections.Immutable;
 using Microsoft.CodeAnalysis.Text;
 
@@ -11,7 +12,7 @@ internal interface IEditorConfigOptionAccumulator<TResults, TResult>
         where TResults : EditorConfigFile<TResult>
         where TResult : EditorConfigOption
     {
-        void ProcessSection(Section section, ImmutableDictionary<string, (string value, TextLine? line)> properties);
+        void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties);
         TResults Complete(string? filePath);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
index 51bae3ea22c83..d873387893390 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EditorConfig/Parsing/NamingStyles/NamingStyleOptionAccumulator.cs
@@ -2,7 +2,9 @@
 // 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.Collections.Immutable;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Text;
 using static Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles.EditorConfigNamingStyleParser;
@@ -20,11 +22,9 @@ public EditorConfigNamingStyles Complete(string? fileName)
             return editorConfigNamingStyles;
         }
 
-        public void ProcessSection(
-            Section section,
-            ImmutableDictionary<string, (string value, TextLine? line)> properties)
+        public void ProcessSection(Section section, IReadOnlyDictionary<string, (string value, TextLine? line)> properties)
         {
-            foreach (var ruleTitle in GetRuleTitles(TrimDictionary(properties)))
+            foreach (var ruleTitle in GetRuleTitles(properties))
             {
                 if (TryGetSymbolSpec(section, ruleTitle, properties, out var applicableSymbolInfo) &&
                     TryGetNamingStyleData(section, ruleTitle, properties, out var namingScheme) &&
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
index 31d34a2ff238f..9006335cb9933 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/AnalyzerConfigOptionsExtensions.cs
@@ -84,7 +84,8 @@ private static bool TryGetEditorConfigOption<T>(this AnalyzerConfigOptions analy
                 // This option has .editorconfig storage defined, even if the current configuration does not provide a
                 // value for it.
                 hasEditorConfigStorage = true;
-                if (configStorageLocation.TryGetOption(analyzerConfigOptions, option.Type, out var objectValue))
+                if (StructuredAnalyzerConfigOptions.TryGetStructuredOptions(analyzerConfigOptions, out var structuredOptions) &&
+                    configStorageLocation.TryGetOption(structuredOptions, option.Type, out var objectValue))
                 {
                     value = (T?)objectValue;
                     return true;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
index 567882578d52f..f63d5d5684323 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis.NamingStyles;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Roslyn.Utilities;
 
@@ -14,43 +15,15 @@ namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     internal static partial class EditorConfigNamingStyleParser
     {
-        /// <remarks>
-        /// The dictionary we get from the VS editorconfig API uses the same dictionary object if there are no changes, so we can cache based on dictionary
-        /// </remarks>
-        // TODO: revisit this cache. The assumption that the dictionary doesn't change in the exact instance is terribly fragile,
-        // and with the new .editorconfig support won't hold as well as we'd like: a single tree will have a stable instance but
-        // that won't necessarily be the same across files and projects.
-        private static readonly ConditionalWeakTable<IReadOnlyDictionary<string, string?>, NamingStylePreferences> _cache = new();
-        private static readonly object _cacheLock = new();
-
-        public static NamingStylePreferences GetNamingStylesFromDictionary(IReadOnlyDictionary<string, string?> rawOptions)
+        public static NamingStylePreferences ParseDictionary(AnalyzerConfigOptions allRawConventions)
         {
-            if (_cache.TryGetValue(rawOptions, out var value))
-            {
-                return value;
-            }
-
-            lock (_cacheLock)
-            {
-                if (!_cache.TryGetValue(rawOptions, out value))
-                {
-                    value = ParseDictionary(rawOptions);
-                    _cache.Add(rawOptions, value);
-                }
-
-                return value;
-            }
-        }
+            var trimmedDictionary = TrimDictionary(allRawConventions);
 
-        public static NamingStylePreferences ParseDictionary(IReadOnlyDictionary<string, string?> allRawConventions)
-        {
             var symbolSpecifications = ArrayBuilder<SymbolSpecification>.GetInstance();
             var namingStyles = ArrayBuilder<NamingStyle>.GetInstance();
             var namingRules = ArrayBuilder<SerializableNamingRule>.GetInstance();
             var ruleNames = new Dictionary<(Guid symbolSpecificationID, Guid namingStyleID, ReportDiagnostic enforcementLevel), string>();
 
-            var trimmedDictionary = TrimDictionary(allRawConventions);
-
             foreach (var namingRuleTitle in GetRuleTitles(trimmedDictionary))
             {
                 if (TryGetSymbolSpec(namingRuleTitle, trimmedDictionary, out var symbolSpec) &&
@@ -127,19 +100,12 @@ public static NamingStylePreferences ParseDictionary(IReadOnlyDictionary<string,
                     }));
         }
 
-        internal static Dictionary<string, T> TrimDictionary<T>(IReadOnlyDictionary<string, T> allRawConventions)
+        internal static Dictionary<string, string> TrimDictionary(AnalyzerConfigOptions allRawConventions)
         {
-            // Keys have been lowercased, but values have not. Because values here reference key
-            // names we need any comparisons to ignore case.
-            // For example, to make a naming style called "Pascal_Case_style" match up correctly
-            // with the key "dotnet_naming_style.pascal_case_style.capitalization", we have to
-            // ignore casing for that lookup.
-            var trimmedDictionary = new Dictionary<string, T>(allRawConventions.Count, AnalyzerConfigOptions.KeyComparer);
-            foreach (var item in allRawConventions)
+            var trimmedDictionary = new Dictionary<string, string>(AnalyzerConfigOptions.KeyComparer);
+            foreach (var key in allRawConventions.Keys)
             {
-                var key = item.Key.Trim();
-                var value = item.Value;
-                trimmedDictionary[key] = value;
+                trimmedDictionary[key.Trim()] = allRawConventions.TryGetValue(key, out var value) ? value : throw new InvalidOperationException();
             }
 
             return trimmedDictionary;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
index 894beddc04a6e..4b0d78792aae8 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingRule.cs
@@ -16,7 +16,7 @@ private static bool TryGetSerializableNamingRule(
             string namingRuleTitle,
             SymbolSpecification symbolSpec,
             NamingStyle namingStyle,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             [NotNullWhen(true)] out SerializableNamingRule? serializableNamingRule)
         {
             if (!TryGetRuleSeverity(namingRuleTitle, conventionsDictionary, out var severity))
@@ -43,13 +43,13 @@ internal static bool TryGetRuleSeverity(
 
         private static bool TryGetRuleSeverity(
             string namingRuleName,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             out ReportDiagnostic severity)
         {
-            var result = TryGetRuleSeverity<string?, object?>(
+            var result = TryGetRuleSeverity<string, object?>(
                 namingRuleName,
                 conventionsDictionary,
-                x => x!,
+                x => x,
                 x => null, // we don't have a tuple
                 out var tuple);
             severity = tuple.severity;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
index 80099a64b1c3a..50e5e709b87c4 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_NamingStyle.cs
@@ -47,13 +47,13 @@ internal static bool TryGetNamingStyleData(
 
         private static bool TryGetNamingStyleData(
             string namingRuleName,
-            IReadOnlyDictionary<string, string?> rawOptions,
+            IReadOnlyDictionary<string, string> rawOptions,
             out NamingStyle namingStyle)
         {
-            return TryGetNamingStyleData<string?, object?, NamingStyle>(
+            return TryGetNamingStyleData<string, object?, NamingStyle>(
                 namingRuleName,
                 rawOptions,
-                s => s ?? string.Empty,
+                s => s,
                 x => null,
                 s => (s ?? string.Empty, null),
                 (nameTuple, prefixTuple, suffixTuple, wordSeparatorTuple, capitalizationTuple) =>
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
index 67e3176c0cd5c..a299f9e7fe7a6 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/EditorConfig/EditorConfigNamingStyleParser_SymbolSpec.cs
@@ -46,13 +46,13 @@ internal static bool TryGetSymbolSpec(
 
         private static bool TryGetSymbolSpec(
             string namingRuleTitle,
-            IReadOnlyDictionary<string, string?> conventionsDictionary,
+            IReadOnlyDictionary<string, string> conventionsDictionary,
             [NotNullWhen(true)] out SymbolSpecification? symbolSpec)
         {
-            return TryGetSymbolSpec<string?, object?, SymbolSpecification>(
+            return TryGetSymbolSpec<string, object?, SymbolSpecification>(
                 namingRuleTitle,
                 conventionsDictionary,
-                s => (s ?? string.Empty, null),
+                s => (s, null),
                 () => null,
                 (t0, t1, t2, t3) => new SymbolSpecification(
                         Guid.NewGuid(),
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
index bf1d0e1124e80..980a1801b3be1 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/NamingStylePreferences.cs
@@ -56,9 +56,13 @@ public NamingStylePreferences(
         }
 
         public static NamingStylePreferences Default => FromXElement(XElement.Parse(DefaultNamingPreferencesString));
+        public static NamingStylePreferences Empty => new(ImmutableArray<SymbolSpecification>.Empty, ImmutableArray<NamingStyle>.Empty, ImmutableArray<SerializableNamingRule>.Empty);
 
         public static string DefaultNamingPreferencesString => _defaultNamingPreferencesString;
 
+        public bool IsEmpty
+            => SymbolSpecifications.IsEmpty && NamingStyles.IsEmpty && NamingRules.IsEmpty;
+
         internal NamingStyle GetNamingStyle(Guid namingStyleID)
             => NamingStyles.Single(s => s.ID == namingStyleID);
 
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
index c2cb04b627680..0463567afcbc3 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/Serialization/SymbolSpecification.cs
@@ -24,6 +24,7 @@
 namespace Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles
 {
     [DataContract]
+    [DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
     internal sealed class SymbolSpecification : IEquatable<SymbolSpecification>, IObjectWritable
     {
         private static readonly SymbolSpecification DefaultSymbolSpecificationTemplate = CreateDefaultSymbolSpecification();
@@ -57,6 +58,9 @@ public SymbolSpecification(
             RequiredModifierList = modifiers.IsDefault ? DefaultSymbolSpecificationTemplate.RequiredModifierList : modifiers;
         }
 
+        private string GetDebuggerDisplay()
+            => Name;
+
         public static SymbolSpecification CreateDefaultSymbolSpecification()
         {
             // This is used to create new, empty symbol specifications for users to then customize.
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
deleted file mode 100644
index a850af2038898..0000000000000
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocationExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.Reflection;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Roslyn.Utilities;
-
-namespace Microsoft.CodeAnalysis.Options
-{
-    internal static class EditorConfigStorageLocationExtensions
-    {
-        public static bool TryGetOption(this IEditorConfigStorageLocation editorConfigStorageLocation, AnalyzerConfigOptions analyzerConfigOptions, Type type, out object? value)
-        {
-            // This is a workaround until we have an API for enumeratings AnalyzerConfigOptions. See https://github.com/dotnet/roslyn/issues/41840
-            if (analyzerConfigOptions.GetType().FullName == typeof(DictionaryAnalyzerConfigOptions).FullName)
-            {
-                var optionsField = analyzerConfigOptions.GetType().GetField(nameof(DictionaryAnalyzerConfigOptions.Options), BindingFlags.NonPublic | BindingFlags.Instance);
-                Contract.ThrowIfNull(optionsField);
-
-                var options = optionsField.GetValue(analyzerConfigOptions);
-                Contract.ThrowIfNull(options);
-
-                return editorConfigStorageLocation.TryGetOption((ImmutableDictionary<string, string?>)options, type, out value);
-            }
-
-            value = null;
-            return false;
-        }
-    }
-}
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
index fe92fbb888eff..0e349c86bd476 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/EditorConfigStorageLocation`1.cs
@@ -8,6 +8,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeStyle;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
 #if CODE_STYLE
@@ -59,10 +61,9 @@ public EditorConfigStorageLocation(string keyName, Func<string, Optional<T>> par
             _getEditorConfigStringForValue = getEditorConfigStringForValue ?? throw new ArgumentNullException(nameof(getEditorConfigStringForValue));
         }
 
-        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? result)
+        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? result)
         {
-            if (rawOptions.TryGetValue(KeyName, out var value)
-                && value is object)
+            if (options.TryGetValue(KeyName, out var value))
             {
                 var ret = TryGetOption(value, type, out var typedResult);
                 result = typedResult;
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
index fdaca1ff999d2..9d6d0521f2b27 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/IEditorConfigStorageLocation.cs
@@ -4,11 +4,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 
 namespace Microsoft.CodeAnalysis.Options
 {
     internal interface IEditorConfigStorageLocation
     {
-        bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object? value);
+        bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object? value);
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
index e3dd6c3e96ae9..650356dd5b95d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfig/NamingStylePreferenceEditorConfigStorageLocation.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
 using Roslyn.Utilities;
 
@@ -12,30 +13,13 @@ namespace Microsoft.CodeAnalysis.Options
 {
     internal sealed class NamingStylePreferenceEditorConfigStorageLocation : OptionStorageLocation2, IEditorConfigStorageLocation
     {
-        public bool TryGetOption(IReadOnlyDictionary<string, string?> rawOptions, Type type, out object result)
-        {
-            var tuple = ParseDictionary(rawOptions, type);
-            result = tuple.result;
-            return tuple.succeeded;
-        }
-
-        private static (object result, bool succeeded) ParseDictionary(
-            IReadOnlyDictionary<string, string?> allRawConventions, Type type)
+        public bool TryGetOption(StructuredAnalyzerConfigOptions options, Type type, out object result)
         {
             if (type == typeof(NamingStylePreferences))
             {
-                var editorconfigNamingStylePreferences = EditorConfigNamingStyleParser.GetNamingStylesFromDictionary(allRawConventions);
-
-                if (!editorconfigNamingStylePreferences.NamingRules.Any() &&
-                    !editorconfigNamingStylePreferences.NamingStyles.Any() &&
-                    !editorconfigNamingStylePreferences.SymbolSpecifications.Any())
-                {
-                    // We were not able to parse any rules from editorconfig, tell the caller that the parse failed
-                    return (result: editorconfigNamingStylePreferences, succeeded: false);
-                }
-
-                // no existing naming styles were passed so just return the set of styles that were parsed from editorconfig
-                return (result: editorconfigNamingStylePreferences, succeeded: true);
+                var preferences = options.GetNamingStylePreferences();
+                result = preferences;
+                return !preferences.IsEmpty;
             }
 
             throw ExceptionUtilities.UnexpectedValue(type);

From ecd957a952b2f7d756355ee8deea3ae483b57ff2 Mon Sep 17 00:00:00 2001
From: AlFas <AlFasGD@users.noreply.github.com>
Date: Fri, 13 May 2022 03:16:56 +0300
Subject: [PATCH 401/413] Fix nested in generic type binding issues in enabled
 nullability context (#61182)

Co-authored-by: Fred Silberberg <fred@silberberg.xyz>
---
 .../Portable/Binder/Binder_Expressions.cs     |   2 +-
 .../Semantic/Semantics/ColorColorTests.cs     | 146 ++++++++++++++++++
 2 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
index 729ac73c9ad4d..92cc9ab0f0796 100644
--- a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
+++ b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
@@ -6047,7 +6047,7 @@ private BoundExpression BindLeftIdentifierOfPotentialColorColorMemberAccess(Iden
                         {
                             var typeDiagnostics = BindingDiagnosticBag.Create(diagnostics);
                             var boundType = BindNamespaceOrType(left, typeDiagnostics);
-                            if (TypeSymbol.Equals(boundType.Type, leftType, TypeCompareKind.ConsiderEverything2))
+                            if (TypeSymbol.Equals(boundType.Type, leftType, TypeCompareKind.AllIgnoreOptions))
                             {
                                 // NOTE: ReplaceTypeOrValueReceiver will call CheckValue explicitly.
                                 boundValue = BindToNaturalType(boundValue, valueDiagnostics);
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
index 4cb4007004d61..2493a9866c4cb 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
@@ -2182,5 +2182,151 @@ class C2
                 Diagnostic(ErrorCode.ERR_MethDelegateMismatch, "new System.Action(C2.ReferenceEquals)").WithArguments("ReferenceEquals", "System.Action").WithLocation(9, 13)
                 );
         }
+
+        [WorkItem(61171, "https://github.com/dotnet/roslyn/issues/61171")]
+        [Theory]
+        [InlineData(null)]
+        [InlineData("class")]
+        [InlineData("struct")]
+        [InlineData("unmanaged")]
+        [InlineData("notnull")]
+        public void WorkItem61171_Constraints(string constraint)
+        {
+            string constraintLine = $"where TValue : {constraint}";
+            if (string.IsNullOrEmpty(constraint))
+            {
+                constraintLine = "";
+            }
+
+            string source = $@"
+#nullable enable
+
+namespace DataStructures.Trees;
+
+public sealed class Tree<TValue>
+    {constraintLine}
+{{
+    public abstract class Node
+    {{
+        public abstract NodeType NodeType {{ get; }}
+    }}
+
+    public sealed class ParentNode : Node
+    {{
+        public override NodeType NodeType => Tree<TValue>.NodeType.Parent;
+    }}
+
+    public sealed class LeafNode : Node
+    {{
+        public override Tree<TValue>.NodeType NodeType => NodeType.Leaf;
+    }}
+
+    public enum NodeType
+    {{
+        Parent,
+        Leaf,
+    }}
+}}
+";
+
+            var compilation = CreateCompilation(source);
+
+            compilation.VerifyDiagnostics();
+        }
+
+        [WorkItem(61171, "https://github.com/dotnet/roslyn/issues/61171")]
+        [Theory]
+        [InlineData("dynamic", "object")]
+        [InlineData("(int a, int b)", "(int, int)")]
+        public void WorkItem61171_DynamicObjectTuple(string inheritedArgument, string propertyArgument)
+        {
+            string source = $@"
+public class Tree<TValue>
+{{
+    public enum NodeType
+    {{
+        Parent,
+        Leaf,
+    }}
+}}
+
+public class Tree1 : Tree<{inheritedArgument}>
+{{
+}}
+
+public class Tree2 : Tree1
+{{
+    public sealed class LeafNode
+    {{
+        public Tree<{propertyArgument}>.NodeType NodeType => NodeType.Leaf;
+    }}
+}}
+";
+
+            var compilation = CreateCompilation(source);
+
+            compilation.VerifyDiagnostics();
+        }
+
+        [WorkItem(61171, "https://github.com/dotnet/roslyn/issues/61171")]
+        [Fact]
+        public void WorkItem61171_ModoptObject()
+        {
+            string genericTreeDefinitionSource = @"
+public class Tree2 : Tree1
+{
+    public sealed class LeafNode
+    {
+        public Tree<dynamic>.NodeType NodeType => NodeType.Leaf;
+    }
+}
+";
+
+            string implementingTreeWithModoptObjectILSource = @"
+.class public auto ansi beforefieldinit Tree`1<class TValue>
+    extends [mscorlib]System.Object
+{
+    // Nested Types
+    .class nested public auto ansi sealed NodeType<class TValue>
+        extends [mscorlib]System.Enum
+    {
+        // Fields
+        .field public specialname rtspecialname int32 value__
+        .field public static literal valuetype Tree`1/NodeType<!TValue> Parent = int32(0)
+        .field public static literal valuetype Tree`1/NodeType<!TValue> Leaf = int32(1)
+
+    } // end of class NodeType
+
+
+    // Methods
+    .method public hidebysig specialname rtspecialname 
+        instance void .ctor () cil managed 
+    {
+        ldarg.0
+        call instance void [mscorlib]System.Object::.ctor()
+        ret
+    } // end of method Tree`1::.ctor
+
+} // end of class Tree`1
+
+.class public auto ansi beforefieldinit Tree1
+    extends class Tree`1<object modopt(object)>
+{
+    // Methods
+    .method public hidebysig specialname rtspecialname 
+        instance void .ctor () cil managed 
+    {
+        ldarg.0
+        call instance void class Tree`1<object>::.ctor()
+        ret
+    } // end of method Tree1::.ctor
+
+} // end of class Tree1
+";
+
+            var compilation = CreateCompilationWithIL(genericTreeDefinitionSource, implementingTreeWithModoptObjectILSource);
+
+            compilation.VerifyDiagnostics();
+        }
     }
 }

From 9839a677e6f95b53d8cae3e32a562dbc00c1056b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Thu, 12 May 2022 19:01:17 -0700
Subject: [PATCH 402/413] Remove Razor and editor inference document option
 providers (#61091)

* Emulate editorconfig options for Razor design-time document, remove RazorDocumentOptionsProvider

* Remove InferredIndentationDocumentOptionsProviderFactory

* Test and fixes

* Link to issue

* Handle syntax trees with empty path
---
 .../DataProvider/SettingsProviderBase.cs      |   6 +-
 ...dentationDocumentOptionsProviderFactory.cs | 109 --------
 ...egacyIndentationManagerWorkspaceService.cs |  40 +++
 .../LegacyGlobalOptionsWorkspaceService.cs    |   7 +
 .../AbstractLanguageServerProtocolTests.cs    |   4 +-
 .../RazorDocumentOptionsProviderFactory.cs    |  75 ------
 ...IncrementalAnalyzer_IncrementalAnalyzer.cs |  12 +-
 .../AnalyzersCommandHandler.cs                |   2 +-
 .../BaseDiagnosticAndGeneratorItemSource.cs   |   4 +-
 ...torConfigDocumentOptionsProviderFactory.cs |   6 +-
 .../ILegacyGlobalOptionsWorkspaceService.cs   |   3 +
 ...egacyIndentationManagerWorkspaceService.cs |  22 ++
 .../Host/DocumentService/Extensions.cs        |   7 +-
 .../Workspace/Solution/AnalyzerConfigData.cs  |  15 +-
 .../Portable/Workspace/Solution/Document.cs   |  30 ---
 .../Workspace/Solution/ProjectState.cs        | 239 ++++++++++++++++--
 .../EditorConfigCodeStyleParserTests.cs       |   4 +-
 ...ferenceEditorConfigStorageLocationTests.cs |   6 +-
 .../CoreTest/SolutionTests/SolutionTests.cs   |  47 ++++
 .../StructuredAnalyzerConfigOptions.cs        |  43 ++--
 .../DiagnosticDescriptorExtensions.cs         |  20 +-
 21 files changed, 401 insertions(+), 300 deletions(-)
 delete mode 100644 src/EditorFeatures/Core/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
 create mode 100644 src/EditorFeatures/Core/Formatting/LegacyIndentationManagerWorkspaceService.cs
 delete mode 100644 src/Features/Core/Portable/ExternalAccess/Razor/Api/RazorDocumentOptionsProviderFactory.cs
 create mode 100644 src/Workspaces/Core/Portable/Options/ILegacyIndentationManagerWorkspaceService.cs

diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
index 64ec7898fe01e..af8711db437a8 100644
--- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
+++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/SettingsProviderBase.cs
@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Extensions;
@@ -51,10 +52,9 @@ protected void Update()
                 return;
             }
 
-            var configOptionsProvider = new ProjectState.ProjectAnalyzerConfigOptionsProvider(project.State);
-            var workspaceOptions = configOptionsProvider.GetOptionsForSourcePath(givenFolder.FullName);
+            var configData = project.State.GetAnalyzerOptionsForPath(givenFolder.FullName, CancellationToken.None);
             var result = project.GetAnalyzerConfigOptions();
-            var options = new CombinedAnalyzerConfigOptions(workspaceOptions, result);
+            var options = new CombinedAnalyzerConfigOptions(configData.ConfigOptions, result);
             UpdateOptions(options, Workspace.Options);
         }
 
diff --git a/src/EditorFeatures/Core/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs b/src/EditorFeatures/Core/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
deleted file mode 100644
index dd88c7cea9c41..0000000000000
--- a/src/EditorFeatures/Core/Formatting/InferredIndentationDocumentOptionsProviderFactory.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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 Microsoft.CodeAnalysis.ErrorReporting;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Utilities;
-
-namespace Microsoft.CodeAnalysis.Formatting
-{
-    [Export(typeof(IDocumentOptionsProviderFactory))]
-    [Order(After = PredefinedDocumentOptionsProviderNames.EditorConfig)]
-    internal sealed class InferredIndentationDocumentOptionsProviderFactory : IDocumentOptionsProviderFactory
-    {
-        private readonly IIndentationManagerService _indentationManagerService;
-
-        [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public InferredIndentationDocumentOptionsProviderFactory(IIndentationManagerService indentationManagerService)
-            => _indentationManagerService = indentationManagerService;
-
-        public IDocumentOptionsProvider? TryCreate(Workspace workspace)
-            => new DocumentOptionsProvider(_indentationManagerService);
-
-        private class DocumentOptionsProvider : IDocumentOptionsProvider
-        {
-            private readonly IIndentationManagerService _indentationManagerService;
-
-            public DocumentOptionsProvider(IIndentationManagerService indentationManagerService)
-                => _indentationManagerService = indentationManagerService;
-
-            public Task<IDocumentOptions?> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken)
-                => Task.FromResult<IDocumentOptions?>(new DocumentOptions(document.Project.Solution.Workspace, document.Id, _indentationManagerService));
-
-            private sealed class DocumentOptions : IDocumentOptions
-            {
-                private readonly Workspace _workspace;
-                private readonly DocumentId _documentId;
-                private readonly IIndentationManagerService _indentationManagerService;
-
-                public DocumentOptions(Workspace workspace, DocumentId id, IIndentationManagerService indentationManagerService)
-                {
-                    _workspace = workspace;
-                    _documentId = id;
-                    _indentationManagerService = indentationManagerService;
-                }
-
-                public bool TryGetDocumentOption(OptionKey option, out object? value)
-                {
-                    // We have to go back to the original workspace to see if this document is open, and if so, grab the text container. The API
-                    // from the editor is defined on a text buffer, and once a Document is forked it's definitely not holding onto a buffer anymore.
-                    if (_workspace.IsDocumentOpen(_documentId))
-                    {
-                        var currentDocument = _workspace.CurrentSolution.GetDocument(_documentId);
-                        if (currentDocument != null && currentDocument.TryGetText(out var text))
-                        {
-                            var textBuffer = text.Container.TryGetTextBuffer();
-
-                            if (textBuffer != null)
-                            {
-                                return TryGetOptionForBuffer(textBuffer, option, out value);
-                            }
-                            else
-                            {
-                                FatalError.ReportAndCatch(new System.Exception("We had an open document but it wasn't associated with a buffer. That meant we coudln't apply formatting settings."));
-                            }
-                        }
-                    }
-
-                    value = null;
-                    return false;
-                }
-
-                private bool TryGetOptionForBuffer(ITextBuffer textBuffer, OptionKey option, out object? value)
-                {
-                    if (option.Option == FormattingOptions.UseTabs)
-                    {
-                        value = !_indentationManagerService.UseSpacesForWhitespace(textBuffer, explicitFormat: false);
-                        return true;
-                    }
-                    else if (option.Option == FormattingOptions.TabSize)
-                    {
-                        value = _indentationManagerService.GetTabSize(textBuffer, explicitFormat: false);
-                        return true;
-                    }
-                    else if (option.Option == FormattingOptions.IndentationSize)
-                    {
-                        value = _indentationManagerService.GetIndentSize(textBuffer, explicitFormat: false);
-                        return true;
-                    }
-                    else
-                    {
-                        value = null;
-                        return false;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/EditorFeatures/Core/Formatting/LegacyIndentationManagerWorkspaceService.cs b/src/EditorFeatures/Core/Formatting/LegacyIndentationManagerWorkspaceService.cs
new file mode 100644
index 0000000000000..75aa893b288c4
--- /dev/null
+++ b/src/EditorFeatures/Core/Formatting/LegacyIndentationManagerWorkspaceService.cs
@@ -0,0 +1,40 @@
+// 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.ErrorReporting;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+
+namespace Microsoft.CodeAnalysis.Formatting;
+
+[ExportWorkspaceService(typeof(ILegacyIndentationManagerWorkspaceService)), Shared]
+internal sealed class LegacyIndentationManagerWorkspaceService : ILegacyIndentationManagerWorkspaceService
+{
+    private readonly IIndentationManagerService _indentationManagerService;
+
+    [ImportingConstructor]
+    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+    public LegacyIndentationManagerWorkspaceService(IIndentationManagerService indentationManagerService)
+    {
+        _indentationManagerService = indentationManagerService;
+    }
+
+    private static ITextBuffer GetRequiredTextBuffer(SourceText text)
+        => text.Container.TryGetTextBuffer() ?? throw new InvalidOperationException(
+            "We had an open document but it wasn't associated with a buffer. That meant we couldn't apply formatting settings.");
+
+    public bool UseSpacesForWhitespace(SourceText text)
+        => _indentationManagerService.UseSpacesForWhitespace(GetRequiredTextBuffer(text), explicitFormat: false);
+
+    public int GetTabSize(SourceText text)
+        => _indentationManagerService.GetTabSize(GetRequiredTextBuffer(text), explicitFormat: false);
+
+    public int GetIndentSize(SourceText text)
+        => _indentationManagerService.GetIndentSize(GetRequiredTextBuffer(text), explicitFormat: false);
+}
diff --git a/src/EditorFeatures/Core/Options/LegacyGlobalOptionsWorkspaceService.cs b/src/EditorFeatures/Core/Options/LegacyGlobalOptionsWorkspaceService.cs
index c51e3a6f6fc16..2b63d91443dbb 100644
--- a/src/EditorFeatures/Core/Options/LegacyGlobalOptionsWorkspaceService.cs
+++ b/src/EditorFeatures/Core/Options/LegacyGlobalOptionsWorkspaceService.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Composition;
+using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Options
@@ -22,5 +23,11 @@ public LegacyGlobalOptionsWorkspaceService(IGlobalOptionService globalOptions)
         {
             GlobalOptions = globalOptions;
         }
+
+        public bool RazorUseTabs
+            => GlobalOptions.GetOption(RazorLineFormattingOptionsStorage.UseTabs);
+
+        public int RazorTabSize
+            => GlobalOptions.GetOption(RazorLineFormattingOptionsStorage.TabSize);
     }
 }
diff --git a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
index 3afeea0bb9836..756534e28cf01 100644
--- a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
+++ b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
@@ -50,8 +50,8 @@ public abstract partial class AbstractLanguageServerProtocolTests
 
         private class TestSpanMapperProvider : IDocumentServiceProvider
         {
-            TService IDocumentServiceProvider.GetService<TService>()
-                => (TService)(object)new TestSpanMapper();
+            TService? IDocumentServiceProvider.GetService<TService>() where TService : class
+                => typeof(TService) == typeof(ISpanMappingService) ? (TService)(object)new TestSpanMapper() : null;
         }
 
         internal class TestSpanMapper : ISpanMappingService
diff --git a/src/Features/Core/Portable/ExternalAccess/Razor/Api/RazorDocumentOptionsProviderFactory.cs b/src/Features/Core/Portable/ExternalAccess/Razor/Api/RazorDocumentOptionsProviderFactory.cs
deleted file mode 100644
index 87a01af6e36db..0000000000000
--- a/src/Features/Core/Portable/ExternalAccess/Razor/Api/RazorDocumentOptionsProviderFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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 System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Options;
-
-namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Api
-{
-    [Shared]
-    [Export(typeof(IDocumentOptionsProviderFactory))]
-    [ExtensionOrder(Before = PredefinedDocumentOptionsProviderNames.EditorConfig)]
-    internal sealed class RazorDocumentOptionsProviderFactory : IDocumentOptionsProviderFactory
-    {
-        private readonly Lazy<IRazorDocumentOptionsService> _innerRazorDocumentOptionsService;
-
-        [ImportingConstructor]
-        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public RazorDocumentOptionsProviderFactory(
-            Lazy<IRazorDocumentOptionsService> innerRazorDocumentOptionsService)
-        {
-            if (innerRazorDocumentOptionsService is null)
-            {
-                throw new ArgumentNullException(nameof(innerRazorDocumentOptionsService));
-            }
-
-            _innerRazorDocumentOptionsService = innerRazorDocumentOptionsService;
-        }
-
-        public IDocumentOptionsProvider? TryCreate(Workspace workspace)
-            => new RazorDocumentOptionsProvider(_innerRazorDocumentOptionsService);
-
-        private sealed class RazorDocumentOptionsProvider : IDocumentOptionsProvider
-        {
-            public readonly Lazy<IRazorDocumentOptionsService> RazorDocumentOptionsService;
-
-            public RazorDocumentOptionsProvider(Lazy<IRazorDocumentOptionsService> razorDocumentOptionsService)
-            {
-                RazorDocumentOptionsService = razorDocumentOptionsService;
-            }
-
-            public async Task<IDocumentOptions?> GetOptionsForDocumentAsync(
-                Document document,
-                CancellationToken cancellationToken)
-            {
-                if (!document.IsRazorDocument())
-                {
-                    return null;
-                }
-
-                var options = await RazorDocumentOptionsService.Value.GetOptionsForDocumentAsync(
-                    document, cancellationToken).ConfigureAwait(false);
-                return new RazorDocumentOptions(options);
-            }
-        }
-
-        // Used to convert IRazorDocumentOptions -> IDocumentOptions
-        private sealed class RazorDocumentOptions : IDocumentOptions
-        {
-            private readonly IRazorDocumentOptions _razorOptions;
-
-            public RazorDocumentOptions(IRazorDocumentOptions razorOptions)
-            {
-                _razorOptions = razorOptions;
-            }
-
-            public bool TryGetDocumentOption(OptionKey option, out object? value)
-                => _razorOptions.TryGetDocumentOption(option, out value);
-        }
-    }
-}
diff --git a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
index 034940b2462f6..33b6e4642e081 100644
--- a/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
+++ b/src/Features/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_IncrementalAnalyzer.cs
@@ -372,16 +372,12 @@ private IReadOnlyList<StateSet> GetStateSetsForFullSolutionAnalysis(IEnumerable<
                 stateSets = stateSets.Where(s => !s.FromBuild(project.Id));
             }
 
-            // Compute analyzer config options for computing effective severity.
-            // Note that these options are not cached onto the project, so we compute it once upfront. 
-            var analyzerConfigOptions = project.GetAnalyzerConfigOptions();
-
             // Include only analyzers we want to run for full solution analysis.
             // Analyzers not included here will never be saved because result is unknown.
-            return stateSets.Where(s => IsCandidateForFullSolutionAnalysis(s.Analyzer, project, analyzerConfigOptions)).ToList();
+            return stateSets.Where(s => IsCandidateForFullSolutionAnalysis(s.Analyzer, project)).ToList();
         }
 
-        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project, AnalyzerConfigData? analyzerConfigOptions)
+        private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Project project)
         {
             // PERF: Don't query descriptors for compiler analyzer or workspace load analyzer, always execute them.
             if (analyzer == FileContentLoadAnalyzer.Instance ||
@@ -413,7 +409,9 @@ private bool IsCandidateForFullSolutionAnalysis(DiagnosticAnalyzer analyzer, Pro
 
             // For most of analyzers, the number of diagnostic descriptors is small, so this should be cheap.
             var descriptors = DiagnosticAnalyzerInfoCache.GetDiagnosticDescriptors(analyzer);
-            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions?.Result) != ReportDiagnostic.Hidden);
+            var analyzerConfigOptions = project.GetAnalyzerConfigOptions();
+
+            return descriptors.Any(d => d.GetEffectiveSeverity(project.CompilationOptions!, analyzerConfigOptions?.AnalyzerOptions, analyzerConfigOptions?.TreeOptions) != ReportDiagnostic.Hidden);
         }
 
         private void RaiseProjectDiagnosticsIfNeeded(
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
index 89101c51cfdba..2be007a5001e7 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs
@@ -296,7 +296,7 @@ private void UpdateSeverityMenuItemsChecked()
 
                 foreach (var diagnosticItem in group)
                 {
-                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions?.Result);
+                    var severity = diagnosticItem.Descriptor.GetEffectiveSeverity(project.CompilationOptions, analyzerConfigOptions?.AnalyzerOptions, analyzerConfigOptions?.TreeOptions);
                     selectedItemSeverities.Add(severity);
                 }
             }
diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
index 114541cfd6522..61f7fdfedb9d2 100644
--- a/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
+++ b/src/VisualStudio/Core/Impl/SolutionExplorer/DiagnosticItem/BaseDiagnosticAndGeneratorItemSource.cs
@@ -117,7 +117,7 @@ private BulkObservableCollection<BaseItem> CreateDiagnosticAndGeneratorItems(Pro
                 .Select(g =>
                 {
                     var selectedDiagnostic = g.OrderBy(d => d, s_comparer).First();
-                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions?.Result);
+                    var effectiveSeverity = selectedDiagnostic.GetEffectiveSeverity(options, analyzerConfigOptions?.AnalyzerOptions, analyzerConfigOptions?.TreeOptions);
                     return new DiagnosticItem(projectId, AnalyzerReference, selectedDiagnostic, effectiveSeverity, CommandHandler);
                 }));
 
@@ -183,7 +183,7 @@ void OnProjectConfigurationChanged()
 
                     foreach (var item in _items.OfType<DiagnosticItem>())
                     {
-                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions?.Result);
+                        var effectiveSeverity = item.Descriptor.GetEffectiveSeverity(project.CompilationOptions, newAnalyzerConfigOptions?.AnalyzerOptions, newAnalyzerConfigOptions?.TreeOptions);
                         item.UpdateEffectiveSeverity(effectiveSeverity);
                     }
                 }
diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
index bacb11927cb04..84af82e9c2268 100644
--- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
+++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -10,6 +10,7 @@
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Diagnostics;
+using static Microsoft.CodeAnalysis.ProjectState;
 
 namespace Microsoft.CodeAnalysis.Options.EditorConfig
 {
@@ -22,8 +23,9 @@ private sealed class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvi
         {
             public async Task<IDocumentOptions?> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken)
             {
-                var data = await document.GetAnalyzerOptionsAsync(cancellationToken).ConfigureAwait(false);
-                return new DocumentOptions(data?.AnalyzerConfigOptions);
+                var provider = (ProjectAnalyzerConfigOptionsProvider)document.Project.State.AnalyzerOptions.AnalyzerConfigOptionsProvider;
+                var options = await provider.GetOptionsAsync(document.DocumentState, cancellationToken).ConfigureAwait(false);
+                return new DocumentOptions(options);
             }
 
             private sealed class DocumentOptions : IDocumentOptions
diff --git a/src/Workspaces/Core/Portable/Options/ILegacyGlobalOptionsWorkspaceService.cs b/src/Workspaces/Core/Portable/Options/ILegacyGlobalOptionsWorkspaceService.cs
index 28ef99b1777dc..09e25ff7610f1 100644
--- a/src/Workspaces/Core/Portable/Options/ILegacyGlobalOptionsWorkspaceService.cs
+++ b/src/Workspaces/Core/Portable/Options/ILegacyGlobalOptionsWorkspaceService.cs
@@ -13,5 +13,8 @@ namespace Microsoft.CodeAnalysis.Options
     internal interface ILegacyGlobalOptionsWorkspaceService : IWorkspaceService
     {
         public IGlobalOptionService GlobalOptions { get; }
+
+        public bool RazorUseTabs { get; }
+        public int RazorTabSize { get; }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Options/ILegacyIndentationManagerWorkspaceService.cs b/src/Workspaces/Core/Portable/Options/ILegacyIndentationManagerWorkspaceService.cs
new file mode 100644
index 0000000000000..2511f3c7af9a4
--- /dev/null
+++ b/src/Workspaces/Core/Portable/Options/ILegacyIndentationManagerWorkspaceService.cs
@@ -0,0 +1,22 @@
+// 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.Text;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Formatting;
+
+/// <summary>
+/// Enables legacy APIs to access indentation inference editor APIs from workspace.
+/// https://github.com/dotnet/roslyn/issues/61109
+/// </summary>
+internal interface ILegacyIndentationManagerWorkspaceService : IWorkspaceService
+{
+    bool UseSpacesForWhitespace(SourceText text);
+    int GetTabSize(SourceText text);
+    int GetIndentSize(SourceText text);
+}
diff --git a/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs b/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
index f28f82c91a99c..5098275406113 100644
--- a/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Host/DocumentService/Extensions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.Host
 {
     internal static class Extensions
     {
-        private const string RazorCSharp = "RazorCSharp";
+        private const string RazorCSharpLspClientName = "RazorCSharp";
 
         public static bool CanApplyChange([NotNullWhen(returnValue: true)] this TextDocument? document)
             => document?.State.CanApplyChange() ?? false;
@@ -23,6 +23,9 @@ public static bool SupportsDiagnostics([NotNullWhen(returnValue: true)] this Tex
             => document?.Services.GetService<IDocumentOperationService>()?.SupportDiagnostics ?? false;
 
         public static bool IsRazorDocument(this TextDocument document)
-            => document.Services.GetService<DocumentPropertiesService>()?.DiagnosticsLspClientName == RazorCSharp;
+            => IsRazorDocument(document.State);
+
+        public static bool IsRazorDocument(this TextDocumentState documentState)
+            => documentState.Services.GetService<DocumentPropertiesService>()?.DiagnosticsLspClientName == RazorCSharpLspClientName;
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
index c417192872bb6..99371f49965bb 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/AnalyzerConfigData.cs
@@ -12,17 +12,14 @@ namespace Microsoft.CodeAnalysis;
 /// </summary>
 internal readonly struct AnalyzerConfigData
 {
-    private readonly AnalyzerConfigOptionsResult _result;
-    private readonly StructuredAnalyzerConfigOptions _configOptions;
+    public readonly StructuredAnalyzerConfigOptions ConfigOptions;
+    public readonly ImmutableDictionary<string, string> AnalyzerOptions;
+    public readonly ImmutableDictionary<string, ReportDiagnostic> TreeOptions;
 
     public AnalyzerConfigData(AnalyzerConfigOptionsResult result)
     {
-        _result = result;
-        _configOptions = new StructuredAnalyzerConfigOptions(result.AnalyzerOptions);
+        ConfigOptions = StructuredAnalyzerConfigOptions.Create(result.AnalyzerOptions);
+        AnalyzerOptions = result.AnalyzerOptions;
+        TreeOptions = result.TreeOptions;
     }
-
-    public AnalyzerConfigOptionsResult Result => _result;
-    public StructuredAnalyzerConfigOptions AnalyzerConfigOptions => _configOptions;
-    public ImmutableDictionary<string, string> AnalyzerOptions => _result.AnalyzerOptions;
-    public ImmutableDictionary<string, ReportDiagnostic> TreeOptions => _result.TreeOptions;
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
index 7f4f520e8d25a..27f7c17b2f5fc 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/Document.cs
@@ -512,35 +512,5 @@ private void InitializeCachedOptions(OptionSet solutionOptions)
 
             Interlocked.CompareExchange(ref _cachedOptions, newAsyncLazy, comparand: null);
         }
-
-        internal async Task<AnalyzerConfigData?> GetAnalyzerOptionsAsync(CancellationToken cancellationToken)
-        {
-            var projectFilePath = Project.FilePath;
-            // We need to work out path to this document. Documents may not have a "real" file path if they're something created
-            // as a part of a code action, but haven't been written to disk yet.
-            string? effectiveFilePath = null;
-
-            if (FilePath != null)
-            {
-                effectiveFilePath = FilePath;
-            }
-            else if (Name != null && projectFilePath != null)
-            {
-                var projectPath = PathUtilities.GetDirectoryName(projectFilePath);
-
-                if (!RoslynString.IsNullOrEmpty(projectPath) &&
-                    PathUtilities.GetDirectoryName(projectFilePath) is string directory)
-                {
-                    effectiveFilePath = PathUtilities.CombinePathsUnchecked(directory, Name);
-                }
-            }
-
-            if (effectiveFilePath == null)
-            {
-                return null;
-            }
-
-            return await Project.State.GetAnalyzerOptionsForPathAsync(effectiveFilePath, cancellationToken).ConfigureAwait(false);
-        }
     }
 }
diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
index 9370c87f3b2c6..7e892afb42c48 100644
--- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
+++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectState.cs
@@ -13,7 +13,11 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles;
+using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Serialization;
 using Roslyn.Utilities;
 
@@ -254,42 +258,46 @@ public async Task<AnalyzerConfigData> GetAnalyzerOptionsForPathAsync(string path
             return cache.GetOptionsForSourcePath(path);
         }
 
+        public AnalyzerConfigData GetAnalyzerOptionsForPath(string path, CancellationToken cancellationToken)
+            => _lazyAnalyzerConfigOptions.GetValue(cancellationToken).GetOptionsForSourcePath(path);
+
         public AnalyzerConfigData? GetAnalyzerConfigOptions()
         {
-            // We need to find the analyzer config options at the root of the project.
-            // Currently, there is no compiler API to query analyzer config options for a directory in a language agnostic fashion.
-            // So, we use a dummy language-specific file name appended to the project directory to query analyzer config options.
+            var extension = _projectInfo.Language switch
+            {
+                LanguageNames.CSharp => ".cs",
+                LanguageNames.VisualBasic => ".vb",
+                _ => null
+            };
 
-            var projectDirectory = PathUtilities.GetDirectoryName(_projectInfo.FilePath);
-            if (!PathUtilities.IsAbsolute(projectDirectory))
+            if (extension == null)
             {
                 return null;
             }
 
-            var fileName = Guid.NewGuid().ToString();
-            string sourceFilePath;
-            switch (_projectInfo.Language)
+            if (!PathUtilities.IsAbsolute(_projectInfo.FilePath))
             {
-                case LanguageNames.CSharp:
-                    // Suppression should be removed or addressed https://github.com/dotnet/roslyn/issues/41636
-                    sourceFilePath = PathUtilities.CombineAbsoluteAndRelativePaths(projectDirectory, $"{fileName}.cs")!;
-                    break;
+                return null;
+            }
 
-                case LanguageNames.VisualBasic:
-                    // Suppression should be removed or addressed https://github.com/dotnet/roslyn/issues/41636
-                    sourceFilePath = PathUtilities.CombineAbsoluteAndRelativePaths(projectDirectory, $"{fileName}.vb")!;
-                    break;
+            // We need to find the analyzer config options at the root of the project.
+            // Currently, there is no compiler API to query analyzer config options for a directory in a language agnostic fashion.
+            // So, we use a dummy language-specific file name appended to the project directory to query analyzer config options.
+            // NIL character is invalid in paths so it will never match any pattern in editorconfig, but editorconfig parsing allows it.
+            // TODO: https://github.com/dotnet/roslyn/issues/61217
 
-                default:
-                    return null;
-            }
+            var projectDirectory = PathUtilities.GetDirectoryName(_projectInfo.FilePath);
+            Contract.ThrowIfNull(projectDirectory);
+
+            var sourceFilePath = PathUtilities.CombinePathsUnchecked(projectDirectory, "\0" + extension);
 
-            return _lazyAnalyzerConfigOptions.GetValue(CancellationToken.None).GetOptionsForSourcePath(sourceFilePath);
+            return GetAnalyzerOptionsForPath(sourceFilePath, CancellationToken.None);
         }
 
         internal sealed class ProjectAnalyzerConfigOptionsProvider : AnalyzerConfigOptionsProvider
         {
             private readonly ProjectState _projectState;
+            private RazorDesignTimeAnalyzerConfigOptions? _lazyRazorDesignTimeOptions = null;
 
             public ProjectAnalyzerConfigOptionsProvider(ProjectState projectState)
                 => _projectState = projectState;
@@ -298,19 +306,200 @@ private AnalyzerConfigOptionsCache GetCache()
                 => _projectState._lazyAnalyzerConfigOptions.GetValue(CancellationToken.None);
 
             public override AnalyzerConfigOptions GlobalOptions
-                => GetCache().GlobalConfigOptions.AnalyzerConfigOptions;
+                => GetCache().GlobalConfigOptions.ConfigOptions;
 
             public override AnalyzerConfigOptions GetOptions(SyntaxTree tree)
-                => GetOptionsForSourcePath(tree.FilePath);
+            {
+                var documentId = DocumentState.GetDocumentIdForTree(tree);
+                var cache = GetCache();
+                if (documentId != null && _projectState.DocumentStates.TryGetState(documentId, out var documentState))
+                {
+                    var result = GetOptions(cache, documentState);
+                    if (result != null)
+                    {
+                        return result;
+                    }
+                }
+
+                return GetOptionsForSourcePath(cache, tree.FilePath);
+            }
+
+            internal async ValueTask<StructuredAnalyzerConfigOptions?> GetOptionsAsync(DocumentState documentState, CancellationToken cancellationToken)
+            {
+                var cache = await _projectState._lazyAnalyzerConfigOptions.GetValueAsync(cancellationToken).ConfigureAwait(false);
+                return GetOptions(cache, documentState);
+            }
+
+            private StructuredAnalyzerConfigOptions? GetOptions(in AnalyzerConfigOptionsCache cache, DocumentState documentState)
+            {
+                if (documentState.IsRazorDocument())
+                {
+                    return _lazyRazorDesignTimeOptions ??= new RazorDesignTimeAnalyzerConfigOptions(_projectState.LanguageServices.WorkspaceServices);
+                }
+
+                var filePath = GetEffectiveFilePath(documentState);
+                if (filePath == null)
+                {
+                    return null;
+                }
+
+                var options = GetOptionsForSourcePath(cache, filePath);
+                var workspace = _projectState._solutionServices.Workspace;
+
+                var legacyIndentationService = workspace.Services.GetService<ILegacyIndentationManagerWorkspaceService>();
+                if (legacyIndentationService == null)
+                {
+                    return options;
+                }
+
+                return new AnalyzerConfigWithInferredIndentationOptions(options, workspace, legacyIndentationService, documentState.Id);
+            }
 
             public override AnalyzerConfigOptions GetOptions(AdditionalText textFile)
             {
                 // TODO: correctly find the file path, since it looks like we give this the document's .Name under the covers if we don't have one
-                return GetOptionsForSourcePath(textFile.Path);
+                return GetOptionsForSourcePath(GetCache(), textFile.Path);
             }
 
-            public AnalyzerConfigOptions GetOptionsForSourcePath(string path)
-                => GetCache().GetOptionsForSourcePath(path).AnalyzerConfigOptions;
+            private static StructuredAnalyzerConfigOptions GetOptionsForSourcePath(in AnalyzerConfigOptionsCache cache, string path)
+                => cache.GetOptionsForSourcePath(path).ConfigOptions;
+
+            private string? GetEffectiveFilePath(DocumentState documentState)
+            {
+                if (!string.IsNullOrEmpty(documentState.FilePath))
+                {
+                    return documentState.FilePath;
+                }
+
+                // We need to work out path to this document. Documents may not have a "real" file path if they're something created
+                // as a part of a code action, but haven't been written to disk yet.
+
+                var projectFilePath = _projectState.FilePath;
+
+                if (documentState.Name != null && projectFilePath != null)
+                {
+                    var projectPath = PathUtilities.GetDirectoryName(projectFilePath);
+
+                    if (!RoslynString.IsNullOrEmpty(projectPath) &&
+                        PathUtilities.GetDirectoryName(projectFilePath) is string directory)
+                    {
+                        return PathUtilities.CombinePathsUnchecked(directory, documentState.Name);
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Provides editorconfig options for Razor design-time documents.
+        /// Razor does not support editorconfig options but has custom settings for a few formatting options whose values
+        /// are only available in-proc and the same for all Razor design-time documents.
+        /// This type emulates these options as analyzer config options.
+        /// </summary>
+        private sealed class RazorDesignTimeAnalyzerConfigOptions : StructuredAnalyzerConfigOptions
+        {
+            private readonly ILegacyGlobalOptionsWorkspaceService? _globalOptions;
+
+            public RazorDesignTimeAnalyzerConfigOptions(HostWorkspaceServices services)
+            {
+                // not available OOP:
+                _globalOptions = services.GetService<ILegacyGlobalOptionsWorkspaceService>();
+            }
+
+            public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+            {
+                if (_globalOptions != null)
+                {
+                    if (key == "indent_style")
+                    {
+                        value = _globalOptions.RazorUseTabs ? "tab" : "space";
+                        return true;
+                    }
+
+                    if (key == "tab_width" || key == "indent_size")
+                    {
+                        value = _globalOptions.RazorTabSize.ToString();
+                        return true;
+                    }
+                }
+
+                value = null;
+                return false;
+            }
+
+            public override IEnumerable<string> Keys
+            {
+                get
+                {
+                    if (_globalOptions != null)
+                    {
+                        yield return "indent_style";
+                        yield return "tab_width";
+                        yield return "indent_size";
+                    }
+                }
+            }
+
+            public override NamingStylePreferences GetNamingStylePreferences()
+                => NamingStylePreferences.Empty;
+        }
+
+        /// <summary>
+        /// Provides analyzer config options with indentation options overridden by editor indentation inference for open documents.
+        /// TODO: Remove once https://github.com/dotnet/roslyn/issues/61109 is addressed.
+        /// </summary>
+        private sealed class AnalyzerConfigWithInferredIndentationOptions : StructuredAnalyzerConfigOptions
+        {
+            private readonly Workspace _workspace;
+            private readonly ILegacyIndentationManagerWorkspaceService _service;
+            private readonly DocumentId _documentId;
+            private readonly StructuredAnalyzerConfigOptions _options;
+
+            public AnalyzerConfigWithInferredIndentationOptions(StructuredAnalyzerConfigOptions options, Workspace workspace, ILegacyIndentationManagerWorkspaceService service, DocumentId documentId)
+            {
+                _workspace = workspace;
+                _service = service;
+                _documentId = documentId;
+                _options = options;
+            }
+
+            public override NamingStylePreferences GetNamingStylePreferences()
+                => _options.GetNamingStylePreferences();
+
+            public override IEnumerable<string> Keys
+                => _options.Keys;
+
+            public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+            {
+                // For open documents override indentation option values with values inferred by the editor:
+                if (key is "indent_style" or "tab_width" or "indent_size" &&
+                    _workspace.IsDocumentOpen(_documentId))
+                {
+                    var currentDocument = _workspace.CurrentSolution.GetDocument(_documentId);
+                    if (currentDocument != null && currentDocument.TryGetText(out var text))
+                    {
+                        try
+                        {
+                            value = key switch
+                            {
+                                "indent_style" => _service.UseSpacesForWhitespace(text) ? "space" : "tab",
+                                "tab_width" => _service.GetTabSize(text).ToString(),
+                                "indent_size" => _service.GetIndentSize(text).ToString(),
+                                _ => throw ExceptionUtilities.UnexpectedValue(key)
+                            };
+
+                            return true;
+                        }
+                        catch (Exception e) when (FatalError.ReportAndCatch(e))
+                        {
+                            // fall through
+                        }
+                    }
+                }
+
+                return _options.TryGetValue(key, out value);
+            }
         }
 
         private sealed class ProjectSyntaxTreeOptionsProvider : SyntaxTreeOptionsProvider
diff --git a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
index fa91961a9e6ac..851afd8ccbe48 100644
--- a/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
+++ b/src/Workspaces/CoreTest/CodeStyle/EditorConfigCodeStyleParserTests.cs
@@ -67,7 +67,7 @@ public void TestParseEditorConfigAccessibilityModifiers(string args, int value,
             var storageLocation = CodeStyleOptions2.RequireAccessibilityModifiers.StorageLocations
                 .OfType<EditorConfigStorageLocation<CodeStyleOption2<AccessibilityModifiersRequired>>>()
                 .Single();
-            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, args));
+            var allRawConventions = StructuredAnalyzerConfigOptions.Create(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, args));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(CodeStyleOption2<AccessibilityModifiersRequired>), out var parsedCodeStyleOption));
             var codeStyleOption = (CodeStyleOption2<AccessibilityModifiersRequired>)parsedCodeStyleOption!;
@@ -89,7 +89,7 @@ public void TestParseEditorConfigEndOfLine(string configurationString, string ne
             var storageLocation = FormattingOptions.NewLine.StorageLocations
                 .OfType<EditorConfigStorageLocation<string>>()
                 .Single();
-            var allRawConventions = new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, configurationString));
+            var allRawConventions = StructuredAnalyzerConfigOptions.Create(DictionaryAnalyzerConfigOptions.EmptyDictionary.Add(storageLocation.KeyName, configurationString));
 
             Assert.True(storageLocation.TryGetOption(allRawConventions, typeof(string), out var parsedNewLine));
             Assert.Equal(newLine, (string?)parsedNewLine);
diff --git a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
index 2fd9b59b756f7..28d71b7effce5 100644
--- a/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
+++ b/src/Workspaces/CoreTest/EditorConfigStorageLocation/NamingStylePreferenceEditorConfigStorageLocationTests.cs
@@ -22,7 +22,7 @@ public class NamingStylePreferenceEditorConfigStorageLocationTests
         public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturnsFalse()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var result = editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(NamingStylePreferences), out _);
+            var result = editorConfigStorageLocation.TryGetOption(StructuredAnalyzerConfigOptions.Create(DictionaryAnalyzerConfigOptions.EmptyDictionary), typeof(NamingStylePreferences), out _);
             Assert.False(result, "Expected TryParseReadonlyDictionary to return 'false' for empty dictionary");
         }
 
@@ -30,7 +30,7 @@ public static void TestEmptyDictionaryReturnNoNamingStylePreferencesObjectReturn
         public static void TestNonEmptyDictionaryReturnsTrue()
         {
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
-            var options = new StructuredAnalyzerConfigOptions(new Dictionary<string, string>()
+            var options = StructuredAnalyzerConfigOptions.Create(new Dictionary<string, string>()
             {
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.severity"] = "error",
                 ["dotnet_naming_rule.methods_and_properties_must_be_pascal_case.symbols"] = "method_and_property_symbols",
@@ -53,7 +53,7 @@ public static void TestObjectTypeThrowsInvalidOperationException()
             var editorConfigStorageLocation = new NamingStylePreferenceEditorConfigStorageLocation();
             Assert.Throws<InvalidOperationException>(() =>
             {
-                editorConfigStorageLocation.TryGetOption(new StructuredAnalyzerConfigOptions(DictionaryAnalyzerConfigOptions.Empty), typeof(object), out var @object);
+                editorConfigStorageLocation.TryGetOption(StructuredAnalyzerConfigOptions.Create(DictionaryAnalyzerConfigOptions.EmptyDictionary), typeof(object), out var @object);
             });
         }
     }
diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
index 3f8445a9501dc..8b24b531764e7 100644
--- a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
+++ b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs
@@ -3385,5 +3385,52 @@ public async Task ReplacingTextMultipleTimesDoesNotRootIntermediateCopiesIfCompi
 
             GC.KeepAlive(finalSolution);
         }
+
+        [Theory]
+        [InlineData("a/proj.csproj", "a/.editorconfig", "a/b/test.cs", "*.cs", true, true)]
+        [InlineData("a/proj.csproj", "a/b/.editorconfig", "a/b/test.cs", "*.cs", false, true)]
+        [InlineData("a/proj.csproj", "a/.editorconfig", null, "*.cs", true, true)]
+        [InlineData("a/proj.csproj", "a/b/.editorconfig", null, "*.cs", false, false)]
+        [InlineData("a/proj.csproj", "a/.editorconfig", "", "*.cs", true, true)]
+        [InlineData("a/proj.csproj", "a/b/.editorconfig", "", "*.cs", false, false)]
+        [InlineData(null, "a/.editorconfig", "a/b/test.cs", "*.cs", false, true)]
+        [InlineData(null, "a/.editorconfig", null, "*.cs", false, false)]
+        [InlineData("a/proj.csproj", "a/.editorconfig", null, "*test.cs", false, true)]
+        public async Task EditorConfigOptions(string projectPath, string configPath, string sourcePath, string pattern, bool appliedToEntireProject, bool appliedToDocument)
+        {
+            projectPath = string.IsNullOrEmpty(projectPath) ? projectPath : Path.Combine(TempRoot.Root, projectPath);
+            configPath = Path.Combine(TempRoot.Root, configPath);
+            sourcePath = string.IsNullOrEmpty(sourcePath) ? sourcePath : Path.Combine(TempRoot.Root, sourcePath);
+
+            using var workspace = CreateWorkspace();
+            var projectId = ProjectId.CreateNewId();
+
+            var projectInfo = ProjectInfo.Create(
+                projectId,
+                VersionStamp.Default,
+                name: "proj1",
+                assemblyName: "proj1.dll",
+                language: LanguageNames.CSharp,
+                filePath: projectPath);
+
+            var documentId = DocumentId.CreateNewId(projectId);
+
+            var solution = workspace.CurrentSolution
+                .AddProject(projectInfo)
+                .AddDocument(documentId, "test.cs", SourceText.From("public class C { }"), filePath: sourcePath)
+                .AddAnalyzerConfigDocument(DocumentId.CreateNewId(projectId), ".editorconfig", SourceText.From($"[{pattern}]\nindent_style = tab"), filePath: configPath);
+
+            var document = solution.GetRequiredDocument(documentId);
+
+            var documentOptions = await document.GetOptionsAsync(CancellationToken.None);
+            Assert.Equal(appliedToDocument, documentOptions.GetOption(FormattingOptions2.UseTabs));
+
+            var syntaxTree = await document.GetSyntaxTreeAsync();
+            var documentOptionsViaSyntaxTree = document.Project.State.AnalyzerOptions.AnalyzerConfigOptionsProvider.GetOptions(syntaxTree);
+            Assert.Equal(appliedToDocument, documentOptionsViaSyntaxTree.TryGetValue("indent_style", out var value) == true && value == "tab");
+
+            var projectOptions = document.Project.GetAnalyzerConfigOptions();
+            Assert.Equal(appliedToEntireProject, projectOptions?.AnalyzerOptions.TryGetValue("indent_style", out value) == true && value == "tab");
+        }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
index 6fb0cb022c226..041573f48731d 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Diagnostics/StructuredAnalyzerConfigOptions.cs
@@ -17,32 +17,37 @@ namespace Microsoft.CodeAnalysis.Diagnostics;
 /// <see cref="AnalyzerConfigOptions"/> that memoize structured (parsed) form of certain complex options to avoid parsing them multiple times.
 /// Storages of these complex options may directly call the specialized getters to reuse the cached values.
 /// </summary>
-internal sealed class StructuredAnalyzerConfigOptions : AnalyzerConfigOptions
+internal abstract class StructuredAnalyzerConfigOptions : AnalyzerConfigOptions
 {
-    private readonly AnalyzerConfigOptions _options;
-    private readonly Lazy<NamingStylePreferences> _lazyNamingStylePreferences;
-
-    public StructuredAnalyzerConfigOptions(AnalyzerConfigOptions options)
+    internal sealed class Implementation : StructuredAnalyzerConfigOptions
     {
-        _options = options;
-        _lazyNamingStylePreferences = new Lazy<NamingStylePreferences>(() => EditorConfigNamingStyleParser.ParseDictionary(_options));
+        private readonly AnalyzerConfigOptions _options;
+        private readonly Lazy<NamingStylePreferences> _lazyNamingStylePreferences;
+
+        public Implementation(AnalyzerConfigOptions options)
+        {
+            _options = options;
+            _lazyNamingStylePreferences = new Lazy<NamingStylePreferences>(() => EditorConfigNamingStyleParser.ParseDictionary(_options));
+        }
+
+        public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+            => _options.TryGetValue(key, out value);
+
+        public override IEnumerable<string> Keys
+            => _options.Keys;
+
+        public override NamingStylePreferences GetNamingStylePreferences()
+            => _lazyNamingStylePreferences.Value;
     }
 
-    public StructuredAnalyzerConfigOptions(ImmutableDictionary<string, string> options)
-        : this(new DictionaryAnalyzerConfigOptions(options))
+    public abstract NamingStylePreferences GetNamingStylePreferences();
+
+    public static StructuredAnalyzerConfigOptions Create(ImmutableDictionary<string, string> options)
     {
         Contract.ThrowIfFalse(options.KeyComparer == KeyComparer);
+        return new Implementation(new DictionaryAnalyzerConfigOptions(options));
     }
 
-    public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
-        => _options.TryGetValue(key, out value);
-
-    public override IEnumerable<string> Keys
-        => _options.Keys;
-
-    public NamingStylePreferences GetNamingStylePreferences()
-        => _lazyNamingStylePreferences.Value;
-
     public static bool TryGetStructuredOptions(AnalyzerConfigOptions configOptions, [NotNullWhen(true)] out StructuredAnalyzerConfigOptions? options)
     {
         if (configOptions is StructuredAnalyzerConfigOptions structuredOptions)
@@ -86,7 +91,7 @@ private static bool TryGetCorrespondingCodeStyleInstance(AnalyzerConfigOptions c
         {
             if (!s_codeStyleStructuredOptions.TryGetValue(configOptions, out options))
             {
-                options = new StructuredAnalyzerConfigOptions(configOptions);
+                options = new Implementation(configOptions);
                 s_codeStyleStructuredOptions.Add(configOptions, options);
             }
         }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/DiagnosticDescriptorExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/DiagnosticDescriptorExtensions.cs
index 566c0afd3d3ea..831700cd46652 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/DiagnosticDescriptorExtensions.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/DiagnosticDescriptorExtensions.cs
@@ -30,18 +30,22 @@ public static ImmutableArray<string> ImmutableCustomTags(this DiagnosticDescript
         /// 1. Compilation options from ruleset file, if any, and command line options such as /nowarn, /warnaserror, etc.
         /// 2. Analyzer config documents at the project root directory or in ancestor directories.
         /// </summary>
-        public static ReportDiagnostic GetEffectiveSeverity(this DiagnosticDescriptor descriptor, CompilationOptions compilationOptions, AnalyzerConfigOptionsResult? analyzerConfigOptions)
+        public static ReportDiagnostic GetEffectiveSeverity(
+            this DiagnosticDescriptor descriptor,
+            CompilationOptions compilationOptions,
+            ImmutableDictionary<string, string>? analyzerOptions,
+            ImmutableDictionary<string, ReportDiagnostic>? treeOptions)
         {
             var effectiveSeverity = descriptor.GetEffectiveSeverity(compilationOptions);
 
             // Apply analyzer config options, unless configured with a non-default value in compilation options.
             // Note that compilation options (/nowarn, /warnaserror) override analyzer config options.
-            if (analyzerConfigOptions.HasValue &&
+            if (treeOptions != null && analyzerOptions != null &&
                 (!compilationOptions.SpecificDiagnosticOptions.TryGetValue(descriptor.Id, out var reportDiagnostic) ||
                  reportDiagnostic == ReportDiagnostic.Default))
             {
-                if (analyzerConfigOptions.Value.TreeOptions.TryGetValue(descriptor.Id, out reportDiagnostic) && reportDiagnostic != ReportDiagnostic.Default ||
-                    TryGetSeverityFromBulkConfiguration(descriptor, analyzerConfigOptions.Value, out reportDiagnostic))
+                if (treeOptions.TryGetValue(descriptor.Id, out reportDiagnostic) && reportDiagnostic != ReportDiagnostic.Default ||
+                    TryGetSeverityFromBulkConfiguration(descriptor, analyzerOptions, out reportDiagnostic))
                 {
                     Debug.Assert(reportDiagnostic != ReportDiagnostic.Default);
                     effectiveSeverity = reportDiagnostic;
@@ -145,11 +149,9 @@ public static ReportDiagnostic GetEffectiveSeverity(this DiagnosticDescriptor de
         /// </summary>
         private static bool TryGetSeverityFromBulkConfiguration(
             DiagnosticDescriptor descriptor,
-            AnalyzerConfigOptionsResult analyzerConfigOptions,
+            ImmutableDictionary<string, string> analyzerOptions,
             out ReportDiagnostic severity)
         {
-            Debug.Assert(!analyzerConfigOptions.TreeOptions.ContainsKey(descriptor.Id));
-
             // Analyzer bulk configuration does not apply to:
             //  1. Disabled by default diagnostics
             //  2. Compiler diagnostics
@@ -164,7 +166,7 @@ private static bool TryGetSeverityFromBulkConfiguration(
             // If user has explicitly configured default severity for the diagnostic category, that should be respected.
             // For example, 'dotnet_analyzer_diagnostic.category-security.severity = error'
             var categoryBasedKey = $"{DotnetAnalyzerDiagnosticPrefix}.{CategoryPrefix}-{descriptor.Category}.{SeveritySuffix}";
-            if (analyzerConfigOptions.AnalyzerOptions.TryGetValue(categoryBasedKey, out var value) &&
+            if (analyzerOptions.TryGetValue(categoryBasedKey, out var value) &&
                 EditorConfigSeverityStrings.TryParse(value, out severity))
             {
                 return true;
@@ -172,7 +174,7 @@ private static bool TryGetSeverityFromBulkConfiguration(
 
             // Otherwise, if user has explicitly configured default severity for all analyzer diagnostics, that should be respected.
             // For example, 'dotnet_analyzer_diagnostic.severity = error'
-            if (analyzerConfigOptions.AnalyzerOptions.TryGetValue(DotnetAnalyzerDiagnosticSeverityKey, out value) &&
+            if (analyzerOptions.TryGetValue(DotnetAnalyzerDiagnosticSeverityKey, out value) &&
                 EditorConfigSeverityStrings.TryParse(value, out severity))
             {
                 return true;

From b0021c144b3eeeb1967247a86301758821f4f3fd Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Thu, 12 May 2022 20:10:37 -0700
Subject: [PATCH 403/413] Update PublishData.json with new package

---
 eng/config/PublishData.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json
index 1d27a1598951e..892471b284749 100644
--- a/eng/config/PublishData.json
+++ b/eng/config/PublishData.json
@@ -25,6 +25,7 @@
       "Microsoft.CodeAnalysis.Build.Tasks": "arcade",
       "Microsoft.Net.Compilers": "arcade",
       "Microsoft.Net.Compilers.Toolset": "arcade",
+      "Microsoft.Net.Compilers.Toolset.Arm64": "arcade",
       "Microsoft.NETCore.Compilers": "arcade",
       "Microsoft.CodeAnalysis.Debugging": "arcade",
       "Microsoft.CodeAnalysis.PooledObjects": "arcade",

From 9529d26ccfee000ac18d5549f8e5576050799b89 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Thu, 12 May 2022 21:59:51 -0700
Subject: [PATCH 404/413] Fix focus on rename UI opening (#60846)

Focus the UI based on the Loaded event instead of Initialized
---
 .../CommandHandlers/RenameCommandHandler.cs   | 36 +++++++++++--------
 ...RenameAdornment.xaml => RenameFlyout.xaml} |  6 ++--
 ...Adornment.xaml.cs => RenameFlyout.xaml.cs} | 18 ++++++----
 ...tViewModel.cs => RenameFlyoutViewModel.cs} |  6 ++--
 .../{Dashboard.xaml => RenameDashboard.xaml}  |  9 +++--
 ...hboard.xaml.cs => RenameDashboard.xaml.cs} | 12 +++----
 ...er.cs => RenameDashboardAutomationPeer.cs} |  4 +--
 ...Severity.cs => RenameDashboardSeverity.cs} |  2 +-
 ...ewModel.cs => RenameDashboardViewModel.cs} | 14 ++++----
 .../InlineRename/UI/InlineRenameAdornment.cs  | 18 ++++++++++
 .../UI/InlineRenameAdornmentManager.cs        | 11 +++---
 .../AbstractRenameCommandHandler.cs           |  8 ++---
 ...tractRenameCommandHandler_RenameHandler.cs |  2 +-
 ...AbstractRenameCommandHandler_TabHandler.cs |  8 ++---
 .../Test2/Rename/DashboardTests.vb            | 22 ++++++------
 .../Test2/Rename/RenameCommandHandlerTests.vb |  2 +-
 .../CSharp/CSharpAutomaticBraceCompletion.cs  |  1 +
 17 files changed, 102 insertions(+), 77 deletions(-)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/{InlineRenameAdornment.xaml => RenameFlyout.xaml} (96%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/{InlineRenameAdornment.xaml.cs => RenameFlyout.xaml.cs} (90%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/{InlineRenameAdornmentViewModel.cs => RenameFlyoutViewModel.cs} (97%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/{Dashboard.xaml => RenameDashboard.xaml} (98%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/{Dashboard.xaml.cs => RenameDashboard.xaml.cs} (98%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/{DashboardAutomationPeer.cs => RenameDashboardAutomationPeer.cs} (85%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/{DashboardSeverity.cs => RenameDashboardSeverity.cs} (89%)
 rename src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/{DashboardViewModel.cs => RenameDashboardViewModel.cs} (95%)
 create mode 100644 src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs

diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs b/src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs
index 586f40a466758..8e357e7501559 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Extensions;
 using Microsoft.CodeAnalysis.Telemetry;
+using System.Windows;
 
 #if !COCOA
 using System.Linq;
@@ -41,39 +42,44 @@ public RenameCommandHandler(IThreadingContext threadingContext, InlineRenameServ
         }
 
 #if !COCOA
-        protected override bool DashboardShouldReceiveKeyboardNavigation(ITextView textView)
-            => GetDashboard(textView) is { } dashboard && dashboard.ShouldReceiveKeyboardNavigation;
+        protected override bool AdornmentShouldReceiveKeyboardNavigation(ITextView textView)
+            => GetAdornment(textView) switch
+            {
+                RenameDashboard dashboard => dashboard.ShouldReceiveKeyboardNavigation,
+                RenameFlyout => true, // Always receive keyboard navigation for the inline adornment
+                _ => false
+            };
 
         protected override void SetFocusToTextView(ITextView textView)
         {
             (textView as IWpfTextView)?.VisualElement.Focus();
         }
 
-        protected override void SetFocusToDashboard(ITextView textView)
+        protected override void SetFocusToAdornment(ITextView textView)
         {
-            if (GetDashboard(textView) is { } dashboard)
+            if (GetAdornment(textView) is { } adornment)
             {
-                dashboard.Focus();
+                adornment.Focus();
             }
         }
 
-        protected override void SetDashboardFocusToNextElement(ITextView textView)
+        protected override void SetAdornmentFocusToNextElement(ITextView textView)
         {
-            if (GetDashboard(textView) is { } dashboard)
+            if (GetAdornment(textView) is RenameDashboard dashboard)
             {
                 dashboard.FocusNextElement();
             }
         }
 
-        protected override void SetDashboardFocusToPreviousElement(ITextView textView)
+        protected override void SetAdornmentFocusToPreviousElement(ITextView textView)
         {
-            if (GetDashboard(textView) is { } dashboard)
+            if (GetAdornment(textView) is RenameDashboard dashboard)
             {
                 dashboard.FocusNextElement();
             }
         }
 
-        private static Dashboard? GetDashboard(ITextView textView)
+        private static InlineRenameAdornment? GetAdornment(ITextView textView)
         {
             // If our adornment layer somehow didn't get composed, GetAdornmentLayer will throw.
             // Don't crash if that happens.
@@ -81,7 +87,7 @@ protected override void SetDashboardFocusToPreviousElement(ITextView textView)
             {
                 var adornment = ((IWpfTextView)textView).GetAdornmentLayer("RoslynRenameDashboard");
                 return adornment.Elements.Any()
-                    ? adornment.Elements[0].Adornment as Dashboard
+                    ? adornment.Elements[0].Adornment as InlineRenameAdornment
                     : null;
             }
             catch (ArgumentOutOfRangeException)
@@ -124,7 +130,7 @@ protected override void Commit(InlineRenameSession activeSession, ITextView text
             }
         }
 #else
-        protected override bool DashboardShouldReceiveKeyboardNavigation(ITextView textView)
+        protected override bool AdornmentShouldReceiveKeyboardNavigation(ITextView textView)
             => false;
 
         protected override void SetFocusToTextView(ITextView textView)
@@ -132,17 +138,17 @@ protected override void SetFocusToTextView(ITextView textView)
             // No action taken for Cocoa
         }
 
-        protected override void SetFocusToDashboard(ITextView textView)
+        protected override void SetFocusToAdornment(ITextView textView)
         {
             // No action taken for Cocoa
         }
 
-        protected override void SetDashboardFocusToNextElement(ITextView textView)
+        protected override void SetAdornmentFocusToNextElement(ITextView textView)
         {
             // No action taken for Cocoa
         }
 
-        protected override void SetDashboardFocusToPreviousElement(ITextView textView)
+        protected override void SetAdornmentFocusToPreviousElement(ITextView textView)
         {
             // No action taken for Cocoa
         }
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
similarity index 96%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
index a1dd57a5407e6..133d27528bc6b 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
@@ -1,17 +1,15 @@
-<UserControl x:Class="Microsoft.CodeAnalysis.Editor.InlineRename.Adornment.InlineRenameAdornment"
+<rename:InlineRenameAdornment x:Class="Microsoft.CodeAnalysis.Editor.Implementation.InlineRename.RenameFlyout"
              x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Microsoft.CodeAnalysis.Editor.InlineRename.Adornment"
              xmlns:rename="clr-namespace:Microsoft.CodeAnalysis.Editor.Implementation.InlineRename"
              xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
              xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
              MinWidth="200"
-             x:Name="control"
              KeyDown="Adornment_KeyDown"
              MouseDown="Adornment_ConsumeMouseEvent"
              MouseUp="Adornment_ConsumeMouseEvent"
@@ -119,4 +117,4 @@
                 />
     </StackPanel>
     </Border>
-</UserControl>
+</rename:InlineRenameAdornment>
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
similarity index 90%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
index b99751dfe5d22..2e47494b93514 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornment.xaml.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
@@ -8,17 +8,17 @@
 using System.Windows.Input;
 using Microsoft.VisualStudio.Text.Editor;
 
-namespace Microsoft.CodeAnalysis.Editor.InlineRename.Adornment
+namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
     /// <summary>
     /// Interaction logic for InlineRenameAdornment.xaml
     /// </summary>
-    internal partial class InlineRenameAdornment : UserControl, IDisposable
+    internal partial class RenameFlyout : InlineRenameAdornment
     {
-        private readonly InlineRenameAdornmentViewModel _viewModel;
+        private readonly RenameFlyoutViewModel _viewModel;
         private readonly ITextView _textView;
 
-        public InlineRenameAdornment(InlineRenameAdornmentViewModel viewModel, ITextView textView)
+        public RenameFlyout(RenameFlyoutViewModel viewModel, ITextView textView)
         {
             DataContext = _viewModel = viewModel;
             _textView = textView;
@@ -29,8 +29,12 @@ public InlineRenameAdornment(InlineRenameAdornmentViewModel viewModel, ITextView
             _textView.LostAggregateFocus += TextView_LostFocus;
             _textView.Caret.PositionChanged += TextView_CursorChanged;
 
-            // On initialization focus the first tab target
-            Initialized += (s, e) => MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+            // On load focus the first tab target
+            Loaded += (s, e) =>
+            {
+                Focus();
+                MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+            };
 
             InitializeComponent();
             PositionAdornment();
@@ -67,7 +71,7 @@ private void PositionAdornment()
             Canvas.SetLeft(this, left);
         }
 
-        public void Dispose()
+        public override void Dispose()
         {
             _viewModel.Dispose();
 
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornmentViewModel.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyoutViewModel.cs
similarity index 97%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornmentViewModel.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyoutViewModel.cs
index c9932ebf66ef6..91b9e5d33d184 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/InlineRenameAdornmentViewModel.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyoutViewModel.cs
@@ -14,16 +14,16 @@
 using Microsoft.CodeAnalysis.Rename;
 using Microsoft.VisualStudio.PlatformUI.OleComponentSupport;
 
-namespace Microsoft.CodeAnalysis.Editor.InlineRename.Adornment
+namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal class InlineRenameAdornmentViewModel : INotifyPropertyChanged, IDisposable
+    internal class RenameFlyoutViewModel : INotifyPropertyChanged, IDisposable
     {
         private readonly InlineRenameSession _session;
         private OleComponent? _oleComponent;
         private bool _disposedValue;
         public event PropertyChangedEventHandler? PropertyChanged;
 
-        public InlineRenameAdornmentViewModel(InlineRenameSession session)
+        public RenameFlyoutViewModel(InlineRenameSession session)
         {
             _session = session;
             _session.ReplacementTextChanged += OnReplacementTextChanged;
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
similarity index 98%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
index f0a17489c9676..0cbe0c93e247f 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
@@ -1,5 +1,4 @@
-<UserControl x:Class="Microsoft.CodeAnalysis.Editor.Implementation.InlineRename.Dashboard"
-             x:Name="dashboard"
+<rename:InlineRenameAdornment x:Class="Microsoft.CodeAnalysis.Editor.Implementation.InlineRename.RenameDashboard"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -21,7 +20,7 @@
         Do not change this automation id.
     -->
 
-    <UserControl.Resources>
+    <rename:InlineRenameAdornment.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="../InlineRenameColors.xaml"/>
@@ -47,7 +46,7 @@
             Stretch="Uniform"
             Data="F1 M 0,0L 2,0L 5,3L 8,0L 10,0L 6,4L 10,8L 8,8L 5,5L 2,8L 0,8L 4,4L 0,0 Z" />
         </ResourceDictionary>
-    </UserControl.Resources>
+    </rename:InlineRenameAdornment.Resources>
 
     <Grid>
         <Grid.RowDefinitions>
@@ -252,4 +251,4 @@
 
         <Rectangle Name="DashboardAccentBar" Grid.Row="1" Height="4" Fill="{DynamicResource {x:Static rename:InlineRenameColors.AccentBarColorKey}}" />
     </Grid>
-</UserControl>
+</rename:InlineRenameAdornment>
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml.cs
similarity index 98%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml.cs
index 33391dd5aa541..7d64068ea639e 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/Dashboard.xaml.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml.cs
@@ -22,9 +22,9 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal partial class Dashboard : UserControl, IDisposable
+    internal partial class RenameDashboard : InlineRenameAdornment
     {
-        private readonly DashboardViewModel _model;
+        private readonly RenameDashboardViewModel _model;
         private readonly IWpfTextView _textView;
         private readonly IAdornmentLayer _findAdornmentLayer;
         private PresentationSource _presentationSource;
@@ -45,8 +45,8 @@ internal partial class Dashboard : UserControl, IDisposable
                 RenameShortcutKey.PreviewChanges
             };
 
-        public Dashboard(
-            DashboardViewModel model,
+        public RenameDashboard(
+            RenameDashboardViewModel model,
             IEditorFormatMapService editorFormatMapService,
             IWpfTextView textView)
         {
@@ -253,7 +253,7 @@ protected override void OnAccessKey(AccessKeyEventArgs e)
         }
 
         protected override AutomationPeer OnCreateAutomationPeer()
-            => new DashboardAutomationPeer(this, _model.OriginalName);
+            => new RenameDashboardAutomationPeer(this, _model.OriginalName);
 
         private void DisconnectFromPresentationSource()
         {
@@ -363,7 +363,7 @@ private void Commit()
             }
         }
 
-        public void Dispose()
+        public override void Dispose()
         {
             _textView.GotAggregateFocus -= OnTextViewGotAggregateFocus;
             _textView.LostAggregateFocus -= OnTextViewLostAggregateFocus;
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardAutomationPeer.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardAutomationPeer.cs
similarity index 85%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardAutomationPeer.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardAutomationPeer.cs
index a4c917b22f663..7d255741224b1 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardAutomationPeer.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardAutomationPeer.cs
@@ -12,11 +12,11 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
     /// <summary>
     /// Custom AutomationPeer to announce that an Inline Rename session has begun.
     /// </summary>
-    internal class DashboardAutomationPeer : UserControlAutomationPeer
+    internal class RenameDashboardAutomationPeer : UserControlAutomationPeer
     {
         private readonly string _identifier;
 
-        public DashboardAutomationPeer(UserControl owner, string identifier) : base(owner)
+        public RenameDashboardAutomationPeer(UserControl owner, string identifier) : base(owner)
             => _identifier = identifier;
 
         protected override bool HasKeyboardFocusCore()
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardSeverity.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardSeverity.cs
similarity index 89%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardSeverity.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardSeverity.cs
index bb77e09dbc0c6..2c55c302d9d89 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardSeverity.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardSeverity.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal enum DashboardSeverity
+    internal enum RenameDashboardSeverity
     {
         None,
         Info,
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardViewModel.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardViewModel.cs
similarity index 95%
rename from src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardViewModel.cs
rename to src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardViewModel.cs
index 9578fd2a2fcc8..c452cfa5cb78c 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/DashboardViewModel.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardViewModel.cs
@@ -15,18 +15,18 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal class DashboardViewModel : INotifyPropertyChanged, IDisposable
+    internal class RenameDashboardViewModel : INotifyPropertyChanged, IDisposable
     {
         private readonly InlineRenameSession _session;
 
-        private DashboardSeverity _severity = DashboardSeverity.None;
+        private RenameDashboardSeverity _severity = RenameDashboardSeverity.None;
         private string _searchText;
         private int _resolvableConflictCount;
         private int _unresolvableConflictCount;
         private string _errorText;
         private bool _isReplacementTextValid;
 
-        public DashboardViewModel(InlineRenameSession session)
+        public RenameDashboardViewModel(InlineRenameSession session)
         {
             _session = session;
             _searchText = EditorFeaturesResources.Searching;
@@ -141,21 +141,21 @@ private void UpdateSeverity()
             if (_errorText != null ||
                 _unresolvableConflictCount > 0)
             {
-                _severity = DashboardSeverity.Error;
+                _severity = RenameDashboardSeverity.Error;
             }
             else if (_resolvableConflictCount > 0)
             {
-                _severity = DashboardSeverity.Info;
+                _severity = RenameDashboardSeverity.Info;
             }
             else
             {
-                _severity = DashboardSeverity.None;
+                _severity = RenameDashboardSeverity.None;
             }
         }
 
         public InlineRenameSession Session => _session;
 
-        public DashboardSeverity Severity => _severity;
+        public RenameDashboardSeverity Severity => _severity;
 
         public bool AllowFileRename => _session.FileRenameInfo == InlineRenameFileRenameInfo.Allowed && _isReplacementTextValid;
         public bool ShowFileRename => _session.FileRenameInfo != InlineRenameFileRenameInfo.NotAllowed;
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs
new file mode 100644
index 0000000000000..58e5e9d917ce5
--- /dev/null
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs
@@ -0,0 +1,18 @@
+// 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.Tasks;
+using System.Windows.Controls;
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
+{
+    internal abstract class InlineRenameAdornment : UserControl, IDisposable
+    {
+        public abstract void Dispose();
+    }
+}
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs
index 2b7ba9ad31710..d02febbe2b0fd 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs
@@ -7,7 +7,6 @@
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.InlineRename;
-using Microsoft.CodeAnalysis.Editor.InlineRename.Adornment;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text.Classification;
@@ -72,8 +71,8 @@ private void UpdateAdornments()
                 var useInlineAdornment = _globalOptionService.GetOption(InlineRenameExperimentationOptions.UseInlineAdornment);
                 if (useInlineAdornment)
                 {
-                    var adornment = new InlineRenameAdornment(
-                        (InlineRenameAdornmentViewModel)s_createdViewModels.GetValue(_renameService.ActiveSession, session => new InlineRenameAdornmentViewModel(session)),
+                    var adornment = new RenameFlyout(
+                        (RenameFlyoutViewModel)s_createdViewModels.GetValue(_renameService.ActiveSession, session => new RenameFlyoutViewModel(session)),
                         _textView);
 
                     _adornmentLayer.AddAdornment(
@@ -85,13 +84,13 @@ private void UpdateAdornments()
                 }
                 else
                 {
-                    var newAdornment = new Dashboard(
-                        (DashboardViewModel)s_createdViewModels.GetValue(_renameService.ActiveSession, session => new DashboardViewModel(session)),
+                    var newAdornment = new RenameDashboard(
+                        (RenameDashboardViewModel)s_createdViewModels.GetValue(_renameService.ActiveSession, session => new RenameDashboardViewModel(session)),
                         _editorFormatMapService,
                         _textView);
 
                     _adornmentLayer.AddAdornment(AdornmentPositioningBehavior.ViewportRelative, null, null, newAdornment,
-                        (tag, adornment) => ((Dashboard)adornment).Dispose());
+                        (tag, adornment) => ((RenameDashboard)adornment).Dispose());
                 }
             }
         }
diff --git a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler.cs b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler.cs
index 22d0027ba9c8f..908ed357152ff 100644
--- a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler.cs
+++ b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler.cs
@@ -28,15 +28,15 @@ protected AbstractRenameCommandHandler(
 
         public string DisplayName => EditorFeaturesResources.Rename;
 
-        protected abstract bool DashboardShouldReceiveKeyboardNavigation(ITextView textView);
+        protected abstract bool AdornmentShouldReceiveKeyboardNavigation(ITextView textView);
 
         protected abstract void SetFocusToTextView(ITextView textView);
 
-        protected abstract void SetFocusToDashboard(ITextView textView);
+        protected abstract void SetFocusToAdornment(ITextView textView);
 
-        protected abstract void SetDashboardFocusToPreviousElement(ITextView textView);
+        protected abstract void SetAdornmentFocusToPreviousElement(ITextView textView);
 
-        protected abstract void SetDashboardFocusToNextElement(ITextView textView);
+        protected abstract void SetAdornmentFocusToNextElement(ITextView textView);
 
         private CommandState GetCommandState(Func<CommandState> nextHandler)
         {
diff --git a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_RenameHandler.cs b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_RenameHandler.cs
index 822784904259d..d762156c45e02 100644
--- a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_RenameHandler.cs
+++ b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_RenameHandler.cs
@@ -67,7 +67,7 @@ private void ExecuteRenameWorker(RenameCommandArgs args, CommandExecutionContext
                 // If so, focus the dashboard
                 if (_renameService.ActiveSession.TryGetContainingEditableSpan(caretPoint.Value, out _))
                 {
-                    SetFocusToDashboard(args.TextView);
+                    SetFocusToAdornment(args.TextView);
                     return;
                 }
                 else
diff --git a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_TabHandler.cs b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_TabHandler.cs
index aa56c00d35c4e..82b8e618a0d01 100644
--- a/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_TabHandler.cs
+++ b/src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler_TabHandler.cs
@@ -20,9 +20,9 @@ public CommandState GetCommandState(TabKeyCommandArgs args, Func<CommandState> n
         public void ExecuteCommand(TabKeyCommandArgs args, Action nextHandler, CommandExecutionContext context)
         {
             // If the Dashboard is focused, just navigate through its UI.
-            if (DashboardShouldReceiveKeyboardNavigation(args.TextView))
+            if (AdornmentShouldReceiveKeyboardNavigation(args.TextView))
             {
-                SetDashboardFocusToNextElement(args.TextView);
+                SetAdornmentFocusToNextElement(args.TextView);
                 return;
             }
 
@@ -52,9 +52,9 @@ public CommandState GetCommandState(BackTabKeyCommandArgs args, Func<CommandStat
         public void ExecuteCommand(BackTabKeyCommandArgs args, Action nextHandler, CommandExecutionContext context)
         {
             // If the Dashboard is focused, just navigate through its UI.
-            if (DashboardShouldReceiveKeyboardNavigation(args.TextView))
+            if (AdornmentShouldReceiveKeyboardNavigation(args.TextView))
             {
-                SetDashboardFocusToPreviousElement(args.TextView);
+                SetAdornmentFocusToPreviousElement(args.TextView);
                 return;
             }
             else
diff --git a/src/EditorFeatures/Test2/Rename/DashboardTests.vb b/src/EditorFeatures/Test2/Rename/DashboardTests.vb
index eee1bf947cd4f..6a1906fa21596 100644
--- a/src/EditorFeatures/Test2/Rename/DashboardTests.vb
+++ b/src/EditorFeatures/Test2/Rename/DashboardTests.vb
@@ -96,7 +96,7 @@ class Program
                 renameOverloads:=True,
                 hasRenameOverload:=True,
                 unresolvableConflictText:=String.Format(EditorFeaturesResources._0_unresolvable_conflict_s, 1),
-                severity:=DashboardSeverity.Error)
+                severity:=RenameDashboardSeverity.Error)
         End Function
 
         <WpfTheory>
@@ -116,7 +116,7 @@ class AttributeAttribute : System.Attribute { }
                     newName:="AttributeAttributeAttribute",
                     searchResultText:=EditorFeaturesResources.Rename_will_update_1_reference_in_1_file,
                     resolvableConflictText:=String.Format(EditorFeaturesResources._0_conflict_s_will_be_resolved, 1),
-                    severity:=DashboardSeverity.Info)
+                    severity:=RenameDashboardSeverity.Info)
         End Function
 
         <WpfTheory>
@@ -334,7 +334,7 @@ class $$Program
                 newName:="goo",
                 searchResultText:=String.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_file, 2),
                 resolvableConflictText:=String.Format(EditorFeaturesResources._0_conflict_s_will_be_resolved, 1),
-                severity:=DashboardSeverity.Info)
+                severity:=RenameDashboardSeverity.Info)
         End Function
 
         <WorkItem(5923, "DevDiv_Projects/Roslyn")>
@@ -359,7 +359,7 @@ class $$Program
                 newName:="goo",
                 searchResultText:=String.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_file, 2),
                 resolvableConflictText:=String.Format(EditorFeaturesResources._0_conflict_s_will_be_resolved, 2),
-                severity:=DashboardSeverity.Info)
+                severity:=RenameDashboardSeverity.Info)
         End Function
 
         <WpfTheory>
@@ -382,7 +382,7 @@ class $$Program
                 newName:="goo",
                 searchResultText:=EditorFeaturesResources.Rename_will_update_1_reference_in_1_file,
                 unresolvableConflictText:=String.Format(EditorFeaturesResources._0_unresolvable_conflict_s, 1),
-                severity:=DashboardSeverity.Error)
+                severity:=RenameDashboardSeverity.Error)
         End Function
 
         <WpfTheory>
@@ -407,7 +407,7 @@ class $$Program
                 newName:="goo",
                 searchResultText:=String.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_file, 3),
                 unresolvableConflictText:=String.Format(EditorFeaturesResources._0_unresolvable_conflict_s, 3),
-                severity:=DashboardSeverity.Error)
+                severity:=RenameDashboardSeverity.Error)
         End Function
 
         <WpfTheory>
@@ -444,7 +444,7 @@ class $$Program
                    newName:="Bar",
                    searchResultText:=String.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_files, 4, 2),
                    resolvableConflictText:=String.Format(EditorFeaturesResources._0_conflict_s_will_be_resolved, 1),
-                   severity:=DashboardSeverity.Info)
+                   severity:=RenameDashboardSeverity.Info)
         End Function
 
         <WpfTheory>
@@ -543,7 +543,7 @@ class D : B
             Optional renameFile As Boolean = False,
             Optional resolvableConflictText As String = Nothing,
             Optional unresolvableConflictText As String = Nothing,
-            Optional severity As DashboardSeverity = DashboardSeverity.None
+            Optional severity As RenameDashboardSeverity = RenameDashboardSeverity.None
         ) As Tasks.Task
 
             Using workspace = CreateWorkspaceWithWaiter(test, host)
@@ -577,14 +577,14 @@ class D : B
                     edit.Apply()
                 End Using
 
-                Using dashboard = New Dashboard(
-                    New DashboardViewModel(DirectCast(sessionInfo.Session, InlineRenameSession)),
+                Using dashboard = New RenameDashboard(
+                    New RenameDashboardViewModel(DirectCast(sessionInfo.Session, InlineRenameSession)),
                     editorFormatMapService:=Nothing,
                     textView:=cursorDocument.GetTextView())
 
                     Await WaitForRename(workspace)
 
-                    Dim model = DirectCast(dashboard.DataContext, DashboardViewModel)
+                    Dim model = DirectCast(dashboard.DataContext, RenameDashboardViewModel)
 
                     Assert.Equal(searchResultText, model.SearchText)
 
diff --git a/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb b/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
index 9c568374c2f08..89b402dda2697 100644
--- a/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb
@@ -238,7 +238,7 @@ End Class
                 Await WaitForRename(workspace)
 
                 ' Unfocus the dashboard
-                Dim dashboard = DirectCast(view.GetAdornmentLayer("RoslynRenameDashboard").Elements(0).Adornment, Dashboard)
+                Dim dashboard = DirectCast(view.GetAdornmentLayer("RoslynRenameDashboard").Elements(0).Adornment, RenameDashboard)
                 dashboard.ShouldReceiveKeyboardNavigation = False
 
                 commandHandler.ExecuteCommand(New TabKeyCommandArgs(view, view.TextBuffer),
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAutomaticBraceCompletion.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAutomaticBraceCompletion.cs
index 326429ff2813b..55980cc53afd2 100644
--- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAutomaticBraceCompletion.cs
+++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAutomaticBraceCompletion.cs
@@ -299,6 +299,7 @@ class C {
 
         [WpfTheory, CombinatorialData, Trait(Traits.Feature, Traits.Features.AutomaticCompletion)]
         public void DoubleQuote_InsertionAndTabCompletion(bool showCompletionInArgumentLists)
+
         {
             SetUpEditor(@"
 class C {

From 6acb38ddbc67c3c9fd2b1807aec95e5722c174e8 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Thu, 12 May 2022 22:33:38 -0700
Subject: [PATCH 405/413] Enable add usings on paste by default (#61299)

With the new experience no longer blocking the UI thread, we want to enable this feature by default in 17.3
---
 .../AbstractAddImportsPasteCommandHandler.cs  |  2 +-
 .../Shared/Options/FeatureOnOffOptions.cs     | 12 ++++--
 .../Options/AdvancedOptionPageControl.xaml.cs |  8 +---
 .../CSharp/CSharpAddMissingUsingsOnPaste.cs   | 39 -------------------
 .../Options/AdvancedOptionPageControl.xaml.vb |  8 +---
 .../AutomationObject.OnOff.vb                 |  4 +-
 6 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs b/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs
index 06c9643439d34..fd215741024cf 100644
--- a/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs
+++ b/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs
@@ -57,7 +57,7 @@ public CommandState GetCommandState(PasteCommandArgs args, Func<CommandState> ne
         public void ExecuteCommand(PasteCommandArgs args, Action nextCommandHandler, CommandExecutionContext executionContext)
         {
             // If the feature is not explicitly enabled we can exit early
-            if (_globalOptions.GetOption(FeatureOnOffOptions.AddImportsOnPaste, args.SubjectBuffer.GetLanguageName()) != true)
+            if (!_globalOptions.GetOption(FeatureOnOffOptions.AddImportsOnPaste, args.SubjectBuffer.GetLanguageName()))
             {
                 nextCommandHandler();
                 return;
diff --git a/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs b/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs
index f54e8a00d40ab..32d34894b342a 100644
--- a/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs
+++ b/src/EditorFeatures/Core/Shared/Options/FeatureOnOffOptions.cs
@@ -94,9 +94,15 @@ public FeatureOnOffOptions()
             FeatureName, "NavigateAsynchronously", defaultValue: true,
             storageLocation: new RoamingProfileStorageLocation("TextEditor.NavigateAsynchronously"));
 
-        public static readonly PerLanguageOption2<bool?> AddImportsOnPaste = new(
-            FeatureName, "AddImportsOnPaste", defaultValue: null,
-            storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.AddImportsOnPaste"));
+        /// <summary>
+        /// This option was previously "bool?" to accomodate different supported defaults
+        /// that were being provided via remote settings. The feature has stabalized and moved
+        /// to on by default, so the storage location was changed to
+        /// TextEditor.%LANGUAGE%.Specific.AddImportsOnPaste2 (note the 2 suffix).
+        /// </summary>
+        public static readonly PerLanguageOption2<bool> AddImportsOnPaste = new(
+            FeatureName, "AddImportsOnPaste", defaultValue: true,
+            storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.AddImportsOnPaste2"));
 
         public static readonly Option2<bool?> OfferRemoveUnusedReferences = new(
             FeatureName, "OfferRemoveUnusedReferences", defaultValue: true,
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
index ee2694786184a..40e6c100acd26 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -75,13 +75,7 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             BindToOption(SeparateImportGroups, GenerationOptions.SeparateImportDirectiveGroups, LanguageNames.CSharp);
             BindToOption(SuggestForTypesInReferenceAssemblies, SymbolSearchOptionsStorage.SearchReferenceAssemblies, LanguageNames.CSharp);
             BindToOption(SuggestForTypesInNuGetPackages, SymbolSearchOptionsStorage.SearchNuGetPackages, LanguageNames.CSharp);
-            BindToOption(AddUsingsOnPaste, FeatureOnOffOptions.AddImportsOnPaste, LanguageNames.CSharp, () =>
-            {
-                // This option used to be backed by an experimentation flag but is no longer.
-                // Having the option still a bool? keeps us from running into storage related issues,
-                // but if the option was stored as null we want it to respect this default
-                return false;
-            });
+            BindToOption(AddUsingsOnPaste, FeatureOnOffOptions.AddImportsOnPaste, LanguageNames.CSharp);
 
             // Quick Actions
             BindToOption(ComputeQuickActionsAsynchronouslyExperimental, SuggestionsOptions.Asynchronous, () =>
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpAddMissingUsingsOnPaste.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpAddMissingUsingsOnPaste.cs
index 2a2cbc5bad2a6..304eadde5e4d0 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpAddMissingUsingsOnPaste.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpAddMissingUsingsOnPaste.cs
@@ -57,45 +57,6 @@ static void Main(string[] args)
             AssertEx.EqualOrDiff(@"
 using System;
 
-class Program
-{
-    static void Main(string[] args)
-    {
-    }
-
-    Task DoThingAsync() => Task.CompletedTask;
-}", await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken));
-        }
-
-        [IdeFact]
-        public async Task VerifyDisabledWithNull()
-        {
-            var project = ProjectName;
-            await TestServices.SolutionExplorer.AddFileAsync(project, "Example.cs", contents: @"
-public class Example
-{
-}
-", cancellationToken: HangMitigatingCancellationToken);
-            await SetUpEditorAsync(@"
-using System;
-
-class Program
-{
-    static void Main(string[] args)
-    {
-    }
-
-    $$
-}", HangMitigatingCancellationToken);
-
-            var globalOptions = await TestServices.Shell.GetComponentModelServiceAsync<IGlobalOptionService>(HangMitigatingCancellationToken);
-            globalOptions.SetGlobalOption(new OptionKey(FeatureOnOffOptions.AddImportsOnPaste, LanguageNames.CSharp), null);
-
-            await PasteAsync(@"Task DoThingAsync() => Task.CompletedTask;", HangMitigatingCancellationToken);
-
-            AssertEx.EqualOrDiff(@"
-using System;
-
 class Program
 {
     static void Main(string[] args)
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
index 386d61981a952..b9611c52bbf4e 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
@@ -67,13 +67,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             BindToOption(SeparateImportGroups, GenerationOptions.SeparateImportDirectiveGroups, LanguageNames.VisualBasic)
             BindToOption(SuggestForTypesInReferenceAssemblies, SymbolSearchOptionsStorage.SearchReferenceAssemblies, LanguageNames.VisualBasic)
             BindToOption(SuggestForTypesInNuGetPackages, SymbolSearchOptionsStorage.SearchNuGetPackages, LanguageNames.VisualBasic)
-            BindToOption(AddMissingImportsOnPaste, FeatureOnOffOptions.AddImportsOnPaste, LanguageNames.VisualBasic,
-                         Function()
-                             ' This option used to be backed by an experimentation flag but Is no longer.
-                             ' Having the option still a bool? keeps us from running into storage related issues,
-                             ' but if the option was stored as null we want it to respect this default
-                             Return False
-                         End Function)
+            BindToOption(AddMissingImportsOnPaste, FeatureOnOffOptions.AddImportsOnPaste, LanguageNames.VisualBasic)
 
             ' Quick Actions
             BindToOption(ComputeQuickActionsAsynchronouslyExperimental, SuggestionsOptions.Asynchronous,
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb b/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
index 07ce66fec3b03..26bf099e64884 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.OnOff.vb
@@ -125,11 +125,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             End Set
         End Property
 
-        Public Property AddImportsOnPaste As Integer
+        Public Property AddImportsOnPaste As Boolean
             Get
                 Return GetBooleanOption(FeatureOnOffOptions.AddImportsOnPaste)
             End Get
-            Set(value As Integer)
+            Set(value As Boolean)
                 SetBooleanOption(FeatureOnOffOptions.AddImportsOnPaste, value)
             End Set
         End Property

From 45d468d39a2c11b4028ed50cc258a0c5393639dd Mon Sep 17 00:00:00 2001
From: Julien Couvreur <jcouv@users.noreply.github.com>
Date: Fri, 13 May 2022 10:55:28 -0700
Subject: [PATCH 406/413] Relax assertion in SyntheticBoundNodeFactory.Convert
 (#61287)

---
 .../Lowering/SyntheticBoundNodeFactory.cs     |  3 +-
 .../Semantic/Semantics/ColorColorTests.cs     | 39 +++++++++++++++++++
 .../Test/Semantic/Semantics/RecordTests.cs    |  6 +--
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/Compilers/CSharp/Portable/Lowering/SyntheticBoundNodeFactory.cs b/src/Compilers/CSharp/Portable/Lowering/SyntheticBoundNodeFactory.cs
index 0bb67f8d7d8e7..0e80a7df79155 100644
--- a/src/Compilers/CSharp/Portable/Lowering/SyntheticBoundNodeFactory.cs
+++ b/src/Compilers/CSharp/Portable/Lowering/SyntheticBoundNodeFactory.cs
@@ -1298,7 +1298,8 @@ public BoundExpression Convert(TypeSymbol type, BoundExpression arg)
 #endif 
             Conversion c = Compilation.Conversions.ClassifyConversionFromExpression(arg, type, isChecked: false, ref useSiteInfo);
             Debug.Assert(c.Exists);
-            Debug.Assert(useSiteInfo.Diagnostics.IsNullOrEmpty());
+            // The use-site diagnostics should be reported earlier, and we shouldn't get to lowering if they're errors.
+            Debug.Assert(!useSiteInfo.HasErrors);
 
             return Convert(type, arg, c);
         }
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
index 2493a9866c4cb..fd06afe6e76a5 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ColorColorTests.cs
@@ -2117,6 +2117,45 @@ void F()
             main.VerifyEmitDiagnostics(unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning);
         }
 
+        [Fact, WorkItem(61284, "https://github.com/dotnet/roslyn/issues/61284")]
+        public void PatternMatchToBaseTypeWithUseSiteWarningOnBaseType()
+        {
+            string sourceRefLib = @"
+public class Base { }
+";
+
+            var refLib = CreateEmptyCompilation(
+                sourceRefLib,
+                assemblyName: "RefLib",
+                references: new[] { TestMetadata.Net20.mscorlib });
+
+            refLib.VerifyEmitDiagnostics();
+
+            string sourceMain = @"
+public class Derived : Base { }
+class C
+{
+    void M(Derived d)
+    {
+        _ = d is Base b;
+    }
+}
+";
+
+            var main = CreateEmptyCompilation(sourceMain, assemblyName: "Main",
+                references: new MetadataReference[]
+                {
+                    new CSharpCompilationReference(refLib),
+                    TestMetadata.Net451.mscorlib
+                });
+
+            var unifyReferenceWarning =
+                // warning CS1701: Assuming assembly reference 'mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' used by 'RefLib' matches identity 'mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' of 'mscorlib', you may need to supply runtime policy
+                Diagnostic(ErrorCode.WRN_UnifyReferenceMajMin).WithArguments("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "RefLib", "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "mscorlib");
+
+            main.VerifyEmitDiagnostics(unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning, unifyReferenceWarning);
+        }
+
         [WorkItem(19458, "https://github.com/dotnet/roslyn/issues/19458")]
         [Fact]
         public void ObsoleteConstColorColorEnum()
diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
index f872c316c1810..97ddce1d7134f 100644
--- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs
@@ -30313,7 +30313,7 @@ class C2 : I(0)
                 );
         }
 
-        [ConditionalTheory(typeof(NoUsedAssembliesValidation), Reason = "https://github.com/dotnet/roslyn/issues/60060")]
+        [Theory]
         [WorkItem(44902, "https://github.com/dotnet/roslyn/issues/44902")]
         [CombinatorialData]
         public void CrossAssemblySupportingAndNotSupportingCovariantReturns(bool useCompilationReference)
@@ -30326,7 +30326,7 @@ public void CrossAssemblySupportingAndNotSupportingCovariantReturns(bool useComp
 public record C(int I) : B(I);";
 
             var compA = CreateEmptyCompilation(new[] { sourceA, IsExternalInitTypeDefinition }, references: TargetFrameworkUtil.GetReferences(TargetFramework.NetStandard20));
-            compA.VerifyDiagnostics();
+            compA.VerifyEmitDiagnostics();
             Assert.False(compA.Assembly.RuntimeSupportsCovariantReturnsOfClasses);
             var actualMembers = compA.GetMember<NamedTypeSymbol>("C").GetMembers().ToTestDisplayStrings();
             var expectedMembers = new[]
@@ -30354,7 +30354,7 @@ public record C(int I) : B(I);";
 
             // CS1701: Assuming assembly reference '{0}' used by '{1}' matches identity '{2}' of '{3}', you may need to supply runtime policy
             var compB = CreateCompilation(sourceB, references: new[] { refA }, options: TestOptions.ReleaseDll.WithSpecificDiagnosticOptions("CS1701", ReportDiagnostic.Suppress), parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp);
-            compB.VerifyDiagnostics();
+            compB.VerifyEmitDiagnostics();
             Assert.True(compB.Assembly.RuntimeSupportsCovariantReturnsOfClasses);
 
             actualMembers = compB.GetMember<NamedTypeSymbol>("D").GetMembers().ToTestDisplayStrings();

From b4f5814f4c1ca13dd9b204be686d4315c7edb6f1 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Fri, 13 May 2022 22:54:26 +0300
Subject: [PATCH 407/413] Fix several LSP completion kind mappings (#61243)

* Fix several LSP completion kind mappings

* Extension method
---
 .../Protocol/Extensions/ProtocolConversions.cs              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Features/LanguageServer/Protocol/Extensions/ProtocolConversions.cs b/src/Features/LanguageServer/Protocol/Extensions/ProtocolConversions.cs
index a8cef53e8bacf..8ca5de4f61e73 100644
--- a/src/Features/LanguageServer/Protocol/Extensions/ProtocolConversions.cs
+++ b/src/Features/LanguageServer/Protocol/Extensions/ProtocolConversions.cs
@@ -51,18 +51,18 @@ internal static class ProtocolConversions
             { WellKnownTags.Assembly, LSP.CompletionItemKind.File },
             { WellKnownTags.Class, LSP.CompletionItemKind.Class },
             { WellKnownTags.Constant, LSP.CompletionItemKind.Constant },
-            { WellKnownTags.Delegate, LSP.CompletionItemKind.Method },
+            { WellKnownTags.Delegate, LSP.CompletionItemKind.Delegate },
             { WellKnownTags.Enum, LSP.CompletionItemKind.Enum },
             { WellKnownTags.EnumMember, LSP.CompletionItemKind.EnumMember },
             { WellKnownTags.Event, LSP.CompletionItemKind.Event },
-            { WellKnownTags.ExtensionMethod, LSP.CompletionItemKind.Method },
+            { WellKnownTags.ExtensionMethod, LSP.CompletionItemKind.ExtensionMethod },
             { WellKnownTags.Field, LSP.CompletionItemKind.Field },
             { WellKnownTags.Interface, LSP.CompletionItemKind.Interface },
             { WellKnownTags.Intrinsic, LSP.CompletionItemKind.Text },
             { WellKnownTags.Keyword, LSP.CompletionItemKind.Keyword },
             { WellKnownTags.Label, LSP.CompletionItemKind.Text },
             { WellKnownTags.Local, LSP.CompletionItemKind.Variable },
-            { WellKnownTags.Namespace, LSP.CompletionItemKind.Text },
+            { WellKnownTags.Namespace, LSP.CompletionItemKind.Namespace },
             { WellKnownTags.Method, LSP.CompletionItemKind.Method },
             { WellKnownTags.Module, LSP.CompletionItemKind.Module },
             { WellKnownTags.Operator, LSP.CompletionItemKind.Operator },

From 329783d66b1a1ddbf29e73f14b83756593122fa5 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 13 May 2022 13:35:17 -0700
Subject: [PATCH 408/413] Fix issue where we were getting a raw-string in a
 skipped token, causing a crash

---
 .../VirtualChars/CSharpVirtualCharService.cs                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
index cb8d9cbb76bc0..4eaa6b3c9a265 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -78,7 +78,9 @@ protected override VirtualCharSequence TryConvertToVirtualCharsWorker(SyntaxToke
 
                 case SyntaxKind.MultiLineRawStringLiteralToken:
                 case SyntaxKind.UTF8MultiLineRawStringLiteralToken:
-                    return TryConvertMultiLineRawStringToVirtualChars(token, (LiteralExpressionSyntax)token.GetRequiredParent(), tokenIncludeDelimiters: true);
+                    return token.GetRequiredParent() is LiteralExpressionSyntax literalExpression
+                        ? TryConvertMultiLineRawStringToVirtualChars(token, literalExpression, tokenIncludeDelimiters: true)
+                        : default;
 
                 case SyntaxKind.InterpolatedStringTextToken:
                     {

From 97baafb3cde54e3320595a5ce4f60fc584cd8718 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 13 May 2022 13:42:15 -0700
Subject: [PATCH 409/413] Add test

---
 .../CSharpVirtualCharServiceTests.cs          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
index 1ccc396e41439..5808f2cd3a9f4 100644
--- a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
+++ b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -106,6 +106,26 @@ private static bool PrintAsUnicodeEscape(VirtualChar c)
             return true;
         }
 
+        [Fact, WorkItem(61270, "https://github.com/dotnet/roslyn/issues/61270")]
+        public void TestRawStringInSkippedToken()
+        {
+            var text = """"
+                namespace N
+                {
+                    """
+                    goo
+                    """
+                }
+                """";
+
+            var tree = SyntaxFactory.ParseSyntaxTree(text);
+            var compilationUnit = (CompilationUnitSyntax)tree.GetRoot();
+            var namespaceDeclaration = (NamespaceDeclarationSyntax)compilationUnit.Members[0];
+            var skippedTrivia = namespaceDeclaration.OpenBraceToken.TrailingTrivia.Single(t => t.Kind() is SyntaxKind.SkippedTokensTrivia);
+            var virtualChars = CSharpVirtualCharService.Instance.TryConvertToVirtualChars(skippedTrivia.Token);
+            Assert.True(virtualChars.IsDefault);
+        }
+
         [Fact]
         public void TestEmptyString()
             => Test("\"\"", "");

From 6e9ca481390106da9d981cbfccd45e8180dba411 Mon Sep 17 00:00:00 2001
From: "gel@microsoft.com" <gel@microsoft.com>
Date: Fri, 13 May 2022 14:26:29 -0700
Subject: [PATCH 410/413] Add an UWP OptProf test for IDE

---
 eng/config/OptProf.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/eng/config/OptProf.json b/eng/config/OptProf.json
index cc10a99203cf9..f90b671021b6a 100644
--- a/eng/config/OptProf.json
+++ b/eng/config/OptProf.json
@@ -217,6 +217,31 @@
               "testCases":[ "VSPE.OptProfTests.vs_asl_cs_scenario", "VSPE.OptProfTests.vs_perf_DesignTime_solution_loadclose_cs_picasso", "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
             }
           ]
+        },
+        {
+          "container": "XamlOptProf",
+          "filteredTestCases": [
+            {
+              "filename": "/Microsoft.CodeAnalysis.dll",
+              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated" ]
+            },
+            {
+              "filename": "/Microsoft.CodeAnalysis.CSharp.dll",
+              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated" ]
+            },
+            {
+              "filename": "/Microsoft.VisualStudio.LanguageServices.dll",
+              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated" ]
+            },
+            {
+              "filename": "/Microsoft.CodeAnalysis.Features.dll",
+              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated" ]
+            },
+            {
+              "filename": "/Microsoft.CodeAnalysis.Workspaces.dll",
+              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated" ]
+            }
+          ]
         }
       ]
     },

From cfc362e051eaa95bac0a4cda1de21a54d474df8f Mon Sep 17 00:00:00 2001
From: Julien Couvreur <jcouv@users.noreply.github.com>
Date: Fri, 13 May 2022 18:29:06 -0700
Subject: [PATCH 411/413] Add pointer for `AnalysisLevel` to warning waves doc
 (#61196)

---
 docs/compilers/CSharp/Warnversion Warning Waves.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/compilers/CSharp/Warnversion Warning Waves.md b/docs/compilers/CSharp/Warnversion Warning Waves.md
index 5cfca6f920311..8f94acb0964d4 100644
--- a/docs/compilers/CSharp/Warnversion Warning Waves.md	
+++ b/docs/compilers/CSharp/Warnversion Warning Waves.md	
@@ -1,4 +1,4 @@
-# /warn warning "waves"
+# /warn warning "waves"
 
 The C# compiler flag `/warn` controls optional warnings.
 When we introduce new warnings that can be reported on existing code,
@@ -9,6 +9,10 @@ where `n` is a whole number.
 
 The default warning level when the command-line compiler is used is `4`. If you want the compiler to produce all applicable warnings, you can specify `/warn:9999`.
 
+In a typical project, this setting is controlled by the `AnalysisLevel` property,
+which determines the `WarningLevel` property (passed to the `Csc` task).
+For more information on `AnalysisLevel`, see https://devblogs.microsoft.com/dotnet/automatically-find-latent-bugs-in-your-code-with-net-5/
+
 ## Warning level 7
 
 The compiler shipped with .NET 7 (the C# 11 compiler) contains the following warnings which are reported only under `/warn:7` or higher.

From e9a3b3b1f962e5429f9e4084bd44869b6548c361 Mon Sep 17 00:00:00 2001
From: AlFas <AlFasGD@users.noreply.github.com>
Date: Sat, 14 May 2022 04:31:15 +0300
Subject: [PATCH 412/413] Remove parameter null-checking from the Language
 Feature Status list (#61302)

---
 docs/Language Feature Status.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/Language Feature Status.md b/docs/Language Feature Status.md
index f4beddde0c9b6..eb5c3996b4e3a 100644
--- a/docs/Language Feature Status.md	
+++ b/docs/Language Feature Status.md	
@@ -16,7 +16,6 @@ efforts behind them.
 | [auto-default structs](https://github.com/dotnet/csharplang/issues/5737) | main | [Merged into 17.3p1](https://github.com/dotnet/roslyn/issues/60167) | [RikkiGibson](https://github.com/RikkiGibson) | [cston](https://github.com/cston), [jcouv](https://github.com/jcouv) | 
 | [Newlines in interpolations](https://github.com/dotnet/csharplang/issues/4935) | main | [Merged in 17.1p1](https://github.com/dotnet/roslyn/issues/57154) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv), [chsienki](https://github.com/chsienki) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [List patterns](https://github.com/dotnet/csharplang/issues/3435) | [list-patterns](https://github.com/dotnet/roslyn/tree/features/list-patterns) | [Merged in 17.1p2](https://github.com/dotnet/roslyn/issues/51289) | [alrz](https://github.com/alrz) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) |
-| [Parameter null-checking](https://github.com/dotnet/csharplang/issues/2145) | [param-nullchecking](https://github.com/dotnet/roslyn/tree/features/param-nullchecking) | [Merged in 17.1p3](https://github.com/dotnet/roslyn/issues/36024) | [RikkiGibson](https://github.com/RikkiGibson), [fayrose](https://github.com/fayrose) | [cston](https://github.com/cston), [chsienki](https://github.com/chsienki) | [jaredpar](https://github.com/jaredpar) |
 | [Raw string literals](https://github.com/dotnet/csharplang/issues/4304) | [RawStringLiterals](https://github.com/dotnet/roslyn/tree/features/RawStringLiterals) | [Merged into 17.2](https://github.com/dotnet/roslyn/issues/55306) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [Cache delegates for static method group](https://github.com/dotnet/roslyn/issues/5835) | main | [Merged into 17.2](https://github.com/dotnet/roslyn/pull/58288) | [pawchen](https://github.com/pawchen) | [AlekseyTs](https://github.com/AlekseyTs), [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs) |
 | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [Merged into 17.3p2](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) |

From 1102b716c5d9b0e29b2a3eb6e4c1e8f5f3314f78 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramesh <ramkumar.ramesh.8@live.com>
Date: Sat, 14 May 2022 22:11:53 +0530
Subject: [PATCH 413/413] [EE] Implement IDkmClrFullNameProvider2 in Roslyn's
 ResultProvider Formatter. (#60522)

* Implement IDkmClrFullNameProvider2 in Roslyn's ResultProvider Formatter.

Issue:
- Debugger added IDkmClrFullNameProvider2 API with https://devdiv.visualstudio.com/DevDiv/_git/Concord/pullrequest/301518
- It is currently temporarily implement in Concord, needs to be implemented in Roslyn so implementation can be removed from Concord.

Changes:
1. Formatter:
- Implement IDkmClrFullNameProvider2. It has 2 methods, one to format local names and the other given field metadata.
- Currently only implemented for C#. I'm not that familiar with VB and the GeneratedNames stuff in VB needs some splitting and moving around to get working.

2. Unit tests:
- Add unit tests for the common cases of hoisted locals, synthesized locals, etc.

3. Versions.props:
Update MicrosoftVSSDKVSDConfigToolVersion to a newer version which recognizes IDkmClrFullNameProvider2.

* PR feedback - fix casing of MetadataImport

* PR feedback - move GetOriginalLocalVariableName, GetOriginalFieldName back to CSharpFormatter

Co-authored-by: Ramkumar Ramesh <ramram@microsoft.com>
---
 eng/Versions.props                            |   2 +-
 .../Source/ResultProvider/CSharpFormatter.cs  |  23 ++
 .../CSharpResultProvider.projitems            |  14 +-
 .../CSharpResultProvider.vsdconfigxml         |   1 +
 .../Test/ResultProvider/FullNameTests.cs      |  73 ++++
 .../Core/Source/ResultProvider/Formatter.cs   |  35 +-
 .../Debugger/Engine/DkmClrLocalVariable.cs    |  23 ++
 .../Debugger/Engine/DkmClrMethodId.cs         |  91 +++++
 .../Debugger/Engine/DkmClrModuleInstance.cs   | 362 ++++++++++++++++++
 .../Debugger/Engine/DkmClrRuntimeInstance.cs  |   3 +
 .../Debugger/Engine/DkmILRange.cs             |  28 ++
 .../Engine/IDkmClrFullNameProvider2.cs        |  32 ++
 .../ResultProvider/VisualBasicFormatter.vb    |  10 +
 13 files changed, 692 insertions(+), 5 deletions(-)
 create mode 100644 src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrLocalVariable.cs
 create mode 100644 src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrMethodId.cs
 create mode 100644 src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmILRange.cs
 create mode 100644 src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/IDkmClrFullNameProvider2.cs

diff --git a/eng/Versions.props b/eng/Versions.props
index 195af52d3604b..fc5ad636a327e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -244,7 +244,7 @@
     <UIAComWrapperVersion>1.1.0.14</UIAComWrapperVersion>
     <MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.0.1056-Dev17PIAs-g9dffd635</MicrosoftVSSDKBuildToolsVersion>
-    <MicrosoftVSSDKVSDConfigToolVersion>16.0.2032702</MicrosoftVSSDKVSDConfigToolVersion>
+    <MicrosoftVSSDKVSDConfigToolVersion>17.0.1051901-preview</MicrosoftVSSDKVSDConfigToolVersion>
     <VsWebsiteInteropVersion>8.0.50727</VsWebsiteInteropVersion>
     <vswhereVersion>2.4.1</vswhereVersion>
     <XamarinMacVersion>1.0.0</XamarinMacVersion>
diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpFormatter.cs b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpFormatter.cs
index 70ed67b5b6bca..48c977e37764d 100644
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpFormatter.cs
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpFormatter.cs
@@ -5,6 +5,7 @@
 #nullable disable
 
 using System.Collections.ObjectModel;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.ExpressionEvaluator;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Type = Microsoft.VisualStudio.Debugger.Metadata.Type;
@@ -47,6 +48,28 @@ internal override string TrimAndGetFormatSpecifiers(string expression, out ReadO
             return RemoveLeadingAndTrailingContent(expression, 0, expression.Length, IsWhitespace, ch => ch == ';' || IsWhitespace(ch));
         }
 
+        internal override string GetOriginalLocalVariableName(string name)
+        {
+            if (!GeneratedNameParser.TryParseGeneratedName(name, out _, out var openBracketOffset, out var closeBracketOffset))
+            {
+                return name;
+            }
+
+            var result = name.Substring(openBracketOffset + 1, closeBracketOffset - openBracketOffset - 1);
+            return result;
+        }
+
+        internal override string GetOriginalFieldName(string name)
+        {
+            if (!GeneratedNameParser.TryParseGeneratedName(name, out _, out var openBracketOffset, out var closeBracketOffset))
+            {
+                return name;
+            }
+
+            var result = name.Substring(openBracketOffset + 1, closeBracketOffset - openBracketOffset - 1);
+            return result;
+        }
+
         private static string RemoveComments(string expression)
         {
             var pooledBuilder = PooledStringBuilder.GetInstance();
diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems
index b7fbc47c43aee..4a1ab9087b7cb 100644
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems
@@ -16,10 +16,18 @@
     <Compile Include="$(MSBuildThisFileDirectory)CSharpFormatter.Values.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CSharpFormatter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CSharpResultProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\CSharp\Portable\Symbols\Synthesized\GeneratedNameConstants.cs">
+      <Link>Compiler\Symbols\Synthesized\GeneratedNameConstants.cs</Link>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\CSharp\Portable\Symbols\Synthesized\GeneratedNameKind.cs">
+      <Link>Compiler\Symbols\Synthesized\GeneratedNameKind.cs</Link>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\..\Compilers\CSharp\Portable\Symbols\Synthesized\GeneratedNameParser.cs">
+      <Link>Compiler\Symbols\Synthesized\GeneratedNameParser.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <VsdConfigXmlFiles Include="$(MSBuildThisFileDirectory)CSharpResultProvider.vsdconfigxml">
-      <SubType>Designer</SubType>
-    </VsdConfigXmlFiles>
+    <VsdConfigXmlFiles Include="$(MSBuildThisFileDirectory)CSharpResultProvider.vsdconfigxml" />
+    <None Include="$(MSBuildThisFileDirectory)CSharpResultProvider.vsdconfigxml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.vsdconfigxml b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.vsdconfigxml
index ee70103ebd240..23c9a8edffb40 100644
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.vsdconfigxml
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.vsdconfigxml
@@ -27,6 +27,7 @@
           <Interface Name="IDkmClrFormatter"/>
           <Interface Name="IDkmClrFormatter2"/>
           <Interface Name="IDkmClrFullNameProvider"/>
+          <Interface Name="IDkmClrFullNameProvider2"/>
         </InterfaceGroup>
       </Implements>
     </Class>
diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs
index 79d4af226b5d8..733566a3afc95 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs
@@ -909,5 +909,78 @@ .method public hidebysig specialname rtspecialname instance void  .ctor() cil ma
             Verify(GetChildren(children.Single()),
                 EvalResult("x", "0", "int", fullName: null));
         }
+
+        [Fact]
+        public void MangledName_SimplifySynthesizedLocalName()
+        {
+            IDkmClrFullNameProvider2 fullNameProvider = new CSharpFormatter();
+            var inspectionContext = CreateDkmInspectionContext();
+            // The synthesized locals name should just become an empty string since it's compiler generated.
+            Assert.Equal(string.Empty, fullNameProvider.GetClrNameForLocalVariable(inspectionContext, null, default, default, new DkmClrLocalVariable("CS$<>8__locals0")));
+        }
+
+        [Fact]
+        public void MangledName_SimplifyThisProxyField()
+        {
+            var il = @"
+.class public C
+{
+  .field public object '<>4__this'
+}
+";
+            ImmutableArray<byte> assemblyBytes;
+            ImmutableArray<byte> pdbBytes;
+            CSharpTestBase.EmitILToArray(il, appendDefaultHeader: true, includePdb: false, assemblyBytes: out assemblyBytes, pdbBytes: out pdbBytes);
+            var assembly = ReflectionUtilities.Load(assemblyBytes);
+
+            var fieldToken = assembly.GetType("C").GetFields().First().MetadataToken;
+
+            IDkmClrFullNameProvider2 fullNameProvider = new CSharpFormatter();
+            var inspectionContext = CreateDkmInspectionContext();
+            // The stashed <>4__this should just become an empty string since it's compiler generated.
+            Assert.Equal(string.Empty, fullNameProvider.GetClrNameForField(inspectionContext, new DkmClrRuntimeInstance(assembly).Modules[0], fieldToken));
+        }
+
+        [Fact]
+        public void MangledName_SimplifyHoistedLocal()
+        {
+            var il = @"
+.class public C
+{
+  .field public object '<myClass>5__1'
+}
+";
+            ImmutableArray<byte> assemblyBytes;
+            ImmutableArray<byte> pdbBytes;
+            CSharpTestBase.EmitILToArray(il, appendDefaultHeader: true, includePdb: false, assemblyBytes: out assemblyBytes, pdbBytes: out pdbBytes);
+            var assembly = ReflectionUtilities.Load(assemblyBytes);
+
+            var fieldToken = assembly.GetType("C").GetFields().First().MetadataToken;
+
+            IDkmClrFullNameProvider2 fullNameProvider = new CSharpFormatter();
+            var inspectionContext = CreateDkmInspectionContext();
+            Assert.Equal("myClass", fullNameProvider.GetClrNameForField(inspectionContext, new DkmClrRuntimeInstance(assembly).Modules[0], fieldToken));
+        }
+
+        [Fact]
+        public void MangledName_SimplifyBackingField()
+        {
+            var il = @"
+.class public C
+{
+  .field public object '<StringProperty>k__BackingField'
+}
+";
+            ImmutableArray<byte> assemblyBytes;
+            ImmutableArray<byte> pdbBytes;
+            CSharpTestBase.EmitILToArray(il, appendDefaultHeader: true, includePdb: false, assemblyBytes: out assemblyBytes, pdbBytes: out pdbBytes);
+            var assembly = ReflectionUtilities.Load(assemblyBytes);
+
+            var fieldToken = assembly.GetType("C").GetFields().First().MetadataToken;
+
+            IDkmClrFullNameProvider2 fullNameProvider = new CSharpFormatter();
+            var inspectionContext = CreateDkmInspectionContext();
+            Assert.Equal("StringProperty", fullNameProvider.GetClrNameForField(inspectionContext, new DkmClrRuntimeInstance(assembly).Modules[0], fieldToken));
+        }
     }
 }
diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Formatter.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Formatter.cs
index 4e065bf34ae16..2abd33f9ac74e 100644
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Formatter.cs
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Formatter.cs
@@ -11,6 +11,8 @@
 using System.Diagnostics;
 using System.Text;
 using Microsoft.CodeAnalysis.PooledObjects;
+using Microsoft.MetadataReader;
+using Microsoft.VisualStudio.Debugger;
 using Microsoft.VisualStudio.Debugger.Clr;
 using Microsoft.VisualStudio.Debugger.ComponentInterfaces;
 using Microsoft.VisualStudio.Debugger.Evaluation;
@@ -22,7 +24,7 @@ namespace Microsoft.CodeAnalysis.ExpressionEvaluator
     /// <summary>
     /// Computes string representations of <see cref="DkmClrValue"/> instances.
     /// </summary>
-    internal abstract partial class Formatter : IDkmClrFormatter, IDkmClrFormatter2, IDkmClrFullNameProvider
+    internal abstract partial class Formatter : IDkmClrFormatter, IDkmClrFormatter2, IDkmClrFullNameProvider, IDkmClrFullNameProvider2
     {
         private readonly string _defaultFormat;
         private readonly string _nullString;
@@ -173,6 +175,34 @@ string IDkmClrFullNameProvider.GetClrExpressionForThis(DkmInspectionContext insp
             return _thisString;
         }
 
+        string IDkmClrFullNameProvider2.GetClrNameForLocalVariable(DkmInspectionContext inspectionContext, DkmClrModuleInstance moduleInstance, DkmClrMethodId methodId, DkmILRange iLRange, DkmClrLocalVariable localVariable)
+        {
+            return GetOriginalLocalVariableName(localVariable.Name);
+        }
+
+        string IDkmClrFullNameProvider2.GetClrNameForField(DkmInspectionContext inspectionContext, DkmClrModuleInstance moduleInstance, int fieldToken)
+        {
+            var import = (IMetadataImport)moduleInstance.GetMetaDataImport();
+
+            // Just get some of information about properties. Get rest later only if needed.
+            int hr = import.GetFieldProps(fieldToken, out _, null, 0, out var nameLength, out _, out _, out _, out _, out _, out _);
+            const int S_OK = 0;
+            if (hr != S_OK)
+            {
+                throw new ArgumentException("Invalid field token.", nameof(fieldToken));
+            }
+
+            var sb = new StringBuilder(nameLength);
+            hr = import.GetFieldProps(fieldToken, out _, sb, sb.Capacity, out _, out _, out _, out _, out _, out _, out _);
+            if (hr != S_OK)
+            {
+                throw new DkmException((DkmExceptionCode)hr);
+            }
+
+            string metadataName = sb.ToString();
+            return GetOriginalFieldName(metadataName);
+        }
+
         // CONSIDER: If the number or complexity of the "language-specific syntax helpers" grows (or if
         // we make this a public API, it would be good to consider abstracting them into a separate object
         // that can be passed to the ResultProvider on construction (a "LanguageSyntax" service of sorts).
@@ -188,6 +218,9 @@ string IDkmClrFullNameProvider.GetClrExpressionForThis(DkmInspectionContext insp
 
         internal abstract bool IsWhitespace(char c);
 
+        internal abstract string GetOriginalLocalVariableName(string name);
+        internal abstract string GetOriginalFieldName(string name);
+
         // Note: We could be less conservative (e.g. "new C()").
         private bool NeedsParentheses(string expr)
         {
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrLocalVariable.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrLocalVariable.cs
new file mode 100644
index 0000000000000..7225d50cc5cf0
--- /dev/null
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrLocalVariable.cs
@@ -0,0 +1,23 @@
+// 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
+
+#region Assembly Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+// References\Debugger\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll
+
+#endregion
+
+namespace Microsoft.VisualStudio.Debugger.Clr
+{
+    public class DkmClrLocalVariable
+    {
+        public string Name { get; }
+
+        internal DkmClrLocalVariable(string name)
+        {
+            Name = name;
+        }
+    }
+}
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrMethodId.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrMethodId.cs
new file mode 100644
index 0000000000000..aa6a33ac17012
--- /dev/null
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrMethodId.cs
@@ -0,0 +1,91 @@
+// 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
+
+#region Assembly Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+// References\Debugger\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll
+
+#endregion
+
+using System;
+
+namespace Microsoft.VisualStudio.Debugger.Clr
+{
+    public struct DkmClrMethodId : IComparable<DkmClrMethodId>, IEquatable<DkmClrMethodId>
+    {
+        public int CompareTo(DkmClrMethodId other)
+        {
+            if (this.Token != other.Token)
+            {
+                if (this.Token < other.Token)
+                    return -1;
+                else
+                    return 1;
+            }
+            if (this.Version != other.Version)
+            {
+                if (this.Version < other.Version)
+                    return -1;
+                else
+                    return 1;
+            }
+            return 0;
+        }
+
+        public bool Equals(DkmClrMethodId other)
+        {
+            return (this.CompareTo(other) == 0);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is DkmClrMethodId && Equals((DkmClrMethodId)obj);
+        }
+
+        public static bool operator !=(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) != 0;
+        }
+
+        public static bool operator ==(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) == 0;
+        }
+
+        public static bool operator >(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) > 0;
+        }
+
+        public static bool operator <(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) < 0;
+        }
+
+        public static bool operator >=(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) >= 0;
+        }
+
+        public static bool operator <=(DkmClrMethodId element0, DkmClrMethodId element1)
+        {
+            return element0.CompareTo(element1) <= 0;
+        }
+        public override int GetHashCode()
+        {
+            return Token ^ ((int)Version);
+        }
+
+        public readonly int Token;
+
+        public readonly uint Version;
+
+        public DkmClrMethodId(int Token, uint Version)
+        {
+            this.Token = Token;
+            this.Version = Version;
+        }
+    }
+}
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs
index b6940815f033d..7085d069cee6d 100644
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs
@@ -10,12 +10,15 @@
 #endregion
 
 using Microsoft.CodeAnalysis.ExpressionEvaluator;
+using Microsoft.MetadataReader;
 using Microsoft.VisualStudio.Debugger.Symbols;
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Adds;
+using System.Text;
 using System.Threading;
 
 namespace Microsoft.VisualStudio.Debugger.Clr
@@ -66,5 +69,364 @@ internal int ResolveTypeNameFailures
         {
             get { return _resolveTypeNameFailures; }
         }
+
+        public object GetMetaDataImport() => new MetadataImportMock(Assembly);
+
+        private class MetadataImportMock : IMetadataImport
+        {
+            private readonly Assembly _assembly;
+            public MetadataImportMock(Assembly assembly)
+            {
+                _assembly = assembly;
+            }
+
+            int IMetadataImport.GetFieldProps(int mb, out int mdTypeDef, StringBuilder szField, int cchField, out int pchField, out FieldAttributes pdwAttr, out EmbeddedBlobPointer ppvSigBlob, out int pcbSigBlob, out int pdwCPlusTypeFlab, out IntPtr ppValue, out int pcchValue)
+            {
+                mdTypeDef = default;
+                pchField = default;
+                pdwAttr = default;
+                ppvSigBlob = default;
+                pcbSigBlob = default;
+                pdwCPlusTypeFlab = default;
+                ppValue = default;
+                pcchValue = default;
+
+                // Iterate over all types in the assembly to find the field matching the token.
+                foreach (var type in _assembly.GetTypes())
+                {
+                    foreach (var field in type.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
+                    {
+                        // Found a match.
+                        if (field.MetadataToken == mb)
+                        {
+                            var fieldName = field.Name;
+                            pchField = fieldName.Length;
+
+                            if (szField != null && cchField != 0)
+                            {
+                                if (cchField < pchField)
+                                {
+                                    return -1;
+                                }
+
+                                szField.Append(fieldName);
+                            }
+
+                            return 0;
+                        }
+                    }
+                }
+
+                return 1;
+            }
+
+            #region IMetadataImport - throws NotImplementedException
+            void IMetadataImport.CloseEnum(IntPtr hEnum)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.CountEnum(HCORENUM hEnum, out int pulCount)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.ResetEnum(HCORENUM hEnum, int ulPos)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumTypeDefs(ref HCORENUM phEnum, out int rTypeDefs, uint cMax, out uint pcTypeDefs)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumInterfaceImpls(ref HCORENUM phEnum, int td, out int rImpls, int cMax, ref int pcImpls)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumTypeRefs(ref HCORENUM phEnum, int[] td, uint cMax, uint pcTypeRefs)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindTypeDefByName(string szTypeDef, int tkEnclosingClass, out int token)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetScopeProps(StringBuilder szName, int cchName, out int pchName, out Guid mvid)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetModuleFromScope(out int mdModule)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetTypeDefProps(int td, StringBuilder szTypeDef, int cchTypeDef, out int pchTypeDef, out TypeAttributes pdwTypeDefFlags, out int ptkExtends)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetInterfaceImplProps(int iiImpl, out int pClass, out int ptkIface)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetTypeRefProps(int tr, out int ptkResolutionScope, StringBuilder szName, int cchName, out int pchName)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.ResolveTypeRef(int tr, ref Guid riid, out object ppIScope)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMembers(ref uint phEnum, uint cl, uint[] rMembers, uint cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMembersWithName(ref uint phEnum, uint cl, string szName, uint[] rMembers, uint cMax, ref uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMethods(ref HCORENUM phEnum, int cl, out int mdMethodDef, int cMax, out int pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMethodsWithName(ref HCORENUM phEnum, int cl, string szName, out int mdMethodDef, int cMax, out int pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumFields(ref HCORENUM phEnum, int cl, out int mdFieldDef, int cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumFieldsWithName(ref uint phEnum, uint cl, string szName, uint[] rFields, uint cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumParams(ref HCORENUM phEnum, int mdMethodDef, int[] rParams, int cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMemberRefs(ref uint phEnum, uint tkParent, uint[] rMemberRefs, uint cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMethodImpls(ref HCORENUM hEnum, Token typeDef, out Token methodBody, out Token methodDecl, int cMax, out int cTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumPermissionSets(ref HCORENUM hEnum, uint tk, uint dwActions, uint[] rPermission, ref uint cMax)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindMember(int typeDefToken, string szName, byte[] pvSigBlob, int cbSigBlob, out int memberDefToken)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindMethod(int typeDef, string szName, EmbeddedBlobPointer pvSigBlob, int cbSigBlob, out int methodDef)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindField(int typeDef, string szName, byte[] pvSigBlob, int cbSigBlob, out int fieldDef)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindMemberRef(int typeRef, string szName, byte[] pvSigBlob, int cbSigBlob, out int result)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetMethodProps(uint md, out int pClass, StringBuilder szMethod, int cchMethod, out uint pchMethod, out MethodAttributes pdwAttr, out EmbeddedBlobPointer ppvSigBlob, out uint pcbSigBlob, out uint pulCodeRVA, out uint pdwImplFlags)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetMemberRefProps(Token mr, out Token ptk, StringBuilder szMember, int cchMember, out uint pchMember, out EmbeddedBlobPointer ppvSigBlob, out uint pbSig)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumProperties(ref HCORENUM phEnum, int td, out int mdFieldDef, int cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumEvents(ref HCORENUM phEnum, int td, out int mdFieldDef, int cMax, out uint pcEvents)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetEventProps(int ev, out int pClass, StringBuilder szEvent, int cchEvent, out int pchEvent, out int pdwEventFlags, out int ptkEventType, out int pmdAddOn, out int pmdRemoveOn, out int pmdFire, out int rmdOtherMethod, uint cMax, out uint pcOtherMethod)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumMethodSemantics(ref uint phEnum, uint mb, uint[] rEventProp, uint cMax, out uint pcEventProp)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetMethodSemantics(uint mb, uint tkEventProp, out uint pdwSemanticsFlags)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetClassLayout(int typeDef, out uint dwPackSize, COR_FIELD_OFFSET[] rFieldOffset, uint cMax, out uint cFieldOffset, out uint ulClassSize)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetFieldMarshal(int tk, out IntPtr ppvNativeType, out int pcbNativeType)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetRVA(int token, out uint rva, out uint flags)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetPermissionSetProps(uint pm, out uint pdwAction, out IntPtr ppvPermission, out int pcbPermission)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetSigFromToken(int token, out EmbeddedBlobPointer pSig, out int cbSig)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetModuleRefProps(int mur, StringBuilder szName, int cchName, out int pchName)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumModuleRefs(ref HCORENUM phEnum, out int mdModuleRef, int cMax, out uint pcModuleRefs)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetTypeSpecFromToken(Token typeSpec, out EmbeddedBlobPointer pSig, out int cbSig)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetNameFromToken(uint tk, string pszUtf8NamePtr)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumUnresolvedMethods(ref uint phEnum, uint[] rMethods, uint cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetUserString(int stk, char[] szString, int cchString, out int pchString)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetPinvokeMap(uint tk, out uint pdwMappingFlags, StringBuilder szImportName, uint cchImportName, out uint pchImportName, out int pmrImportDLL)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumSignatures(ref uint phEnum, uint[] rSignatures, uint cmax, out uint pcSignatures)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumTypeSpecs(ref uint phEnum, uint[] rTypeSpecs, uint cmax, out uint pcTypeSpecs)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumUserStrings(ref uint phEnum, uint[] rStrings, uint cmax, out uint pcStrings)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetParamForMethodIndex(uint md, uint ulParamSeq, out uint pParam, out int ppd)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.EnumCustomAttributes(ref HCORENUM phEnum, int tk, int tkType, out Token mdCustomAttribute, uint cMax, out uint pcTokens)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetCustomAttributeProps(Token cv, out Token tkObj, out Token tkType, out EmbeddedBlobPointer blob, out int cbSize)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.FindTypeRef(int tkResolutionScope, string szName, out int typeRef)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetMemberProps(uint mb, out uint pClass, StringBuilder szMember, uint cchMember, out uint pchMember, out uint pdwAttr, out IntPtr ppvSigBlob, out uint pcbSigBlob, out uint pulCodeRVA, out uint pdwImplFlags, out uint pdwCPlusTypeFlag, out IntPtr ppValue, out uint pcchValue)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetPropertyProps(Token prop, out Token pClass, StringBuilder szProperty, int cchProperty, out int pchProperty, out PropertyAttributes pdwPropFlags, out EmbeddedBlobPointer ppvSig, out int pbSig, out int pdwCPlusTypeFlag, out UnusedIntPtr ppDefaultValue, out int pcchDefaultValue, out Token pmdSetter, out Token pmdGetter, out Token rmdOtherMethod, uint cMax, out uint pcOtherMethod)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetParamProps(int tk, out int pmd, out uint pulSequence, StringBuilder szName, uint cchName, out uint pchName, out uint pdwAttr, out uint pdwCPlusTypeFlag, out UnusedIntPtr ppValue, out uint pcchValue)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetCustomAttributeByName(int tkObj, string szName, out EmbeddedBlobPointer ppData, out uint pcbData)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IMetadataImport.IsValidToken(uint tk)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetNestedClassProps(int tdNestedClass, out int tdEnclosingClass)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.GetNativeCallConvFromSig(IntPtr pvSig, uint cbSig, out uint pCallConv)
+            {
+                throw new NotImplementedException();
+            }
+
+            int IMetadataImport.IsGlobal(uint pd, out int pbGlobal)
+            {
+                throw new NotImplementedException();
+            }
+
+            #endregion
+        }
     }
 }
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrRuntimeInstance.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrRuntimeInstance.cs
index f3d7a6fab89d9..dcbaba8b660e7 100644
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrRuntimeInstance.cs
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrRuntimeInstance.cs
@@ -37,6 +37,9 @@ public class DkmClrRuntimeInstance : DkmRuntimeInstance
         private readonly Dictionary<string, DkmClrObjectFavoritesInfo> _favoritesByTypeName;
         internal readonly GetMemberValueDelegate GetMemberValue;
 
+        internal DkmClrRuntimeInstance(Assembly assembly) : this(new[] { assembly })
+        { }
+
         internal DkmClrRuntimeInstance(
             Assembly[] assemblies,
             GetModuleDelegate getModule = null,
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmILRange.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmILRange.cs
new file mode 100644
index 0000000000000..d99a20bc9a3c4
--- /dev/null
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmILRange.cs
@@ -0,0 +1,28 @@
+// 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
+
+#region Assembly Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+// References\Debugger\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll
+
+#endregion
+
+using System;
+
+namespace Microsoft.VisualStudio.Debugger.Clr
+{
+    public struct DkmILRange
+    {
+        public readonly uint StartOffset;
+
+        public readonly uint EndOffset;
+
+        public DkmILRange(uint StartOffset, uint EndOffset)
+        {
+            this.StartOffset = StartOffset;
+            this.EndOffset = EndOffset;
+        }
+    }
+}
diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/IDkmClrFullNameProvider2.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/IDkmClrFullNameProvider2.cs
new file mode 100644
index 0000000000000..73909819d14b8
--- /dev/null
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/IDkmClrFullNameProvider2.cs
@@ -0,0 +1,32 @@
+// 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
+
+#region Assembly Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+// References\Debugger\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll
+#endregion
+
+using System.Collections.ObjectModel;
+using Microsoft.VisualStudio.Debugger.Clr;
+using Microsoft.VisualStudio.Debugger.Evaluation;
+using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation;
+
+namespace Microsoft.VisualStudio.Debugger.ComponentInterfaces
+{
+    public interface IDkmClrFullNameProvider2
+    {
+        string GetClrNameForLocalVariable(
+            DkmInspectionContext inspectionContext,
+            DkmClrModuleInstance moduleInstance,
+            DkmClrMethodId methodId,
+            DkmILRange ilRange,
+            DkmClrLocalVariable localVariable);
+
+        string GetClrNameForField(
+            DkmInspectionContext inspectionContext,
+            DkmClrModuleInstance moduleInstance,
+            int fieldToken);
+    }
+}
diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/VisualBasicFormatter.vb b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/VisualBasicFormatter.vb
index 176141a0807e9..75f3892a1a40d 100644
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/VisualBasicFormatter.vb
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/VisualBasicFormatter.vb
@@ -49,6 +49,16 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
             Return RemoveLeadingAndTrailingWhitespace(expression)
         End Function
 
+        ' TODO https://github.com/dotnet/roslyn/issues/60581
+        Friend Overrides Function GetOriginalLocalVariableName(name As String) As String
+            Return name
+        End Function
+
+        ' TODO Implement this VB. https://github.com/dotnet/roslyn/issues/60581
+        Friend Overrides Function GetOriginalFieldName(name As String) As String
+            Return name
+        End Function
+
         Private Shared Function RemoveComments(expression As String) As String
             ' Workaround for https://dev.azure.com/devdiv/DevDiv/_workitems/edit/847849
             ' Do not remove any comments that might be in a string.