microsoft
/
BuildXL
зеркало из https://github.com/microsoft/BuildXL.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 548469: Update StackExchange.Redis to 2.1.30 

Revert !547252

Related work items: #1697377
This commit is contained in:
Sergey Tepliakov 2020-04-29 19:25:20 +00:00
Родитель b1ba48cd45
Коммит 526e2c4a3b
7 изменённых файлов: 123 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc
Просмотреть файл

@ -20,7 +20,7 @@ export const msbuildRuntimeContent = [
importFrom("Microsoft.Build.Runtime").pkg,
importFrom("SystemMemoryForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("SystemNumericsVectorsForMSBuild").pkg,
importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("SystemRuntimeCompilerServicesUnsafeForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("System.Threading.Tasks.Dataflow").pkg,
...BuildXLSdk.isDotNetCoreBuild ? [

7
Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc
Просмотреть файл

@ -20,11 +20,16 @@ export const redisPackages = [
importFrom("System.IO.Pipelines").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
importFrom("System.Threading.Channels").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
importFrom("Microsoft.Bcl.AsyncInterfaces").pkg,
]
: [
importFrom("System.IO.Pipelines").pkg,
importFrom("System.Threading.Channels").pkg,
importFrom("System.Runtime.CompilerServices.Unsafe").pkg
importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
// Workaround to avoid compilation issues due to duplicate definition of IAsyncEnumerable<T>
// Redis.StackExchange package references .netstandard2 and the tests are running under .NET Core App 3.1
// and Microsoft.Bcl.AsyncInterfaces package was changed between .netstandard2 and .netstandard2.1
importFrom("Microsoft.Bcl.AsyncInterfaces").withQualifier({targetFramework: "netstandard2.1"}).pkg,
]),
// Needed because of snipped dependencies for System.IO.Pipelines and System.Threading.Channels
importFrom("System.Threading.Tasks.Extensions").pkg,

2
Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
Просмотреть файл

@ -51,6 +51,7 @@ namespace DistributedTest {
importFrom("Microsoft.IdentityModel.Clients.ActiveDirectory").pkg,
importFrom("System.IdentityModel.Tokens.Jwt").pkg
),
...redisPackages,
Distributed.dll,
...Distributed.eventHubPackagages,
UtilitiesCore.dll,
@ -70,7 +71,6 @@ namespace DistributedTest {
importFrom("Grpc.Core.Api").pkg,
...importFrom("Sdk.Selfhost.RocksDbSharp").pkgs,
importFrom("StackExchange.Redis").pkg,
...BuildXLSdk.fluentAssertionsWorkaround,
importFrom("WindowsAzure.Storage").pkg,

89
Public/Src/Cache/ContentStore/DistributedTest/Redis/MockRedisDatabaseFactory.TestDatabase.cs
Просмотреть файл

@ -9,7 +9,7 @@ using StackExchange.Redis;
namespace ContentStoreTest.Distributed.Redis
{
internal class TestDatabase : IDatabaseAsync, IBatch, IDatabase
internal class TestDatabase : IBatch, IDatabase
{
private readonly ITestRedisDatabase _testDb;
private readonly IBatch _testBatch;
@ -20,6 +20,8 @@ namespace ContentStoreTest.Distributed.Redis
_testBatch = testBatch;
}
public long KeyTouch(RedisKey[] keys, CommandFlags flags = CommandFlags.None) => 0;
public int Database => throw new NotImplementedException();
IConnectionMultiplexer IRedisAsync.Multiplexer => throw new NotImplementedException();
@ -310,6 +312,15 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public global::System.Collections.Generic.IAsyncEnumerable<HashEntry> HashScanAsync(
RedisKey key,
RedisValue pattern = new RedisValue(),
int pageSize = 250,
long cursor = 0,
int pageOffset = 0,
CommandFlags flags = CommandFlags.None) =>
throw new NotImplementedException();
public IEnumerable<HashEntry> HashScan(RedisKey key, RedisValue pattern, int pageSize, CommandFlags flags)
{
throw new NotImplementedException();
@ -330,6 +341,8 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public long HashStringLength(RedisKey key, RedisValue hashField, CommandFlags flags = CommandFlags.None) => 0;
public Task HashSetAsync(RedisKey key, HashEntry[] hashFields, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
@ -340,6 +353,8 @@ namespace ContentStoreTest.Distributed.Redis
return _testDb.HashSetAsync(key, hashField, value, when, flags);
}
public Task<long> HashStringLengthAsync(RedisKey key, RedisValue hashField, CommandFlags flags = CommandFlags.None) => null;
public RedisValue[] HashValues(RedisKey key, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
@ -1265,6 +1280,24 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public global::System.Collections.Generic.IAsyncEnumerable<RedisValue> SetScanAsync(
RedisKey key,
RedisValue pattern = new RedisValue(),
int pageSize = 250,
long cursor = 0,
int pageOffset = 0,
CommandFlags flags = CommandFlags.None) =>
throw new NotImplementedException();
public global::System.Collections.Generic.IAsyncEnumerable<SortedSetEntry> SortedSetScanAsync(
RedisKey key,
RedisValue pattern = new RedisValue(),
int pageSize = 250,
long cursor = 0,
int pageOffset = 0,
CommandFlags flags = CommandFlags.None) =>
throw new NotImplementedException();
public IEnumerable<SortedSetEntry> SortedSetScan(RedisKey key, RedisValue pattern, int pageSize, CommandFlags flags)
{
throw new NotImplementedException();
@ -1370,11 +1403,21 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public bool StreamCreateConsumerGroup(RedisKey key, RedisValue groupName, RedisValue? position = null, bool createStream = true, CommandFlags flags = CommandFlags.None) => false;
public Task<bool> StreamCreateConsumerGroupAsync(RedisKey key, RedisValue groupName, RedisValue? position = null, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
}
public Task<bool> StreamCreateConsumerGroupAsync(
RedisKey key,
RedisValue groupName,
RedisValue? position = null,
bool createStream = true,
CommandFlags flags = CommandFlags.None) =>
null;
public long StreamDelete(RedisKey key, RedisValue[] messageIds, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
@ -1490,21 +1533,59 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public StreamEntry[] StreamReadGroup(
RedisKey key,
RedisValue groupName,
RedisValue consumerName,
RedisValue? position = null,
int? count = null,
bool noAck = false,
CommandFlags flags = CommandFlags.None) =>
new StreamEntry[] { };
public RedisStream[] StreamReadGroup(StreamPosition[] streamPositions, RedisValue groupName, RedisValue consumerName, int? countPerStream = null, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
}
public RedisStream[] StreamReadGroup(
StreamPosition[] streamPositions,
RedisValue groupName,
RedisValue consumerName,
int? countPerStream = null,
bool noAck = false,
CommandFlags flags = CommandFlags.None) =>
new RedisStream[] { };
public Task<StreamEntry[]> StreamReadGroupAsync(RedisKey key, RedisValue groupName, RedisValue consumerName, RedisValue? position = null, int? count = null, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
}
public Task<StreamEntry[]> StreamReadGroupAsync(
RedisKey key,
RedisValue groupName,
RedisValue consumerName,
RedisValue? position = null,
int? count = null,
bool noAck = false,
CommandFlags flags = CommandFlags.None) =>
null;
public Task<RedisStream[]> StreamReadGroupAsync(StreamPosition[] streamPositions, RedisValue groupName, RedisValue consumerName, int? countPerStream = null, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
}
public Task<RedisStream[]> StreamReadGroupAsync(
StreamPosition[] streamPositions,
RedisValue groupName,
RedisValue consumerName,
int? countPerStream = null,
bool noAck = false,
CommandFlags flags = CommandFlags.None) =>
null;
public long StreamTrim(RedisKey key, int maxLength, bool useApproximateMaxLength = false, CommandFlags flags = CommandFlags.None)
{
throw new NotImplementedException();
@ -1727,11 +1808,17 @@ namespace ContentStoreTest.Distributed.Redis
throw new NotImplementedException();
}
public bool KeyTouch(RedisKey key, CommandFlags flags = CommandFlags.None) => false;
public Task<RedisValue> StringSetRangeAsync(RedisKey key, long offset, RedisValue value, CommandFlags flags = CommandFlags.None)
{
return _testDb.StringSetRangeAsync(key, offset, value);
}
public Task<bool> KeyTouchAsync(RedisKey key, CommandFlags flags = CommandFlags.None) => null;
public Task<long> KeyTouchAsync(RedisKey[] keys, CommandFlags flags = CommandFlags.None) => null;
public bool TryWait(Task task)
{
throw new NotImplementedException();

2
Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
Просмотреть файл

@ -27,7 +27,7 @@ namespace VBCSCompilerLogger {
runtimeContent:[
importFrom("System.Reflection.Metadata").pkg,
importFrom("SystemMemoryForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("SystemRuntimeCompilerServicesUnsafeForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("SystemNumericsVectorsForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
]
});

21
cg/nuget/cgmanifest.json
Просмотреть файл

@ -2652,7 +2652,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Pipelines.Sockets.Unofficial",
"Version": "2.0.22"
"Version": "2.1.6"
}
}
},
@ -2733,7 +2733,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "StackExchange.Redis",
"Version": "2.0.601"
"Version": "2.1.30"
}
}
},
@ -3039,7 +3039,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Diagnostics.PerformanceCounter",
"Version": "4.5.0"
"Version": "4.7.0"
}
}
},
@ -3237,7 +3237,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.IO.Pipelines",
"Version": "4.5.3"
"Version": "4.7.0"
}
}
},
@ -3633,7 +3633,16 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Runtime.CompilerServices.Unsafe",
"Version": "4.5.2"
"Version": "4.5.3"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "System.Runtime.CompilerServices.Unsafe",
"Version": "4.7.0"
}
}
},
@ -4002,7 +4011,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Threading.Channels",
"Version": "4.5.0"
"Version": "4.7.0"
}
}
},

21
config.dsc
Просмотреть файл

@ -213,12 +213,12 @@ config({
{ id: "Microsoft.Bcl.Async", version: "1.0.168" },
{ id: "Microsoft.Bcl.AsyncInterfaces", version: "1.1.0" },
{ id: "Microsoft.Bcl.Build", version: "1.0.14" },
{ id: "StackExchange.Redis", version: "2.0.601",
dependentPackageIdsToSkip: ["System.IO.Pipelines", "System.Threading.Channels"] },
{ id: "Pipelines.Sockets.Unofficial", version: "2.0.22",
dependentPackageIdsToSkip: ["System.IO.Pipelines", "System.Runtime.CompilerServices.Unsafe"] },
{ id: "System.Diagnostics.PerformanceCounter", version: "4.5.0" },
{ id: "System.Threading.Channels", version: "4.5.0",
{ id: "StackExchange.Redis", version: "2.1.30",
dependentPackageIdsToSkip: ["System.IO.Pipelines", "System.Threading.Channels", "Microsoft.Bcl.AsyncInterfaces"] },
{ id: "Pipelines.Sockets.Unofficial", version: "2.1.6",
dependentPackageIdsToSkip: ["System.IO.Pipelines", "System.Runtime.CompilerServices.Unsafe", "Microsoft.Bcl.AsyncInterfaces"] },
{ id: "System.Diagnostics.PerformanceCounter", version: "4.7.0" },
{ id: "System.Threading.Channels", version: "4.7.0",
dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
{ id: "System.Interactive.Async", version: "3.1.1" },
{ id: "TransientFaultHandling.Core", version: "5.1.1209.1" },
@ -242,8 +242,8 @@ config({
{ id: "Microsoft.ApplicationInsights.WindowsServer", version: "2.3.0" },
{ id: "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel", version: "2.3.0" },
{ id: "System.Memory", version: "4.5.1" },
{ id: "System.Runtime.CompilerServices.Unsafe", version: "4.5.2" },
{ id: "System.IO.Pipelines", version: "4.5.3",
{ id: "System.Runtime.CompilerServices.Unsafe", version: "4.7.0" },
{ id: "System.IO.Pipelines", version: "4.7.0",
dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
{ id: "System.Security.Cryptography.Xml", version: "4.5.0" },
{ id: "System.Text.Encodings.Web", version: "4.5.0" },
@ -288,8 +288,9 @@ config({
{ id: "System.CodeDom", version: "4.4.0"},
{ id: "System.Text.Encoding.CodePages", version: "4.5.1",
dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"]},
{ id: "System.Memory", version: "4.5.3", alias: "SystemMemoryForMSBuild",
dependentPackageIdsToSkip: ["*"]},
{ id: "System.Memory", version: "4.5.3", alias: "SystemMemoryForMSBuild", dependentPackageIdsToSkip: ["*"]},
{ id: "System.Runtime.CompilerServices.Unsafe", version: "4.5.3", alias: "SystemRuntimeCompilerServicesUnsafeForMSBuild", dependentPackageIdsToSkip: ["*"]},
{ id: "System.Numerics.Vectors", version: "4.4.0", alias: "SystemNumericsVectorsForMSBuild"},
// Used for MSBuild input/output prediction