diff --git a/Directory.Build.props b/Directory.Build.props index 06d8ce4df81bd2..99eee260233d71 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -178,7 +178,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(TargetRid).$(HostConfiguration)', 'corehost')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(NetCoreAppCurrent)', '$(TargetRid)', 'publish')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(NetCoreAppCurrent)', '$(PortableTargetRid)', 'publish')) diff --git a/eng/Subsets.props b/eng/Subsets.props index 82d19b2f8000bc..3c854690a1c0a9 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -656,6 +656,8 @@ <_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true'">true <_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true <_BuildCdacPack Condition="'$(_CDacToolsBuilt)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' and ('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'linux')">true + + <_BuildCdacPack Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetsLinuxMusl)' == 'true'">false <_BuildBundle Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09177807fcb309..bcefb9e13383b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project da5dd054a531e6fea65643b7e754285b73eab433 - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness feac80219b22c403d32df9b6bd61cbf78e1b9986 - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 385d085eb055cabeaed3dde958a900e7b31cf6ce - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d - + https://github.com/dotnet/dotnet - 86117ef4343bab700dab871c416e55b22848cd52 + f65cc9c656ea330c50ed30694c4b0834489f7f6d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 546ed5aef70cda..799ba253273b26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,17 +36,17 @@ - 10.0.0-preview.25360.101 + 10.0.0-preview.25362.103 - 5.0.0-1.25360.101 + 5.0.0-1.25362.103 - 5.0.0-1.25360.101 - 5.0.0-1.25360.101 - 5.0.0-1.25360.101 + 5.0.0-1.25362.103 + 5.0.0-1.25362.103 + 5.0.0-1.25362.103 - 10.0.100-preview.7.25360.101 + 10.0.100-preview.7.25362.103 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 2.9.3-beta.25360.101 - 10.0.0-beta.25360.101 - 2.9.3-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 - 10.0.0-beta.25360.101 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 2.9.3-beta.25362.103 + 10.0.0-beta.25362.103 + 2.9.3-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 + 10.0.0-beta.25362.103 1.4.0 6.0.0-preview.1.102 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25362.103 6.0.0 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25362.103 + 10.0.0-preview.7.25362.103 6.0.0 4.6.1 @@ -128,16 +128,16 @@ 8.0.0 8.0.1 5.0.0 - 10.0.0-preview.7.25360.101 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25362.103 + 10.0.0-preview.7.25362.103 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25362.103 7.0.0 - 10.0.0-preview.7.25360.101 + 10.0.0-preview.7.25362.103 8.0.0 4.5.1 @@ -180,7 +180,7 @@ 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta6.25360.101 + 2.0.0-beta7.25362.103 3.1.16 2.1.0 2.0.3 @@ -226,7 +226,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25360.101 + 0.11.5-alpha.25362.103 10.0.0-preview.6.25302.1 @@ -258,7 +258,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport --> - 10.0.100-preview.7.25360.101 + 10.0.100-preview.7.25362.103 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda diff --git a/global.json b/global.json index be75acb6bae149..de131c7b2cb3ce 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-preview.7.25322.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25360.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25360.101", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25360.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25362.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25362.103", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25362.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25360.101" + "Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25362.103" } } diff --git a/src/coreclr/tools/ILVerify/Program.cs b/src/coreclr/tools/ILVerify/Program.cs index eae57d8bfd752d..c5129006e4fa0e 100644 --- a/src/coreclr/tools/ILVerify/Program.cs +++ b/src/coreclr/tools/ILVerify/Program.cs @@ -362,7 +362,7 @@ private string GetFullClassName(MetadataReader metadataReader, TypeDefinitionHan fullName.Append(GetFullClassName(metadataReader, declaringType)); fullName.Append('+'); } - + var namespaceName = metadataReader.GetString(typeDef.Namespace); if (!string.IsNullOrEmpty(namespaceName)) { @@ -372,7 +372,7 @@ private string GetFullClassName(MetadataReader metadataReader, TypeDefinitionHan var typeName = metadataReader.GetString(typeDef.Name); fullName.Append(typeName); - + return fullName.ToString(); } @@ -479,10 +479,14 @@ public PEReader Resolve(string simpleName) private T Get(Argument argument) => _command.Result.GetValue(argument); private static int Main(string[] args) => - new CommandLineConfiguration(new ILVerifyRootCommand().UseVersion()) + new ILVerifyRootCommand().UseVersion() + .Parse(args, new() { ResponseFileTokenReplacer = Helpers.TryReadResponseFile, - EnableDefaultExceptionHandler = false, - }.Invoke(args); + }) + .Invoke(new() + { + EnableDefaultExceptionHandler = false + }); } } diff --git a/src/coreclr/tools/aot/ILCompiler/Program.cs b/src/coreclr/tools/aot/ILCompiler/Program.cs index 0cf9f83308e207..46ce7a5696d804 100644 --- a/src/coreclr/tools/aot/ILCompiler/Program.cs +++ b/src/coreclr/tools/aot/ILCompiler/Program.cs @@ -804,12 +804,16 @@ private static IEnumerable ProcessWarningCodes(IEnumerable warningC private T Get(Option option) => _command.Result.GetValue(option); private static int Main(string[] args) => - new CommandLineConfiguration(new ILCompilerRootCommand(args) + new ILCompilerRootCommand(args) .UseVersion() - .UseExtendedHelp(ILCompilerRootCommand.PrintExtendedHelp)) - { - ResponseFileTokenReplacer = Helpers.TryReadResponseFile, - EnableDefaultExceptionHandler = false, - }.Invoke(args); + .UseExtendedHelp(ILCompilerRootCommand.PrintExtendedHelp) + .Parse(args, new() + { + ResponseFileTokenReplacer = Helpers.TryReadResponseFile, + }) + .Invoke(new() + { + EnableDefaultExceptionHandler = false + }); } } diff --git a/src/coreclr/tools/aot/crossgen2/Program.cs b/src/coreclr/tools/aot/crossgen2/Program.cs index c38f577c5a3f45..53404bb9feb440 100644 --- a/src/coreclr/tools/aot/crossgen2/Program.cs +++ b/src/coreclr/tools/aot/crossgen2/Program.cs @@ -912,12 +912,16 @@ internal static bool IsValidPublicKey(byte[] blob) private T Get(Option option) => _command.Result.GetValue(option); private static int Main(string[] args) => - new CommandLineConfiguration(new Crossgen2RootCommand(args) + new Crossgen2RootCommand(args) .UseVersion() - .UseExtendedHelp(Crossgen2RootCommand.PrintExtendedHelp)) - { - ResponseFileTokenReplacer = Helpers.TryReadResponseFile, - EnableDefaultExceptionHandler = false, - }.Invoke(args); + .UseExtendedHelp(Crossgen2RootCommand.PrintExtendedHelp) + .Parse(args, new() + { + ResponseFileTokenReplacer = Helpers.TryReadResponseFile, + }) + .Invoke(new() + { + EnableDefaultExceptionHandler = false + }); } } diff --git a/src/coreclr/tools/dotnet-pgo/Program.cs b/src/coreclr/tools/dotnet-pgo/Program.cs index 3ed5bd51efc4e8..a36fce10d09e1c 100644 --- a/src/coreclr/tools/dotnet-pgo/Program.cs +++ b/src/coreclr/tools/dotnet-pgo/Program.cs @@ -161,13 +161,17 @@ public Program(PgoRootCommand command) private bool IsSet(Option option) => _command.Result.GetResult(option) != null; private static int Main(string[] args) => - new CommandLineConfiguration(new PgoRootCommand(args) + new PgoRootCommand(args) .UseVersion() - .UseExtendedHelp(PgoRootCommand.PrintExtendedHelp)) - { - ResponseFileTokenReplacer = Helpers.TryReadResponseFile, - EnableDefaultExceptionHandler = false, - }.Invoke(args); + .UseExtendedHelp(PgoRootCommand.PrintExtendedHelp) + .Parse(args, new() + { + ResponseFileTokenReplacer = Helpers.TryReadResponseFile, + }) + .Invoke(new() + { + EnableDefaultExceptionHandler = false + }); public static void PrintWarning(string warning) { diff --git a/src/coreclr/tools/r2rdump/Program.cs b/src/coreclr/tools/r2rdump/Program.cs index 4755414bd66496..9bf71723a02f59 100644 --- a/src/coreclr/tools/r2rdump/Program.cs +++ b/src/coreclr/tools/r2rdump/Program.cs @@ -499,9 +499,12 @@ public int Run() private T Get(Option option) => _command.Result.GetValue(option); public static int Main(string[] args) => - new CommandLineConfiguration(new R2RDumpRootCommand().UseVersion()) - { - ResponseFileTokenReplacer = Helpers.TryReadResponseFile - }.Invoke(args); + new R2RDumpRootCommand().UseVersion() + .Parse(args, + new ParserConfiguration() + { + ResponseFileTokenReplacer = Helpers.TryReadResponseFile + }) + .Invoke(); } } diff --git a/src/coreclr/tools/r2rtest/CommandLineOptions.cs b/src/coreclr/tools/r2rtest/CommandLineOptions.cs index c892030f1af94b..3966dbed6ebcc1 100644 --- a/src/coreclr/tools/r2rtest/CommandLineOptions.cs +++ b/src/coreclr/tools/r2rtest/CommandLineOptions.cs @@ -299,7 +299,7 @@ void CreateCommand(string name, string description, Option[] options, Func("--asp-net-path", "-asp") { Description = "Path to SERP's ASP.NET Core folder" }.AcceptExistingOnly(); private static int Main(string[] args) => - new CommandLineConfiguration(new R2RTestRootCommand().UseVersion()).Invoke(args); + new R2RTestRootCommand().UseVersion().Parse(args).Invoke(); } public partial class BuildOptions diff --git a/src/native/managed/compile-native.proj b/src/native/managed/compile-native.proj index bede6454426570..737593267ed65f 100644 --- a/src/native/managed/compile-native.proj +++ b/src/native/managed/compile-native.proj @@ -19,8 +19,13 @@ false false - - $(NativeAotSupported) + + false + + false + false + true + false diff --git a/src/tools/StressLogAnalyzer/src/Program.cs b/src/tools/StressLogAnalyzer/src/Program.cs index 88690222f9cbe1..51059c44337d03 100644 --- a/src/tools/StressLogAnalyzer/src/Program.cs +++ b/src/tools/StressLogAnalyzer/src/Program.cs @@ -56,8 +56,8 @@ private static unsafe int ReadFromMemoryMappedLog(ulong address, Span buff public static async Task Main(string[] args) { - CommandLineConfiguration configuration = new(CreateRootCommand()); - ParseResult parsedArguments = configuration.Parse(args); + RootCommand rootCommand = CreateRootCommand(); + ParseResult parsedArguments = rootCommand.Parse(args); while (true) { @@ -79,11 +79,12 @@ public static async Task Main(string[] args) { // Parse the remaining string as new arguments for the analyzer. FileInfo inputFileArgument = parsedArguments.GetValue(InputFileArgument)!; - parsedArguments = configuration.Parse($"\"{inputFileArgument.FullName}\" {command[1..]}"); + parsedArguments = rootCommand.Parse($"\"{inputFileArgument.FullName}\" {command[1..]}"); break; } } - }; + } + ; } private static readonly Argument InputFileArgument = new Argument("log file")