Skip to content

Commit 42556c8

Browse files
nagilsonnagilson
authored
Merge branch 'main' into CommandFolderSources
2 parents 04843c3 + 706bc55 commit 42556c8

40 files changed

+535
-1035
lines changed

‎eng/Version.Details.xml

Lines changed: 194 additions & 194 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

‎eng/common/cross/armel/armel.jessie.patch

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

‎eng/common/cross/build-rootfs.sh

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,13 @@ while :; do
164164
armel)
165165
__BuildArch=armel
166166
__UbuntuArch=armel
167-
__UbuntuRepo="http://ftp.debian.org/debian/"
168-
__CodeName=jessie
167+
__UbuntuRepo="http://archive.debian.org/debian/"
168+
__CodeName=buster
169169
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
170+
__LLDB_Package="liblldb-6.0-dev"
171+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
172+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
173+
__UbuntuSuites=
170174
;;
171175
armv6)
172176
__BuildArch=armv6
@@ -278,46 +282,23 @@ while :; do
278282

279283
;;
280284
xenial) # Ubuntu 16.04
281-
if [[ "$__CodeName" != "jessie" ]]; then
282-
__CodeName=xenial
283-
fi
284-
;;
285-
zesty) # Ubuntu 17.04
286-
if [[ "$__CodeName" != "jessie" ]]; then
287-
__CodeName=zesty
288-
fi
285+
__CodeName=xenial
289286
;;
290287
bionic) # Ubuntu 18.04
291-
if [[ "$__CodeName" != "jessie" ]]; then
292-
__CodeName=bionic
293-
fi
288+
__CodeName=bionic
294289
;;
295290
focal) # Ubuntu 20.04
296-
if [[ "$__CodeName" != "jessie" ]]; then
297-
__CodeName=focal
298-
fi
291+
__CodeName=focal
299292
;;
300293
jammy) # Ubuntu 22.04
301-
if [[ "$__CodeName" != "jessie" ]]; then
302-
__CodeName=jammy
303-
fi
294+
__CodeName=jammy
304295
;;
305296
noble) # Ubuntu 24.04
306-
if [[ "$__CodeName" != "jessie" ]]; then
307-
__CodeName=noble
308-
fi
297+
__CodeName=noble
309298
if [[ -n "$__LLDB_Package" ]]; then
310299
__LLDB_Package="liblldb-18-dev"
311300
fi
312301
;;
313-
jessie) # Debian 8
314-
__CodeName=jessie
315-
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
316-
317-
if [[ -z "$__UbuntuRepo" ]]; then
318-
__UbuntuRepo="http://ftp.debian.org/debian/"
319-
fi
320-
;;
321302
stretch) # Debian 9
322303
__CodeName=stretch
323304
__LLDB_Package="liblldb-6.0-dev"
@@ -333,7 +314,7 @@ while :; do
333314
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
334315

335316
if [[ -z "$__UbuntuRepo" ]]; then
336-
__UbuntuRepo="http://ftp.debian.org/debian/"
317+
__UbuntuRepo="http://archive.debian.org/debian/"
337318
fi
338319
;;
339320
bullseye) # Debian 11
@@ -473,10 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
473454
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
474455
fi
475456

476-
if [[ "$__BuildArch" == "armel" ]]; then
477-
__LLDB_Package="lldb-3.5-dev"
478-
fi
479-
480457
__UbuntuPackages+=" ${__LLDB_Package:-}"
481458

482459
if [[ -z "$__UbuntuRepo" ]]; then
@@ -850,12 +827,6 @@ EOF
850827
if [[ "$__SkipUnmount" == "0" ]]; then
851828
umount "$__RootfsDir"/* || true
852829
fi
853-
854-
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
855-
pushd "$__RootfsDir"
856-
patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
857-
popd
858-
fi
859830
elif [[ "$__Tizen" == "tizen" ]]; then
860831
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
861832
else

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

‎global.json

Lines changed: 2 additions & 2 deletions
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.25163.2",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25163.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.6",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.6",
1919
"Microsoft.Build.NoTargets": "3.7.0"
2020
}
2121
}

‎sdk.sln

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format", "src\BuiltI
482482
EndProject
483483
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "test\dotnet-format.Tests\tests\dotnet-format.UnitTests.csproj", "{D7495CE7-64E5-4715-9304-799A41EC1D71}"
484484
EndProject
485-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
485+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
486486
EndProject
487487
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
488488
EndProject
@@ -528,6 +528,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.NetCore.To
528528
EndProject
529529
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers", "src\Layout\VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers\VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj", "{C5C4F9CA-25B8-2B20-826D-EA93F667C316}"
530530
EndProject
531+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.NetCore.Templates", "src\Layout\VS.Redist.Common.NetCore.Templates\VS.Redist.Common.NetCore.Templates.proj", "{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}"
532+
EndProject
531533
Global
532534
GlobalSection(SolutionConfigurationPlatforms) = preSolution
533535
Debug|Any CPU = Debug|Any CPU
@@ -1014,6 +1016,10 @@ Global
10141016
{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|Any CPU.Build.0 = Debug|Any CPU
10151017
{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|Any CPU.ActiveCfg = Release|Any CPU
10161018
{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|Any CPU.Build.0 = Release|Any CPU
1019+
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1020+
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
1021+
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
1022+
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.Build.0 = Release|Any CPU
10171023
EndGlobalSection
10181024
GlobalSection(SolutionProperties) = preSolution
10191025
HideSolutionNode = FALSE
@@ -1200,6 +1206,7 @@ Global
12001206
{20CA4572-8865-38BF-31C9-E58855D0CD40} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
12011207
{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
12021208
{C5C4F9CA-25B8-2B20-826D-EA93F667C316} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
1209+
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
12031210
EndGlobalSection
12041211
GlobalSection(ExtensibilityGlobals) = postSolution
12051212
SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}

‎src/Cli/dotnet/commands/dotnet-test/LocalizableStrings.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,10 @@ See https://aka.ms/dotnet-test/mtp for more information.</value>
455455
<value>The provided project file has an invalid extension: {0}.</value>
456456
</data>
457457
<data name="CmdMultipleBuildPathOptionsErrorDescription" xml:space="preserve">
458-
<value>Specify either the project, solution or directory option.</value>
458+
<value>Specify either the project, solution, directory, or test modules option.</value>
459+
</data>
460+
<data name="CmdOptionCannotBeUsedWithTestModulesDescription" xml:space="preserve">
461+
<value>The options architecture, configuration, framework, operating system, and runtime cannot be used with '--test-modules' option.</value>
459462
</data>
460463
<data name="CmdNoAnsiDescription" xml:space="preserve">
461464
<value>Disable ANSI output.</value>

‎src/Cli/dotnet/commands/dotnet-test/MSBuildHandler.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@ namespace Microsoft.DotNet.Cli;
1212

1313
internal sealed class MSBuildHandler : IDisposable
1414
{
15-
private readonly List<string> _args;
15+
private readonly BuildOptions _buildOptions;
1616
private readonly TestApplicationActionQueue _actionQueue;
1717
private readonly TerminalTestReporter _output;
1818

1919
private readonly ConcurrentBag<TestApplication> _testApplications = new();
2020
private bool _areTestingPlatformApplications = true;
2121

22-
public MSBuildHandler(List<string> args, TestApplicationActionQueue actionQueue, TerminalTestReporter output)
22+
public MSBuildHandler(BuildOptions buildOptions, TestApplicationActionQueue actionQueue, TerminalTestReporter output)
2323
{
24-
_args = args;
24+
_buildOptions = buildOptions;
2525
_actionQueue = actionQueue;
2626
_output = output;
2727
}
2828

29-
public bool RunMSBuild(BuildOptions buildOptions)
29+
public bool RunMSBuild()
3030
{
31-
if (!ValidationUtility.ValidateBuildPathOptions(buildOptions, _output))
31+
if (!ValidationUtility.ValidateBuildPathOptions(_buildOptions, _output))
3232
{
3333
return false;
3434
}
3535

3636
int msBuildExitCode;
3737
string path;
38-
PathOptions pathOptions = buildOptions.PathOptions;
38+
PathOptions pathOptions = _buildOptions.PathOptions;
3939

4040
if (!string.IsNullOrEmpty(pathOptions.ProjectPath))
4141
{
4242
path = PathUtility.GetFullPath(pathOptions.ProjectPath);
43-
msBuildExitCode = RunBuild(path, isSolution: false, buildOptions);
43+
msBuildExitCode = RunBuild(path, isSolution: false);
4444
}
4545
else if (!string.IsNullOrEmpty(pathOptions.SolutionPath))
4646
{
4747
path = PathUtility.GetFullPath(pathOptions.SolutionPath);
48-
msBuildExitCode = RunBuild(path, isSolution: true, buildOptions);
48+
msBuildExitCode = RunBuild(path, isSolution: true);
4949
}
5050
else
5151
{
5252
path = PathUtility.GetFullPath(pathOptions.DirectoryPath ?? Directory.GetCurrentDirectory());
53-
msBuildExitCode = RunBuild(path, buildOptions);
53+
msBuildExitCode = RunBuild(path);
5454
}
5555

5656
if (msBuildExitCode != ExitCode.Success)
@@ -62,7 +62,7 @@ public bool RunMSBuild(BuildOptions buildOptions)
6262
return true;
6363
}
6464

65-
private int RunBuild(string directoryPath, BuildOptions buildOptions)
65+
private int RunBuild(string directoryPath)
6666
{
6767
(bool solutionOrProjectFileFound, string message) = SolutionAndProjectUtility.TryGetProjectOrSolutionFilePath(directoryPath, out string projectOrSolutionFilePath, out bool isSolution);
6868

@@ -72,16 +72,16 @@ private int RunBuild(string directoryPath, BuildOptions buildOptions)
7272
return ExitCode.GenericFailure;
7373
}
7474

75-
(IEnumerable<TestModule> projects, bool restored) = GetProjectsProperties(projectOrSolutionFilePath, isSolution, buildOptions);
75+
(IEnumerable<TestModule> projects, bool restored) = GetProjectsProperties(projectOrSolutionFilePath, isSolution);
7676

7777
InitializeTestApplications(projects);
7878

7979
return restored ? ExitCode.Success : ExitCode.GenericFailure;
8080
}
8181

82-
private int RunBuild(string filePath, bool isSolution, BuildOptions buildOptions)
82+
private int RunBuild(string filePath, bool isSolution)
8383
{
84-
(IEnumerable<TestModule> projects, bool restored) = GetProjectsProperties(filePath, isSolution, buildOptions);
84+
(IEnumerable<TestModule> projects, bool restored) = GetProjectsProperties(filePath, isSolution);
8585

8686
InitializeTestApplications(projects);
8787

@@ -114,7 +114,7 @@ private void InitializeTestApplications(IEnumerable<TestModule> modules)
114114
throw new UnreachableException($"This program location is thought to be unreachable. Class='{nameof(MSBuildHandler)}' Method='{nameof(InitializeTestApplications)}'");
115115
}
116116

117-
var testApp = new TestApplication(module, _args);
117+
var testApp = new TestApplication(module, _buildOptions);
118118
_testApplications.Add(testApp);
119119
}
120120
}
@@ -133,11 +133,11 @@ public bool EnqueueTestApplications()
133133
return true;
134134
}
135135

136-
private (IEnumerable<TestModule> Projects, bool Restored) GetProjectsProperties(string solutionOrProjectFilePath, bool isSolution, BuildOptions buildOptions)
136+
private (IEnumerable<TestModule> Projects, bool Restored) GetProjectsProperties(string solutionOrProjectFilePath, bool isSolution)
137137
{
138138
(IEnumerable<TestModule> projects, bool isBuiltOrRestored) = isSolution ?
139-
MSBuildUtility.GetProjectsFromSolution(solutionOrProjectFilePath, buildOptions) :
140-
MSBuildUtility.GetProjectsFromProject(solutionOrProjectFilePath, buildOptions);
139+
MSBuildUtility.GetProjectsFromSolution(solutionOrProjectFilePath, _buildOptions) :
140+
MSBuildUtility.GetProjectsFromProject(solutionOrProjectFilePath, _buildOptions);
141141

142142
LogProjectProperties(projects);
143143

0 commit comments

Comments
 (0)