merge
This commit is contained in:
Adam
commit
c38dbb9b28
|
|
@ -159,6 +159,12 @@ Desktop.ini
|
||||||
$RECYCLE.BIN/
|
$RECYCLE.BIN/
|
||||||
|
|
||||||
# Mac crap
|
# Mac crap
|
||||||
|
<<<<<<< HEAD
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
bin
|
||||||
obj
|
obj
|
||||||
bin
|
bin
|
||||||
|
obj
|
||||||
|
=======
|
||||||
|
.DS_Store
|
||||||
|
>>>>>>> 2891b240fbaeda9cf85f05d4ea0ce3b26599a50c
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,16 @@
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="AyCode.Core">
|
||||||
|
<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="AyCode.Core.Server">
|
||||||
|
<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="AyCode.Utils">
|
||||||
|
<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -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": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +0,0 @@
|
||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// 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.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
b8eb1975d633ad8e4c1478e6a33aea91b5fb370e2c78b1a34c4b2ac700ad2e5e
|
|
||||||
|
|
@ -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 =
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
// <auto-generated/>
|
|
||||||
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;
|
|
||||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
84a2b4c5f19407ce23cab3f87b993d4f84768c68d7896a97f2100c6dfffb04e8
|
|
||||||
|
|
@ -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
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
|
||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Fullepi\.nuget\packages\;C:\Program Files\DevExpress 24.1\Components\Offline Packages;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
|
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<SourceRoot Include="C:\Users\Fullepi\.nuget\packages\" />
|
|
||||||
<SourceRoot Include="C:\Program Files\DevExpress 24.1\Components\Offline Packages\" />
|
|
||||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
|
|
||||||
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -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": []
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue