Skip to content

Commit 398dbc9

Browse files
author
Paul van Brenk
committed
PR feedback
1 parent b208284 commit 398dbc9

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Build/Common.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
DestinationFolder="$(CopyOutputsToPath)Symbols" />
147147

148148
<Copy SourceFiles="@(SatelliteDllsProjectOutputGroupOutput)"
149-
DestinationFiles="@(SatelliteDllsProjectOutputGroupOutput->'$(CopyOutputsToPath)UnsignedBinaries\%(TargetPath)')"
149+
DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries\%(SatelliteDllsProjectOutputGroupOutput.TargetDir)"
150150
SkipUnchangedFiles="true" />
151151

152152
<Copy SourceFiles="@(OutputBinariesToSign -> '$(OutputPath)%(filename)%(extension)')"

Nodejs/Product/Npm/Npm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@
155155
<Compile Include="SQLite\SQLite.cs" />
156156
<Compile Include="SQLite\SQLiteAsync.cs" />
157157
</ItemGroup>
158-
<ItemGroup>
158+
<ItemGroup Condition="$(VSTarget) == '14.0'">
159159
<EmbeddedResource Include="Resources.resx">
160160
<Generator>ResXFileCodeGenerator</Generator>
161161
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
162162
<SubType>Designer</SubType>
163163
</EmbeddedResource>
164164
</ItemGroup>
165-
<ItemGroup>
165+
<ItemGroup Condition="$(VSTarget) == '15.0'">
166166
<EmbeddedResource Include="Resources.cs.resx" />
167167
<EmbeddedResource Include="Resources.de.resx" />
168168
<EmbeddedResource Include="Resources.en.resx">

Nodejs/Setup/BuildRelease.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,8 @@ try {
591591
submit_symbols "$project_name$spacename" "$buildnumber $($i.VSName) $config" "symbols" $i.symboldir $symbol_contacts
592592

593593
Write-Output "End symbol submission for $($i.VSName)"
594-
}
595594

596-
foreach ($i in $target_info) {
595+
Write-Output "Begin Setup build for $($i.VSName)"
597596
$target_msbuild_exe = msbuild-exe $i
598597
$target_msbuild_options = msbuild-options $i
599598
& $target_msbuild_exe $global_msbuild_options $target_msbuild_options `
@@ -607,6 +606,8 @@ try {
607606
/p:SignedBinariesPath=$($i.signed_bindir) `
608607
/p:RezipVSIXFiles=true `
609608
$setup_swix_project
609+
610+
Write-Output "End Setup build for $($i.VSName)"
610611
}
611612

612613
$jobs = @()

0 commit comments

Comments
 (0)