diff --git a/marketplace/Empostor.Plugins.QqVerify.dll b/marketplace/Empostor.Plugins.QqVerify.dll deleted file mode 100644 index 173e501..0000000 Binary files a/marketplace/Empostor.Plugins.QqVerify.dll and /dev/null differ diff --git a/marketplace/plugins.json b/marketplace/plugins.json index dc9502d..c81779e 100644 --- a/marketplace/plugins.json +++ b/marketplace/plugins.json @@ -77,19 +77,6 @@ } ] }, - { - "id": "cn.hayashiume.qqverify", - "name": "QQ群验证API", - "description": "[仅限中国],搭配 [本插件](https://github.com/HayashiUme/LLOneBot_Empostor_Verify) 使用", - "author": "HayashiUme", - "versions": [ - { - "version": "1.0.0", - "empostor_version": "2.0.0", - "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/master/marketplace/Empostor.Plugins.QqVerify.dll" - } - ] - }, { "id": "cn.hayashiume.message", "name": "Leave a Message", diff --git a/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs b/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs index ab4604d..376ce2e 100644 --- a/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs +++ b/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs @@ -2,10 +2,10 @@ namespace Empostor.Api.Service.Admin.Verify { public interface IVerifyStore { - void AddPending(string friendCode, string qqNumber); + void AddPending(string friendCode, string userOpenid); bool ValidateSecret(string secret); - bool TryConfirm(string friendCode, string qqNumber); + bool TryConfirm(string friendCode, string userOpenid); } } diff --git a/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj b/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj deleted file mode 100644 index 084f985..0000000 --- a/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - net10.0 - Empostor.Plugins.QqVerify - enable - - - - - - - - diff --git a/src/Empostor.Plugins.QqVerify/Localization/en.json b/src/Empostor.Plugins.QqVerify/Localization/en.json deleted file mode 100644 index 350a3f8..0000000 --- a/src/Empostor.Plugins.QqVerify/Localization/en.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "command.verify.description":"Verify your QQ number for group access.", - "command.verify.usage":"verify ", - "qqverify.chinese_only":"This command is only available for Chinese language players.\n此功能仅支持简体/繁体中文玩家使用。", - "qqverify.no_friendcode":"Unable to get your friend code. Please make sure you are logged in.", - "qqverify.usage_message":"Usage: #verify \nExample: #verify 123456789", - "qqverify.recorded":"Verification request recorded! Send /验证 {0} to the QQ bot.\nNote: The code is valid for 10 minutes." -} diff --git a/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json b/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json deleted file mode 100644 index 33ec057..0000000 --- a/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "command.verify.description":"验证你的QQ号以获取群组访问权限。", - "command.verify.usage":"verify ", - "qqverify.chinese_only":"此功能仅支持简体/繁体中文玩家使用。\nThis command is only available for Chinese language players.", - "qqverify.no_friendcode":"无法获取你的好友代码,请确保已登录账号。", - "qqverify.usage_message":"用法:#verify <你的QQ号>\n示例:#verify 123456789", - "qqverify.recorded":"已记录验证请求!请私聊QQ机器人发送:/验证 {0}\n注意:验证码10分钟内有效。" -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs b/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs deleted file mode 100644 index c96ec54..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Empostor.Api.Admin; -using Empostor.Api.Plugins; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyAdminExtension : IAdminExtension -{ - private readonly QqVerifyConfig _config; - private readonly string _configPath; - - public QqVerifyAdminExtension(QqVerifyConfig config, string configPath) - { - _config = config; - _configPath = configPath; - } - - public string Id => "qq-verify"; - - public string Title => "QQ Verify"; - - public string Icon => "shield"; - - public void Build(AdminPanelBuilder b) - { - b.RegisterTextbox(t => - { - t.Label = "Bot secret"; - t.Value = _config.BotSecret; - t.Secret = true; - t.Placeholder = "change-bot-secret"; - t.OnSubmit(async ctx => - { - _config.BotSecret = ctx.Value ?? string.Empty; - PluginConfigLoader.Save(_configPath, _config); - return AdminActionResult.Ok("Bot secret saved."); - }); - }); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs b/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs deleted file mode 100644 index 69dfccc..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Threading.Tasks; -using Empostor.Api.Commands; -using Empostor.Api.Service.Admin.Verify; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyCommand : ICommand -{ - private readonly IVerifyStore _store; - - public QqVerifyCommand(IVerifyStore store) - { - _store = store; - } - - public string Name => "verify"; - public string LocalizationOwner => QqVerifyPlugin.Owner; - - public string[] Aliases => new[] { "ver" }; - - public string Description => "Verify your QQ number for group access."; - - public string Usage => "verify "; - - public async ValueTask ExecuteAsync(CommandContext ctx) - { - if (!ctx.IsSenderChinese()) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.chinese_only", - "This command is only available for Chinese language players.\n此功能仅支持简体/繁体中文玩家使用。"), - ctx.PlayerControl); - return true; - } - - var fc = ctx.Sender.Client.FriendCode; - if (string.IsNullOrEmpty(fc)) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.no_friendcode", - "Unable to get your friend code. Please make sure you are logged in."), - ctx.PlayerControl); - return true; - } - - var qqNumber = ctx.RawArgs?.Trim(); - if (string.IsNullOrEmpty(qqNumber) || !long.TryParse(qqNumber, out _)) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.usage_message", - "Usage: #verify \nExample: #verify 123456789"), - ctx.PlayerControl); - return true; - } - - _store.AddPending(fc, qqNumber); - - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.recorded", - "Verification request recorded! Send /验证 {0} to the QQ bot.\nNote: The code is valid for 10 minutes.", fc), - ctx.PlayerControl); - - return true; - } - - private static string T(CommandContext ctx, string key, string defaultText, params object?[] arguments) - { - return ctx.GetPluginString(QqVerifyPlugin.Owner, key, arguments); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs b/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs deleted file mode 100644 index 22fc580..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyConfig -{ - [JsonPropertyName("botSecret")] - public string BotSecret { get; set; } = "change-bot-secret"; -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs b/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs deleted file mode 100644 index 04d9168..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Threading.Tasks; -using Empostor.Api.Localization; -using Empostor.Api.Plugins; -using Microsoft.Extensions.Logging; - -namespace Empostor.Plugins.QqVerify; - -[EmpostorPlugin(Owner, "QQ Verify", "ELinmei", "1.0.0")] -public sealed class QqVerifyPlugin : PluginBase -{ - public const string Owner = "cn.hayashiume.qqverify"; - private readonly ILocalizationRegistry _registry; - private readonly ILogger _logger; - private IDisposable? _registration; - public QqVerifyPlugin(ILogger logger, ILocalizationRegistry registry) { _logger = logger; _registry = registry; } - public override ValueTask EnableAsync() - { - if (!_registry.TryRegister(new LocalizationCatalog(Owner, typeof(QqVerifyPlugin).Assembly, "Empostor.Plugins.QqVerify.Localization"), out _registration)) - _logger.LogWarning("Could not register localization resources for {Owner}", Owner); - return default; - } - public override ValueTask DisableAsync() { _registration?.Dispose(); return default; } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs b/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs deleted file mode 100644 index a45f961..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Empostor.Api.Admin; -using Empostor.Api.Commands; -using Empostor.Api.Plugins; -using Empostor.Api.Service.Admin.Verify; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyStartup : IPluginStartup -{ - private string _configPath = "[QQ Verify]Config.json"; - - public void SetConfigPath(string configPath) => _configPath = configPath; - - public void ConfigureHost(IHostBuilder host) { } - - public void ConfigureServices(IServiceCollection services) - { - var config = PluginConfigLoader.Load(_configPath); - services.AddSingleton(config); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton( - sp => sp.GetRequiredService()); - services.AddSingleton( - _ => new QqVerifyAdminExtension(config, _configPath)); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs b/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs deleted file mode 100644 index 8dcf3d2..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using Empostor.Api.Service.Admin.Verify; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyStore : IVerifyStore -{ - private readonly object _lock = new(); - private readonly Dictionary _pending = new(); - private static readonly TimeSpan Expiry = TimeSpan.FromMinutes(10); - private readonly QqVerifyConfig _config; - - public QqVerifyStore(QqVerifyConfig config) - { - _config = config; - } - - public void AddPending(string friendCode, string qqNumber) - { - var key = Normalize(friendCode); - lock (_lock) - { - CleanExpiredLocked(); - _pending[key] = new PendingEntry(qqNumber, DateTime.UtcNow); - } - } - - public bool ValidateSecret(string secret) - { - return !string.IsNullOrWhiteSpace(secret) && secret == _config.BotSecret; - } - - public bool TryConfirm(string friendCode, string qqNumber) - { - var key = Normalize(friendCode); - lock (_lock) - { - CleanExpiredLocked(); - if (_pending.TryGetValue(key, out var entry) && entry.QqNumber == qqNumber) - { - _pending.Remove(key); - return true; - } - - return false; - } - } - - private void CleanExpiredLocked() - { - var cutoff = DateTime.UtcNow - Expiry; - var expired = new List(); - foreach (var (k, v) in _pending) - { - if (v.Timestamp < cutoff) - { - expired.Add(k); - } - } - - foreach (var k in expired) - { - _pending.Remove(k); - } - } - - private static string Normalize(string fc) - { - return (fc ?? string.Empty).Trim().ToUpperInvariant(); - } - - private sealed record PendingEntry(string QqNumber, DateTime Timestamp); -} diff --git a/src/Empostor.Plugins.QqVerify/packages.lock.json b/src/Empostor.Plugins.QqVerify/packages.lock.json deleted file mode 100644 index 8c2d1e8..0000000 --- a/src/Empostor.Plugins.QqVerify/packages.lock.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net10.0": { - "BouncyCastle.Cryptography": { - "type": "Transitive", - "resolved": "2.6.1", - "contentHash": "vZsG2YILhthgRqO+ZVgRff4ZFKKTl0v7kqaVBLCtRvpREhfBP33pcWrdA3PRYgWuFL1RxiUFvjMUHTdBZlJcoA==" - }, - "Empostor.Hazel": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "cblWCgvLcQ2xK6ztV04RVrghVEnJpCWe4N6G3LCNaJhuUq367a1/bbtQxUWAflqvgSvGwY3g3SClhh9eWTCBDA==", - "dependencies": { - "BouncyCastle.Cryptography": "2.6.1", - "Empostor.Hazel.Abstractions": "1.0.2", - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.6", - "Microsoft.Extensions.ObjectPool": "8.0.1", - "Serilog": "4.3.1" - } - }, - "Empostor.Hazel.Abstractions": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "uJqGMASOGj+ELffmIMqubyvJ/FHjOXA1RtQdS38s1LRhP+Eu4zJMTTndr12+Q3vS0kHggFFyuExFmNxWyzWmig==" - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.2.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "9.0.6", - "contentHash": "0Zn6nR/6g+90MxskZyOOMPQvnPnrrGu6bytPwkV+azDcTtCSuQ1+GJUrg8Klmnrjk1i6zMpw2lXijl+tw7Q3kA==" - }, - "Microsoft.Extensions.Diagnostics.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" - } - }, - "Microsoft.Extensions.FileProviders.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" - }, - "Serilog": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "savYe7h5yRlkqBVOwP8cIRDOdqKiPmYCU4W87JH38sBmcKD5EBoXvQIw6bNEvZ/pTe1gsiye3VFCzBsoppGkXQ==" - }, - "empostor.api": { - "type": "Project", - "dependencies": { - "Empostor.Hazel": "[1.0.2, )", - "Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )", - "Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )", - "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )" - } - } - } - } -} \ No newline at end of file diff --git a/src/Empostor.Server/Http/VerifyController.cs b/src/Empostor.Server/Http/VerifyController.cs index 7565601..794a4ed 100644 --- a/src/Empostor.Server/Http/VerifyController.cs +++ b/src/Empostor.Server/Http/VerifyController.cs @@ -23,12 +23,12 @@ public sealed class VerifyController : ControllerBase return Unauthorized(new { ok = false, error = "Invalid bot secret." }); } - if (string.IsNullOrWhiteSpace(req.FriendCode) || string.IsNullOrWhiteSpace(req.QqNumber)) + if (string.IsNullOrWhiteSpace(req.FriendCode) || string.IsNullOrWhiteSpace(req.UserOpenid)) { - return BadRequest(new { ok = false, error = "friendCode and qqNumber are required." }); + return BadRequest(new { ok = false, error = "friendCode and userOpenid are required." }); } - var ok = _store.TryConfirm(req.FriendCode, req.QqNumber); + var ok = _store.TryConfirm(req.FriendCode, req.UserOpenid); if (ok) { return Ok(new { ok = true }); @@ -44,6 +44,6 @@ public sealed class VerifyController : ControllerBase public sealed record VerifyConfirmRequest( [property: JsonPropertyName("friendCode")] string FriendCode, - [property: JsonPropertyName("qqNumber")] string QqNumber, + [property: JsonPropertyName("userOpenid")] string UserOpenid, [property: JsonPropertyName("secret")] string Secret); } diff --git a/src/Empostor.sln b/src/Empostor.sln index 0438b80..95e71bb 100644 --- a/src/Empostor.sln +++ b/src/Empostor.sln @@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.FixedCode" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.FriendCodeValidator", "Empostor.Plugins.FriendCodeValidator\Empostor.Plugins.FriendCodeValidator.csproj", "{70CD7AC9-1DE3-CD23-602A-EFD504B91450}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.QqVerify", "Empostor.Plugins.QqVerify\Empostor.Plugins.QqVerify.csproj", "{B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.PlayerChannel", "Empostor.Plugins.PlayerChannel\Empostor.Plugins.PlayerChannel.csproj", "{D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugin.Chat", "Empostor.Plugin.Chat\Empostor.Plugin.Chat.csproj", "{9D1FD146-E7D9-4AFF-9B8E-25E6021A69D7}" @@ -133,18 +131,6 @@ Global {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x64.Build.0 = Release|Any CPU {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x86.ActiveCfg = Release|Any CPU {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x86.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x64.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x86.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x86.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x64.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x64.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x86.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x86.Build.0 = Release|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -262,7 +248,6 @@ Global {AA000002-0000-0000-0000-000000000002} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {C583BD2A-1468-99CA-4E3D-CBDA4D2EDB9F} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {70CD7AC9-1DE3-CD23-602A-EFD504B91450} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {9D1FD146-E7D9-4AFF-9B8E-25E6021A69D7} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {ADC4F301-51C0-45DB-B97A-BE3844DFD19B} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}