Merge pull request #53 from onerain88/ci

chore: 整理工程目录
oneRain 2020-04-30 15:37:08 +08:00 committed by GitHub
commit 559f7dbb5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
123 changed files with 387 additions and 162 deletions

View File

@ -12,8 +12,10 @@ deploy:
api_key:
secure: U33UbFuAmwE/hsI3iYpUNLJ+3wkVBq5JxGd2Z03QU9jtYN+N1GCcBJ3oIsdyYZPDmwdqjcc/s2GGiy75NDljnaeI4/p+rfVw01e6Ht/CQPNioxqxmC3645YDsg8Iao0vrSP1aevurc/5Oq+DNk+s0DQn/sBK11ZxOO7dwxqBZqJSdYs6hXhenzC3qKMRw2Wu7Px/ETGbYSXlvVfmmMkw3CVutankT/QQPZM1u6uA8bJvcoPzOoUCuTMLfa+ie4O1WUYSwkyb+yYWjNkWhTo8b/scdVZjYmJ5tIIHP04AKump2kISBvXBysCdwScMvvZplJgVHc0x9qx+vvyGEWmKa3C4xDa5t0IwDHmApe6dPRc05WL9lwDh6KtiZ4vJEFvGfKPOXRmg4fDVnRIQHazMSFvFXgcwZoiPsMWnAvl45Cardbt1JLvlfGlnJ+wQ5RPev99LwvkXooJVqtEByR9AWozyGS8XFypbpFj2xpCe7ZJSmB8h0ElDsl2zmgWPeZkcOIFcVR2+2jl6B2XOnBWukxRUpeX1x+B4rDIKtTAHrkvtGNr5bb4Q6gUAQSqpvUDqV3gXdXW19H+yrlAImBFo6nS3qm/NzsVGmK+SaRzG6oOFfejW0NPnt2MdO0GV5s6L0CYp86Zpk/GrViO7AKjMqYfM2rwJS1rnLlxpTDoPcaA=
file:
- "LeanCloud-SDK-Standard.zip"
- "LeanCloud-SDK-Unity.zip"
- "LeanCloud-SDK-Storage-Standard.zip"
- "LeanCloud-SDK-Storage-Unity.zip"
- "LeanCloud-SDK-Realtime-Standard.zip"
- "LeanCloud-SDK-Realtime-Unity.zip"
skip_cleanup: true
on:
repo: leancloud/csharp-sdk

View File

@ -0,0 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.1.0</ReleaseVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Common\AppRouter\LCAppServer.cs">
<Link>AppRouter\LCAppServer.cs</Link>
</Compile>
<Compile Include="..\Common\AppRouter\LCAppRouter.cs">
<Link>AppRouter\LCAppRouter.cs</Link>
</Compile>
<Compile Include="..\Common\Http\LCHttpUtils.cs">
<Link>Http\LCHttpUtils.cs</Link>
</Compile>
<Compile Include="..\Common\Json\LCJsonUtils.cs">
<Link>Json\LCJsonUtils.cs</Link>
</Compile>
<Compile Include="..\Common\Log\LCLogger.cs">
<Link>Log\LCLogger.cs</Link>
</Compile>
<Compile Include="..\Common\Log\LCLogLevel.cs">
<Link>Log\LCLogLevel.cs</Link>
</Compile>
<Compile Include="..\Common\Task\LCTaskExtensions.cs">
<Link>Task\LCTaskExtensions.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\UnityLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

View File

@ -1,19 +0,0 @@
namespace LeanCloud {
/// <summary>
/// 日志级别
/// </summary>
public enum LCLogLevel {
/// <summary>
/// 调试级别
/// </summary>
Debug,
/// <summary>
/// 警告级别
/// </summary>
Warn,
/// <summary>
/// 错误级别
/// </summary>
Error,
}
}

View File

@ -1,51 +0,0 @@
using System;
using System.Text;
namespace LeanCloud {
/// <summary>
/// 日志类
/// </summary>
public static class LCLogger {
/// <summary>
/// 日志回调接口,方便开发者调试
/// </summary>
/// <value>The log delegate.</value>
public static Action<LCLogLevel, string> LogDelegate {
get; set;
}
public static void Debug(string log) {
LogDelegate?.Invoke(LCLogLevel.Debug, log);
}
public static void Debug(string format, params object[] args) {
LogDelegate?.Invoke(LCLogLevel.Debug, string.Format(format, args));
}
public static void Warn(string log) {
LogDelegate?.Invoke(LCLogLevel.Warn, log);
}
public static void Warn(string format, params object[] args) {
LogDelegate?.Invoke(LCLogLevel.Warn, string.Format(format, args));
}
public static void Error(string log) {
LogDelegate?.Invoke(LCLogLevel.Error, log);
}
public static void Error(string format, params object[] args) {
LogDelegate?.Invoke(LCLogLevel.Error, string.Format(format, args));
}
public static void Error(Exception e) {
StringBuilder sb = new StringBuilder();
sb.Append(e.GetType());
sb.Append("\n");
sb.Append(e.Message);
sb.Append("\n");
sb.Append(e.StackTrace);
Error(sb.ToString());
}
}
}

View File

@ -1,43 +0,0 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Concurrent;
using System.Collections.Generic;
namespace LeanCloud.Common {
/// <summary>
/// 单线程环境,用于控制台应用 await 返回
/// </summary>
public class SingleThreadSynchronizationContext : SynchronizationContext {
private readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> queue = new BlockingCollection<KeyValuePair<SendOrPostCallback, object>>();
public override void Post(SendOrPostCallback d, object state) {
queue.Add(new KeyValuePair<SendOrPostCallback, object>(d, state));
}
public void RunOnCurrentThread() {
while (queue.TryTake(out KeyValuePair<SendOrPostCallback, object> workItem, Timeout.Infinite)) {
workItem.Key(workItem.Value);
}
}
public void Complete() {
queue.CompleteAdding();
}
public static void Run(Func<Task> func) {
SynchronizationContext prevContext = Current;
try {
SingleThreadSynchronizationContext syncContext = new SingleThreadSynchronizationContext();
SetSynchronizationContext(syncContext);
Task t = func();
syncContext.RunOnCurrentThread();
t.GetAwaiter().GetResult();
} finally {
SetSynchronizationContext(prevContext);
}
}
}
}

View File

@ -6,7 +6,7 @@ OUTPUT_DIRECTORY = ./Doc/
EXTRACT_ALL = yes
EXTRACT_PRIVATE = no
EXTRACT_STATIC = yes
INPUT = ./Storage/
INPUT = ./Storage/Storage/ ./Realtime/Realtime/
#Do not add anything here unless you need to. Doxygen already covers all
#common formats like .c/.cc/.cxx/.c++/.cpp/.inl/.h/.hpp
FILE_PATTERNS =

View File

@ -0,0 +1,130 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.1.0</ReleaseVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Realtime\Conversation\LCIMConversation.cs">
<Link>Conversation\LCIMConversation.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMServiceConversation.cs">
<Link>Conversation\LCIMServiceConversation.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMConversationMemberInfo.cs">
<Link>Conversation\LCIMConversationMemberInfo.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMConversationQuery.cs">
<Link>Conversation\LCIMConversationQuery.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMChatRoom.cs">
<Link>Conversation\LCIMChatRoom.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMMessageQueryOptions.cs">
<Link>Conversation\LCIMMessageQueryOptions.cs</Link>
</Compile>
<Compile Include="..\Realtime\Conversation\LCIMTemporaryConversation.cs">
<Link>Conversation\LCIMTemporaryConversation.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\WebSocket\LCWebSocketClient.cs">
<Link>Internal\WebSocket\LCWebSocketClient.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Connection\LCHeartBeat.cs">
<Link>Internal\Connection\LCHeartBeat.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Connection\LCConnection.cs">
<Link>Internal\Connection\LCConnection.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Protocol\Messages2Proto.cs">
<Link>Internal\Protocol\Messages2Proto.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Controller\LCIMSessionController.cs">
<Link>Internal\Controller\LCIMSessionController.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Controller\LCIMController.cs">
<Link>Internal\Controller\LCIMController.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Controller\LCIMMessageController.cs">
<Link>Internal\Controller\LCIMMessageController.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Controller\LCIMConversationController.cs">
<Link>Internal\Controller\LCIMConversationController.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Controller\LCIMGoAwayController.cs">
<Link>Internal\Controller\LCIMGoAwayController.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Router\LCRTMServer.cs">
<Link>Internal\Router\LCRTMServer.cs</Link>
</Compile>
<Compile Include="..\Realtime\Internal\Router\LCRTMRouter.cs">
<Link>Internal\Router\LCRTMRouter.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMVideoMessage.cs">
<Link>Message\LCIMVideoMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMMessageSendOptions.cs">
<Link>Message\LCIMMessageSendOptions.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMBinaryMessage.cs">
<Link>Message\LCIMBinaryMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMFileMessage.cs">
<Link>Message\LCIMFileMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMRecalledMessage.cs">
<Link>Message\LCIMRecalledMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMMessage.cs">
<Link>Message\LCIMMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMTextMessage.cs">
<Link>Message\LCIMTextMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMImageMessage.cs">
<Link>Message\LCIMImageMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMAudioMessage.cs">
<Link>Message\LCIMAudioMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMLocationMessage.cs">
<Link>Message\LCIMLocationMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Message\LCIMTypedMessage.cs">
<Link>Message\LCIMTypedMessage.cs</Link>
</Compile>
<Compile Include="..\Realtime\Result\LCIMOperationFailure.cs">
<Link>Result\LCIMOperationFailure.cs</Link>
</Compile>
<Compile Include="..\Realtime\Result\LCIMPageResult.cs">
<Link>Result\LCIMPageResult.cs</Link>
</Compile>
<Compile Include="..\Realtime\Result\LCIMPartiallySuccessResult.cs">
<Link>Result\LCIMPartiallySuccessResult.cs</Link>
</Compile>
<Compile Include="..\Realtime\Signature\LCIMSignature.cs">
<Link>Signature\LCIMSignature.cs</Link>
</Compile>
<Compile Include="..\Realtime\Signature\ILCIMSignatureFactory.cs">
<Link>Signature\ILCIMSignatureFactory.cs</Link>
</Compile>
<Compile Include="..\Realtime\Signature\LCIMSignatureAction.cs">
<Link>Signature\LCIMSignatureAction.cs</Link>
</Compile>
<Compile Include="..\Realtime\LCIMClient.cs">
<Link>LCIMClient.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common-Unity\Common-Unity.csproj" />
<ProjectReference Include="..\..\Storage\Storage-Unity\Storage-Unity.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\UnityLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.11.4" />
</ItemGroup>
</Project>

View File

@ -0,0 +1,5 @@
<linker>
<assembly fullname="LeanCloud" preserve="all"/>
<assembly fullname="LeanCloud.Storage" preserve="all"/>
<assembly fullname="LeanCloud.Realtime" preserve="all"/>
</linker>

View File

@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Collections.Generic;
using LeanCloud;
using LeanCloud.Common;
using LeanCloud.Storage;
using LeanCloud.Realtime;
@ -79,13 +78,13 @@ namespace Realtime.Test {
await conversation.Send(textMessage);
Assert.NotNull(textMessage.Id);
LCFile image = new LCFile("hello", "../../../../assets/hello.png");
LCFile image = new LCFile("hello", "../../../../../assets/hello.png");
await image.Save();
LCIMImageMessage imageMessage = new LCIMImageMessage(image);
await conversation.Send(imageMessage);
Assert.NotNull(imageMessage.Id);
LCFile file = new LCFile("apk", "../../../../assets/test.apk");
LCFile file = new LCFile("apk", "../../../../../assets/test.apk");
await file.Save();
LCIMFileMessage fileMessage = new LCIMFileMessage(file);
await conversation.Send(fileMessage);

View File

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Realtime\Realtime.csproj" />
<ProjectReference Include="..\..\Storage\Storage.csproj" />
<ProjectReference Include="..\..\Realtime\Realtime\Realtime.csproj" />
<ProjectReference Include="..\..\Storage\Storage\Storage.csproj" />
</ItemGroup>
</Project>

View File

@ -7,10 +7,6 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\Storage\Storage.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.11.4" />
</ItemGroup>
@ -26,4 +22,8 @@
<Folder Include="Internal\Protocol\" />
<Folder Include="Result\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common\Common.csproj" />
<ProjectReference Include="..\..\Storage\Storage\Storage.csproj" />
</ItemGroup>
</Project>

View File

@ -6,8 +6,6 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common.csproj" />
<ProjectReference Include="..\..\Realtime\Realtime.csproj" />
<ProjectReference Include="..\..\Storage\Storage.csproj" />
<ProjectReference Include="..\..\Realtime\Realtime\Realtime.csproj" />
</ItemGroup>
</Project>

View File

@ -0,0 +1,129 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.1.0</ReleaseVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Storage\LCACL.cs">
<Link>LCACL.cs</Link>
</Compile>
<Compile Include="..\Storage\LCApplication.cs">
<Link>LCApplication.cs</Link>
</Compile>
<Compile Include="..\Storage\LCCloud.cs">
<Link>LCCloud.cs</Link>
</Compile>
<Compile Include="..\Storage\LCException.cs">
<Link>LCException.cs</Link>
</Compile>
<Compile Include="..\Storage\LCFile.cs">
<Link>LCFile.cs</Link>
</Compile>
<Compile Include="..\Storage\LCGeoPoint.cs">
<Link>LCGeoPoint.cs</Link>
</Compile>
<Compile Include="..\Storage\LCObject.cs">
<Link>LCObject.cs</Link>
</Compile>
<Compile Include="..\Storage\LCQuery.cs">
<Link>LCQuery.cs</Link>
</Compile>
<Compile Include="..\Storage\LCRelation.cs">
<Link>LCRelation.cs</Link>
</Compile>
<Compile Include="..\Storage\LCRole.cs">
<Link>LCRole.cs</Link>
</Compile>
<Compile Include="..\Storage\LCUser.cs">
<Link>LCUser.cs</Link>
</Compile>
<Compile Include="..\Storage\LCUserAuthDataLoginOption.cs">
<Link>LCUserAuthDataLoginOption.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCNumberOperation.cs">
<Link>Internal\Operation\LCNumberOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCAddRelationOperation.cs">
<Link>Internal\Operation\LCAddRelationOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCDeleteOperation.cs">
<Link>Internal\Operation\LCDeleteOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCSetOperation.cs">
<Link>Internal\Operation\LCSetOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCAddUniqueOperation.cs">
<Link>Internal\Operation\LCAddUniqueOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCRemoveOperation.cs">
<Link>Internal\Operation\LCRemoveOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCRemoveRelationOperation.cs">
<Link>Internal\Operation\LCRemoveRelationOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\LCAddOperation.cs">
<Link>Internal\Operation\LCAddOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Operation\ILCOperation.cs">
<Link>Internal\Operation\ILCOperation.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\File\LCProgressableStreamContent.cs">
<Link>Internal\File\LCProgressableStreamContent.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\File\LCQiniuUploader.cs">
<Link>Internal\File\LCQiniuUploader.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\File\LCMimeTypeMap.cs">
<Link>Internal\File\LCMimeTypeMap.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\File\LCAWSUploader.cs">
<Link>Internal\File\LCAWSUploader.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Codec\LCEncoder.cs">
<Link>Internal\Codec\LCEncoder.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Codec\LCDecoder.cs">
<Link>Internal\Codec\LCDecoder.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Object\LCSubClassInfo.cs">
<Link>Internal\Object\LCSubClassInfo.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Object\LCBatch.cs">
<Link>Internal\Object\LCBatch.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Object\LCObjectData.cs">
<Link>Internal\Object\LCObjectData.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Http\LCHttpClient.cs">
<Link>Internal\Http\LCHttpClient.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Http\LCJsonConverter.cs">
<Link>Internal\Http\LCJsonConverter.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Query\LCEqualCondition.cs">
<Link>Internal\Query\LCEqualCondition.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Query\LCOperationCondition.cs">
<Link>Internal\Query\LCOperationCondition.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Query\LCRelatedCondition.cs">
<Link>Internal\Query\LCRelatedCondition.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Query\ILCQueryCondition.cs">
<Link>Internal\Query\ILCQueryCondition.cs</Link>
</Compile>
<Compile Include="..\Storage\Internal\Query\LCCompositionalCondition.cs">
<Link>Internal\Query\LCCompositionalCondition.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\UnityLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common-Unity\Common-Unity.csproj" />
</ItemGroup>
</Project>

View File

@ -0,0 +1,4 @@
<linker>
<assembly fullname="LeanCloud" preserve="all"/>
<assembly fullname="LeanCloud.Storage" preserve="all"/>
</linker>

View File

@ -7,8 +7,8 @@ using LeanCloud.Storage;
namespace Storage.Test {
public class FileTest {
static readonly string AvatarFilePath = "../../../../assets/hello.png";
static readonly string APKFilePath = "../../../../assets/test.apk";
static readonly string AvatarFilePath = "../../../../../assets/hello.png";
static readonly string APKFilePath = "../../../../../assets/test.apk";
[SetUp]
public void SetUp() {

View File

@ -15,6 +15,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Storage\Storage.csproj" />
<ProjectReference Include="..\..\Storage\Storage\Storage.csproj" />
</ItemGroup>
</Project>

Some files were not shown because too many files have changed in this diff Show More