diff --git a/.gitignore b/.gitignore index 20926ec..4eba4c0 100644 --- a/.gitignore +++ b/.gitignore @@ -159,6 +159,12 @@ Desktop.ini $RECYCLE.BIN/ # Mac crap +<<<<<<< HEAD .DS_Store +bin obj bin +obj +======= +.DS_Store +>>>>>>> 2891b240fbaeda9cf85f05d4ea0ce3b26599a50c diff --git a/Mango.Nop.Core/Mango.Nop.Core.csproj b/Mango.Nop.Core/Mango.Nop.Core.csproj index fa71b7a..dcd945e 100644 --- a/Mango.Nop.Core/Mango.Nop.Core.csproj +++ b/Mango.Nop.Core/Mango.Nop.Core.csproj @@ -6,4 +6,16 @@ enable + + + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + + + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + + + diff --git a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.deps.json b/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.deps.json deleted file mode 100644 index 425c840..0000000 --- a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.deps.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v8.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v8.0": { - "Mango.Nop.Services/1.0.0": { - "runtime": { - "Mango.Nop.Services.dll": {} - } - } - } - }, - "libraries": { - "Mango.Nop.Services/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.dll b/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.dll deleted file mode 100644 index 55f9e93..0000000 Binary files a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.dll and /dev/null differ diff --git a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.pdb b/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.pdb deleted file mode 100644 index 2ef07bb..0000000 Binary files a/Mango.Nop.Services/bin/Debug/net8.0/Mango.Nop.Services.pdb and /dev/null differ diff --git a/Mango.Nop.Services/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/Mango.Nop.Services/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs deleted file mode 100644 index 2217181..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfo.cs b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfo.cs deleted file mode 100644 index 06c3193..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Mango.Nop.Services")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3c6908010b274be009484be3f868679f3dc1a856")] -[assembly: System.Reflection.AssemblyProductAttribute("Mango.Nop.Services")] -[assembly: System.Reflection.AssemblyTitleAttribute("Mango.Nop.Services")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Generated by the MSBuild WriteCodeFragment class. - diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfoInputs.cache b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfoInputs.cache deleted file mode 100644 index b0e16fd..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -b8eb1975d633ad8e4c1478e6a33aea91b5fb370e2c78b1a34c4b2ac700ad2e5e diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GeneratedMSBuildEditorConfig.editorconfig b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index bdc3590..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -is_global = true -build_property.TargetFramework = net8.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Mango.Nop.Services -build_property.ProjectDir = H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GlobalUsings.g.cs b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GlobalUsings.g.cs deleted file mode 100644 index 8578f3d..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.GlobalUsings.g.cs +++ /dev/null @@ -1,8 +0,0 @@ -// -global using global::System; -global using global::System.Collections.Generic; -global using global::System.IO; -global using global::System.Linq; -global using global::System.Net.Http; -global using global::System.Threading; -global using global::System.Threading.Tasks; diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.assets.cache b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.assets.cache deleted file mode 100644 index bbb525f..0000000 Binary files a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.assets.cache and /dev/null differ diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.CoreCompileInputs.cache b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.CoreCompileInputs.cache deleted file mode 100644 index 5b75a61..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -84a2b4c5f19407ce23cab3f87b993d4f84768c68d7896a97f2100c6dfffb04e8 diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.FileListAbsolute.txt b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.FileListAbsolute.txt deleted file mode 100644 index 63c02cb..0000000 --- a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,11 +0,0 @@ -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\bin\Debug\net8.0\Mango.Nop.Services.deps.json -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\bin\Debug\net8.0\Mango.Nop.Services.dll -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\bin\Debug\net8.0\Mango.Nop.Services.pdb -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.GeneratedMSBuildEditorConfig.editorconfig -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.AssemblyInfoInputs.cache -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.AssemblyInfo.cs -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.csproj.CoreCompileInputs.cache -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.dll -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\refint\Mango.Nop.Services.dll -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\Mango.Nop.Services.pdb -H:\Applications\Mango\Source\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\obj\Debug\net8.0\ref\Mango.Nop.Services.dll diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.dll b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.dll deleted file mode 100644 index 55f9e93..0000000 Binary files a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.dll and /dev/null differ diff --git a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.pdb b/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.pdb deleted file mode 100644 index 2ef07bb..0000000 Binary files a/Mango.Nop.Services/obj/Debug/net8.0/Mango.Nop.Services.pdb and /dev/null differ diff --git a/Mango.Nop.Services/obj/Debug/net8.0/ref/Mango.Nop.Services.dll b/Mango.Nop.Services/obj/Debug/net8.0/ref/Mango.Nop.Services.dll deleted file mode 100644 index c3de720..0000000 Binary files a/Mango.Nop.Services/obj/Debug/net8.0/ref/Mango.Nop.Services.dll and /dev/null differ diff --git a/Mango.Nop.Services/obj/Debug/net8.0/refint/Mango.Nop.Services.dll b/Mango.Nop.Services/obj/Debug/net8.0/refint/Mango.Nop.Services.dll deleted file mode 100644 index c3de720..0000000 Binary files a/Mango.Nop.Services/obj/Debug/net8.0/refint/Mango.Nop.Services.dll and /dev/null differ diff --git a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.dgspec.json b/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.dgspec.json deleted file mode 100644 index db2167a..0000000 --- a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.dgspec.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "format": 1, - "restore": { - "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj": {} - }, - "projects": { - "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj": { - "version": "1.0.0", - "restore": { - "projectUniqueName": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj", - "projectName": "Mango.Nop.Services", - "projectPath": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj", - "packagesPath": "C:\\Users\\Fullepi\\.nuget\\packages\\", - "outputPath": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\obj\\", - "projectStyle": "PackageReference", - "fallbackFolders": [ - "C:\\Program Files\\DevExpress 24.1\\Components\\Offline Packages", - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" - ], - "configFilePaths": [ - "C:\\Users\\Fullepi\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 24.1.config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" - ], - "originalTargetFrameworks": [ - "net8.0" - ], - "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\DevExpress 24.1\\Components\\System\\Components\\Packages": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, - "H:\\Applications\\Aycode\\Source\\Anata-Plugins-NetCore\\_AnataDlls": {}, - "https://api.nuget.org/v3/index.json": {} - }, - "frameworks": { - "net8.0": { - "targetAlias": "net8.0", - "projectReferences": {} - } - }, - "warningProperties": { - "warnAsError": [ - "NU1605" - ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" - } - }, - "frameworks": { - "net8.0": { - "targetAlias": "net8.0", - "imports": [ - "net461", - "net462", - "net47", - "net471", - "net472", - "net48", - "net481" - ], - "assetTargetFallback": true, - "warn": true, - "frameworkReferences": { - "Microsoft.NETCore.App": { - "privateAssets": "all" - } - }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json" - } - } - } - } -} \ No newline at end of file diff --git a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.props b/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.props deleted file mode 100644 index f84ee86..0000000 --- a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - True - NuGet - $(MSBuildThisFileDirectory)project.assets.json - $(UserProfile)\.nuget\packages\ - C:\Users\Fullepi\.nuget\packages\;C:\Program Files\DevExpress 24.1\Components\Offline Packages;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages - PackageReference - 6.11.1 - - - - - - - \ No newline at end of file diff --git a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.targets b/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.targets deleted file mode 100644 index 3dc06ef..0000000 --- a/Mango.Nop.Services/obj/Mango.Nop.Services.csproj.nuget.g.targets +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/Mango.Nop.Services/obj/project.assets.json b/Mango.Nop.Services/obj/project.assets.json deleted file mode 100644 index 9b2331c..0000000 --- a/Mango.Nop.Services/obj/project.assets.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "version": 3, - "targets": { - "net8.0": {} - }, - "libraries": {}, - "projectFileDependencyGroups": { - "net8.0": [] - }, - "packageFolders": { - "C:\\Users\\Fullepi\\.nuget\\packages\\": {}, - "C:\\Program Files\\DevExpress 24.1\\Components\\Offline Packages": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} - }, - "project": { - "version": "1.0.0", - "restore": { - "projectUniqueName": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj", - "projectName": "Mango.Nop.Services", - "projectPath": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj", - "packagesPath": "C:\\Users\\Fullepi\\.nuget\\packages\\", - "outputPath": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\obj\\", - "projectStyle": "PackageReference", - "fallbackFolders": [ - "C:\\Program Files\\DevExpress 24.1\\Components\\Offline Packages", - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" - ], - "configFilePaths": [ - "C:\\Users\\Fullepi\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 24.1.config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" - ], - "originalTargetFrameworks": [ - "net8.0" - ], - "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\DevExpress 24.1\\Components\\System\\Components\\Packages": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, - "H:\\Applications\\Aycode\\Source\\Anata-Plugins-NetCore\\_AnataDlls": {}, - "https://api.nuget.org/v3/index.json": {} - }, - "frameworks": { - "net8.0": { - "targetAlias": "net8.0", - "projectReferences": {} - } - }, - "warningProperties": { - "warnAsError": [ - "NU1605" - ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" - } - }, - "frameworks": { - "net8.0": { - "targetAlias": "net8.0", - "imports": [ - "net461", - "net462", - "net47", - "net471", - "net472", - "net48", - "net481" - ], - "assetTargetFallback": true, - "warn": true, - "frameworkReferences": { - "Microsoft.NETCore.App": { - "privateAssets": "all" - } - }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json" - } - } - } -} \ No newline at end of file diff --git a/Mango.Nop.Services/obj/project.nuget.cache b/Mango.Nop.Services/obj/project.nuget.cache deleted file mode 100644 index 7aba1e8..0000000 --- a/Mango.Nop.Services/obj/project.nuget.cache +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 2, - "dgSpecHash": "1mPhOlBztiY=", - "success": true, - "projectFilePath": "H:\\Applications\\Mango\\Source\\NopCommerce.Common\\4.70\\Libraries\\Mango.Nop.Services\\Mango.Nop.Services.csproj", - "expectedPackageFiles": [], - "logs": [] -} \ No newline at end of file