Skip to content

Commit

Permalink
RavenDB-15925 Disable bundling into Single File Application
Browse files Browse the repository at this point in the history
  • Loading branch information
ppekrol committed Nov 26, 2020
1 parent cb1b736 commit 21fd52b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions scripts/buildProjects.ps1
Expand Up @@ -34,9 +34,9 @@ function BuildServer ( $srcDir, $outDir, $target) {

$commandArgs += '/p:SourceLinkCreate=true'

if ($target -and $global:isPublishBundlingEnabled) {
$commandArgs += '/p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true'
}
#if ($target -and $global:isPublishBundlingEnabled) {
# $commandArgs += '/p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true'
#}

write-host -ForegroundColor Cyan "Publish server: $command $commandArgs"
Invoke-Expression -Command "$command $commandArgs"
Expand Down Expand Up @@ -140,9 +140,9 @@ function BuildTool ( $toolName, $srcDir, $outDir, $target, $trim ) {

$commandArgs += "/p:SourceLinkCreate=true"

if ($target -and $global:isPublishBundlingEnabled) {
$commandArgs += "/p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=$trim"
}
#if ($target -and $global:isPublishBundlingEnabled) {
# $commandArgs += "/p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=$trim"
#}

write-host -ForegroundColor Cyan "Publish ${toolName}: $command $commandArgs"
Invoke-Expression -Command "$command $commandArgs"
Expand Down
10 changes: 5 additions & 5 deletions scripts/package.ps1
Expand Up @@ -75,11 +75,11 @@ function LayoutServerPackage ( $packageDir, $projectDir, $packOpts ) {
$target = $packOpts.Target
CopyStudioPackageToServerOutputDirectory $packOpts

if ($target.IsUnix -and $global:isPublishBundlingEnabled) {
# TODO get 'net5.0' from somewhere
$buildDir = [io.path]::Combine($projectDir, "src", "Raven.Server", "bin", "Release", "net5.0", $target.Runtime)
CopyNativeBinariesRequiredForDebugging $buildDir "$($packOpts.OutDirs.Server)" $target.NativeBinExtension
}
#if ($target.IsUnix -and $global:isPublishBundlingEnabled) {
# # TODO get 'net5.0' from somewhere
# $buildDir = [io.path]::Combine($projectDir, "src", "Raven.Server", "bin", "Release", "net5.0", $target.Runtime)
# CopyNativeBinariesRequiredForDebugging $buildDir "$($packOpts.OutDirs.Server)" $target.NativeBinExtension
#}

CopyLicenseFile $packageDir
CopyAckFile $packageDir
Expand Down

0 comments on commit 21fd52b

Please sign in to comment.