IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0

Browse Source
This commit is contained in:
Viktor Fomin 2021-09-14 15:50:32 +03:00
commit 50c0ad1856
5 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.nuget/packages/AppLimit.CloudComputing.SharpBox.1.1.0.453.nupkg
View File

Binary file not shown.

BIN
.nuget/packages/AppLimit.CloudComputing.SharpBox.1.1.0.454.nupkg Normal file
View File

Binary file not shown.

2
products/ASC.Files/Core/ASC.Files.Core.csproj
View File

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.1.0.453" />
<PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.1.0.454" />
<PackageReference Include="Box.V2.Core" Version="3.24.0" />
<PackageReference Include="DocuSign.eSign.dll" Version="4.4.1" />
<PackageReference Include="Dropbox.Api" Version="4.10.0" />

10
thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj vendored
View File

@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProductVersion>9.0.30729</ProductVersion>
<TargetFrameworks>net5.0;net4.8</TargetFrameworks>
<TargetFrameworks>net4.8;net5.0</TargetFrameworks>
<FileUpgradeFlags />
<UpgradeBackupLocation />
<AssemblyTitle>AppLimit.CloudComputing.SharpBox</AssemblyTitle>
<Company>Ascensio System SIA</Company>
<Product>AppLimit.CloudComputing.SharpBox</Product>
<Copyright>(c) Ascensio System SIA. All rights reserved</Copyright>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<WarningsAsErrors></WarningsAsErrors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.1.0.453</Version>
<Version>1.1.0.454</Version>
<PackageLicenseExpression></PackageLicenseExpression>
<AssemblyVersion>1.1.0.453</AssemblyVersion>
<FileVersion>1.1.0.453</FileVersion>
<AssemblyVersion>1.1.0.454</AssemblyVersion>
<FileVersion>1.1.0.454</FileVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>

35
thirdparty/AppLimit.CloudComputing.SharpBox/Common/Cache/CachedDictionary.cs vendored
View File

@ -49,7 +49,7 @@ namespace AppLimit.CloudComputing.SharpBox.Common.Cache
Debug.Print("inserted root key {0}", rootKey);
#endif
MemoryCache.Remove(rootKey);
MemoryCache.Set(rootKey, DateTime.UtcNow.Ticks, new MemoryCacheEntryOptions() { AbsoluteExpiration = DateTime.MaxValue, SlidingExpiration = TimeSpan.Zero, Priority = CacheItemPriority.NeverRemove });
MemoryCache.Set(rootKey, DateTime.UtcNow.Ticks, new MemoryCacheEntryOptions() { Priority = CacheItemPriority.NeverRemove });
}
public override void Reset(string rootKey, string key)
@ -64,7 +64,18 @@ namespace AppLimit.CloudComputing.SharpBox.Common.Cache
public override void Add(string rootkey, string key, T newValue)
{
var builtrootkey = BuildKey(string.Empty, string.IsNullOrEmpty(rootkey) ? "root" : rootkey);
var builtrootkey = BuildKey(string.Empty, string.IsNullOrEmpty(rootkey) ? "root" : rootkey);
var options = new MemoryCacheEntryOptions
{
Priority = CacheItemPriority.Normal,
AbsoluteExpiration = AbsoluteExpiration
};
if (SlidingExpiration != TimeSpan.Zero)
{
options.SlidingExpiration = SlidingExpiration;
}
if (!MemoryCache.TryGetValue(builtrootkey, out _))
{
#if (DEBUG)
@ -72,11 +83,7 @@ namespace AppLimit.CloudComputing.SharpBox.Common.Cache
#endif
//Insert root if no present
MemoryCache.Remove(builtrootkey);
MemoryCache.Set(builtrootkey, DateTime.UtcNow.Ticks, new MemoryCacheEntryOptions
{
AbsoluteExpiration = AbsoluteExpiration,
SlidingExpiration = SlidingExpiration
});
MemoryCache.Set(builtrootkey, DateTime.UtcNow.Ticks, options);
MemoryCache.Remove(BuildKey(key, rootkey));
}
@ -85,18 +92,8 @@ namespace AppLimit.CloudComputing.SharpBox.Common.Cache
{
var buildKey = BuildKey(key, rootkey);
MemoryCache.Remove(buildKey);
var options = new MemoryCacheEntryOptions
{
Priority = CacheItemPriority.Normal,
AbsoluteExpiration = AbsoluteExpiration,
SlidingExpiration = SlidingExpiration,
};
MemoryCache.Set(BuildKey(key, rootkey), newValue, new MemoryCacheEntryOptions
{
Priority = CacheItemPriority.Normal,
AbsoluteExpiration = AbsoluteExpiration,
SlidingExpiration = SlidingExpiration
});
MemoryCache.Set(BuildKey(key, rootkey), newValue, options);
//TODO
//options.AddExpirationToken(Microsoft.Extensions.Primitives.CancellationChangeToken);
//new CacheDependency(null, new[] { _baseKey, builtrootkey }),