Skip to content

Commit 4ffe0a7

Browse files
authored
Merge pull request #1450 from paulvanbrenk/fixdebugwarning
Include localized resources in the shared project.
2 parents 71f7cff + 925a807 commit 4ffe0a7

File tree

2 files changed

+75
-11
lines changed

2 files changed

+75
-11
lines changed

Common/Product/SharedProject/ProcessOutput.cs.rej

Lines changed: 0 additions & 10 deletions
This file was deleted.

Common/Product/SharedProject/SharedProject.proj

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,12 +700,86 @@
700700
<Visible>true</Visible>
701701
</Compile>
702702
</ItemGroup>
703-
<ItemGroup>
703+
<ItemGroup Condition="$(VSTarget) == '14.0'">
704704
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.resx">
705705
<Link>SharedProject\ProjectResources.resx</Link>
706706
<ManifestResourceName>Microsoft.VisualStudio.Project</ManifestResourceName>
707707
<Visible>true</Visible>
708708
</EmbeddedResource>
709+
</ItemGroup>
710+
<ItemGroup Condition="$(VSTarget) == '15.0'">
711+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.cs.resx">
712+
<Link>SharedProject\ProjectResources.cs.resx</Link>
713+
<ManifestResourceName>Microsoft.VisualStudio.Project.cs</ManifestResourceName>
714+
<Visible>true</Visible>
715+
</EmbeddedResource>
716+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.de.resx">
717+
<Link>SharedProject\ProjectResources.de.resx</Link>
718+
<ManifestResourceName>Microsoft.VisualStudio.Project.de</ManifestResourceName>
719+
<Visible>true</Visible>
720+
</EmbeddedResource>
721+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.en.resx">
722+
<Link>SharedProject\ProjectResources.en.resx</Link>
723+
<ManifestResourceName>Microsoft.VisualStudio.Project.en</ManifestResourceName>
724+
<Visible>true</Visible>
725+
</EmbeddedResource>
726+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.es.resx">
727+
<Link>SharedProject\ProjectResources.es.resx</Link>
728+
<ManifestResourceName>Microsoft.VisualStudio.Project.es</ManifestResourceName>
729+
<Visible>true</Visible>
730+
</EmbeddedResource>
731+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.fr.resx">
732+
<Link>SharedProject\ProjectResources.fr.resx</Link>
733+
<ManifestResourceName>Microsoft.VisualStudio.Project.fr</ManifestResourceName>
734+
<Visible>true</Visible>
735+
</EmbeddedResource>
736+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.it.resx">
737+
<Link>SharedProject\ProjectResources.it.resx</Link>
738+
<ManifestResourceName>Microsoft.VisualStudio.Project.it</ManifestResourceName>
739+
<Visible>true</Visible>
740+
</EmbeddedResource>
741+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.ja.resx">
742+
<Link>SharedProject\ProjectResources.ja.resx</Link>
743+
<ManifestResourceName>Microsoft.VisualStudio.Project.ja</ManifestResourceName>
744+
<Visible>true</Visible>
745+
</EmbeddedResource>
746+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.ko.resx">
747+
<Link>SharedProject\ProjectResources.ko.resx</Link>
748+
<ManifestResourceName>Microsoft.VisualStudio.Project.ko</ManifestResourceName>
749+
<Visible>true</Visible>
750+
</EmbeddedResource>
751+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.pl.resx">
752+
<Link>SharedProject\ProjectResources.pl.resx</Link>
753+
<ManifestResourceName>Microsoft.VisualStudio.Project.pl</ManifestResourceName>
754+
<Visible>true</Visible>
755+
</EmbeddedResource>
756+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.pt-BR.resx">
757+
<Link>SharedProject\ProjectResources.pt-BR.resx</Link>
758+
<ManifestResourceName>Microsoft.VisualStudio.Project.pt-BR</ManifestResourceName>
759+
<Visible>true</Visible>
760+
</EmbeddedResource>
761+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.ru.resx">
762+
<Link>SharedProject\ProjectResources.ru.resx</Link>
763+
<ManifestResourceName>Microsoft.VisualStudio.Project.ru</ManifestResourceName>
764+
<Visible>true</Visible>
765+
</EmbeddedResource>
766+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.tr.resx">
767+
<Link>SharedProject\ProjectResources.tr.resx</Link>
768+
<ManifestResourceName>Microsoft.VisualStudio.Project.tr</ManifestResourceName>
769+
<Visible>true</Visible>
770+
</EmbeddedResource>
771+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.zh-Hans.resx">
772+
<Link>SharedProject\ProjectResources.zh-Hans.resx</Link>
773+
<ManifestResourceName>Microsoft.VisualStudio.Project.zh-Hans</ManifestResourceName>
774+
<Visible>true</Visible>
775+
</EmbeddedResource>
776+
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\ProjectResources.zh-Hant.resx">
777+
<Link>SharedProject\ProjectResources.zh-Hant.resx</Link>
778+
<ManifestResourceName>Microsoft.VisualStudio.Project.zh-Hant</ManifestResourceName>
779+
<Visible>true</Visible>
780+
</EmbeddedResource>
781+
</ItemGroup>
782+
<ItemGroup>
709783
<EmbeddedResource Include="$(_ProjectSystemFilesLocation)\WebPiComponentPickerControl.resx">
710784
<DependentUpon>WebPiComponentPickerControl.cs</DependentUpon>
711785
<Link>SharedProject\WebPiComponentPickerControl.resx</Link>

0 commit comments

Comments
 (0)