Update to latest .net 7 previews

Author: Cisien

CSharpRepl.Tests/CSharpRepl.Tests.csproj

@@ -11,11 +11,11 @@
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0-preview.3.22178.4" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220414-03" />
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0-preview.5.22303.8" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220623-07" />
 		<PackageReference Include="xunit" Version="2.4.2-pre.12" />
 		<PackageReference Include="xunit.runner.reporters" Version="2.4.2-pre.12" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

CSharpRepl.Tests/EvalTests.cs

@@ -206,7 +206,6 @@ public async Task Eval_FaultyDirectiveFailsGracefully()
         public void Eval_MissingArgumentsThrowsOnParse()
         {
             var expr = "#nuget";
-
             Assert.Throws<ArgumentException>(() => NugetPreProcessorDirective.Parse(expr));
         }
 

CSharpRepl/CSharpRepl.csproj

@@ -15,16 +15,12 @@
     <ItemGroup>
         <PackageReference Include="AngouriMath" Version="1.3.0" />
         <PackageReference Include="ICSharpCode.Decompiler" Version="3.2.0.3856" />
-
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.3.0-1.22213.10" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NuGet.Packaging" Version="6.3.0-preview.1.10" />
-        <PackageReference Include="NuGet.Protocol" Version="6.3.0-preview.1.10" />
-        <PackageReference Include="NuGet.Resolver" Version="6.3.0-preview.1.10" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0-1.22315.13" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+        <PackageReference Include="NuGet.Packaging" Version="6.3.0-preview.3.89" />
+        <PackageReference Include="NuGet.Protocol" Version="6.3.0-preview.3.89" />
+        <PackageReference Include="NuGet.Resolver" Version="6.3.0-preview.3.89" />
         <PackageReference Include="Seq.Extensions.Logging" Version="6.1.0-dev-00091" />
-        <PackageReference Include="System.Runtime.Experimental" Version="7.0.0-preview.2.22152.2" />
     </ItemGroup>
     <ItemGroup>
       <None Update="start.sh">

CSharpRepl/Eval/ScriptExecutionContext.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using AngouriMath;
 using Microsoft.CodeAnalysis;
 
@@ -62,8 +61,7 @@ public class ScriptExecutionContext
                 typeof(ValueTuple).GetTypeInfo().Assembly,
                 typeof(Globals).GetTypeInfo().Assembly,
                 typeof(Memory<>).GetTypeInfo().Assembly,
-                typeof(Entity).GetTypeInfo().Assembly,
-                typeof(INumber<>).GetTypeInfo().Assembly
+                typeof(Entity).GetTypeInfo().Assembly
         };
         public ScriptOptions Options =>
             ScriptOptions.Default

CSharpRepl/Program.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks;
+using CSDiscordService.Eval;
 
 namespace CSDiscordService
 {
@@ -17,7 +18,10 @@ public static async Task Main()
         {
             Environment.SetEnvironmentVariable("HOME", Path.GetTempPath());
             var host = CreateWebHostBuilder().Build();
+            var replService = host.Services.GetRequiredService<CSharpEval>();
 
+            // run eval once on startup so the first time its hit isn't cripplingly slow.
+            await replService.RunEvalAsync("1+1");
             await host.RunAsync();
         }
 

CSharpRepl/Startup.cs

@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
 using CSDiscordService.Eval;
 using System;
 using System.Threading.Tasks;
@@ -42,7 +41,7 @@ public void ConfigureServices(IServiceCollection services)
                     new RuntimeTypeHandleJsonConverter(), new TypeJsonConverterFactory(), new AssemblyJsonConverter(),
                     new ModuleJsonConverter(), new AssemblyJsonConverterFactory(), 
                     new DirectoryInfoJsonConverter(),
-                     new AngouriMathEntityConverter(), new AngouriMathEntityVarsConverter(),
+                    new AngouriMathEntityConverter(), new AngouriMathEntityVarsConverter(),
                     new IntPtrJsonConverter() 
                     }
             };
@@ -76,11 +75,9 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<IDirectiveProcessor, NugetDirectiveProcessor>();
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, CSharpEval evalService, IHostApplicationLifetime appLifetime)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApplicationLifetime appLifetime)
         {
             _appLifetime = appLifetime;
-            // run eval once on startup so the first time its hit isn't cripplingly slow.
-            evalService.RunEvalAsync("1+1").ConfigureAwait(false).GetAwaiter().GetResult();
             app.UseRouting();
             app.Use(async (context, next) =>
             {