Skip to content

Commit

Permalink
Minor improvements to build workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
dbeuchler committed Oct 20, 2020
1 parent 86c1b3c commit 6f5dbc9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .build/BuildToolkit.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ function Invoke-PackFrameworkProject($CsprojFile, [bool]$IsTool = $False, [bool]
Write-Host "Try to pack .NET Framework project: $CsprojFile.Name ...";

# Check if there is a matching nuspec for the proj
$nuspecPath = [IO.Path]::ChangeExtension($CsprojFile.FullName, "nuspec")
$csprojFullName = $CsprojFile.FullName;
$nuspecPath = [IO.Path]::ChangeExtension($csprojFullName, "nuspec")
if(-not (Test-Path $nuspecPath)) {
Write-Host-Warning "Nuspec for project not found: $CsprojFile.Name";
return;
Expand All @@ -461,7 +462,7 @@ function Invoke-PackFrameworkProject($CsprojFile, [bool]$IsTool = $False, [bool]
}

# Call nuget with default arguments plus optional
& $global:NugetCli pack "$nuspecPath" @packargs
& $global:NugetCli pack "$csprojFullName" @packargs
Invoke-ExitCodeCheck $LastExitCode;
}

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ jobs:
shell: pwsh
run: ./Build.ps1 -IntegrationTests

- name: Cover Report
shell: pwsh
run: ./Build.ps1 -CoverReport

- name: Codecov
uses: codecov/codecov-action@v1
with:
Expand Down

0 comments on commit 6f5dbc9

Please sign in to comment.