From 1ba596079f9502a4ee8f819cf52a9ce031749ebe Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 14 Jan 2026 08:28:17 -0600 Subject: [PATCH 1/2] Fix OmniSharp tests silently passing on script execution failures (#52435) --- .../OmniSharpTests.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index c44e8e03a90e..7af6a2137b7c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -49,8 +49,8 @@ public async Task VerifyScenario(DotNetTemplate template) string projectDirectory = DotNetHelper.ExecuteNew(templateName, projectName); (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( - Path.Combine(OmniSharpDirectory, "run"), - $"-s {projectDirectory}", + DotNetHelper.DotNetPath, + $"{Path.Combine(OmniSharpDirectory, "OmniSharp.dll")} -- -s {projectDirectory}", OutputHelper, logOutput: true, millisecondTimeout: 5000, @@ -59,6 +59,8 @@ public async Task VerifyScenario(DotNetTemplate template) Assert.NotEqual(0, executeResult.Process.ExitCode); Assert.DoesNotContain("ERROR", executeResult.StdOut); Assert.DoesNotContain("ERROR", executeResult.StdErr); + Assert.DoesNotContain("command not found", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); + Assert.DoesNotContain("No such file or directory", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); } private async Task InitializeOmniSharp() @@ -66,7 +68,7 @@ private async Task InitializeOmniSharp() if (!Directory.Exists(OmniSharpDirectory)) { using HttpClient client = new(); - string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}.tar.gz"; + string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}-net6.0.tar.gz"; Uri omniSharpTarballUrl = new($"https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v{OmniSharpReleaseVersion}/{omniSharpTarballFile}"); await client.DownloadFileAsync(omniSharpTarballUrl, omniSharpTarballFile, OutputHelper); From 4cd2cc93b63a43cf2585354c66d90a2cf8e4a0f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 14:29:15 +0000 Subject: [PATCH 2/2] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 224 +++++++++++++++++----------------------- eng/Versions.props | 95 ++++++++--------- 3 files changed, 149 insertions(+), 180 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc821d0d5225..0ac98986f7f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43475c12ccc5..3a8c40fa01ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae diff --git a/eng/Versions.props b/eng/Versions.props index 7f5d82caa4ef..d02494c97383 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26063.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion)