Skip to content

Commit 02daf0e

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [923e36d from that repo](AArnott/Library.Template@923e36d).
2 parents 2450cb2 + 923e36d commit 02daf0e

File tree

9 files changed

+10
-15
lines changed

9 files changed

+10
-15
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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2121
with:
2222
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
2323

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/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,6 @@ jobs:
194194
- powershell: Write-Host "##vso[task.setvariable variable=PROFILINGINPUTSDROPNAME]$(tools/variables/ProfilingInputsDropName.ps1)"
195195
displayName: ⚙ Set ProfilingInputsDropName for optprof
196196

197-
- ${{ if eq(variables['Build.Reason'], 'Schedule') }}:
198-
- template: schedule-only-steps.yml
199-
200197
- template: install-dependencies.yml
201198

202199
- script: dotnet nbgv cloud -ca

azure-pipelines/dotnet.yml

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

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

azure-pipelines/schedule-only-steps.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

azure-pipelines/vs-insertion.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ resources:
1515
trigger:
1616
tags:
1717
- Real signed
18-
- auto-insertion
1918

2019
variables:
2120
- template: GlobalVariables.yml

tools/Install-DotNetSdk.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ Function Get-InstallerExe(
125125
}
126126

127127
if ($TypedVersion.Build -eq -1) {
128-
$versionInfo = -Split (Invoke-WebRequest -Uri "https://dotnetcli.blob.core.windows.net/dotnet/$sku/$Version/latest.version" -UseBasicParsing)
128+
$versionInfo = -Split (Invoke-WebRequest -Uri "https://builds.dotnet.microsoft.com/dotnet/$sku/$Version/latest.version" -UseBasicParsing)
129129
$Version = $versionInfo[-1]
130130
}
131131

132132
$majorMinor = "$($TypedVersion.Major).$($TypedVersion.Minor)"
133133
$ReleasesFile = Join-Path $DotNetInstallScriptRoot "$majorMinor\releases.json"
134134
if (!(Test-Path $ReleasesFile)) {
135-
Get-FileFromWeb -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$majorMinor/releases.json" -OutDir (Split-Path $ReleasesFile) | Out-Null
135+
Get-FileFromWeb -Uri "https://builds.dotnet.microsoft.com/dotnet/release-metadata/$majorMinor/releases.json" -OutDir (Split-Path $ReleasesFile) | Out-Null
136136
}
137137

138138
$releases = Get-Content $ReleasesFile | ConvertFrom-Json

0 commit comments

Comments
 (0)