Remove nuget, fix several issues, update deps

CoolCoderSuper · CoolCoderSuper · commit dc6dac7fa023 · 2025-07-01T14:26:11.000-04:00
diff --git a/DeveloperCore.REPL.sln b/DeveloperCore.REPL.sln
diff --git a/DeveloperCore.REPL.slnx b/DeveloperCore.REPL.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="DeveloperCore.REPL/DeveloperCore.REPL.vbproj" />
+  <Project Path="VBRepl/VBRepl.vbproj" />
+</Solution>
diff --git a/DeveloperCore.REPL/DeveloperCore.REPL.vbproj b/DeveloperCore.REPL/DeveloperCore.REPL.vbproj
@@ -6,11 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.7.0" />
-    <PackageReference Include="NuGet.Common" Version="6.7.0" />
-    <PackageReference Include="NuGet.PackageManagement" Version="6.7.0" />
-    <PackageReference Include="NuGet.ProjectModel" Version="6.7.0" />
-    <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.14.0" />
   </ItemGroup>
 
 </Project>
diff --git a/DeveloperCore.REPL/IExpression.vb b/DeveloperCore.REPL/IExpression.vb
@@ -1,3 +1,3 @@
 ﻿Public Interface IExpression
-    Function Evaluate(state As Dictionary(Of String, Object)) As Object
-End Interface
+    Function Evaluate(state As Dictionary(Of String, Object)) As Task(Of Object)
+End Interface
diff --git a/DeveloperCore.REPL/REPL.vb b/DeveloperCore.REPL/REPL.vb
@@ -1,21 +1,10 @@
 ﻿Imports System.IO
-Imports System.Threading
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Emit
 Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports NuGet.Common
-Imports NuGet.Configuration
-Imports NuGet.PackageManagement
-Imports NuGet.Packaging
-Imports NuGet.Packaging.Core
-Imports NuGet.ProjectManagement
-Imports NuGet.Protocol.Core.Types
-Imports NuGet.Resolver
-'TODO: Child variables only
-'TODO: Async
+'TODO: Async - Can't parse Await with ParseExecutableStatement
 'TODO: Non method things
-'TODO: Maybe replace variable references with dictionary lookups
 'TODO: State save should be inserted before all returns
 Public Class REPL
     Private _imports As New List(Of ImportsStatementSyntax)
@@ -24,17 +13,17 @@ Public Class REPL
     Private _trees As New List(Of SyntaxTree)
     Private ReadOnly _nugetCache As String = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "DeveloperCore.REPL", "NuGetCache")
 
-    Public Function Evaluate(str As String) As EvaluationResults
+    Public Async Function Evaluate(str As String) As Task(Of EvaluationResults)
         Dim newStatement As StatementSyntax = SyntaxFactory.ParseExecutableStatement(str)
         Dim comp As VisualBasicCompilation = GetCompilation(newStatement)
         Using ms As New MemoryStream
             Dim res As EmitResult = comp.Emit(ms)
-            Dim results As Object
+            Dim results As Object = Nothing
             If res.Success Then
                 If TypeOf newStatement Is ImportsStatementSyntax Then
                     _imports.Add(newStatement)
                 End If
-                results = Run(ms)
+                results = Await Run(ms)
             End If
             Return New EvaluationResults(comp.GetDiagnostics.Where(Function(x) x.Severity <> DiagnosticSeverity.Hidden).ToArray, results)
         End Using
@@ -56,8 +45,9 @@ Public Class REPL
     Private Function GetMethod(stateName As String, statement As StatementSyntax) As MethodBlockSyntax
         Dim method As MethodBlockSyntax = SyntaxCreator.GetMethod(stateName)
         Dim defaultReturn As ReturnStatementSyntax = SyntaxFactory.ReturnStatement(SyntaxFactory.NothingLiteralExpression(SyntaxFactory.ParseToken("Nothing")))
+        Dim taskYield As ExpressionStatementSyntax = SyntaxFactory.ExpressionStatement(SyntaxFactory.AwaitExpression(SyntaxFactory.ParseExpression("System.Threading.Tasks.Task.Yield()")))
         If TypeOf statement Is ImportsStatementSyntax Then
-            method = method.AddStatements(defaultReturn)
+            method = method.AddStatements(taskYield, defaultReturn)
         Else
             Dim stateVars As New List(Of VariableDeclaratorSyntax)
             For Each key As String In _state.Keys
@@ -66,7 +56,7 @@ Public Class REPL
             Next
             Dim varDeclaration As LocalDeclarationStatementSyntax = SyntaxFactory.LocalDeclarationStatement(New SyntaxTokenList().Add(SyntaxFactory.ParseToken("Dim")), New SeparatedSyntaxList(Of VariableDeclaratorSyntax)().AddRange(stateVars))
             Dim varUpdates As New List(Of StatementSyntax)
-            Dim vars As VariableDeclaratorSyntax() = varDeclaration.Declarators.Concat(statement.DescendantNodes.OfType(Of VariableDeclaratorSyntax)).ToArray
+            Dim vars As VariableDeclaratorSyntax() = varDeclaration.Declarators.Concat(statement.ChildNodes.OfType(Of VariableDeclaratorSyntax)).ToArray
             For Each var As VariableDeclaratorSyntax In vars
                 Dim name As String = var.Names.First.Identifier.Text
                 If Not _state.ContainsKey(name) Then
@@ -75,17 +65,17 @@ Public Class REPL
                     varUpdates.Add(SyntaxFactory.ParseExecutableStatement($"{stateName}(""{name}"") = {name}"))
                 End If
             Next
-            method = method.WithStatements(New SyntaxList(Of StatementSyntax)().AddRange({varDeclaration, statement}).AddRange(varUpdates).Add(defaultReturn))
+            method = method.WithStatements(New SyntaxList(Of StatementSyntax)().AddRange({varDeclaration, statement}).AddRange(varUpdates).Add(taskYield).Add(defaultReturn))
         End If
         Return method
     End Function
 
-    Private Function Run(ms As MemoryStream) As Object
+    Private Async Function Run(ms As MemoryStream) As Task(Of Object)
         Dim asm As Reflection.Assembly = Reflection.Assembly.Load(ms.ToArray)
         Dim type As Type = asm.GetType("Expression")
         Dim obj As IExpression = Activator.CreateInstance(type)
         Try
-            Return obj.Evaluate(_state)
+            Return Await obj.Evaluate(_state)
         Catch ex As Exception
             Return ex
         End Try
@@ -139,40 +129,16 @@ Public Class REPL
         Return result
     End Function
 
-    Public Async Function AddReference(ref As String) As Task
+    Public Sub AddReference(ref As String)
         If IsValidPath(ref) AndAlso File.Exists(ref) Then
             Select Case Path.GetExtension(ref)
                 Case ".dll", ".exe"
                     _references.Add(MetadataReference.CreateFromFile(ref))
                 Case ".vb"
                     _trees.Add(SyntaxFactory.ParseSyntaxTree(File.ReadAllText(ref)))
             End Select
-        ElseIf ref.StartsWith("nuget:") Then
-            'TODO: Add package selector
-            Directory.CreateDirectory(_nugetCache)
-            Dim parts As String() = ref.Split(":"c)
-            Dim name As String = parts(1).Trim
-            Dim version As String = If(parts.Length > 2, parts(2).Trim, "")
-            Dim providers As New List(Of Lazy(Of INuGetResourceProvider))
-            providers.AddRange(Repository.Provider.GetCoreV3())
-            Dim sourceRepository As New SourceRepository(New PackageSource("https://api.nuget.org/v3/index.json"), providers)
-            Dim log As New Logger
-            Dim nugetSettings As Settings = Settings.LoadDefaultSettings(_nugetCache)
-            Dim sourceProvider As New PackageSourceProvider(nugetSettings)
-            Dim repositoryProvider As New SourceRepositoryProvider(sourceProvider, providers)
-            Dim project As New FolderNuGetProject(_nugetCache)
-            Dim manager As New NuGetPackageManager(repositoryProvider, nugetSettings, _nugetCache) With {.PackagesFolderNuGetProject = project}
-            Dim searchSource As PackageSearchResource = sourceRepository.GetResource(Of PackageSearchResource)()
-            Dim package As IPackageSearchMetadata = (Await searchSource.SearchAsync(name, New SearchFilter(True) With {.IncludeDelisted = False, .SupportedFrameworks = {"netstandard2.0"}}, 0, 10, log, CancellationToken.None)).FirstOrDefault
-            If package Is Nothing Then Throw New Exception($"Package {name} not found")
-            Dim prerelease As Boolean = True
-            Dim unListed As Boolean = False
-            Dim resolutionContext As New ResolutionContext(DependencyBehavior.Lowest, prerelease, unListed, VersionConstraints.None)
-            Dim context As New ProjectContext
-            Dim identity As New PackageIdentity(package.Identity.Id, package.Identity.Version)
-            Await manager.InstallPackageAsync(project, identity, resolutionContext, context, sourceRepository, {}, CancellationToken.None)
         End If
-    End Function
+    End Sub
 
     Private Shared Function IsValidPath(path As String) As Boolean
         Dim fi As FileInfo = Nothing
@@ -185,97 +151,3 @@ Public Class REPL
         Return If(fi Is Nothing, False, True)
     End Function
 End Class
-
-Public Class Logger
-    Implements ILogger
-    Private logs As New List(Of String)()
-
-    Public Sub LogDebug(data As String) Implements ILogger.LogDebug
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogVerbose(data As String) Implements ILogger.LogVerbose
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogInformation(data As String) Implements ILogger.LogInformation
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogMinimal(data As String) Implements ILogger.LogMinimal
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogWarning(data As String) Implements ILogger.LogWarning
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogError(data As String) Implements ILogger.LogError
-        logs.Add(data)
-    End Sub
-
-    Public Sub LogInformationSummary(data As String) Implements ILogger.LogInformationSummary
-        logs.Add(data)
-    End Sub
-
-    Public Sub Log(level As LogLevel, data As String) Implements ILogger.Log
-        logs.Add(data)
-    End Sub
-
-    Public Sub Log(message As ILogMessage) Implements ILogger.Log
-        logs.Add(message.Message)
-    End Sub
-
-    Public Function LogAsync(level As LogLevel, data As String) As Task Implements ILogger.LogAsync
-        logs.Add(data)
-        Return Task.CompletedTask
-    End Function
-
-    Public Function LogAsync(message As ILogMessage) As Task Implements ILogger.LogAsync
-        logs.Add(message.Message)
-        Return Task.CompletedTask
-    End Function
-End Class
-
-Public Class ProjectContext
-    Implements INuGetProjectContext
-    Private logs As New List(Of String)()
-
-    Public Function GetLogs() As List(Of String)
-        Return logs
-    End Function
-
-    Public Sub Log(level As MessageLevel, message As String, ParamArray args As Object()) Implements INuGetProjectContext.Log
-        Dim formattedMessage = String.Format(message, args)
-        logs.Add(formattedMessage)
-    End Sub
-
-    Public Function ResolveFileConflict(message As String) As FileConflictAction Implements INuGetProjectContext.ResolveFileConflict
-        logs.Add(message)
-        Return FileConflictAction.Ignore
-    End Function
-
-    Public Property PackageExtractionContext As PackageExtractionContext Implements INuGetProjectContext.PackageExtractionContext
-
-    Public ReadOnly Property ExecutionContext As NuGet.ProjectManagement.ExecutionContext Implements INuGetProjectContext.ExecutionContext
-
-    Public Property OriginalPackagesConfig As XDocument Implements INuGetProjectContext.OriginalPackagesConfig
-
-    Public Property SourceControlManagerProvider As ISourceControlManagerProvider Implements INuGetProjectContext.SourceControlManagerProvider
-
-    Public Sub ReportError(message As String) Implements INuGetProjectContext.ReportError
-        logs.Add(message)
-    End Sub
-
-    Public Sub Log(message As ILogMessage) Implements INuGetProjectContext.Log
-        Log(message.Level, message.Message)
-    End Sub
-
-    Public Sub ReportError(message As ILogMessage) Implements INuGetProjectContext.ReportError
-        ReportError(message.Message)
-    End Sub
-
-    Public Property ActionType As NuGetActionType Implements INuGetProjectContext.ActionType
-
-    Public Property OperationId As Guid Implements INuGetProjectContext.OperationId
-End Class
diff --git a/DeveloperCore.REPL/SyntaxCreator.vb b/DeveloperCore.REPL/SyntaxCreator.vb
@@ -1,5 +1,4 @@
-﻿Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.VisualBasic
+﻿Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Public Class SyntaxCreator
@@ -9,7 +8,7 @@ Public Class SyntaxCreator
     End Function
 
     Public Shared Function GetMethod(param As String) As MethodBlockSyntax
-        Return SyntaxFactory.FunctionBlock(SyntaxFactory.FunctionStatement("Evaluate").AddImplementsClauseInterfaceMembers(SyntaxFactory.QualifiedName(SyntaxFactory.ParseTypeName("DeveloperCore.REPL.IExpression"), SyntaxFactory.ParseName("Evaluate"))).AddParameterListParameters(SyntaxFactory.Parameter(SyntaxFactory.ModifiedIdentifier(param)).WithAsClause(SyntaxFactory.SimpleAsClause(SyntaxFactory.ParseTypeName("System.Collections.Generic.Dictionary(Of String, Object)")))))
+        Return SyntaxFactory.FunctionBlock(SyntaxFactory.FunctionStatement("Evaluate").AddModifiers(SyntaxFactory.Token(SyntaxKind.AsyncKeyword)).WithAsClause(SyntaxFactory.SimpleAsClause(SyntaxFactory.ParseTypeName("System.Threading.Tasks.Task(Of Object)"))).AddImplementsClauseInterfaceMembers(SyntaxFactory.QualifiedName(SyntaxFactory.ParseTypeName("DeveloperCore.REPL.IExpression"), SyntaxFactory.ParseName("Evaluate"))).AddParameterListParameters(SyntaxFactory.Parameter(SyntaxFactory.ModifiedIdentifier(param)).WithAsClause(SyntaxFactory.SimpleAsClause(SyntaxFactory.ParseTypeName("System.Collections.Generic.Dictionary(Of String, Object)")))))
     End Function
 
-End Class
+End Class
diff --git a/VBRepl/Program.vb b/VBRepl/Program.vb
@@ -3,7 +3,6 @@ Imports Spectre.Console
 Imports DeveloperCore.REPL
 Imports System.Reflection
 Public Module Program
-
     'TODO: Default imports
     'TODO: Config file
     Public Sub Main(args As String())
@@ -30,13 +29,13 @@ Public Module Program
                         ref = ref.Substring(1, ref.Length - 2)
                     End If
                     Try
-                        repl.AddReference(ref).Wait()
+                        repl.AddReference(ref)
                     Catch ex As Exception
                         AnsiConsole.WriteException(ex)
                     End Try
                     Continue While
                 End If
-                Dim r As EvaluationResults = repl.Evaluate(res.Text)
+                Dim r As EvaluationResults = repl.Evaluate(res.Text).Result
                 If TypeOf r.Result Is Exception Then
                     AnsiConsole.WriteException(r.Result)
                 ElseIf r.Result IsNot Nothing Then
@@ -66,4 +65,4 @@ Public Module Program
         End Select
     End Function
 
-End Module
+End Module
diff --git a/VBRepl/VBRepl.vbproj b/VBRepl/VBRepl.vbproj
@@ -3,13 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>VBRepl</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.7.0" />
     <PackageReference Include="PrettyPrompt" Version="4.1.1" />
-    <PackageReference Include="Spectre.Console" Version="0.47.0" />
+    <PackageReference Include="Spectre.Console" Version="0.50.0" />
   </ItemGroup>
 
   <ItemGroup>
