PHXH
/
csharp-sdk-upm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into leanengine

oneRain 2021-03-05 12:23:24 +08:00
parent fec7d89ee9 5ca2b36bce
commit 70e5b6c3bb
16 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Common-Unity/Common-Unity.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
Common/Common/Common.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
LiveQuery/LiveQuery-Unity/LiveQuery-Unity.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<AssemblyName>LiveQuery</AssemblyName> <AssemblyName>LiveQuery</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
LiveQuery/LiveQuery.Test/LiveQuery.Test.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
LiveQuery/LiveQuery/LiveQuery.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>

2
Realtime/Realtime-Unity/Realtime-Unity.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyName>Realtime</AssemblyName> <AssemblyName>Realtime</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
Realtime/Realtime.Test/Realtime.Test.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Realtime/Realtime/Realtime.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<RootNamespace>LeanCloud.Realtime</RootNamespace> <RootNamespace>LeanCloud.Realtime</RootNamespace>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>

2
Sample/LiveQueryApp/LiveQueryApp.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Sample/RealtimeApp/RealtimeApp.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Storage/Storage-Unity/Storage-Unity.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<AssemblyName>Storage</AssemblyName> <AssemblyName>Storage</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
Storage/Storage.Test/Storage.Test.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Storage/Storage/LCApplication.cs
View File

@ -9,7 +9,7 @@ namespace LeanCloud {
/// </summary> /// </summary>
public class LCApplication { public class LCApplication {
// SDK 版本号，用于 User-Agent 统计 // SDK 版本号，用于 User-Agent 统计
internal const string SDKVersion = "0.6.3"; internal const string SDKVersion = "0.6.4";
// 接口版本号，用于接口版本管理 // 接口版本号，用于接口版本管理
internal const string APIVersion = "1.1"; internal const string APIVersion = "1.1";

9
Storage/Storage/LCQuery.cs
View File

@ -351,7 +351,14 @@ namespace LeanCloud.Storage {
throw new ArgumentNullException(nameof(objectId)); throw new ArgumentNullException(nameof(objectId));
} }
string path = $"classes/{ClassName}/{objectId}"; string path = $"classes/{ClassName}/{objectId}";
Dictionary<string, object> response = await LCApplication.HttpClient.Get<Dictionary<string, object>>(path); Dictionary<string, object> queryParams = null;
string includes = Condition.BuildIncludes();
if (!string.IsNullOrEmpty(includes)) {
queryParams = new Dictionary<string, object> {
{ "include", includes }
};
}
Dictionary<string, object> response = await LCApplication.HttpClient.Get<Dictionary<string, object>>(path, queryParams: queryParams);
return DecodeLCObject(response); return DecodeLCObject(response);
} }

2
Storage/Storage/Storage.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<ReleaseVersion>0.6.3</ReleaseVersion> <ReleaseVersion>0.6.4</ReleaseVersion>
<RootNamespace>LeanCloud.Storage</RootNamespace> <RootNamespace>LeanCloud.Storage</RootNamespace>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>

2
csharp-sdk.sln
View File

@ -112,6 +112,6 @@ Global
{9D5E6A37-8925-48ED-B7EA-12C89291B59D} = {2D980281-F060-4363-AB7A-D4B6C30ADDBB} {9D5E6A37-8925-48ED-B7EA-12C89291B59D} = {2D980281-F060-4363-AB7A-D4B6C30ADDBB}
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
version = 0.6.3 version = 0.6.4
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal