From c9badca4a008ecc53765edb43b0481e5ee93bd18 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 17 Jul 2025 10:56:53 -0700 Subject: [PATCH 1/4] Move to .NET 10p6 Let's try to get ahead of the next one. --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 7495e1ea259c2..748088bed40d1 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "10.0.100-preview.5.25277.114", + "version": "10.0.100-preview.6.25358.103", "allowPrerelease": false, "rollForward": "patch" }, "tools": { - "dotnet": "10.0.100-preview.5.25277.114", + "dotnet": "10.0.100-preview.6.25358.103", "vs": { "version": "17.14.0" }, From b8eb028694f5cffaf6e6f96f9c04fc322962a068 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 17 Jul 2025 13:32:58 -0700 Subject: [PATCH 2/4] Update contributing docs as well. --- docs/contributing/Building, Debugging, and Testing on Unix.md | 2 +- .../contributing/Building, Debugging, and Testing on Windows.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing/Building, Debugging, and Testing on Unix.md b/docs/contributing/Building, Debugging, and Testing on Unix.md index 5d1d326a4d610..6f224b39f7584 100644 --- a/docs/contributing/Building, Debugging, and Testing on Unix.md +++ b/docs/contributing/Building, Debugging, and Testing on Unix.md @@ -12,7 +12,7 @@ Particularly for developers who aren't experienced with .NET Core development on 1. Install [VS Code](https://code.visualstudio.com/Download) - After you install VS Code, install the [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) - Important tip: You can look up editor commands by name by hitting *Ctrl+Shift+P*, or by hitting *Ctrl+P* and typing a `>` character. This will help you get familiar with editor commands mentioned below. On a Mac, use *⌘* instead of *Ctrl*. -1. Install the [.NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) which matches the `sdk.version` property in [global.json](../../global.json#L3) +1. Install the [.NET 10.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) which matches the `sdk.version` property in [global.json](../../global.json#L3) 3. You can build from VS Code by running the *Run Build Task* command, then selecting an appropriate task such as *build* or *build current project* (the latter builds the containing project for the current file you're viewing in the editor). 4. You can run tests from VS Code by opening a test class in the editor, then using the *Run Tests in Context* and *Debug Tests in Context* editor commands. You may want to bind these commands to keyboard shortcuts that match their Visual Studio equivalents (**Ctrl+R, T** for *Run Tests in Context* and **Ctrl+R, Ctrl+T** for *Debug Tests in Context*). 5. You can launch a new VS Code instance with the language server from your current code by running the "launch vscode with language server" task. diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md index 235ae3e82854c..cd3d77670b084 100644 --- a/docs/contributing/Building, Debugging, and Testing on Windows.md +++ b/docs/contributing/Building, Debugging, and Testing on Windows.md @@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2. - Ensure C# and Visual Basic, MSBuild, and .NET Core are included in the selected individual components - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features - Restart Visual Studio -1. Install the [.NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) which matches the `sdk.version` property in [global.json](../../global.json#L3) +1. Install the [.NET 10.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) which matches the `sdk.version` property in [global.json](../../global.json#L3) 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading. 1. Run Restore.cmd 1. Open Roslyn.sln From b9f3277d35ffc819b888bc56db67ebac6fde1764 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 17 Jul 2025 13:38:43 -0700 Subject: [PATCH 3/4] Downgrade xunit.runner.visualstudio to 2.8.2 --- eng/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props index fb7fcdf5f646d..cb98540dea5a2 100644 --- a/eng/Directory.Packages.props +++ b/eng/Directory.Packages.props @@ -273,7 +273,7 @@ - + From 0e6493c4b42dcca0b726c9310a46d45216be0cee Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 18 Jul 2025 10:19:29 -0700 Subject: [PATCH 4/4] Skip GetProjectXml_FileBasedProgram_SdkTooOld_01 test --- .../VirtualProjectXmlProviderTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/VirtualProjectXmlProviderTests.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/VirtualProjectXmlProviderTests.cs index 09b63ac338ae5..b4809eb519cd4 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/VirtualProjectXmlProviderTests.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/VirtualProjectXmlProviderTests.cs @@ -48,7 +48,7 @@ private async Task GetProjectXmlProviderAsync() return exportProvider.GetExportedValue(); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/roslyn/issues/79464")] public async Task GetProjectXml_FileBasedProgram_SdkTooOld_01() { var projectProvider = await GetProjectXmlProviderAsync();