Skip to content

Commit 3ceff40

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 294642 (#7009)
[release/7.0.x] Source code updates from dotnet/dotnet
1 parent baf3a9f commit 3ceff40

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ This file should be imported by eng/Versions.props
2121
<!-- dotnet/corefx dependencies -->
2222
<SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
2323
<!-- dotnet/dotnet dependencies -->
24-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetArcadeSdkPackageVersion>
25-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetXliffTasksPackageVersion>
24+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25612.103</MicrosoftDotNetArcadeSdkPackageVersion>
25+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25612.103</MicrosoftDotNetXliffTasksPackageVersion>
2626
</PropertyGroup>
2727
<!--Property group for alternate package version names-->
2828
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="ed2ddf8a7ae00575eadfc737cb828f1c3a632305" BarId="293627" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="a1b9d991e4596823841f4f9d840e72ac369e3a7e" BarId="294642" />
44
<!--
55
Currently this file is required to publish builds to .NET build asset registry.
66
See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25605.116">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25612.103">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
61+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25605.116">
63+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25612.103">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
65+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
6666
</Dependency>
6767
</ToolsetDependencies>
6868
</Dependencies>

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

‎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/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ try {
7070
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
7171
}
7272
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
73-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
73+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty
7474
}
7575
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7676
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

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

278278
Retry({
279279
Write-Host "GET $uri"
280-
Invoke-WebRequest $uri -OutFile $installScript
280+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
281281
})
282282
}
283283

@@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394394

395395
# If the version of msbuild is going to be xcopied,
396396
# use this version. Version matches a package here:
397-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
398-
$defaultXCopyMSBuildVersion = '17.13.0'
397+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0
398+
$defaultXCopyMSBuildVersion = '18.0.0'
399399

400400
if (!$vsRequirements) {
401401
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
@@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
510510
Write-Host "Downloading $packageName $packageVersion"
511511
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
512512
Retry({
513-
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
513+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
514514
})
515515

516516
if (!(Test-Path $packagePath)) {
@@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
556556
Write-Host "Downloading vswhere $vswhereVersion"
557557
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
558558
Retry({
559-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
559+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
560560
})
561561
}
562562

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"pinned": true
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.116",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.103",
1313
"Microsoft.Build.NoTargets": "3.7.0"
1414
}
1515
}

0 commit comments

Comments
 (0)