Skip to content

Commit 19be856

Browse files
[main] Source code updates from dotnet/dotnet (#8983)
* Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Update dependencies from https://github.com/dotnet/dotnet * Remove SB intermediates and baseline --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 1830552 commit 19be856

File tree

5 files changed

+9
-44
lines changed

5 files changed

+9
-44
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

eng/Version.Details.xml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="919f64d9fd105eda6d412b926d9c20951383150f" BarId="265833" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
44
<ProductDependencies>
5-
<!-- Intermediate is necessary for source build. -->
6-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.622301">
7-
<Uri>https://github.com/dotnet/source-build-externals</Uri>
8-
<Sha>d4976ef649e7979d63868aaedd681d940e89d893</Sha>
9-
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
10-
</Dependency>
11-
<!-- Intermediate is necessary for source build. -->
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.622304">
13-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
14-
<Sha>65dce0e04c42107e92af4287fe8b5022407b7440</Sha>
15-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
16-
</Dependency>
17-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25225.102">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25228.104">
186
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>919f64d9fd105eda6d412b926d9c20951383150f</Sha>
7+
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
208
</Dependency>
219
</ProductDependencies>
2210
<ToolsetDependencies>
23-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25225.102">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
2412
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>919f64d9fd105eda6d412b926d9c20951383150f</Sha>
26-
</Dependency>
27-
<!-- Intermediate is necessary for source build. -->
28-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25222.2">
29-
<Uri>https://github.com/dotnet/arcade</Uri>
30-
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
31-
<SourceBuild RepoName="arcade" ManagedOnly="true" />
13+
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
3214
</Dependency>
3315
<!-- Dependencies required for source build. We'll still update manually -->
3416
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<!-- Non-maestro versions -->
1717
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
18-
<SystemCommandLinePackageVersion>2.0.0-beta5.25225.102</SystemCommandLinePackageVersion>
18+
<SystemCommandLinePackageVersion>2.0.0-beta5.25228.104</SystemCommandLinePackageVersion>
1919
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
2020
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
2121
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>

eng/common/core-templates/steps/source-index-stage1-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104"
77
}
88
}

0 commit comments

Comments
 (0)