diff --git a/Example.Backend/Printer.cs b/Example.Backend/Printer.cs index 640283a..88be74e 100644 --- a/Example.Backend/Printer.cs +++ b/Example.Backend/Printer.cs @@ -12,7 +12,7 @@ public class Printer : IPrinter return Name; } - public TransmittedSharedObject Print(string text) + public async Task> Print(string text) { return new Page {Text = text}; } diff --git a/Example.Shared/IPrinter.cs b/Example.Shared/IPrinter.cs index be1a0ed..bded350 100644 --- a/Example.Shared/IPrinter.cs +++ b/Example.Shared/IPrinter.cs @@ -6,6 +6,6 @@ namespace Example.Shared; public interface IPrinter { string GetName(); - TransmittedSharedObject Print(string text); + Task> Print(string text); } \ No newline at end of file diff --git a/mROA.Codegen/Properties/launchSettings.json b/mROA.Codegen/Properties/launchSettings.json index 95224bd..8403a4d 100644 --- a/mROA.Codegen/Properties/launchSettings.json +++ b/mROA.Codegen/Properties/launchSettings.json @@ -3,7 +3,7 @@ "profiles": { "DebugRoslynSourceGenerator": { "commandName": "DebugRoslynComponent", - "targetProject": "../Example.Backend/Example.Backend.csproj" + "targetProject": "../Example.Shared/Example.Shared.csproj" } } } \ No newline at end of file diff --git a/mROA.Codegen/SampleIncrementalSourceGenerator.cs b/mROA.Codegen/SampleIncrementalSourceGenerator.cs index 2cbc31a..696acc4 100644 --- a/mROA.Codegen/SampleIncrementalSourceGenerator.cs +++ b/mROA.Codegen/SampleIncrementalSourceGenerator.cs @@ -154,8 +154,10 @@ namespace {Namespace} } else if (method.ReturnType.OriginalDefinition.ToString() == "System.Threading.Tasks.Task") { - var type = method.ReturnType.ToString().Split(['<', '>'], StringSplitOptions.RemoveEmptyEntries) - .Last(); + + var type = method.ReturnType.ToString(); + type = type.Substring(type.IndexOf('<') + 1); + type = type.Substring(0, type.Length - 1); sb.AppendLine( $"\t\tvar response = await serialisationModule.GetFinalCommandExecution<{type}>(request.CallRequestId);"); sb.AppendLine($"\t\treturn ({type})response.Result;"); diff --git a/mROA.Codegen/obj/Debug/netstandard2.0/mROA.Codegen.AssemblyInfo.cs b/mROA.Codegen/obj/Debug/netstandard2.0/mROA.Codegen.AssemblyInfo.cs index b18a2fc..2f3e2aa 100644 --- a/mROA.Codegen/obj/Debug/netstandard2.0/mROA.Codegen.AssemblyInfo.cs +++ b/mROA.Codegen/obj/Debug/netstandard2.0/mROA.Codegen.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Codegen")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+47c67a22afbe9bd7560c8687b1d56893fcdd2fad")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d780d0ea0b8c501b99358c1e89abc9fa4c46f959")] [assembly: System.Reflection.AssemblyProductAttribute("mROA.Codegen")] [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Codegen")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/mROA.Codegen/obj/mROA.Codegen.csproj.nuget.g.props b/mROA.Codegen/obj/mROA.Codegen.csproj.nuget.g.props index 353ed1c..6f36b67 100644 --- a/mROA.Codegen/obj/mROA.Codegen.csproj.nuget.g.props +++ b/mROA.Codegen/obj/mROA.Codegen.csproj.nuget.g.props @@ -5,18 +5,18 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference 6.12.0 - + - C:\Users\Mikhail\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4 + C:\Users\Mimm\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4 \ No newline at end of file diff --git a/mROA.Test/FrontendFinalTest.cs b/mROA.Test/FrontendFinalTest.cs index c88349c..a765343 100644 --- a/mROA.Test/FrontendFinalTest.cs +++ b/mROA.Test/FrontendFinalTest.cs @@ -1,96 +1,92 @@ -using System.Net; -using System.Net.Sockets; -using System.Reflection; -using mROA.Abstract; -using mROA.Codegen; -using Example.Shared; -using mROA.Implementation; - -namespace mROA.Test; - -public class FrontendFinalTest -{ - private StreamBasedInteractionModule _interactionModule; - private StreamBasedFrontendInteractionModule _frontendInteractionModule; - private JsonFrontendSerialisationModule _frontendSerialisationModule; - private ISerialisationModule _serialisationModule; - private IExecuteModule _executeModule; - private IMethodRepository _methodRepository; - private IContextRepository _contextRepository; - bool isTestNotFinished = true; - private IContextRepository _frontendContextRepository; - - [SetUp] - public void Setup() - { - _methodRepository = new CoCodegenMethodRepository(); - var repo2 = new ContextRepository(); - repo2.FillSingletons(typeof(ITestController).Assembly); - _contextRepository = repo2; - - _interactionModule = new StreamBasedInteractionModule(); - - _serialisationModule = new JsonSerialisationModule(); - - _executeModule = new BasicExecutionModule(); - - IInjectableModule[] backendModules = [_methodRepository, _contextRepository, _interactionModule, _serialisationModule, _executeModule]; - - foreach (var backendModule in backendModules) - foreach (var injection in backendModules) - backendModule.Inject(injection); - - _frontendInteractionModule = new StreamBasedFrontendInteractionModule(); - _frontendSerialisationModule = new JsonFrontendSerialisationModule(); - _frontendContextRepository = new FrontendContextRepository(); - - IInjectableModule[] frontendModules = [_frontendInteractionModule, _frontendSerialisationModule, _frontendContextRepository]; - - foreach (var backendModule in frontendModules) - foreach (var injection in frontendModules) - backendModule.Inject(injection); - - Task.Run(() => - { - TcpListener listener = new TcpListener(IPAddress.Loopback, 4567); - listener.Start(); - - var stream = listener.AcceptTcpClient().GetStream(); - - Console.WriteLine("Client connected"); - - _interactionModule.RegisterSourse(stream); - - while (isTestNotFinished) ; - }); - - var tcpClient = new TcpClient(); - tcpClient.Connect(IPAddress.Loopback, 4567); - _frontendInteractionModule.ServerStream = tcpClient.GetStream(); - - } - - [Test] - public void CallTest() - { - - - var singleton = _frontendContextRepository.GetSingleObject(typeof(ITestController)) as ITestController; - - var x = singleton.B(); - Console.WriteLine(x); - } - - [Test] - public void TransmittionTest() - { - var singleton = _frontendContextRepository.GetSingleObject(typeof(ITestController)) as ITestController; - - var next = singleton.SharedObjectTransmitionTest().Value; - var parameter = singleton.GetTestParameter().Value; - var x = next.Parametrized(new TestParameter { A = 100, LinkedObject = new (parameter!)}); - - - - } -} \ No newline at end of file +// using System.Net; +// using System.Net.Sockets; +// using System.Reflection; +// using mROA.Abstract; +// using mROA.Codegen; +// using Example.Shared; +// using mROA.Implementation; +// +// namespace mROA.Test; +// +// public class FrontendFinalTest +// { +// private StreamBasedInteractionModule _interactionModule; +// private StreamBasedFrontendInteractionModule _frontendInteractionModule; +// private JsonFrontendSerialisationModule _frontendSerialisationModule; +// private ISerialisationModule _serialisationModule; +// private IExecuteModule _executeModule; +// private IMethodRepository _methodRepository; +// private IContextRepository _contextRepository; +// bool isTestNotFinished = true; +// private IContextRepository _frontendContextRepository; +// +// [SetUp] +// public void Setup() +// { +// _methodRepository = new CoCodegenMethodRepository(); +// var repo2 = new ContextRepository(); +// repo2.FillSingletons(typeof(ITestController).Assembly); +// _contextRepository = repo2; +// +// _interactionModule = new StreamBasedInteractionModule(); +// +// _serialisationModule = new JsonSerialisationModule(); +// +// _executeModule = new BasicExecutionModule(); +// +// IInjectableModule[] backendModules = +// [_methodRepository, _contextRepository, _interactionModule, _serialisationModule, _executeModule]; +// +// foreach (var backendModule in backendModules) +// foreach (var injection in backendModules) +// backendModule.Inject(injection); +// +// _frontendInteractionModule = new StreamBasedFrontendInteractionModule(); +// _frontendSerialisationModule = new JsonFrontendSerialisationModule(); +// _frontendContextRepository = new FrontendContextRepository(); +// +// IInjectableModule[] frontendModules = +// [_frontendInteractionModule, _frontendSerialisationModule, _frontendContextRepository]; +// +// foreach (var backendModule in frontendModules) +// foreach (var injection in frontendModules) +// backendModule.Inject(injection); +// +// Task.Run(() => +// { +// TcpListener listener = new TcpListener(IPAddress.Loopback, 4567); +// listener.Start(); +// +// var stream = listener.AcceptTcpClient().GetStream(); +// +// Console.WriteLine("Client connected"); +// +// _interactionModule.RegisterSourse(stream); +// +// while (isTestNotFinished) ; +// }); +// +// var tcpClient = new TcpClient(); +// tcpClient.Connect(IPAddress.Loopback, 4567); +// _frontendInteractionModule.ServerStream = tcpClient.GetStream(); +// } +// +// [Test] +// public void CallTest() +// { +// var singleton = _frontendContextRepository.GetSingleObject(typeof(ITestController)) as ITestController; +// +// var x = singleton.B(); +// Console.WriteLine(x); +// } +// +// [Test] +// public void TransmittionTest() +// { +// var singleton = _frontendContextRepository.GetSingleObject(typeof(ITestController)) as ITestController; +// +// var next = singleton.SharedObjectTransmitionTest().Value; +// var parameter = singleton.GetTestParameter().Value; +// var x = next.Parametrized(new TestParameter { A = 100, LinkedObject = new(parameter!) }); +// } +// } \ No newline at end of file diff --git a/mROA.Test/obj/Debug/net9.0/mROA.Test.AssemblyInfo.cs b/mROA.Test/obj/Debug/net9.0/mROA.Test.AssemblyInfo.cs index c9ee413..3d4c9d9 100644 --- a/mROA.Test/obj/Debug/net9.0/mROA.Test.AssemblyInfo.cs +++ b/mROA.Test/obj/Debug/net9.0/mROA.Test.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+47c67a22afbe9bd7560c8687b1d56893fcdd2fad")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d780d0ea0b8c501b99358c1e89abc9fa4c46f959")] [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/mROA.Test/obj/Release/net9.0/mROA.Test.AssemblyInfo.cs b/mROA.Test/obj/Release/net9.0/mROA.Test.AssemblyInfo.cs index 8f4bfe3..62758ce 100644 --- a/mROA.Test/obj/Release/net9.0/mROA.Test.AssemblyInfo.cs +++ b/mROA.Test/obj/Release/net9.0/mROA.Test.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d780d0ea0b8c501b99358c1e89abc9fa4c46f959")] [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/mROA.Test/obj/mROA.Test.csproj.nuget.g.props b/mROA.Test/obj/mROA.Test.csproj.nuget.g.props index 92a05d6..f0b8464 100644 --- a/mROA.Test/obj/mROA.Test.csproj.nuget.g.props +++ b/mROA.Test/obj/mROA.Test.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference 6.12.0 - + @@ -21,6 +21,6 @@ - C:\Users\Mikhail\.nuget\packages\nunit.analyzers\4.6.0 + C:\Users\Mimm\.nuget\packages\nunit.analyzers\4.6.0 \ No newline at end of file diff --git a/mROA/obj/Debug/net9.0/mROA.AssemblyInfo.cs b/mROA/obj/Debug/net9.0/mROA.AssemblyInfo.cs index 8a6d99e..746a872 100644 --- a/mROA/obj/Debug/net9.0/mROA.AssemblyInfo.cs +++ b/mROA/obj/Debug/net9.0/mROA.AssemblyInfo.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 +// This code was generated by a tool. // -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -14,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("mROA")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+47c67a22afbe9bd7560c8687b1d56893fcdd2fad")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d780d0ea0b8c501b99358c1e89abc9fa4c46f959")] [assembly: System.Reflection.AssemblyProductAttribute("mROA")] [assembly: System.Reflection.AssemblyTitleAttribute("mROA")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/mROA/obj/Debug/net9.0/mROA.GeneratedMSBuildEditorConfig.editorconfig b/mROA/obj/Debug/net9.0/mROA.GeneratedMSBuildEditorConfig.editorconfig index 6ec64ed..c1caa79 100644 --- a/mROA/obj/Debug/net9.0/mROA.GeneratedMSBuildEditorConfig.editorconfig +++ b/mROA/obj/Debug/net9.0/mROA.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = mROA -build_property.ProjectDir = C:\Users\Mikhail\Projects\VisualStudioProjects\mROA\mROA\ +build_property.ProjectDir = C:\Users\Mimm\Projects\VisualStudioProjects\mROA\mROA\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/mROA/obj/mROA.csproj.nuget.g.props b/mROA/obj/mROA.csproj.nuget.g.props index 721d876..7f9c9db 100644 --- a/mROA/obj/mROA.csproj.nuget.g.props +++ b/mROA/obj/mROA.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference 6.12.0 - + \ No newline at end of file