Skip to content

Commit 9603ff6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 294642 (#37368)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25605.116 -> 10.0.0-beta.25612.103) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.2 -> 10.0.2) Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.NETCore.Platforms (Version 10.0.2-servicing.25605.116 -> 10.0.2-servicing.25612.103) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent d723553 commit 9603ff6

File tree

10 files changed

+45
-45
lines changed

10 files changed

+45
-45
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-ed2ddf8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ed2ddf8a/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-a1b9d99" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-a1b9d991/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25612.103</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25612.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25612.103</MicrosoftDotNetHelixSdkPackageVersion>
1212
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.2</MicrosoftExtensionsCachingMemoryPackageVersion>
1313
<MicrosoftExtensionsConfigurationPackageVersion>10.0.2</MicrosoftExtensionsConfigurationPackageVersion>
1414
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
1515
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
1616
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.2-servicing.25605.116</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.2-servicing.25612.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
2020
<MicrosoftExtensionsLoggingPackageVersion>10.0.2</MicrosoftExtensionsLoggingPackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25605.116</MicrosoftNETCorePlatformsPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25612.103</MicrosoftNETCorePlatformsPackageVersion>
2323
<SystemFormatsAsn1PackageVersion>10.0.2</SystemFormatsAsn1PackageVersion>
2424
<SystemRuntimeCachingPackageVersion>10.0.2</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.2</SystemTextEncodingsWebPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ed2ddf8a7ae00575eadfc737cb828f1c3a632305" BarId="293627" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="a1b9d991e4596823841f4f9d840e72ac369e3a7e" BarId="294642" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.2">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
7+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
11+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.2">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
15+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
1616
</Dependency>
1717
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.2">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
19+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.2">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
23+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.2">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
27+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.2">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
31+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.2-servicing.25605.116">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.2-servicing.25612.103">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
35+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.2">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
39+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
43+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25605.116">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25612.103">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
47+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Text.Json" Version="10.0.2">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
51+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
5252
</Dependency>
5353
<Dependency Name="System.Text.Encodings.Web" Version="10.0.2">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
55+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Asn1" Version="10.0.2">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
59+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
6060
</Dependency>
6161
<Dependency Name="System.Runtime.Caching" Version="10.0.2">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
63+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25605.116">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25612.103">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
69+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25605.116">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25612.103">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
73+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25605.116">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25612.103">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
77+
<Sha>a1b9d991e4596823841f4f9d840e72ac369e3a7e</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2004.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-azurelinux-3
66+
image: 1es-mariner-2
6767
os: linux
6868
${{ else }}:
6969
pool:

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100",
3+
"version": "10.0.101",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor",
66
"paths": [
@@ -10,15 +10,15 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100",
13+
"dotnet": "10.0.101",
1414
"runtimes": {
1515
"dotnet": [
1616
"$(MicrosoftNETCorePlatformsVersion)"
1717
]
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.116",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.116"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.103",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25612.103"
2323
}
2424
}

0 commit comments

Comments
 (0)