Skip to content

Commit 028d93f

Browse files
committed
Merge branch 'main' into microbuild
2 parents c8fa888 + 91ee72e commit 028d93f

File tree

6 files changed

+8
-16
lines changed

6 files changed

+8
-16
lines changed

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# You can define any steps you want, and they will run before the agent starts.
2727
# If you do not check out your code, Copilot will do this for you.
2828
steps:
29-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
29+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
3030
with:
3131
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3232
- name: ⚙ Install prerequisites

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
url: ${{ steps.deployment.outputs.page_url }}
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
27+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
2828
with:
2929
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
3030
- name: ⚙ Install prerequisites

.github/workflows/libtemplate-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818
pull-requests: write
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
20+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
2121
with:
2222
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
2323

Expand-Template.ps1

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ Expands this template into an actual project, taking values for placeholders
77
The name of the library. Should consist only of alphanumeric characters and periods.
88
.PARAMETER Author
99
The name to use in copyright and owner notices.
10-
.PARAMETER CodeCovToken
11-
A token obtained from codecov.io for your repo. If not specified, code coverage results will not be published to codecov.io,
12-
but can be added later by editing the Azure Pipelines YAML file.
1310
.PARAMETER Squash
1411
A switch that causes all of git history to be squashed to just one initial commit for the template, and one for its expansion.
1512
#>
@@ -20,8 +17,6 @@ Param(
2017
[Parameter()]
2118
[string]$Author = "Microsoft Corporation",
2219
[Parameter()]
23-
[string]$CodeCovToken,
24-
[Parameter()]
2520
[switch]$Squash
2621
)
2722

@@ -166,11 +161,6 @@ try {
166161
Replace-Placeholders -Path "azure-pipelines.yml" -Replacements $YmlReplacements
167162

168163
$YmlReplacements = @{}
169-
if ($CodeCovToken) {
170-
$YmlReplacements['(codecov_token: ).*(#.*)'] = "`$1$CodeCovToken"
171-
} else {
172-
$YmlReplacements['(codecov_token: ).*(#.*)'] = "#`$1`$2"
173-
}
174164
Replace-Placeholders -Path "azure-pipelines/BuildStageVariables.yml" -Replacements $YmlReplacements
175165

176166
Replace-Placeholders -Path "tools/variables/InsertVersionsValues.ps1" -Replacements @{

azure-pipelines/BuildStageVariables.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ variables:
22
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
33
BuildConfiguration: Release
44
NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
5-
# codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/

azure-pipelines/dotnet.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@ steps:
4242
displayName: 📢 Publish artifacts
4343
condition: succeededOrFailed()
4444

45-
- ${{ if and(ne(variables['codecov_token'], ''), parameters.RunTests) }}:
45+
- ${{ if parameters.RunTests }}:
4646
- powershell: |
4747
$ArtifactStagingFolder = & "tools/Get-ArtifactsStagingDirectory.ps1"
4848
$CoverageResultsFolder = Join-Path $ArtifactStagingFolder "coverageResults-$(Agent.JobName)"
49-
tools/publish-CodeCov.ps1 -CodeCovToken "$(codecov_token)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)"
49+
tools/publish-CodeCov.ps1 -CodeCovToken "$(CODECOV_TOKEN)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)"
5050
displayName: 📢 Publish code coverage results to codecov.io
5151
timeoutInMinutes: 3
5252
continueOnError: true
53+
# Set the CODECOV_TOKEN variable in your Azure Pipeline to enable code coverage reporting
54+
# Get a token from https://codecov.io/
55+
condition: and(succeeded(), ne(variables['CODECOV_TOKEN'], ''))

0 commit comments

Comments
 (0)