Skip to content

Commit fd440a9

Browse files
authored
ensure localized menu name is used for 'F# Interactive' (#7652)
1 parent b2c8d66 commit fd440a9

File tree

4 files changed

+1
-24
lines changed

4 files changed

+1
-24
lines changed

vsintegration/Vsix/RegisterFsharpPackage.pkgdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"CompanyName"="Microsoft Corp."
6161

6262
[$RootKey$\Menus]
63-
"{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}"=", 1000_ctmenu, 1"
63+
"{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}"=", Menus.ctmenu, 1"
6464

6565
[$RootKey$\CLSID\{e1194663-db3c-49eb-8b45-276fcdc440ea}]
6666
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"

vsintegration/src/FSharp.ProjectSystem.FSharp/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,4 @@
124124
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
125125
</ItemGroup>
126126

127-
<Target Name="CopyCtoFile" BeforeTargets="CopyLocalizationResources" DependsOnTargets="VSCTCompile">
128-
<Copy SourceFiles="@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')" DestinationFiles="@(VSCTCompile->'ctofiles\%(FileName).cto')" />
129-
</Target>
130-
131-
<Target Name="CopyLocalizationResources" BeforeTargets="CoreResGen">
132-
<ItemGroup>
133-
<LocalizationResources Include="MenusAndCommands.vsct" />
134-
</ItemGroup>
135-
<Copy SourceFiles="@(LocalizationResources)" DestinationFiles="@(LocalizationResources->'$(OutputPath)\%(Filename)%(Extension)')" />
136-
</Target>
137-
138-
<Target Name="EnsureResourceNameHasCulture" BeforeTargets="MergeCtoResource">
139-
<ItemGroup>
140-
<_GeneratedCTOFilesWithCulture Update="%(Identity)">
141-
<ResourceName>%(ResourceName).%(Culture)</ResourceName>
142-
</_GeneratedCTOFilesWithCulture>
143-
</ItemGroup>
144-
</Target>
145-
146127
</Project>

vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@
220220
<data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
221221
<value>Resources\FSharpAboutBox.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
222222
</data>
223-
<data name="1000_ctmenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
224-
<value>ctofiles\MenusAndCommands.cto;System.Byte[], mscorlib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
225-
</data>
226223
<data name="4000" type="System.Resources.ResXFileRef, System.Windows.Forms">
227224
<value>Resources\FSharpWindowsApplication.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
228225
</data>

0 commit comments

Comments
 (0)