This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 14af6d96a2319c6fc7c2c4b0ed43688c9ec09eba Author: Shad Storhaug <[email protected]> AuthorDate: Sun Jul 7 01:39:50 2019 +0700 Fixed build.ps1 script so it will not try to pack new projects that are added to the solution by default. Removed publish target, as we are now packing the dotnet-cli as a dotnet tool. closes #228 --- build/build.ps1 | 54 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index 081cf03..da171b7 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -53,7 +53,7 @@ properties { $backedUpFiles = New-Object System.Collections.ArrayList -task default -depends Publish +task default -depends Pack task Clean -description "This task cleans up the build directory" { Write-Host "##teamcity[progressMessage 'Cleaning']" @@ -195,17 +195,9 @@ task Pack -depends Compile -description "This task creates the NuGet packages" { Ensure-Directory-Exists "$nuget_package_directory" try { - pushd $base_directory - $packages = Get-ChildItem -Path "$source_directory\**\*.csproj" -Recurse | ? { - !$_.Directory.Name.Contains(".Test") -and - !$_.Directory.Name.Contains(".Demo") -and - !$_.Directory.FullName.Contains("\tools\") -and - !$_.Directory.FullName.Contains("/tools/") -and - !$_.Directory.Name.Contains(".Replicator.AspNetCore") + Exec { + & dotnet.exe pack $solutionFile --configuration $Configuration --output $nuget_package_directory --no-build --include-symbols /p:PackageVersion=$packageVersion } - popd - - Pack-Assemblies $packages $success = $true } finally { @@ -215,36 +207,6 @@ task Pack -depends Compile -description "This task creates the NuGet packages" { } } -task Publish -depends Pack -description "This task publishes the command line tools" { - Write-Host "##teamcity[progressMessage 'Publishing']" - #create the publish output directory - Ensure-Directory-Exists "$publish_directory" - - pushd $base_directory - $tools = Get-ChildItem -Path "$source_directory\**\*.csproj" -Recurse | ? { - $_.Directory.FullName.Contains("\tools\") -or $_.Directory.FullName.Contains("/tools/") -and - !$_.Directory.Name.Contains(".Test") -and - !$_.Directory.Name.Contains("JavaDocToMarkdownConverter") - } - popd - - foreach ($tool in $tools) { - Write-Host "Publishing $tool..." -ForegroundColor Magenta - - $toolName = [io.path]::GetFileNameWithoutExtension($tool) - $outputDirectory = "$publish_directory\$toolName" - Exec { - & dotnet.exe publish $tool --configuration $Configuration --output $outputDirectory - } - - # Zip up the result of the publish - $outputFile = "$outputDirectory.zip" - if (Test-Path $outputFile) { Remove-Item $outputFile } - Add-Type -assembly "system.io.compression.filesystem" - [io.compression.zipfile]::CreateFromDirectory($outputDirectory, $outputFile) - } -} - task Test -depends InstallSDK1IfRequired, InstallSDK2IfRequired, Restore -description "This task runs the tests" { Write-Host "##teamcity[progressMessage 'Testing']" Write-Host "Running tests..." -ForegroundColor DarkCyan @@ -496,16 +458,6 @@ endlocal [System.IO.File]::WriteAllLines($file, $buildBat, $Utf8EncodingNoBom) } -function Pack-Assemblies([string[]]$projects) { - Ensure-Directory-Exists $nuget_package_directory - foreach ($project in $projects) { - Write-Host "Creating NuGet package for $project..." -ForegroundColor Magenta - Exec { - & dotnet.exe pack $project --configuration $Configuration --output $nuget_package_directory --no-build --include-symbols /p:PackageVersion=$packageVersion - } - } -} - function Backup-Files([string[]]$paths) { foreach ($path in $paths) { Backup-File $path
