Skip to content

Commit e34f975

Browse files
dotnet-sb-botdotnet-maestro[bot]adamsitnikViktorHofer
authored
Re-Bootstrap Source Build to .NET 10.0.100-preview.4.25216.1 (#48523)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Adam Sitnik <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
1 parent e793aa4 commit e34f975

File tree

14 files changed

+133
-88
lines changed

14 files changed

+133
-88
lines changed

Diff for: ‎eng/Version.Details.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,9 @@
497497
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
498498
</Dependency>
499499
<!-- Intermediate is necessary for source build. -->
500-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.621501">
500+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.621601">
501501
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
502-
<Sha>432b22e3cdaf69c011358a44e61959769b2f607c</Sha>
502+
<Sha>4b566314cf9602b77f25538a88b9c8175231c106</Sha>
503503
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
504504
</Dependency>
505505
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.25207.1">
@@ -631,42 +631,42 @@
631631
</Dependency>
632632
</ProductDependencies>
633633
<ToolsetDependencies>
634-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
634+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25215.5">
635635
<Uri>https://github.com/dotnet/arcade</Uri>
636-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
636+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
637637
</Dependency>
638-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25212.1">
638+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25215.5">
639639
<Uri>https://github.com/dotnet/arcade</Uri>
640-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
640+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
641641
</Dependency>
642-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25212.1">
642+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25215.5">
643643
<Uri>https://github.com/dotnet/arcade</Uri>
644-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
644+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
645645
</Dependency>
646-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25212.1">
646+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25215.5">
647647
<Uri>https://github.com/dotnet/arcade</Uri>
648-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
648+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
649649
</Dependency>
650-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25212.1">
650+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25215.5">
651651
<Uri>https://github.com/dotnet/arcade</Uri>
652-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
652+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
653653
</Dependency>
654-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25212.1">
654+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25215.5">
655655
<Uri>https://github.com/dotnet/arcade</Uri>
656-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
656+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
657657
</Dependency>
658-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25212.1">
658+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25215.5">
659659
<Uri>https://github.com/dotnet/arcade</Uri>
660-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
660+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
661661
</Dependency>
662-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25212.1">
662+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25215.5">
663663
<Uri>https://github.com/dotnet/arcade</Uri>
664-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
664+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
665665
</Dependency>
666666
<!-- Intermediate is necessary for source build. -->
667-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25212.1">
667+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25215.5">
668668
<Uri>https://github.com/dotnet/arcade</Uri>
669-
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
669+
<Sha>1741844bd26eb13fc4731b1e9aed218686717fbd</Sha>
670670
<SourceBuild RepoName="arcade" ManagedOnly="true" />
671671
</Dependency>
672672
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25215.12">

Diff for: ‎eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@
282282
</PropertyGroup>
283283
<PropertyGroup>
284284
<!-- Dependencies from https://github.com/dotnet/arcade -->
285-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25212.1</MicrosoftDotNetSignToolVersion>
289-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25212.1</MicrosoftDotNetXliffTasksVersion>
290-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25212.1</MicrosoftDotNetXUnitExtensionsVersion>
285+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25215.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25215.5</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25215.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25215.5</MicrosoftDotNetSignToolVersion>
289+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25215.5</MicrosoftDotNetXliffTasksVersion>
290+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25215.5</MicrosoftDotNetXUnitExtensionsVersion>
291291
</PropertyGroup>
292292
<PropertyGroup>
293293
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

Diff for: ‎eng/common/core-templates/steps/install-microbuild.yml

-24
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@ parameters:
1111
steps:
1212
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
1313
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
14-
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
15-
- script: |
16-
version=$(python3 --version | awk '{print $2}')
17-
major=$(echo $version | cut -d. -f1)
18-
minor=$(echo $version | cut -d. -f2)
19-
20-
installPython=false
21-
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
22-
installPython=true
23-
fi
24-
25-
echo "Python version: $version."
26-
echo "Install Python 3.12.x: $installPython."
27-
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
28-
name: InstallPython
29-
displayName: 'Determine Python installation'
30-
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
31-
32-
- task: UsePythonVersion@0
33-
inputs:
34-
versionSpec: '3.12.x'
35-
displayName: 'Use Python 3.12.x'
36-
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))
37-
3814
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
3915
- task: UseDotNet@2
4016
displayName: Install .NET 8.0 SDK for MicroBuild Plugin

Diff for: ‎eng/common/sdk-task.ps1

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ Param(
66
[string] $msbuildEngine = $null,
77
[switch] $restore,
88
[switch] $prepareMachine,
9+
[switch][Alias('nobl')]$excludeCIBinaryLog,
910
[switch] $help,
1011
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1112
)
1213

1314
$ci = $true
14-
$binaryLog = $true
15+
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
1516
$warnAsError = $true
1617

1718
. $PSScriptRoot\tools.ps1
@@ -27,17 +28,19 @@ function Print-Usage() {
2728
Write-Host "Advanced settings:"
2829
Write-Host " -prepareMachine Prepare machine for CI run"
2930
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
31+
Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)"
3032
Write-Host ""
3133
Write-Host "Command line arguments not listed above are passed thru to msbuild."
3234
}
3335

3436
function Build([string]$target) {
3537
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
3638
$log = Join-Path $LogDir "$task$logSuffix.binlog"
39+
$binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
3740
$outputPath = Join-Path $ToolsetDir "$task\"
3841

3942
MSBuild $taskProject `
40-
/bl:$log `
43+
$binaryLogArg `
4144
/t:$target `
4245
/p:Configuration=$configuration `
4346
/p:RepoRoot=$RepoRoot `

Diff for: ‎eng/common/sdk-task.sh

+14-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ show_usage() {
77
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
88
echo " --help Print help and exit"
99
echo ""
10+
11+
echo "Advanced settings:"
12+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo ""
1014
echo "Command line arguments not listed above are passed thru to msbuild."
1115
}
1216

@@ -27,10 +31,12 @@ Build() {
2731
local log_suffix=""
2832
[[ "$target" != "Execute" ]] && log_suffix=".$target"
2933
local log="$log_dir/$task$log_suffix.binlog"
34+
local binaryLogArg=""
35+
[[ $binary_log == true ]] && binaryLogArg="/bl:$log"
3036
local output_path="$toolset_dir/$task/"
3137

3238
MSBuild "$taskProject" \
33-
/bl:"$log" \
39+
$binaryLogArg \
3440
/t:"$target" \
3541
/p:Configuration="$configuration" \
3642
/p:RepoRoot="$repo_root" \
@@ -39,8 +45,10 @@ Build() {
3945
$properties
4046
}
4147

48+
binary_log=true
4249
configuration="Debug"
4350
verbosity="minimal"
51+
exclude_ci_binary_log=false
4452
restore=false
4553
help=false
4654
properties=''
@@ -60,6 +68,11 @@ while (($# > 0)); do
6068
verbosity=$2
6169
shift 2
6270
;;
71+
--excludecibinarylog|--nobl)
72+
binary_log=false
73+
exclude_ci_binary_log=true
74+
shift 1
75+
;;
6376
--help)
6477
help=true
6578
shift 1
@@ -72,7 +85,6 @@ while (($# > 0)); do
7285
done
7386

7487
ci=true
75-
binaryLog=true
7688
warnAsError=true
7789

7890
if $help; then

Diff for: ‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25215.5",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25215.5",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

Diff for: ‎src/SourceBuild/content/eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>10.0.100-preview.4.25214.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>10.0.100-preview.4.25214.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>10.0.100-preview.4.25216.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>10.0.100-preview.4.25216.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- arcade dependencies -->
2929
<MicrosoftDotNetVersionToolsVersion>10.0.0-beta.25110.3</MicrosoftDotNetVersionToolsVersion>
3030
<!-- command-line-api dependencies -->

Diff for: ‎src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ namespace BinaryToolKit;
99

1010
public class Program
1111
{
12-
public static readonly CliArgument<string> TargetDirectory = new("target-directory")
12+
public static readonly Argument<string> TargetDirectory = new("target-directory")
1313
{
1414
Description = "The directory to run the binary tooling on.",
1515
Arity = ArgumentArity.ExactlyOne
1616
};
1717

18-
public static readonly CliOption<string> OutputReportDirectory = new("--output-directory", "-o")
18+
public static readonly Option<string> OutputReportDirectory = new("--output-directory", "-o")
1919
{
2020
Description = "The directory to output the report to.",
2121
Arity = ArgumentArity.ZeroOrOne,
2222
DefaultValueFactory = _ => Path.Combine(Directory.GetCurrentDirectory(), "binary-report")
2323
};
2424

25-
public static readonly CliOption<LogLevel> Level = new("--log-level", "-l")
25+
public static readonly Option<LogLevel> Level = new("--log-level", "-l")
2626
{
2727
Description = "The log level to run the tool in.",
2828
Arity = ArgumentArity.ZeroOrOne,
2929
DefaultValueFactory = _ => LogLevel.Information,
3030
Recursive = true
3131
};
3232

33-
public static readonly CliOption<string> AllowedBinariesFile = new("--allowed-binaries-file", "-ab")
33+
public static readonly Option<string> AllowedBinariesFile = new("--allowed-binaries-file", "-ab")
3434
{
3535
Description = "The file containing the list of allowed binaries that are ignored for cleaning or validating.\n",
3636
Arity = ArgumentArity.ZeroOrOne
@@ -43,7 +43,7 @@ public static async Task<int> Main(string[] args)
4343
var cleanCommand = CreateCommand("clean", "Clean the binaries in the target directory.");
4444
var validateCommand = CreateCommand("validate", "Detect new binaries in the target directory.");
4545

46-
var rootCommand = new CliRootCommand("Tool for detecting, validating, and cleaning binaries in the target directory.")
46+
var rootCommand = new RootCommand("Tool for detecting, validating, and cleaning binaries in the target directory.")
4747
{
4848
Level,
4949
cleanCommand,
@@ -58,17 +58,17 @@ public static async Task<int> Main(string[] args)
5858
return ExitCode;
5959
}
6060

61-
private static CliCommand CreateCommand(string name, string description)
61+
private static Command CreateCommand(string name, string description)
6262
{
63-
return new CliCommand(name, description)
63+
return new Command(name, description)
6464
{
6565
TargetDirectory,
6666
OutputReportDirectory,
6767
AllowedBinariesFile
6868
};
6969
}
7070

71-
private static void SetCommandAction(CliCommand command, Modes mode)
71+
private static void SetCommandAction(Command command, Modes mode)
7272
{
7373
command.SetAction(async (result, CancellationToken) =>
7474
{

Diff for: ‎src/SourceBuild/content/eng/tools/BuildComparer/Program.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,43 @@ public class Program
2424
/// <returns>Return code indicating success (0) or failure (non-zero).</returns>
2525
static int Main(string[] args)
2626
{
27-
var vmrManifestPathArgument = new CliOption<string>("-vmrManifestPath")
27+
var vmrManifestPathArgument = new Option<string>("-vmrManifestPath")
2828
{
2929
Description = "Path to the manifest file",
3030
Required = true
3131
};
32-
var vmrAssetBasePathArgument = new CliOption<string>("-vmrAssetBasePath")
32+
var vmrAssetBasePathArgument = new Option<string>("-vmrAssetBasePath")
3333
{
3434
Description = "Path to the manifest file",
3535
Required = true
3636
};
37-
var msftAssetBasePathArgument = new CliOption<string>("-msftAssetBasePath")
37+
var msftAssetBasePathArgument = new Option<string>("-msftAssetBasePath")
3838
{
3939
Description = "Path to the asset base path",
4040
Required = true
4141
};
42-
var issuesReportArgument = new CliOption<string>("-issuesReport")
42+
var issuesReportArgument = new Option<string>("-issuesReport")
4343
{
4444
Description = "Path to output xml file for non-baselined issues.",
4545
Required = true
4646
};
47-
var noIssuesReportArgument = new CliOption<string>("-noIssuesReport")
47+
var noIssuesReportArgument = new Option<string>("-noIssuesReport")
4848
{
4949
Description = "Path to output xml file for baselined issues and assets without issues.",
5050
Required = true
5151
};
52-
var parallelismArgument = new CliOption<int>("-parallel")
52+
var parallelismArgument = new Option<int>("-parallel")
5353
{
5454
Description = "Amount of parallelism used while analyzing the builds.",
5555
DefaultValueFactory = _ => 8,
5656
Required = true
5757
};
58-
var baselineArgument = new CliOption<string>("-baseline")
58+
var baselineArgument = new Option<string>("-baseline")
5959
{
6060
Description = "Path to the baseline build manifest.",
6161
Required = true
6262
};
63-
var rootCommand = new CliRootCommand(description: "Tool for comparing Microsoft builds with VMR builds.")
63+
var rootCommand = new RootCommand(description: "Tool for comparing Microsoft builds with VMR builds.")
6464
{
6565
vmrManifestPathArgument,
6666
vmrAssetBasePathArgument,

0 commit comments

Comments
 (0)