Skip to content

Commit faa404a

Browse files
authored
Merge pull request #9621 from dotnet/darc-release/8.0.1xx-f0fcc838-868b-4c36-b815-cbf58ae83a6b
[release/8.0.1xx] Update dependencies from dotnet/arcade
2 parents 14038fd + c53221e commit faa404a

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Dependency>
1818
</ProductDependencies>
1919
<ToolsetDependencies>
20-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25605.4">
20+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25611.2">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>f922da012fe84ec4bd6e78ed483de7d6b9f2f564</Sha>
22+
<Sha>4b01306353c43c151d713d152f48a4d523c41960</Sha>
2323
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/common/internal-feed-operations.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

eng/common/post-build/nuget-verification.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

eng/common/post-build/post-build-utils.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Get-MaestroChannel([int]$ChannelId) {
2626
$apiHeaders = Create-MaestroApiRequestHeaders
2727
$apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion"
2828

29-
$result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
29+
$result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
3030
return $result
3131
}
3232

@@ -36,7 +36,7 @@ function Get-MaestroBuild([int]$BuildId) {
3636
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
3737
$apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion"
3838

39-
$result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
39+
$result = try { return Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
4040
return $result
4141
}
4242

@@ -47,7 +47,7 @@ function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) {
4747
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
4848
$apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion"
4949

50-
$result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
50+
$result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
5151
return $result
5252
}
5353

@@ -56,15 +56,15 @@ function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) {
5656

5757
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
5858
$apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion"
59-
Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null
59+
Invoke-WebRequest -UseBasicParsing -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null
6060
}
6161

6262
function Trigger-Subscription([string]$SubscriptionId) {
6363
Validate-MaestroVars
6464

6565
$apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
6666
$apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion"
67-
Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null
67+
Invoke-WebRequest -UseBasicParsing -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null
6868
}
6969

7070
function Validate-MaestroVars {

eng/common/templates-official/post-build/setup-maestro-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
$apiHeaders.Add('Accept', 'application/json')
3838
$apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
3939
40-
$buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
40+
$buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
4141
4242
$BarId = $Env:BARBuildId
4343
$Channels = $Env:PromoteToMaestroChannels -split ","

eng/common/tools.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
267267

268268
Retry({
269269
Write-Host "GET $uri"
270-
Invoke-WebRequest $uri -OutFile $installScript
270+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
271271
})
272272
}
273273

@@ -501,7 +501,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
501501
Write-Host "Downloading $packageName $packageVersion"
502502
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
503503
Retry({
504-
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
504+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
505505
})
506506

507507
Unzip $packagePath $packageDir
@@ -541,7 +541,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
541541
Create-Directory $vsWhereDir
542542
Write-Host 'Downloading vswhere'
543543
Retry({
544-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
544+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
545545
})
546546
}
547547

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "8.0.122"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2"
77
}
88
}

0 commit comments

Comments
 (0)