feat: update to dotnet 10, with unit test fixes and some packages updates #424
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
| <OutputType>Exe</OutputType> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="System.Management" Version="10.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "runtimeOptions": { | ||
| "tfm": "net10.0", | ||
| "framework": { | ||
| "name": "Microsoft.AspNetCore.App", | ||
| "version": "10.0.0" | ||
| }, | ||
| "configProperties": { | ||
| "System.GC.Server": true, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| using CSharpRepl.Services.Roslyn.References; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.IO.Abstractions.TestingHelpers; | ||
| using System.Runtime.InteropServices; | ||
| using Xunit; | ||
|
|
||
| namespace CSharpRepl.Tests; | ||
|
|
@@ -41,6 +42,82 @@ public void GetSharedFrameworkConfiguration_Net5GlobalInstallation_IsLocated() | |
| ); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void GetSharedFrameworkConfiguration_Net10Installation_IsLocated() | ||
| { | ||
| var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData> | ||
| { | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/data/FrameworkList.xml", string.Empty }, | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll", string.Empty }, | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/data/FrameworkList.xml", string.Empty }, | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll", string.Empty }, | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.1/data/FrameworkList.xml", string.Empty }, | ||
| { @"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.1/ref/net10.0/Microsoft.CSharp.dll", string.Empty }, | ||
|
|
||
| { @"/Program Files/dotnet/shared/Microsoft.NETCore.App/9.0.2/Microsoft.CSharp.dll", string.Empty }, | ||
| { @"/Program Files/dotnet/shared/Microsoft.NETCore.App/10.0.0/Microsoft.CSharp.dll", string.Empty }, | ||
| { @"/Program Files/dotnet/shared/Microsoft.NETCore.App/10.0.1/Microsoft.CSharp.dll", string.Empty } | ||
| }); | ||
|
|
||
| var locator = new DotNetInstallationLocator( | ||
| logger: new TestTraceLogger(), io: fileSystem, | ||
| dotnetRuntimePath: @"/Program Files/dotnet/", | ||
| userProfilePath: @"/Users/bob/" | ||
| ); | ||
|
|
||
| var (refPath, implPath) = locator.FindInstallation("Microsoft.NETCore.App", new Version(10, 0, 1)); | ||
|
|
||
| Assert.Equal( | ||
| CrossPlatform(@"/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.1/ref/net10.0"), | ||
| CrossPlatform(refPath) | ||
| ); | ||
| Assert.Equal( | ||
| CrossPlatform(@"/Program Files/dotnet/shared/Microsoft.NETCore.App/10.0.1"), | ||
| CrossPlatform(implPath) | ||
| ); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void GetSharedFrameworkConfiguration_Net10UsesNuGetWhenNotInstalledGlobally() | ||
| { | ||
| string platform = OperatingSystem.IsWindows() ? "win" | ||
| : OperatingSystem.IsLinux() ? "linux" | ||
| : OperatingSystem.IsMacOS() ? "osx" | ||
| : null; | ||
|
|
||
| var architecture = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant(); | ||
|
|
||
| var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData> | ||
| { | ||
| // existing global runtimes but none for net10 | ||
| { @"/Program Files/dotnet/shared/Microsoft.NETCore.App/9.0.0/Microsoft.CSharp.dll", string.Empty }, | ||
|
|
||
| // reference assemblies in .nuget installation | ||
| { @"/Users/bob/.nuget/packages/microsoft.netcore.app.ref/10.0.0/data/FrameworkList.xml", string.Empty }, | ||
| { @"/Users/bob/.nuget/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll", string.Empty }, | ||
|
|
||
| // implementation assemblies in .nuget installation | ||
| { @$"/Users/bob/.nuget/packages/microsoft.netcore.app.runtime.{platform}-{architecture}/10.0.0/runtimes/{platform}-{architecture}/lib/net10.0/Microsoft.CSharp.dll", string.Empty }, | ||
| }); | ||
|
|
||
| var locator = new DotNetInstallationLocator( | ||
| logger: new TestTraceLogger(), io: fileSystem, | ||
| dotnetRuntimePath: @"/Program Files/dotnet/", | ||
| userProfilePath: @"/Users/bob/" | ||
| ); | ||
|
|
||
| var (refPath, implPath) = locator.FindInstallation("Microsoft.NETCore.App", new Version(10, 0, 0)); | ||
|
|
||
| Assert.Equal( | ||
| CrossPlatform(@"/Users/bob/.nuget/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0"), | ||
| CrossPlatform(refPath) | ||
| ); | ||
| Assert.Equal( | ||
| CrossPlatform(@$"/Users/bob/.nuget/packages/microsoft.netcore.app.runtime.{platform}-{architecture}/10.0.0/runtimes/{platform}-{architecture}/lib/net10.0"), | ||
| CrossPlatform(implPath) | ||
| ); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void GetSharedFrameworkConfiguration_NoGlobalNet5ReferenceAssemblies_UsesNuGetInstallation() | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -185,7 +185,7 @@ public async Task Evaluate_ResolveCorrectRuntimeVersionOfReferencedAssembly() | |
| var (buildExitCode, _) = builder.Build("./Data/DemoSolution/DemoSolution.DemoProject3"); | ||
| Assert.Equal(0, buildExitCode); | ||
|
|
||
| var referenceResult = await services.EvaluateAsync(@"#r ""./Data/DemoSolution/DemoSolution.DemoProject3/bin/Debug/net10.0/DemoSolution.DemoProject3.dll"""); | ||
| var importResult = await services.EvaluateAsync(@"DemoSolution.DemoProject3.DemoClass3.GetSystemManagementPath()"); | ||
|
|
||
| Assert.IsType<EvaluationResult.Success>(referenceResult); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,27 +34,27 @@ public async Task GetSymbolAtIndex_ReturnsFullyQualifiedName() | |
| [Fact] | ||
| public async Task GetSymbolAtIndex_ClassInSourceLinkedAssembly_ReturnsSourceLinkUrl() | ||
| { | ||
| // should return a string like https://www.github.com/dotnet/dotnet/blob/b0f34d51fccc69fd334253924abd8d6853fad7aa/src/runtime/src/libraries/System.Console/src/System/Console.cs | ||
| var symbol = await services.GetSymbolAtIndexAsync(@"Console.WriteLine(""howdy"")", "Conso".Length); | ||
|
|
||
| Assert.StartsWith("https://www.github.com/dotnet/dotnet/", symbol.Url); | ||
| Assert.EndsWith("Console.cs", symbol.Url); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task GetSymbolAtIndex_GenericTypeInSourceLinkedAssembly_ReturnsSourceLinkUrl() | ||
| { | ||
| // should return a string like https://www.github.com/dotnet/dotnet/blob/b0f34d51fccc69fd334253924abd8d6853fad7aa/src/runtime/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs | ||
| var symbol = await services.GetSymbolAtIndexAsync(@"List<string>", "Li".Length); | ||
|
|
||
| Assert.StartsWith("https://www.github.com/dotnet/dotnet/", symbol.Url); | ||
| Assert.EndsWith("List.cs", symbol.Url); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task GetSymbolAtIndex_MethodInSourceLinkedAssembly_ReturnsSourceLinkUrl() | ||
| { | ||
| // should return a string like https://www.github.com/dotnet/dotnet/blob/b0f34d51fccc69fd334253924abd8d6853fad7aa/src/runtime/src/libraries/System.Console/src/System/Console.cs#L733-L734 | ||
| var symbol = await services.GetSymbolAtIndexAsync(@"Console.WriteLine(""howdy"")", "Console.Wri".Length); | ||
|
|
||
| AssertLinkWithLineNumber(symbol); | ||
|
|
@@ -63,7 +63,7 @@ public async Task GetSymbolAtIndex_MethodInSourceLinkedAssembly_ReturnsSourceLin | |
| [Fact] | ||
| public async Task GetSymbolAtIndex_PropertyInSourceLinkedAssembly_ReturnsSourceLinkUrl() | ||
| { | ||
| // should return a string like https://www.github.com/dotnet/dotnet/blob/b0f34d51fccc69fd334253924abd8d6853fad7aa/src/runtime/src/libraries/System.Console/src/System/Console.cs | ||
| var symbol = await services.GetSymbolAtIndexAsync(@"Console.Out", "Console.Ou".Length); | ||
|
|
||
| AssertLinkWithLineNumber(symbol); | ||
|
|
@@ -72,7 +72,7 @@ public async Task GetSymbolAtIndex_PropertyInSourceLinkedAssembly_ReturnsSourceL | |
| [Fact] | ||
| public async Task GetSymbolAtIndex_EventInSourceLinkedAssembly_ReturnsSourceLinkUrl() | ||
| { | ||
| // should return a string like https://www.github.com/dotnet/dotnet/blob/b0f34d51fccc69fd334253924abd8d6853fad7aa/src/runtime/src/libraries/System.Console/src/System/Console.cs | ||
| var symbol = await services.GetSymbolAtIndexAsync(@"Console.CancelKeyPress", "Console.CancelKe".Length); | ||
|
|
||
| AssertLinkWithLineNumber(symbol); | ||
|
|
@@ -103,7 +103,7 @@ private static void AssertLinkWithLineNumber(SymbolResult symbol) | |
| Assert.Equal(2, urlParts.Length); | ||
|
|
||
| var url = urlParts[0]; | ||
| Assert.StartsWith("https://www.github.com/dotnet/dotnet/", url); | ||
|
|
||
| var lineHash = urlParts[1]; | ||
| const string LinePattern = "L[0-9]+"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |||||
| <PropertyGroup> | ||||||
| <Version>0.6.7</Version> | ||||||
| <OutputType>Exe</OutputType> | ||||||
| <TargetFramework>net10.0</TargetFramework> | ||||||
| <RollForward>LatestMajor</RollForward> | ||||||
| <LangVersion>latest</LangVersion> | ||||||
| <Nullable>enable</Nullable> | ||||||
|
|
@@ -27,7 +27,7 @@ | |||||
| <ItemGroup> | ||||||
| <PackageReference Include="PrettyPrompt" Version="4.1.1" /> | ||||||
| <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" /> | ||||||
|
Contributor
There was a problem hiding this comment. Maybe could move to the stable version, but may need to handle some breaking changes
Suggested change
Author
There was a problem hiding this comment. Yes, I was looking into that... Although I managed to run it, many tests broke and I started to look into them to see exactly what needed to be updated... Might take some time |
||||||
| <PackageReference Include="System.Reflection.MetadataLoadContext" Version="10.0.0" /> | ||||||
| </ItemGroup> | ||||||
|
|
||||||
| <ItemGroup> | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "10.0.0", | ||
| "rollForward": "latestMajor", | ||
| "allowPrerelease": true | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a hotfix version later this version