Skip to content

Commit 003d56a

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [3749d32 from that repo](AArnott/Library.Template@3749d32).
2 parents 1fd9c69 + 3749d32 commit 003d56a

8 files changed

Lines changed: 28 additions & 7 deletions

File tree

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "18.8.0",
13+
"version": "18.9.0",
1414
"commands": [
1515
"dotnet-coverage"
1616
],

.github/skills/bundle-dependency-prs/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Before aggregating PRs, first try to fix any individual dependency update PRs wi
2727

2828
1. For the dependency PRs with failing build or test PR checks, check out their source branch and fix any issues.
2929
2. Push your fixes as fresh commits to the individual dependency PRs.
30-
If pushing to a repo in the `microsoft` org when the PR is authord by `renovate`, follow-up the push with a PR comment that says exactly this: "/azp run" which triggers PR checks to re-run.
30+
If pushing to a repo in the `microsoft` org when the PR is authored by `renovate`, follow-up the push with a PR comment that says exactly this: "/azp run" which triggers PR checks to re-run.
3131
3. If you can't fix a particular PR, add a comment to the PR describing your attempt and outcome.
3232

3333
## Group dependency PRs that are ready to go

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersionForAnalyzers)" />
5555
</ItemGroup>
5656
<ItemGroup Label="Library.Template">
57-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.8.0" />
57+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.9.0" />
5858
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
5959
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
6060
<PackageVersion Include="Microsoft.Testing.Extensions.Telemetry" Version="$(MicrosoftTestingPlatformVersion)" />

azure-pipelines/prepare-insertion-stages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ stages:
5151
pool:
5252
name: AzurePipelines-EO
5353
demands:
54-
- ImageOverride -equals 1ESPT-Ubuntu24.04
54+
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
5555
os: Linux
5656
templateContext:
5757
outputs:

azure-pipelines/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extends:
3333
pool:
3434
name: AzurePipelines-EO
3535
demands:
36-
- ImageOverride -equals 1ESPT-Ubuntu24.04
36+
- ImageOverride -equals 1ESPT-Ubuntu22.04 # Do NOT upgrade to Ubuntu24 until this is fixed: https://portal.microsofticm.com/imp/v5/incidents/details/830879871/summary
3737
os: Linux
3838
templateContext:
3939
outputs:

tools/GitHubActions.ps1

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ function Add-GitHubActionsEnvVariable {
88
[string]$Value
99
)
1010

11+
if ([string]::IsNullOrWhiteSpace($Path)) {
12+
throw "GitHub Actions environment file must not be empty."
13+
}
14+
1115
if ([string]::IsNullOrWhiteSpace($Name)) {
1216
throw "GitHub Actions environment variable names must not be empty."
1317
}
@@ -16,3 +20,18 @@ function Add-GitHubActionsEnvVariable {
1620
$delimiter = [guid]::NewGuid().ToString('N')
1721
[System.IO.File]::AppendAllText($Path, "$Name<<$delimiter`n$Value`n$delimiter`n", $utf8NoBom)
1822
}
23+
24+
function Add-GitHubActionsPath {
25+
param(
26+
[string]$Path = $env:GITHUB_PATH,
27+
[Parameter(Mandatory = $true)]
28+
[string]$Value
29+
)
30+
31+
if ([string]::IsNullOrWhiteSpace($Path)) {
32+
throw "GitHub Actions path file must not be empty."
33+
}
34+
35+
$utf8NoBom = [System.Text.UTF8Encoding]::new($false)
36+
[System.IO.File]::AppendAllText($Path, "$Value`n", $utf8NoBom)
37+
}

tools/Set-EnvVars.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if ($PrependPath) {
8282
Write-Host "##vso[task.prependpath]$_"
8383
}
8484
if ($env:GITHUB_ACTIONS) {
85-
Add-GitHubActionsEnvVariable -Name PATH -Value $newPathValue
85+
Add-GitHubActionsPath -Value $_
8686
}
8787

8888
$CmdEnvScript += "SET PATH=$_$pathDelimiter%PATH%"

tools/variables/_define.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
param (
1212
)
1313

14-
. "$PSScriptRoot\..\GitHubActions.ps1"
14+
if ($env:GITHUB_ACTIONS) {
15+
. "$PSScriptRoot\..\GitHubActions.ps1"
16+
}
1517

1618
(& "$PSScriptRoot\_all.ps1").GetEnumerator() |% {
1719
# Always use ALL CAPS for env var names since Azure Pipelines converts variable names to all caps and on non-Windows OS, env vars are case sensitive.

0 commit comments

Comments
 (0)