这是indexloc提供的服务，不要输入任何密码
Skip to content

update to net9.0 #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 3, 2025
Merged

update to net9.0 #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a9f152
update to net9.0
jonsequitur Jan 17, 2025
67e4209
update package versions
jonsequitur Jan 17, 2025
c3ab893
update path in script file for new TFM
jonsequitur Jan 18, 2025
62fd0ea
update azure-pipelines YAMLs to install .NET 9
jonsequitur Jan 23, 2025
12f16ca
Install .Net Sdk before running tests
ocalles Jan 23, 2025
ae420e1
update developer guide
jonsequitur Feb 3, 2025
51d90df
update test to reflect .NET 9 API
jonsequitur Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 52 additions & 2 deletions Developer-guide.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
]
},
Expand Down Expand Up @@ -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": {},
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<PackageVersion Include="Assent" Version="2.3.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.24312.2" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.25059.3" />
<PackageVersion Include="Microsoft.Playwright" Version="1.42.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="peaky.client" Version="4.0.79" />
Expand All @@ -20,11 +20,11 @@
<PackageVersion Include="Pocket.Disposable" Version="1.2.0" />
<PackageVersion Include="PocketLogger.For.Xunit" Version="0.9.0" />
<PackageVersion Include="PocketLogger.Subscribe" Version="0.9.0" />
<PackageVersion Include="PocketLogger" Version="0.9.0" />
<PackageVersion Include="PocketLogger" Version="0.9.1" />
<PackageVersion Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.4" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.IntegrationTests/EditorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<Deterministic Condition="'$(NCrunch)' == '1'">false</Deterministic>
<GeneratedFileName>GeneratedLocation.cs</GeneratedFileName>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DebugType>embedded</DebugType>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PlaywrightPlatform>all</PlaywrightPlatform>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<StaticWebAssetBasePath>wasmrunner</StaticWebAssetBasePath>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>true</IsPackable>
Expand Down