Skip to content

Commit 8227a98

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 293783 (#1499)
Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.0.6 -> 18.0.6) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25605.116 -> 10.0.0-beta.25608.105) Microsoft.DotNet.GenAPI.Task (Version 10.0.102-servicing.25605.116 -> 10.0.102-servicing.25608.105) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.2 -> 10.0.2) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent cbaaa90 commit 8227a98

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<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" />
10+
<add key="darc-pub-dotnet-dotnet-279bb6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-279bb6e9/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-dotnet -->
1212
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1313
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildPackageVersion>18.0.6</MicrosoftBuildPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.6</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.116</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.102-servicing.25605.116</MicrosoftDotNetGenAPITaskPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.102-servicing.25608.105</MicrosoftDotNetGenAPITaskPackageVersion>
1313
<MicrosoftNETCoreILAsmPackageVersion>10.0.2</MicrosoftNETCoreILAsmPackageVersion>
1414
<MicrosoftNETCoreILDAsmPackageVersion>10.0.2</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="ed2ddf8a7ae00575eadfc737cb828f1c3a632305" BarId="293627" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="279bb6e979485785576d9279b6582cf7006c6f91" BarId="293783" />
44
<ToolsetDependencies>
55
<Dependency Name="Microsoft.Build" Version="18.0.6">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
7+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.6">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
11+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25605.116">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25608.105">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
15+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.102-servicing.25605.116">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.102-servicing.25608.105">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
19+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.2">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
23+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.2">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>ed2ddf8a7ae00575eadfc737cb828f1c3a632305</Sha>
27+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</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/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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') {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"msbuild-sdks": {
1616
"Microsoft.Build.NoTargets": "3.7.0",
1717
"Microsoft.Build.Traversal": "3.4.0",
18-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.116"
18+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25608.105"
1919
}
2020
}

0 commit comments

Comments
 (0)