Merge pull request #1431 from Microsoft/localizenodetools

Add localization to nodetools

Author: paulvanbrenk

Build/Common.Build.CSharp.targets

@@ -35,21 +35,22 @@
   <Target Name="ConditionalResx"
           BeforeTargets="MainResourcesGeneration"
           Inputs="@(ConditionalEmbeddedResource)"
-          Outputs="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')">
+          Outputs="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)_xf_%(Filename).resx')">
     <WriteLinesToFile
-      File="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')"
+      File="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)_xf_%(Filename).resx')"
       Lines="$([System.IO.File]::ReadAllText(`%(FullPath)`).Replace(`_VSVERSION_`,`$(VSTarget)`).Replace(`_BUILDROOT_`, `$(BuildRoot)`))"
       Overwrite="true"/>
 
-    <Message Text="Written to @(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')" Importance="normal" />
+    <Message Text="Written to @(ConditionalEmbeddedResource->'$(IntermediateOutputPath)_xf_%(Filename).resx')" Importance="normal" />
 
     <ItemGroup>
-      <FileWrites Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')" />
-      <EmbeddedResource Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')">
+      <FileWrites Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)_xf_%(Filename).resx')" />
+      <EmbeddedResource Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)_xf_%(Filename).resx')">
         <ManifestResourceName>%(ConditionalEmbeddedResource.ManifestResourceName)</ManifestResourceName>
         <MergeWithCTO Condition="'%(ConditionalEmbeddedResource.MergeWithCTO)' != ''">%(ConditionalEmbeddedResource.MergeWithCTO)</MergeWithCTO>
         <LastGenOutput Condition="'%(ConditionalEmbeddedResource.LastGenOutput)' != ''">%(ConditionalEmbeddedResource.LastGenOutput)</LastGenOutput>
         <Generator Condition="'%(ConditionalEmbeddedResource.Generator)' != ''">%(ConditionalEmbeddedResource.Generator)</Generator>
+        <LogicalName Condition="'%(ConditionalEmbeddedResource.LogicalName)' != ''">%(ConditionalEmbeddedResource.LogicalName)</LogicalName>
       </EmbeddedResource>
     </ItemGroup>
   </Target>

Build/Common.Build.VSSDK.targets

@@ -286,6 +286,4 @@
              Query="/vsx11:PackageManifest/vsx11:Installation/@InstalledByMsi"
              Value="false" />
   </Target>
-
-
-</Project>
+</Project>

Build/Common.Build.settings

@@ -80,8 +80,8 @@
     The files found are used for deployment to the Experimental hive and
     creation of .vsix files.
     -->
-    <IncludeVsixItemsFromTargets Condition="'$(IncludeVsixItemsFromTargets)' == '' and '$(Configuration)' == 'Debug'">BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup</IncludeVsixItemsFromTargets>
-    <IncludeVsixItemsFromTargets Condition="'$(IncludeVsixItemsFromTargets)' == ''">BuiltProjectOutputGroup</IncludeVsixItemsFromTargets>
+    <IncludeVsixItemsFromTargets Condition="'$(IncludeVsixItemsFromTargets)' == '' and '$(Configuration)' == 'Debug'">BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup;</IncludeVsixItemsFromTargets>
+    <IncludeVsixItemsFromTargets Condition="'$(IncludeVsixItemsFromTargets)' == ''">BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;</IncludeVsixItemsFromTargets>
     <!-- Copies entire VSIX contents to the output directory. -->
     <CopyLocalReferenceVsixItems Condition="'$(CopyLocalReferenceVsixItems)' == ''">false</CopyLocalReferenceVsixItems>
   </PropertyGroup>

Build/Common.Build.targets

@@ -121,15 +121,15 @@
       <_DebugSymbolsFinalOutputProjectOutputGroupOutput Include="@(DebugSymbolsProjectOutputGroupOutput->'%(FinalOutputPath)'" />
     </ItemGroup>
   </Target>
-
+  
   <!--
   Copies certain outputs from the project to the specified path.
   
   This is used when building releases.
   -->
   <Target Name="_CopyOutputsToPath"
           AfterTargets="AfterBuild"
-          DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsFinalOutputProjectOutputGroup"
+          DependsOnTargets="BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;DebugSymbolsFinalOutputProjectOutputGroup"
           Condition="'$(CopyOutputsToPath)' != '' and $(MSBuildProjectExtension) != '.wixproj' and Exists($(TargetPath))">
     <PropertyGroup>
       <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
@@ -145,6 +145,10 @@
     <Copy SourceFiles="@(DebugSymbolsProjectOutputGroupOutput->'%(FinalOutputPath)')"
           DestinationFolder="$(CopyOutputsToPath)Symbols" />
 
+    <Copy SourceFiles="@(SatelliteDllsProjectOutputGroupOutput)"
+          DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries\%(SatelliteDllsProjectOutputGroupOutput.TargetDir)" 
+          SkipUnchangedFiles="true" />
+
     <Copy SourceFiles="@(OutputBinariesToSign -> '$(OutputPath)%(filename)%(extension)')"
           DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries"
           Condition="'@(OutputBinariesToSign)' != ''"/>