Merge remote-tracking branch 'upstream/main' into formatting-problem-…

…with-types-defined-inside-REPL
waf · Sep 28, 2023 · 89617fc · 89617fc
2 parents 2b2dd33 + f5af0da
commit 89617fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/CSharpRepl.Services/CSharpRepl.Services.csproj b/CSharpRepl.Services/CSharpRepl.Services.csproj
@@ -7,24 +7,24 @@
 
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7345" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.1.1.7464" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.5.5" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
     <PackageReference Include="Microsoft.SymbolStore" Version="1.0.431901" />
     <PackageReference Include="PrettyPrompt" Version="4.1.0" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.29" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <!-- when upgrading nuget, make sure you check the SkipCopyOfHostDlls in CSharpRepl.csproj and test '#load' for solutions -->
-    <PackageReference Include="NuGet.PackageManagement" Version="6.6.1" />
+    <PackageReference Include="NuGet.PackageManagement" Version="6.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CSharpRepl.Tests/CSharpRepl.Tests.csproj b/CSharpRepl.Tests/CSharpRepl.Tests.csproj
@@ -14,13 +14,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="NSubstitute" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="PrettyPrompt" Version="4.1.0" />
     <PackageReference Include="Spectre.Console.Testing" Version="0.47.0" />
-    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.2.29" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.2.69" />
+    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/CSharpRepl.Tests/DisassemblerTests.cs b/CSharpRepl.Tests/DisassemblerTests.cs
@@ -30,12 +30,12 @@ public DisassemblerTests()
     [InlineData(OptimizationLevel.Release, "TopLevelProgram")]
     [InlineData(OptimizationLevel.Debug, "TypeDeclaration")]
     [InlineData(OptimizationLevel.Release, "TypeDeclaration")]
-    public void Disassemble_InputCSharp_OutputIL(OptimizationLevel optimizationLevel, string testCase)
+    public async Task Disassemble_InputCSharp_OutputILAsync(OptimizationLevel optimizationLevel, string testCase)
     {
         var input = File.ReadAllText($"./Data/Disassembly/{testCase}.Input.txt").Replace("\r\n", "\n");
         var expectedOutput = File.ReadAllText($"./Data/Disassembly/{testCase}.Output.{optimizationLevel}.il").Replace("\r\n", "\n");
 
-        var result = services.ConvertToIntermediateLanguage(input, debugMode: optimizationLevel == OptimizationLevel.Debug).Result;
+        var result = await services.ConvertToIntermediateLanguage(input, debugMode: optimizationLevel == OptimizationLevel.Debug);
         var actualOutput = Assert
             .IsType<EvaluationResult.Success>(result)
             .ReturnValue