Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]
},
"microsoft.dotnet.helix.jobmonitor": {
"version": "11.0.0-beta.26427.10",
"version": "11.0.0-beta.26452.122",
"commands": [
"dotnet-helix-job-monitor"
]
Expand Down
140 changes: 70 additions & 70 deletions eng/Version.Details.props

Large diffs are not rendered by default.

284 changes: 142 additions & 142 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions eng/common/Get-GitHubAppToken.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,20 @@ $headers = @{

Write-Host "Looking up installation for '$InstallationOwner'..."
try {
$installations = @()
$installations = [System.Collections.Generic.List[object]]::new()
$page = 1
do {
# Assign the response before wrapping it in @(). PowerShell otherwise
# preserves a top-level JSON array as one nested pipeline object.
$pageResponse = Invoke-RestMethod `
-Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
-Headers $headers `
-Method Get
$pageInstallations = @($pageResponse)
$installations += $pageInstallations
$pageInstallationCount = 0
foreach ($installation in $pageResponse) {
$installations.Add($installation)
$pageInstallationCount++
}
$page++
} while ($pageInstallations.Count -eq 100)
} while ($pageInstallationCount -eq 100)
}
catch {
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
Expand Down
8 changes: 8 additions & 0 deletions eng/common/core-templates/job/helix-job-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ parameters:
type: number
default: 30

# Maximum number of work items whose results may be downloaded, parsed, and
# uploaded concurrently.
- name: testResultUploadParallelism
type: number
default: 48

# When 'true' (the default), Helix work items that exit 0 but have failed AzDO test results
# are treated as failed: they count toward the monitor's exit code and are resubmitted by a
# later invocation's retry pass. Set to 'false' to fall back to exit-code-only outcomes.
Expand Down Expand Up @@ -215,6 +221,8 @@ jobs:
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
--stage-name '$(System.StageName)'
--stage-attempt '$(System.StageAttempt)'
--job-attempt '$(System.JobAttempt)'
--test-result-upload-parallelism '${{ parameters.testResultUploadParallelism }}'
)

organization='${{ parameters.organization }}'
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"dotnet": "11.0.100-rc.1.26420.103"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26426.102",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26426.102",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26426.102",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26452.122",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26452.122",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26452.122",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26426.102"
"Microsoft.NET.Sdk.IL": "11.0.0-rc.2.26452.122"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@
</PropertyGroup>

<ItemGroup>
<!-- Private=false stops MSBuild from pulling the referenced project's copy-to-output-directory
items into this project's output. The crossgen2 publish projects only run Publish (see their
DefaultTargets), so build-only outputs like crossgen2.deps.json and crossgen2.runtimeconfig.json
are never produced and copying them would fail. Everything this project packages comes from
the publish output collected via OutputItemType below. -->
<ProjectReference
Include="$(CrossgenPublishProject)"
OutputItemType="_RawCrossgenPublishFiles"
ReferenceOutputAssembly="false" />
ReferenceOutputAssembly="false"
Private="false" />
</ItemGroup>

<Target Name="PublishCrossgen"
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/installers/dotnet-host.proj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageBrandNameSuffix>Host</PackageBrandNameSuffix>
<VSInsertionShortComponentName>NetCore.SharedHost</VSInsertionShortComponentName>
<UseCustomDirectoryHarvesting>true</UseCustomDirectoryHarvesting>
<WixIncludeRegistryKeys>true</WixIncludeRegistryKeys>
<WixIncludeRegistryKeys>false</WixIncludeRegistryKeys>
<RegKeyProductName>sharedhost</RegKeyProductName>
<!-- Contributes to DependencyKey which ensures stable provider key - do not change -->
<WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/async/pgo/pgo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
<Compile Include="$(MSBuildProjectName).cs" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
</Project>
Loading