diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 9a4458ff7537c..7c204fad33abc 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -43,9 +43,9 @@
-
-
-
+
+
+
@@ -88,32 +88,32 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
diff --git a/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs b/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
index de4f0a5eb0dcc..d14ce4996f855 100644
--- a/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
+++ b/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
@@ -83,7 +83,7 @@ Task ISettingsManagerHost5.GetServiceStreamAsync(string serviceMoniker,
throw new NotImplementedException();
}
- private sealed class StringStorage : IStringStorage, IAsyncStringStorage
+ private sealed class StringStorage : IStringStorage2, IAsyncStringStorage
{
private ImmutableDictionary _values = ImmutableDictionary.Empty;
private PropertyChangedEventHandler? _propertyChanged;
@@ -179,5 +179,10 @@ Task IAsyncStringStorage.SetAsync(NamedVersionedString valu
{
throw new NotImplementedException();
}
+
+ void IStringStorage2.ForEachSettingNameStartingWith(string prefix, CharSpanProcessorDelegate processFunc)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/src/VisualStudio/CSharp/Impl/CSharpPackage.cs b/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
index 78177323fcaa7..ccae4e77195f6 100644
--- a/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
+++ b/src/VisualStudio/CSharp/Impl/CSharpPackage.cs
@@ -53,6 +53,7 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.LanguageService
[ProvideLanguageEditorOptionPage(typeof(Options.Formatting.FormattingSpacingPage), "CSharp", @"Code Style\Formatting", "Spacing", pageNameResourceId: "#112", keywordListResourceId: 310)]
[ProvideLanguageEditorOptionPage(typeof(Options.NamingStylesOptionPage), "CSharp", @"Code Style", "Naming", pageNameResourceId: "#115", keywordListResourceId: 314)]
[ProvideLanguageEditorOptionPage(typeof(Options.IntelliSenseOptionPage), "CSharp", null, "IntelliSense", pageNameResourceId: "#103", keywordListResourceId: 312)]
+ [ProvideSettingsManifest(PackageRelativeManifestFile = @"UnifiedSettings\csharpSettings.registration.json")]
[Guid(Guids.CSharpPackageIdString)]
internal sealed class CSharpPackage : AbstractPackage, IVsUserSettingsQuery
{
diff --git a/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj b/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
index c5cfdf4c133f7..6ff52d800af00 100644
--- a/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
+++ b/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
@@ -18,6 +18,7 @@
+
diff --git a/src/VisualStudio/CSharp/Impl/PackageRegistration.pkgdef b/src/VisualStudio/CSharp/Impl/PackageRegistration.pkgdef
index 1a7f62519f085..ee45c4813cee4 100644
--- a/src/VisualStudio/CSharp/Impl/PackageRegistration.pkgdef
+++ b/src/VisualStudio/CSharp/Impl/PackageRegistration.pkgdef
@@ -192,3 +192,10 @@
"Package"="{13C3BBB4-F18F-4111-9F54-A0FB010D9194}"
"SortPriority"=dword:00000064
@="Microsoft Visual C#"
+
+// CacheTag value should be changed when registration file changes
+// See https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/39345/Manifest-Build-Deployment-and-Setup-Authoring-In-Depth?anchor=example-pkgdef-key for more infomation
+[$RootKey$\SettingsManifests\{13c3bbb4-f18f-4111-9f54-a0fb010d9194}]
+@="Microsoft.VisualStudio.LanguageServices.CSharp.LanguageService.CSharpPackage"
+"ManifestPath"="$PackageFolder$\UnifiedSettings\csharpSettings.registration.json"
+"CacheTag"=qword:08DC1824DFE0117B
diff --git a/src/VisualStudio/Setup/UnifiedSettings/csharpIntellisenseSettings.registration.json b/src/VisualStudio/CSharp/Impl/UnifiedSettings/csharpSettings.registration.json
similarity index 96%
rename from src/VisualStudio/Setup/UnifiedSettings/csharpIntellisenseSettings.registration.json
rename to src/VisualStudio/CSharp/Impl/UnifiedSettings/csharpSettings.registration.json
index 2253fef5a7a06..a5a62ad827f35 100644
--- a/src/VisualStudio/Setup/UnifiedSettings/csharpIntellisenseSettings.registration.json
+++ b/src/VisualStudio/CSharp/Impl/UnifiedSettings/csharpSettings.registration.json
@@ -1,3 +1,7 @@
+// NOTE:
+// When this file is changed. Please also update the cache tag under settings entry in src/VisualStudio/CSharp/Impl/PackageRegistration.pkgdef
+// Otherwise your change might be ignored.
+// See https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/39345/Manifest-Build-Deployment-and-Setup-Authoring-In-Depth?anchor=example-pkgdef-key for more details
{
"properties": {
// CompletionOptionsStorage.TriggerOnTypingLetters
diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
index 9af768dba8071..ee3c8f5f5dc30 100644
--- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
+++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -347,7 +347,6 @@
true
false
-