Merge pull request #49 from Lombiq/issue/OSOE-548

OSOE-548: Updating Packages in for OrchardCore 1.6 upgrade
Lombiq · Jun 18, 2023 · 6c328f0 · 6c328f0
2 parents c283705 + 1a65cd7
commit 6c328f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Lombiq.NodeJs.Extensions.Samples.NuGet/Lombiq.NodeJs.Extensions.Samples.NuGet.csproj b/Lombiq.NodeJs.Extensions.Samples.NuGet/Lombiq.NodeJs.Extensions.Samples.NuGet.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <!-- Adding Node.js Extensions as a PackageReference will result in inclusion of its .props and .targets files
          during Build. -->
-    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
+    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.4-alpha.1.osoe-548" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions.csproj b/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions.csproj
@@ -38,14 +38,14 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Npm.Targets" Version="1.3.0">
+    <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0">
       <!-- See https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#controlling-dependency-assets
            and https://github.com/NuGet/docs.microsoft.com-nuget/issues/2716. -->
       <!-- We want to make NPM-Targets' build files (.props and .targets) available to consumer projects, so we need to
            specify "build" here. We also need "buildTransitive", because otherwise it will become part of the "exclude"
            list on the generated <dependency> node in the .nuspec file, which will lead to also the "build" assets being
            excluded (because "buildTransitive" is an extension of "build"). -->
-      <IncludeAssets>build;buildTransitive</IncludeAssets>
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
       <!-- "none" will lead to all other values getting excluded (except for "contentFiles"). -->
       <ExcludeAssets>none</ExcludeAssets>
       <!-- "none" here overrides the default value, which includes "build" and would lead to its exclusion. -->
@@ -85,10 +85,7 @@
       AddNodeJsExtensionsAsNpmPackage
     </InstallNodeJsExtensionsNpmPackageGloballyDependsOn>
   </PropertyGroup>
-  <Target Name="InstallNodeJsExtensionsNpmPackageGlobally"
-          BeforeTargets="BeforeBuild"
-          DependsOnTargets="$(InstallNodeJsExtensionsNpmPackageGloballyDependsOn)"
-          Condition="'$(UseGlobalNodeJsExtensionsNpmPackage)' == 'true'">
+  <Target Name="InstallNodeJsExtensionsNpmPackageGlobally" BeforeTargets="BeforeBuild" DependsOnTargets="$(InstallNodeJsExtensionsNpmPackageGloballyDependsOn)" Condition="'$(UseGlobalNodeJsExtensionsNpmPackage)' == 'true'">
     <Exec Command="pnpm link &quot;$(NodeJsExtensionsNpmPackageSourcePath)&quot;" />
   </Target>