diff --git a/Developer-guide.ipynb b/Developer-guide.ipynb index 71315bab6..41ff3c797 100644 --- a/Developer-guide.ipynb +++ b/Developer-guide.ipynb @@ -8,7 +8,7 @@ "\n", "In order to build Try .NET, you'll need the following installed:\n", "\n", - "* The [.NET 8 SDK](https://learn.microsoft.com/en-us/dotnet/core/install/).\n", + "* The [.NET 9 SDK](https://learn.microsoft.com/en-us/dotnet/core/install/).\n", "* The LTS version of [Node.js](https://nodejs.org/en/download)." ] }, @@ -282,6 +282,56 @@ "Start-Process pwsh -ArgumentList \"-c dotnet run --no-build --project ${tryDotNetProjectFilePath} --launch-profile TryDotNet-Development\"" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "* _Note: If the above crashes with an error that looks like the following, the issue is hardcoded paths in the `Prebuild` folder. If you delete them, they will be regenerated on startup._\n", + "\n", + " ```console\n", + " Logging to: c:\\temp\n", + " Unhandled exception. System.IO.FileNotFoundException: Could not find a part of the path 'C:\\Program Files\\dotnet\\packs\\Microsoft.NETCore.App.Ref\\8.0.8\\ref\\net8.0\\Microsoft.CSharp.dll'.\n", + " File name: 'C:\\Program Files\\dotnet\\packs\\Microsoft.NETCore.App.Ref\\8.0.8\\ref\\net8.0\\Microsoft.CSharp.dll'\n", + " ---> System.IO.DirectoryNotFoundException: Could not find a part of the path 'C:\\Program Files\\dotnet\\packs\\Microsoft.NETCore.App.Ref\\8.0.8\\ref\\net8.0\\Microsoft.CSharp.dll'.\n", + " ```\n", + "\n", + " _The following cell will tell you where the prebuilds are located on your machine. You can delete this directory entirely to allow the prebuilds to be rebuilt when the Try .NET service starts._" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "dotnet_interactive": { + "language": "csharp" + }, + "polyglot_notebook": { + "kernelName": "csharp" + } + }, + "outputs": [], + "source": [ + "using System.IO;\n", + "\n", + "string PrebuildPathEnvironmentVariableName = \"TRYDOTNET_PREBUILDS_PATH\";\n", + "\n", + "var environmentVariable = Environment.GetEnvironmentVariable(PrebuildPathEnvironmentVariableName);\n", + "\n", + "var prebuildsLocation =\n", + " environmentVariable is not null\n", + " ? new DirectoryInfo(environmentVariable)\n", + " : new DirectoryInfo(\n", + " Path.Combine(\n", + " Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),\n", + " \".trydotnet\",\n", + " \"prebuilds\"));\n", + "\n", + "prebuildsLocation.ToString().Display();\n", + "\n", + "// UNCOMMENT TO DELETE THIS FOLDER AND RESET\n", + "// prebuildsLocation.Delete(recursive: true);" + ] + }, { "cell_type": "markdown", "metadata": {}, @@ -325,7 +375,7 @@ "\n", "var peakyClient = new PeakyClient(new Uri(\"https://localhost:7061/tests\"));\n", "\n", - "var tests = (await peakyClient.GetTestsAsync()).Where(t => t.Tags.Any(tag => tag == \"self\"));\n", + "var tests = (await peakyClient.GetTestsAsync()).Where(t => t.Tags.Any(tag => tag is \"self\"));\n", "\n", "foreach (var test in tests)\n", "{\n", diff --git a/Directory.Packages.props b/Directory.Packages.props index a7991b6ff..eacbf7baf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -20,11 +20,11 @@ - + - + diff --git a/azure-pipelines-CI.yml b/azure-pipelines-CI.yml index 02c38d579..9e0b238dc 100644 --- a/azure-pipelines-CI.yml +++ b/azure-pipelines-CI.yml @@ -126,13 +126,17 @@ extends: - name: _BuildArgs value: /p:SignType=$(_SignType) steps: + - task: UseDotNet@2 + displayName: Install SDK 9.0.102 + inputs: + packageType: sdk + version: 9.0.102 - template: /eng/templates/build-and-test-job-windows-templates.yml@self parameters: buildConfig: $(_BuildConfig) skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - - template: /eng/common/templates-official/jobs/jobs.yml@self parameters: enableMicrobuild: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 68b623ff4..a9019d975 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,13 +77,17 @@ stages: - name: _BuildArgs value: /p:SignType=$(_SignType) steps: + - task: UseDotNet@2 + displayName: Install SDK 9.0.102 + inputs: + packageType: sdk + version: 9.0.102 - template: /eng/templates/build-and-test-job-windows-templates.yml@self parameters: buildConfig: $(_BuildConfig) skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - - task: PublishBuildArtifacts@1 displayName: Publish Windows artifacts inputs: diff --git a/eng/build.ps1 b/eng/build.ps1 index d1ae7b747..fbfe4e521 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -48,7 +48,7 @@ try { # playwright if ($test) { - & $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net8.0\playwright.ps1 install chromium + & $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net9.0\playwright.ps1 install chromium } } } diff --git a/global.json b/global.json index 392634d4e..09e8c2ab5 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.204", + "version": "9.0.102", "allowPrerelease": true, "rollForward": "latestMinor" }, "tools": { - "dotnet": "8.0.204", + "dotnet": "9.0.102", "rollForward": "latestMinor" }, "msbuild-sdks": { diff --git a/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs b/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs index e29454f2c..acd19df65 100644 --- a/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs +++ b/src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs @@ -534,7 +534,7 @@ static void Main() {{ signatureHelpDisplayText = signatureHelpDisplayText.Replace("\r", ""); signatureHelpDisplayText.Should().Be(@" -01/18 +01/19 void Console.WriteLine() Writes the current line terminator to the standard output stream. diff --git a/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj b/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj index aa8fda100..dd09f85f8 100644 --- a/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj +++ b/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable false GeneratedLocation.cs diff --git a/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj b/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj index 94565ca19..9a1817f23 100644 --- a/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj +++ b/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable embedded diff --git a/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj b/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj index d88e88435..4c27adbed 100644 --- a/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj +++ b/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable all diff --git a/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj b/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj index 46aa42a78..d675be24e 100644 --- a/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj +++ b/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable wasmrunner diff --git a/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj b/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj index 658a058b0..5c6a3e467 100644 --- a/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj +++ b/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable true