Skip to content

Commit cbb8aed

Browse files
authored
net - pullrequest bugfixes (Azure#48122)
* fix broken reference to install_azurite * disable snippet generation in net - pullrequest until per-yml parameters are supported * fix issue with dependent packages not being generated properly
1 parent 2c09b8b commit cbb8aed

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
- pwsh: |
130130
if ("$(ProjectNames)" -like "*storage*") {
131-
&"$(Build.SourcesDirectory)/eng/scripts/install_azurite.ps1" -AzuriteLocation "$(AzuriteLocation)" -AzuriteVersion "$(AzuriteVersion)"
131+
&"$(Build.SourcesDirectory)/eng/scripts/Install-Azurite.ps1" -AzuriteLocation "$(AzuriteLocation)" -AzuriteVersion "$(AzuriteVersion)"
132132
}
133133
displayName: Install Azurite If Necessary
134134
condition: ne(variables['ProjectNames'], '')

eng/scripts/Language-Settings.ps1

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,20 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
7474
if ($pkgProp.Name -in $DependencyCalculationPackages -and $env:DISCOVER_DEPENDENT_PACKAGES) {
7575
Write-Host "Calculating dependencies for $($pkgProp.Name)"
7676
$outputFilePath = Join-Path $RepoRoot "$($pkgProp.Name)_dependencylist.txt"
77+
$buildOutputPath = Join-Path $RepoRoot "$($pkgProp.Name)_dependencylistoutput.txt"
7778

7879
if (!(Test-Path $outputFilePath)) {
7980
try {
80-
Invoke-LoggedCommand "dotnet build /t:ProjectDependsOn ./eng/service.proj /p:TestDependsOnDependency=`"$($pkgProp.Name)`" /p:IncludeSrc=false " +
81+
$command = "dotnet build /t:ProjectDependsOn ./eng/service.proj /p:TestDependsOnDependency=`"$($pkgProp.Name)`" /p:IncludeSrc=false " +
8182
"/p:IncludeStress=false /p:IncludeSamples=false /p:IncludePerf=false /p:RunApiCompat=false /p:InheritDocEnabled=false /p:BuildProjectReferences=false" +
82-
" /p:OutputProjectFilePath=`"$outputFilePath`""
83+
" /p:OutputProjectFilePath=`"$outputFilePath`" > $buildOutputPath 2>&1"
84+
85+
Invoke-LoggedCommand $command | Out-Null
8386
}
8487
catch {
85-
Write-Host "Failed calculating dependencies for $($pkgProp.Name), continuing."
88+
Write-Host "Failed calculating dependencies for $($pkgProp.Name). Exit code $LASTEXITCODE."
89+
Write-Host "Dumping erroring build output."
90+
Write-Host (Get-Content -Raw $buildOutputPath)
8691
continue
8792
}
8893
}

sdk/pullrequest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ extends:
2222
template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
2323
parameters:
2424
ServiceDirectory: ${{ parameters.Service }}
25+
BuildSnippets: false # setting this to false until we can handle ci.yml level parameter customizations

0 commit comments

Comments
 (0)