Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Remove the EditorFeatures.Wpf dependency from Remote.ServiceHub #45115

Merged
merged 3 commits into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Downloading_index_failed" xml:space="preserve">
<value>Downloading index failed</value>
</data>
<data name="Downloading_index_failed_0" xml:space="preserve">
<value>Downloading index failed:{0}</value>
</data>
<data name="Downloading_IntelliSense_index_for_0" xml:space="preserve">
<value>Downloading IntelliSense index for {0}</value>
</data>
<data name="Regex_Comment" xml:space="preserve">
<value>Regex - Comment</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="$(MicrosoftVisualStudioLanguageStandardClassificationVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisenseVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MicrosoftVisualStudioTextUIWpfVersion)" />
<PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="$(MicrosoftVisualStudioSDKEmbedInteropTypesVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
</ItemGroup>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Index se nepodařilo stáhnout.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Index se nepodařilo stáhnout: {0}.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Stahuje se index IntelliSense pro {0}.</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Shromažďují se návrhy – {0}.</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Fehler beim Herunterladen des Index.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Fehler beim Herunterladen von Index: {0}.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Der IntelliSense-Index für "{0}" wird heruntergeladen.</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Vorschläge werden gesammelt: "{0}"</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Error al descargar el índice.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Error al descargar el índice: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Descargando el índice de IntelliSense para {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Recopilando sugerencias: "{0}"</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Échec du téléchargement de l'index</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Échec du téléchargement de l'index : {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Téléchargement de l'index IntelliSense pour {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Collecte des suggestions - '{0}'</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Il download dell'indice non è riuscito</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Il download dell'indice non è riuscito: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Download dell'indice IntelliSense per {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Raccolta dei suggerimenti - '{0}'</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">インデックスのダウンロードに失敗しました</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">インデックスのダウンロードに失敗しました: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0} の IntelliSense インデックスをダウンロードしています</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">提案を収集しています - '{0}'</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">인덱스를 다운로드하지 못했습니다.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">인덱스 다운로드 실패:{0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0}의 IntelliSense 인덱스 다운로드 중</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">제안을 수집하는 중 - '{0}'</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Pobieranie indeksu nie powiodło się</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Pobieranie indeksu nie powiodło się: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Pobieranie indeksu funkcji IntelliSense dla {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Zbieranie sugestii — „{0}”</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Falha ao baixar o índice</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Falha ao baixar o índice:{0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Baixando o índice do IntelliSense para {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Obtendo Sugestões – '{0}'</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Не удалось скачать индекс.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Ошибка при скачивании индекса: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Загрузка индекса IntelliSense для {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Сбор предложений — "{0}"</target>
Expand Down
15 changes: 0 additions & 15 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Dizin indirilemedi</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Dizin indirilemedi: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0} için IntelliSense dizini indiriliyor</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Öneriler Toplanıyor - '{0}'</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">下载索引失败</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">下载索引失败: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">正在下载用于 {0} 的 IntelliSense 索引</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">正在收集建议 -“{0}”</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">下載索引失敗</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">下載索引失敗: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">正在為 {0} 下載 IntelliSense 索引</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">正在蒐集建議 - '{0}'</target>
Expand Down
9 changes: 9 additions & 0 deletions src/EditorFeatures/Core/EditorFeaturesResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -936,4 +936,13 @@ Do you want to proceed?</value>
<data name="external" xml:space="preserve">
<value>(external)</value>
</data>
<data name="Downloading_index_failed" xml:space="preserve">
<value>Downloading index failed</value>
</data>
<data name="Downloading_index_failed_0" xml:space="preserve">
<value>Downloading index failed:{0}</value>
</data>
<data name="Downloading_IntelliSense_index_for_0" xml:space="preserve">
<value>Downloading IntelliSense index for {0}</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<PackageReference Include="Microsoft.VisualStudio.Imaging" Version="$(MicrosoftVisualStudioImagingVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="$(MicrosoftVisualStudioLanguageStandardClassificationVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisenseVersion)" />
<PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" />
Copy link
Member

Choose a reason for hiding this comment

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

This may be problematic, since this now means VS for Mac needs to ship this binary if they're not. Do we need to move this up a layer to the VS layer rather than down?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a small, netstandard2.0-compatible binary. Today it's used by our Remote.ServiceHub implementation; perhaps we could reorganize the code to remove this requirement but if it doesn't cause a problem it might not be worth the hurdles.

Copy link
Member

Choose a reason for hiding this comment

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

We already ship RemoteControl. Here's the list of all assemblies in VSMac for reference: https://gist.github.com/KirillOsenkov/7d829534a037c2b3545c95d569f34469

Copy link
Member

Choose a reason for hiding this comment

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

@KirillOsenkov: even if you're shipping it, does it function? It looks like the code we see uses a bunch of registry and Windows-specific APIs -- do you have a cross-plat version of it or something else?

Copy link
Contributor

Choose a reason for hiding this comment

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

Registry is implemented under Mono. The PInvokes are only called on Windows, under guarded runtime checks. I've checked the code under the VSRemoteControl repo, and it all looks okay.

Copy link
Member Author

Choose a reason for hiding this comment

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

It doesn't add anything to the MEF composition, so the only way this could get called on Mac is if the code is being invoked explicitly.

Copy link
Member

Choose a reason for hiding this comment

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

If we want to make sure, we can take this change to guard against potential misuse in the future.
sharwell#2

Copy link
Member Author

Choose a reason for hiding this comment

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

@genlu Can you submit that as a follow-up pull request?

Copy link
Member

Choose a reason for hiding this comment

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

Yea, sure. Will do if we think it'd help.

Copy link
Member

Choose a reason for hiding this comment

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

<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Elfie" Version="$(MicrosoftCodeAnalysisElfieVersion)" />
Expand Down
Loading