Merge pull request #9168 from tmeschter/230713-IncludeResourceAssembl…

…iesInNPM feature: Add resource DLLs to NPM package
dotnet · Jul 13, 2023 · 750aca0 · 750aca0
2 parents 2a4dbf6 + 411c2a0
commit 750aca0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...ft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj b/...ft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
@@ -712,11 +712,14 @@
     </None>
   </ItemGroup>
 
-  <Target Name="AddFilesForNpmPackage" DependsOnTargets="Build" Condition="'$(TargetFramework)' == 'net7.0'">
+  <Target Name="AddFilesForNpmPackage" DependsOnTargets="Build;SatelliteDllsProjectOutputGroup" Condition="'$(TargetFramework)' == 'net7.0'">
     <ItemGroup>
       <NpmContent Include="exports.json" />
       <!-- We have a runtime dependency on Microsoft.CodeAnalysis.dll in VS Code scenarios. -->
       <NpmContent Include="$(PkgMicrosoft_CodeAnalysis_Common)\lib\net6.0\Microsoft.CodeAnalysis.dll" />
+      <NpmContent Include="@(SatelliteDllsProjectOutputGroupOutput)">
+        <PackagePath>%(SatelliteDllsProjectOutputGroupOutput.TargetPath)</PackagePath>
+      </NpmContent>
     </ItemGroup>
   </Target>
 

diff --git a/...lStudio.ProjectSystem.Managed.UnitTests/Setup/PackageContentTests.NpmPackage.verified.txt b/...lStudio.ProjectSystem.Managed.UnitTests/Setup/PackageContentTests.NpmPackage.verified.txt
@@ -2,5 +2,18 @@
   exports.json,
   Microsoft.CodeAnalysis.dll,
   Microsoft.VisualStudio.ProjectSystem.Managed.dll,
-  package.json
+  package.json,
+  cs\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  de\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  es\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  fr\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  it\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  ja\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  ko\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  pl\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  pt-BR\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  ru\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  tr\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  zh-Hans\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll,
+  zh-Hant\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll
 ]