7 files changed, 0 insertions(+), 308 deletions(-)
M NosSmooth.sln
D Samples/Test/DllMain.cs
D Samples/Test/Test - Backup.csproj
D Samples/Test/Test.cs
D Samples/Test/Test.csproj
D Samples/testapp/Program.cs
D Samples/testapp/testapp.csproj
M NosSmooth.sln => NosSmooth.sln +0 -30
@@ 27,12 27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{01B5E872-2
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NosCore.Packets", "libs\NosCore.Packets\src\NosCore.Packets\NosCore.Packets.csproj", "{27DF38DF-AC58-4039-A91C-824D829ECECD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Samples\Test\Test.csproj", "{AD990409-0FAD-4595-9CA4-68EBF27A8989}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NosCore.Shared", "libs\NosCore.Shared\src\NosCore.Shared\NosCore.Shared.csproj", "{945E9248-C150-4617-AB0F-1450561859E3}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testapp", "Samples\testapp\testapp.csproj", "{E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".metadata", ".metadata", "{FA63BCED-9D81-4FF7-BA75-A6F3BA31ECDE}"
ProjectSection(SolutionItems) = preProject
Directory.build.props = Directory.build.props
@@ 142,18 138,6 @@ Global
{27DF38DF-AC58-4039-A91C-824D829ECECD}.Release|x64.Build.0 = Release|Any CPU
{27DF38DF-AC58-4039-A91C-824D829ECECD}.Release|x86.ActiveCfg = Release|Any CPU
{27DF38DF-AC58-4039-A91C-824D829ECECD}.Release|x86.Build.0 = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|x64.ActiveCfg = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|x64.Build.0 = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Debug|x86.Build.0 = Debug|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|Any CPU.Build.0 = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|x64.ActiveCfg = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|x64.Build.0 = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|x86.ActiveCfg = Release|Any CPU
- {AD990409-0FAD-4595-9CA4-68EBF27A8989}.Release|x86.Build.0 = Release|Any CPU
{945E9248-C150-4617-AB0F-1450561859E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{945E9248-C150-4617-AB0F-1450561859E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{945E9248-C150-4617-AB0F-1450561859E3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ 166,18 150,6 @@ Global
{945E9248-C150-4617-AB0F-1450561859E3}.Release|x64.Build.0 = Release|Any CPU
{945E9248-C150-4617-AB0F-1450561859E3}.Release|x86.ActiveCfg = Release|Any CPU
{945E9248-C150-4617-AB0F-1450561859E3}.Release|x86.Build.0 = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|x64.Build.0 = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Debug|x86.Build.0 = Debug|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|Any CPU.Build.0 = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|x64.ActiveCfg = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|x64.Build.0 = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|x86.ActiveCfg = Release|Any CPU
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ 190,9 162,7 @@ Global
{06F03B1F-F68A-4C5B-B7FE-128A7CE1A1D7} = {01B5E872-271F-4D30-A1AA-AD48D81840C5}
{63E97FF3-7E40-44DE-9E91-F5DEE79AF95F} = {6078AE6E-7CD0-48E4-84E0-EB164D8881DA}
{27DF38DF-AC58-4039-A91C-824D829ECECD} = {01B5E872-271F-4D30-A1AA-AD48D81840C5}
- {AD990409-0FAD-4595-9CA4-68EBF27A8989} = {F20FE754-FDEA-4F3A-93D4-0750CB9EBB33}
{945E9248-C150-4617-AB0F-1450561859E3} = {01B5E872-271F-4D30-A1AA-AD48D81840C5}
- {E4E4969E-F79C-4074-A3A8-E1EF9C2A4718} = {F20FE754-FDEA-4F3A-93D4-0750CB9EBB33}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C5F46653-4DEC-429B-8580-4ED18ED9B4CA}
D Samples/Test/DllMain.cs => Samples/Test/DllMain.cs +0 -66
@@ 1,66 0,0 @@
-//
-// DllMain.cs
-//
-// Copyright (c) František Boháček. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Runtime.InteropServices;
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Win32.SafeHandles;
-using NosSmooth.Core.Client;
-using NosSmooth.Core.Extensions;
-using NosSmooth.LocalClient.Extensions;
-
-namespace Test
-{
- /// <summary>
- /// Entry point of the dll.
- /// </summary>
- public class DllMain
- {
- /// <summary>
- /// Create console.
- /// </summary>
- public static void CreateConsole()
- {
- AllocConsole();
- }
-
- [DllImport(
- "kernel32.dll",
- EntryPoint = "GetStdHandle",
- SetLastError = true,
- CharSet = CharSet.Auto,
- CallingConvention = CallingConvention.StdCall)]
- private static extern IntPtr GetStdHandle(int nStdHandle);
-
- [DllImport(
- "kernel32.dll",
- EntryPoint = "AllocConsole",
- SetLastError = true,
- CharSet = CharSet.Auto,
- CallingConvention = CallingConvention.StdCall)]
- private static extern int AllocConsole();
-
- /// <summary>
- /// The entrypoint method.
- /// </summary>
- /// <param name="moduleHandle">The handle of the dll.</param>
- /// <returns>The error code.</returns>
- [DllExport]
- public static int Main(IntPtr moduleHandle)
- {
- CreateConsole();
-
- Task.Run(Start);
- return 0;
- }
-
- private static Task Start()
- {
- return new Test().Start();
- }
- }
-}>
\ No newline at end of file
D Samples/Test/Test - Backup.csproj => Samples/Test/Test - Backup.csproj +0 -63
@@ 1,63 0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
- <PropertyGroup>
- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
- </PropertyGroup>
- <PropertyGroup>
- <DllExportIdent>8A46ECC7-E8CA-46E7-9B47-1F7C45D0A117</DllExportIdent>
- <DllExportMetaLibName>DllExport.dll</DllExportMetaLibName>
- <DllExportNamespace>Test</DllExportNamespace>
- <DllExportDDNSCecil>true</DllExportDDNSCecil>
- <PlatformTarget>x86</PlatformTarget>
- <DllExportOrdinalsBase>1</DllExportOrdinalsBase>
- <DllExportGenExpLib>false</DllExportGenExpLib>
- <DllExportOurILAsm>false</DllExportOurILAsm>
- <DllExportSysObjRebase>false</DllExportSysObjRebase>
- <DllExportLeaveIntermediateFiles>false</DllExportLeaveIntermediateFiles>
- <DllExportTimeout>30000</DllExportTimeout>
- <DllExportPeCheck>2</DllExportPeCheck>
- <DllExportPatches>0</DllExportPatches>
- <DllExportPreProcType>0</DllExportPreProcType>
- <DllExportPostProcType>0</DllExportPostProcType>
- </PropertyGroup>
- <ItemGroup>
- <PackageReference Include="DllExport">
- <Version>1.7.4</Version>
- <Visible>false</Visible>
- <Wz>1</Wz>
- </PackageReference>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Local\NosSmooth.LocalClient\NosSmooth.LocalClient.csproj" />
- <ProjectReference Include="..\..\NosSmooth.Core\NosSmooth.Core.csproj" />
- <ProjectReference Include="..\..\NosSmooth.LocalCore\NosSmooth.LocalCore.vcxproj" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\PublishProfiles\" />
- </ItemGroup>
- <ImportGroup Label=".NET DllExport">
- <Import Project="$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets" Condition="Exists($([MSBuild]::Escape('$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets')))" Label="8337224c9ad9e356" />
- </ImportGroup>
- <Target Name="DllExportRestorePkg" BeforeTargets="PrepareForBuild">
- <Error Condition="!Exists('$(SolutionDir)DllExport.bat')" Text="DllExport.bat is not found. Path: '$(SolutionDir)' - https://github.com/3F/DllExport" />
- <Exec Condition="('$(DllExportModImported)' != 'true' Or !Exists('$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets')) And Exists('$(SolutionDir)DllExport.bat')" Command=".\DllExport.bat -action Restore" WorkingDirectory="$(SolutionDir)" />
- <MSBuild Condition="'$(DllExportModImported)' != 'true'" Projects="$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets" Targets="DllExportMetaXBaseTarget" Properties="TargetFramework=$(TargetFramework)">
- <Output TaskParameter="TargetOutputs" PropertyName="DllExportMetaXBase" />
- </MSBuild>
- <ItemGroup>
- <Reference Include="DllExport, PublicKeyToken=8337224c9ad9e356">
- <HintPath>$(SolutionDir)packages\DllExport.1.7.4\gcache\$(DllExportMetaXBase)\$(DllExportNamespace)\$(DllExportMetaLibName)</HintPath>
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- </ItemGroup>
- </Target>
- <Target Name="DllExportRPkgDynamicImport" BeforeTargets="PostBuildEvent" DependsOnTargets="GetFrameworkPaths" Condition="'$(DllExportModImported)' != 'true' And '$(DllExportRPkgDyn)' != 'false'">
- <MSBuild BuildInParallel="true" UseResultsCache="true" Projects="$(MSBuildProjectFullPath)" Properties="DllExportRPkgDyn=true" Targets="Build" />
- </Target>
-</Project>>
\ No newline at end of file
D Samples/Test/Test.cs => Samples/Test/Test.cs +0 -38
@@ 1,38 0,0 @@
-//
-// Test.cs
-//
-// Copyright (c) František Boháček. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NosSmooth.Core.Client;
-using NosSmooth.Core.Extensions;
-using NosSmooth.LocalClient.Extensions;
-
-namespace Test;
-
-public class Test
-{
- public async Task Start()
- {
- var provider = new ServiceCollection()
- .AddNostaleCore()
- .AddLocalClient()
- .AddLogging(b =>
- {
- b.ClearProviders();
- b.AddSimpleConsole();
- b.SetMinimumLevel(LogLevel.Debug);
- })
- .BuildServiceProvider();
- Console.WriteLine("Test");
- var logger = provider.GetRequiredService<ILogger<DllMain>>();
- Console.WriteLine("Hell");
- logger.LogInformation("Built services");
- Thread.Sleep(1000);
-
- var client = provider.GetRequiredService<INostaleClient>();
- await client.RunAsync();
- }
-}>
\ No newline at end of file
D Samples/Test/Test.csproj => Samples/Test/Test.csproj +0 -68
@@ 1,68 0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFramework>net48</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- <LangVersion>10</LangVersion>
- </PropertyGroup>
- <PropertyGroup>
- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
- </PropertyGroup>
- <PropertyGroup>
- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
- </PropertyGroup>
- <PropertyGroup>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
- <DllExportIdent>5F1D9960-ECF6-42DF-AB4D-7350CCF1165B</DllExportIdent>
- <DllExportMetaLibName>DllExport.dll</DllExportMetaLibName>
- <DllExportNamespace>Test</DllExportNamespace>
- <DllExportDDNSCecil>true</DllExportDDNSCecil>
- <PlatformTarget>x86</PlatformTarget>
- <DllExportOrdinalsBase>7</DllExportOrdinalsBase>
- <DllExportGenExpLib>false</DllExportGenExpLib>
- <DllExportOurILAsm>false</DllExportOurILAsm>
- <DllExportSysObjRebase>false</DllExportSysObjRebase>
- <DllExportLeaveIntermediateFiles>false</DllExportLeaveIntermediateFiles>
- <DllExportTimeout>30000</DllExportTimeout>
- <DllExportPeCheck>2</DllExportPeCheck>
- <DllExportPatches>0</DllExportPatches>
- <DllExportPreProcType>0</DllExportPreProcType>
- <DllExportPostProcType>0</DllExportPostProcType>
- </PropertyGroup>
- <ItemGroup>
- <PackageReference Include="DllExport">
- <Version>1.7.4</Version>
- <Visible>false</Visible>
- <Wz>1</Wz>
- </PackageReference>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
- <PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Core\NosSmooth.Core\NosSmooth.Core.csproj" />
- <ProjectReference Include="..\..\Local\NosSmooth.LocalClient\NosSmooth.LocalClient.csproj" />
- <ProjectReference Include="..\..\Local\NosSmooth.LocalCore\NosSmooth.LocalCore.vcxproj" />
- </ItemGroup>
- <ImportGroup Label=".NET DllExport">
- <Import Project="$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets" Condition="Exists($([MSBuild]::Escape('$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets')))" Label="8337224c9ad9e356" />
- </ImportGroup>
- <Target Name="DllExportRestorePkg" BeforeTargets="PrepareForBuild">
- <Error Condition="!Exists('$(SolutionDir)DllExport.bat')" Text="DllExport.bat is not found. Path: '$(SolutionDir)' - https://github.com/3F/DllExport" />
- <Exec Condition="('$(DllExportModImported)' != 'true' Or !Exists('$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets')) And Exists('$(SolutionDir)DllExport.bat')" Command=".\DllExport.bat -action Restore" WorkingDirectory="$(SolutionDir)" />
- <MSBuild Condition="'$(DllExportModImported)' != 'true'" Projects="$(SolutionDir)packages\DllExport.1.7.4\tools\net.r_eg.DllExport.targets" Targets="DllExportMetaXBaseTarget" Properties="TargetFramework=$(TargetFramework)">
- <Output TaskParameter="TargetOutputs" PropertyName="DllExportMetaXBase" />
- </MSBuild>
- <ItemGroup>
- <Reference Include="DllExport, PublicKeyToken=8337224c9ad9e356">
- <HintPath>$(SolutionDir)packages\DllExport.1.7.4\gcache\$(DllExportMetaXBase)\$(DllExportNamespace)\$(DllExportMetaLibName)</HintPath>
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- </ItemGroup>
- </Target>
- <Target Name="DllExportRPkgDynamicImport" BeforeTargets="PostBuildEvent" DependsOnTargets="GetFrameworkPaths" Condition="'$(DllExportModImported)' != 'true' And '$(DllExportRPkgDyn)' != 'false'">
- <MSBuild BuildInParallel="true" UseResultsCache="true" Projects="$(MSBuildProjectFullPath)" Properties="DllExportRPkgDyn=true" Targets="Build" />
- </Target>
-</Project>>
\ No newline at end of file
D Samples/testapp/Program.cs => Samples/testapp/Program.cs +0 -28
@@ 1,28 0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-
-namespace testapp
-{
- internal class Program
- {
- static void Main(string[] args)
- {
- var provider = new ServiceCollection()
- .AddLogging(b =>
- {
- b.ClearProviders();
- b.AddConsole();
- b.SetMinimumLevel(LogLevel.Debug);
- })
- .BuildServiceProvider();
- Console.WriteLine("Test");
- var logger = provider.GetRequiredService<ILogger<Program>>();
- Console.WriteLine("Hell");
- logger.LogError("Built services");
- Console.WriteLine("Hello World!");
- Thread.Sleep(1000);
- }
- }
-}
D Samples/testapp/testapp.csproj => Samples/testapp/testapp.csproj +0 -15
@@ 1,15 0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <OutputType>Exe</OutputType>
- <TargetFramework>net48</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
- </ItemGroup>
-
-</Project>