Skip to content

Commit 923e36d

Browse files
committed
Merge remote-tracking branch 'origin/main' into microbuild
2 parents 028d93f + 1439223 commit 923e36d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 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@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
20+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2121
with:
2222
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
2323

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1515
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
1616
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
17-
<PackageVersion Include="xunit.v3" Version="3.2.0" />
17+
<PackageVersion Include="xunit.v3" Version="3.2.1" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<!-- Put repo-specific GlobalPackageReference items in this group. -->

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)