diff --git a/test/DistEvents/.gitignore b/test/DistEvents/.gitignore deleted file mode 100644 index 8dd4607a4b..0000000000 --- a/test/DistEvents/.gitignore +++ /dev/null @@ -1,398 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.tlog -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files -*.ncb -*.aps - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoApp.AspNetCoreDapr.csproj b/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoApp.AspNetCoreDapr.csproj deleted file mode 100644 index 8801131096..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoApp.AspNetCoreDapr.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - net10.0 - enable - enable - DistDemoApp - MongoDb - - - - - - - - - - - - - - - - - - $(DefineConstants);DISTDEMO_USE_MONGODB - - - - $(DefineConstants);DISTDEMO_USE_EFCORE - - - - - Always - - - - diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoAppAspNetCoreDaprModule.cs b/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoAppAspNetCoreDaprModule.cs deleted file mode 100644 index 843a4af81b..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/DistDemoAppAspNetCoreDaprModule.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Dapr; -using Volo.Abp; -using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; -using Volo.Abp.Autofac; -using Volo.Abp.Dapr; -using Volo.Abp.EventBus.Dapr; -using Volo.Abp.Modularity; - -namespace DistDemoApp; - -#if DISTDEMO_USE_MONGODB -[DependsOn( - typeof(DistDemoAppMongoDbInfrastructureModule), - typeof(AbpAspNetCoreMvcDaprEventBusModule), - typeof(DistDemoAppSharedModule), - typeof(AbpAutofacModule) -)] -#else -[DependsOn( - typeof(DistDemoAppEntityFrameworkCoreInfrastructureModule), - typeof(AbpAspNetCoreMvcDaprEventBusModule), - typeof(DistDemoAppSharedModule), - typeof(AbpAutofacModule) -)] -#endif -public class DistDemoAppAspNetCoreDaprModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { -#if DISTDEMO_USE_MONGODB - context.ConfigureDistDemoMongoInfrastructure(); -#else - context.ConfigureDistDemoEntityFrameworkInfrastructure(); -#endif - - Configure(options => - { - options.HttpEndpoint = "http://localhost:3500"; - }); - - Configure(options => - { - options.PubSubName = "pubsub"; - }); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); - - if (env.IsDevelopment()) - { - app.UseExceptionHandler("/Error"); - } - - app.UseHttpsRedirection(); - app.UseStaticFiles(); - app.UseRouting(); - app.UseCloudEvents(); - app.UseConfiguredEndpoints(endpoints => - { - endpoints.MapControllers(); - endpoints.MapSubscribeHandler(); - }); - } -} diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/Program.cs b/test/DistEvents/DistDemoApp.AspNetCoreDapr/Program.cs deleted file mode 100644 index f5d3f8c8ef..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -using DistDemoApp; -using Dapr; -using Volo.Abp; - -var builder = WebApplication.CreateBuilder(args); -builder.Host.UseAutofac(); - -await builder.AddApplicationAsync(); - -var app = builder.Build(); -await app.InitializeApplicationAsync(); -await app.RunAsync("http://localhost:8090"); diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioController.cs b/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioController.cs deleted file mode 100644 index ff6de4f5b6..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc; - -namespace DistDemoApp; - -[ApiController] -[Route("api/dist-demo/dapr")] -public class ProviderScenarioController : AbpController -{ - private readonly IDistEventScenarioRunner _scenarioRunner; - - public ProviderScenarioController(IDistEventScenarioRunner scenarioRunner) - { - _scenarioRunner = scenarioRunner; - } - - [HttpGet] - public async Task RunAsync() - { - await _scenarioRunner.RunAsync(DistEventScenarioProfile.DaprWeb()); - return Ok(new { Status = "ScenarioCompleted", Profile = "dapr-web" }); - } -} diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioEventHandler.cs b/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioEventHandler.cs deleted file mode 100644 index b26844d7c5..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/ProviderScenarioEventHandler.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.EventBus.Distributed; - -namespace DistDemoApp; - -public class ProviderScenarioEventHandler : - IDistributedEventHandler, - ITransientDependency -{ - public Task HandleEventAsync(ProviderScenarioEvent eventData) - { - Console.WriteLine($"Dapr ASP.NET Core handler received ProviderScenarioEvent: {eventData.Value}"); - return Task.CompletedTask; - } -} diff --git a/test/DistEvents/DistDemoApp.AspNetCoreDapr/appsettings.json b/test/DistEvents/DistDemoApp.AspNetCoreDapr/appsettings.json deleted file mode 100644 index 711c4a34f7..0000000000 --- a/test/DistEvents/DistDemoApp.AspNetCoreDapr/appsettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ConnectionStrings": { - "Default": "mongodb://localhost:27017/DistEventsDemo?retryWrites=false" - }, - "Dapr": { - "HttpEndpoint": "http://localhost:3500" - }, - "DaprEventBus": { - "PubSubName": "pubsub" - }, - "Redis": { - "Configuration": "127.0.0.1" - } -} diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoApp.AzureEmulator.csproj b/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoApp.AzureEmulator.csproj deleted file mode 100644 index d96ef9fda5..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoApp.AzureEmulator.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - Exe - net10.0 - DistDemoApp - MongoDb - - - - - - - - - - - - - - - - - $(DefineConstants);DISTDEMO_USE_MONGODB - - - - $(DefineConstants);DISTDEMO_USE_EFCORE - - - - - Always - - - - diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoAppAzureEmulatorModule.cs b/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoAppAzureEmulatorModule.cs deleted file mode 100644 index 2dd0c59c36..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/DistDemoAppAzureEmulatorModule.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Azure.Messaging.ServiceBus; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.EventBus.Azure; -using Volo.Abp.Modularity; -using Volo.Abp.AzureServiceBus; - -namespace DistDemoApp; - -#if DISTDEMO_USE_MONGODB -[DependsOn( - typeof(DistDemoAppMongoDbInfrastructureModule), - typeof(AbpEventBusAzureModule), - typeof(DistDemoAppSharedModule) -)] -#else -[DependsOn( - typeof(DistDemoAppEntityFrameworkCoreInfrastructureModule), - typeof(AbpEventBusAzureModule), - typeof(DistDemoAppSharedModule) -)] -#endif -public class DistDemoAppAzureEmulatorModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddSingleton(); - context.Services.AddSingleton(); -#if DISTDEMO_USE_MONGODB - context.ConfigureDistDemoMongoInfrastructure(); -#else - context.ConfigureDistDemoEntityFrameworkInfrastructure(); -#endif - - Configure(options => - { - options.Connections.Default.ConnectionString = - "Endpoint=sb://localhost:5673;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"; - options.Connections.Default.Processor = new ServiceBusProcessorOptions - { - AutoCompleteMessages = false - }; - }); - - Configure(options => - { - options.ConnectionName = "Default"; - options.SubscriberName = "DistDemoAzureSubscriber"; - options.TopicName = "DistDemoAzureTopic"; - }); - } -} diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorProcessorPool.cs b/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorProcessorPool.cs deleted file mode 100644 index 84891ae804..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorProcessorPool.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Linq; -using System.Threading.Tasks; -using Azure.Messaging.ServiceBus; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; -using Volo.Abp.AzureServiceBus; -using Volo.Abp.DependencyInjection; - -namespace DistDemoApp; - -public class EmulatorProcessorPool : IProcessorPool, ISingletonDependency -{ - public ILogger Logger { get; set; } - - private bool _isDisposed; - private readonly AbpAzureServiceBusOptions _options; - private readonly IConnectionPool _connectionPool; - private readonly ConcurrentDictionary> _processors; - - public EmulatorProcessorPool( - IOptions options, - IConnectionPool connectionPool) - { - _options = options.Value; - _connectionPool = connectionPool; - _processors = new ConcurrentDictionary>(); - Logger = NullLogger.Instance; - } - - public Task GetAsync(string subscriptionName, string topicName, string connectionName) - { - var processor = _processors.GetOrAdd( - $"{topicName}-{subscriptionName}", - new Lazy(() => - { - var config = _options.Connections.GetOrDefault(connectionName); - var client = _connectionPool.GetClient(connectionName); - return client.CreateProcessor(topicName, subscriptionName, config.Processor); - }) - ).Value; - - return Task.FromResult(processor); - } - - public async ValueTask DisposeAsync() - { - if (_isDisposed) - { - return; - } - - _isDisposed = true; - if (!_processors.Any()) - { - return; - } - - foreach (var item in _processors.Values) - { - var processor = item.Value; - if (processor.IsProcessing) - { - await processor.StopProcessingAsync(); - } - - if (!processor.IsClosed) - { - await processor.CloseAsync(); - } - - await processor.DisposeAsync(); - } - - _processors.Clear(); - } -} diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorPublisherPool.cs b/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorPublisherPool.cs deleted file mode 100644 index f3c9c0a854..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/EmulatorPublisherPool.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Linq; -using System.Threading.Tasks; -using Azure.Messaging.ServiceBus; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Volo.Abp.AzureServiceBus; -using Volo.Abp.DependencyInjection; - -#nullable enable -namespace DistDemoApp; - -public class EmulatorPublisherPool : IPublisherPool, ISingletonDependency -{ - public ILogger Logger { get; set; } - - private bool _isDisposed; - private readonly IConnectionPool _connectionPool; - private readonly ConcurrentDictionary> _publishers; - - public EmulatorPublisherPool(IConnectionPool connectionPool) - { - _connectionPool = connectionPool; - _publishers = new ConcurrentDictionary>(); - Logger = NullLogger.Instance; - } - - public Task GetAsync(string topicName, string? connectionName) - { - var sender = _publishers.GetOrAdd( - topicName, - new Lazy(() => - { - var client = _connectionPool.GetClient(connectionName); - return client.CreateSender(topicName); - }) - ).Value; - - return Task.FromResult(sender); - } - - public async ValueTask DisposeAsync() - { - if (_isDisposed) - { - return; - } - - _isDisposed = true; - if (!_publishers.Any()) - { - return; - } - - foreach (var publisher in _publishers.Values) - { - await publisher.Value.CloseAsync(); - await publisher.Value.DisposeAsync(); - } - - _publishers.Clear(); - } -} diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/Program.cs b/test/DistEvents/DistDemoApp.AzureEmulator/Program.cs deleted file mode 100644 index a5375dad49..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/Program.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Volo.Abp; -using Volo.Abp.Threading; - -namespace DistDemoApp; - -public class Program -{ - public static void Main(string[] args) - { - using var application = AbpApplicationFactory.Create(options => - { - options.UseAutofac(); - options.Services.AddSerilog((serviceProvider, configuration) => - { - }); - options.Services.AddLogging(c => c.AddSerilog()); - }); - - Log.Information("Starting DistDemoApp.AzureEmulator."); - - application.Initialize(); - - AsyncHelper.RunSync(() => application - .ServiceProvider - .GetRequiredService() - .RunAsync(DistEventScenarioProfile.AzureEmulator())); - - application.Shutdown(); - } -} diff --git a/test/DistEvents/DistDemoApp.AzureEmulator/appsettings.json b/test/DistEvents/DistDemoApp.AzureEmulator/appsettings.json deleted file mode 100644 index 4502f1e483..0000000000 --- a/test/DistEvents/DistDemoApp.AzureEmulator/appsettings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "ConnectionStrings": { - "Default": "mongodb://localhost:27017/DistEventsDemo?retryWrites=false" - }, - "Azure": { - "ServiceBus": { - "Connections": { - "Default": { - "ConnectionString": "Endpoint=sb://localhost:5673;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;" - } - } - }, - "EventBus": { - "ConnectionName": "Default", - "SubscriberName": "DistDemoAzureSubscriber", - "TopicName": "DistDemoAzureTopic" - } - }, - "Redis": { - "Configuration": "127.0.0.1" - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj deleted file mode 100644 index 156de09a79..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoApp.EfCoreRabbitMq.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - Exe - net10.0 - DistDemoApp - EntityFrameworkCore - - - - - - - - - - - - - - - - - $(DefineConstants);DISTDEMO_USE_MONGODB - - - - $(DefineConstants);DISTDEMO_USE_EFCORE - - - - - runtime; build; native; contentfiles; analyzers - compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native - - - - - - Always - - - - diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoAppEfCoreRabbitMqModule.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoAppEfCoreRabbitMqModule.cs deleted file mode 100644 index 363373441d..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/DistDemoAppEfCoreRabbitMqModule.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.EventBus.RabbitMq; -using Volo.Abp.Modularity; -using Volo.Abp.RabbitMQ; - -namespace DistDemoApp -{ -#if DISTDEMO_USE_MONGODB - [DependsOn( - typeof(DistDemoAppMongoDbInfrastructureModule), - typeof(AbpEventBusRabbitMqModule), - typeof(DistDemoAppSharedModule) - )] -#else - [DependsOn( - typeof(DistDemoAppEntityFrameworkCoreInfrastructureModule), - typeof(AbpEventBusRabbitMqModule), - typeof(DistDemoAppSharedModule) - )] -#endif - public class DistDemoAppEfCoreRabbitMqModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { -#if DISTDEMO_USE_MONGODB - context.ConfigureDistDemoMongoInfrastructure(); -#else - context.ConfigureDistDemoEntityFrameworkInfrastructure(); -#endif - - Configure(options => - { - // options.Outboxes.Configure(config => - // { - // config.UseDbContext(); - // }); - // - // options.Inboxes.Configure(config => - // { - // config.UseDbContext(); - // }); - }); - - Configure(options => - { - options.Connections.Default.HostName = "localhost"; - }); - - Configure(options => - { - options.ConnectionName = "Default"; - options.ClientName = "DistDemoApp"; - options.ExchangeName = "DistDemo"; - }); - - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.Designer.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.Designer.cs deleted file mode 100644 index 292cff66f9..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.Designer.cs +++ /dev/null @@ -1,162 +0,0 @@ -// -using System; -using DistDemoApp; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.Abp.EntityFrameworkCore; - -namespace DistDemoApp.Migrations -{ - [DbContext(typeof(TodoDbContext))] - [Migration("20210910152547_Added_Boxes_Initial")] - partial class Added_Boxes_Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.9") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("DistDemoApp.TodoItem", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("ExtraProperties") - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Text") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); - - b.HasKey("Id"); - - b.ToTable("TodoItems"); - }); - - modelBuilder.Entity("DistDemoApp.TodoSummary", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("Day") - .HasColumnType("tinyint"); - - b.Property("ExtraProperties") - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Month") - .HasColumnType("tinyint"); - - b.Property("TotalCount") - .HasColumnType("int"); - - b.Property("Year") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("TodoSummaries"); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.IncomingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("MessageId") - .HasColumnType("nvarchar(450)"); - - b.Property("Processed") - .HasColumnType("bit"); - - b.Property("ProcessedTime") - .HasColumnType("datetime2"); - - b.HasKey("Id"); - - b.HasIndex("MessageId"); - - b.HasIndex("Processed", "CreationTime"); - - b.ToTable("AbpEventInbox"); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.OutgoingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.HasKey("Id"); - - b.ToTable("AbpEventOutbox"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.cs deleted file mode 100644 index 9094eaa8c9..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20210910152547_Added_Boxes_Initial.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace DistDemoApp.Migrations -{ - public partial class Added_Boxes_Initial : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AbpEventInbox", - columns: table => new - { - Id = table.Column(type: "uniqueidentifier", nullable: false), - ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), - MessageId = table.Column(type: "nvarchar(450)", nullable: true), - EventName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), - EventData = table.Column(type: "varbinary(max)", nullable: false), - CreationTime = table.Column(type: "datetime2", nullable: false), - Processed = table.Column(type: "bit", nullable: false), - ProcessedTime = table.Column(type: "datetime2", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AbpEventInbox", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AbpEventOutbox", - columns: table => new - { - Id = table.Column(type: "uniqueidentifier", nullable: false), - ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), - EventName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), - EventData = table.Column(type: "varbinary(max)", nullable: false), - CreationTime = table.Column(type: "datetime2", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AbpEventOutbox", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "TodoItems", - columns: table => new - { - Id = table.Column(type: "uniqueidentifier", nullable: false), - Text = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), - ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), - ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), - CreationTime = table.Column(type: "datetime2", nullable: false), - CreatorId = table.Column(type: "uniqueidentifier", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_TodoItems", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "TodoSummaries", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - Year = table.Column(type: "int", nullable: false), - Month = table.Column(type: "tinyint", nullable: false), - Day = table.Column(type: "tinyint", nullable: false), - TotalCount = table.Column(type: "int", nullable: false), - ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), - ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_TodoSummaries", x => x.Id); - }); - - migrationBuilder.CreateIndex( - name: "IX_AbpEventInbox_MessageId", - table: "AbpEventInbox", - column: "MessageId"); - - migrationBuilder.CreateIndex( - name: "IX_AbpEventInbox_Processed_CreationTime", - table: "AbpEventInbox", - columns: new[] { "Processed", "CreationTime" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AbpEventInbox"); - - migrationBuilder.DropTable( - name: "AbpEventOutbox"); - - migrationBuilder.DropTable( - name: "TodoItems"); - - migrationBuilder.DropTable( - name: "TodoSummaries"); - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.Designer.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.Designer.cs deleted file mode 100644 index 718cebec33..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.Designer.cs +++ /dev/null @@ -1,182 +0,0 @@ -// -using System; -using DistDemoApp; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.Abp.EntityFrameworkCore; - -#nullable disable - -namespace DistDemoApp.Migrations -{ - [DbContext(typeof(TodoDbContext))] - [Migration("20260304073807_Update-10.2")] - partial class Update102 - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "10.0.2") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("DistDemoApp.TodoItem", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Text") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); - - b.HasKey("Id"); - - b.ToTable("TodoItems"); - }); - - modelBuilder.Entity("DistDemoApp.TodoSummary", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("Day") - .HasColumnType("tinyint"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Month") - .HasColumnType("tinyint"); - - b.Property("TotalCount") - .HasColumnType("int"); - - b.Property("Year") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("TodoSummaries"); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.IncomingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("HandledTime") - .HasColumnType("datetime2"); - - b.Property("MessageId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.Property("NextRetryTime") - .HasColumnType("datetime2"); - - b.Property("RetryCount") - .HasColumnType("int"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("MessageId"); - - b.HasIndex("Status", "CreationTime"); - - b.ToTable("AbpEventInbox", (string)null); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.OutgoingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.HasKey("Id"); - - b.HasIndex("CreationTime"); - - b.ToTable("AbpEventOutbox", (string)null); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.cs deleted file mode 100644 index a3bcf90174..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/20260304073807_Update-10.2.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace DistDemoApp.Migrations -{ - /// - public partial class Update102 : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_AbpEventInbox_Processed_CreationTime", - table: "AbpEventInbox"); - - migrationBuilder.DropColumn( - name: "Processed", - table: "AbpEventInbox"); - - migrationBuilder.RenameColumn( - name: "ProcessedTime", - table: "AbpEventInbox", - newName: "NextRetryTime"); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "TodoSummaries", - type: "nvarchar(max)", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "TodoSummaries", - type: "nvarchar(40)", - maxLength: 40, - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(40)", - oldMaxLength: 40, - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "TodoItems", - type: "nvarchar(max)", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "TodoItems", - type: "nvarchar(40)", - maxLength: 40, - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(40)", - oldMaxLength: 40, - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "AbpEventOutbox", - type: "nvarchar(max)", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "MessageId", - table: "AbpEventInbox", - type: "nvarchar(450)", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(450)", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "AbpEventInbox", - type: "nvarchar(max)", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true); - - migrationBuilder.AddColumn( - name: "HandledTime", - table: "AbpEventInbox", - type: "datetime2", - nullable: true); - - migrationBuilder.AddColumn( - name: "RetryCount", - table: "AbpEventInbox", - type: "int", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "Status", - table: "AbpEventInbox", - type: "int", - nullable: false, - defaultValue: 0); - - migrationBuilder.CreateIndex( - name: "IX_AbpEventOutbox_CreationTime", - table: "AbpEventOutbox", - column: "CreationTime"); - - migrationBuilder.CreateIndex( - name: "IX_AbpEventInbox_Status_CreationTime", - table: "AbpEventInbox", - columns: new[] { "Status", "CreationTime" }); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_AbpEventOutbox_CreationTime", - table: "AbpEventOutbox"); - - migrationBuilder.DropIndex( - name: "IX_AbpEventInbox_Status_CreationTime", - table: "AbpEventInbox"); - - migrationBuilder.DropColumn( - name: "HandledTime", - table: "AbpEventInbox"); - - migrationBuilder.DropColumn( - name: "RetryCount", - table: "AbpEventInbox"); - - migrationBuilder.DropColumn( - name: "Status", - table: "AbpEventInbox"); - - migrationBuilder.RenameColumn( - name: "NextRetryTime", - table: "AbpEventInbox", - newName: "ProcessedTime"); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "TodoSummaries", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)"); - - migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "TodoSummaries", - type: "nvarchar(40)", - maxLength: 40, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(40)", - oldMaxLength: 40); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "TodoItems", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)"); - - migrationBuilder.AlterColumn( - name: "ConcurrencyStamp", - table: "TodoItems", - type: "nvarchar(40)", - maxLength: 40, - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(40)", - oldMaxLength: 40); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "AbpEventOutbox", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)"); - - migrationBuilder.AlterColumn( - name: "MessageId", - table: "AbpEventInbox", - type: "nvarchar(450)", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(450)"); - - migrationBuilder.AlterColumn( - name: "ExtraProperties", - table: "AbpEventInbox", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string), - oldType: "nvarchar(max)"); - - migrationBuilder.AddColumn( - name: "Processed", - table: "AbpEventInbox", - type: "bit", - nullable: false, - defaultValue: false); - - migrationBuilder.CreateIndex( - name: "IX_AbpEventInbox_Processed_CreationTime", - table: "AbpEventInbox", - columns: new[] { "Processed", "CreationTime" }); - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/TodoDbContextModelSnapshot.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/TodoDbContextModelSnapshot.cs deleted file mode 100644 index 1f12a89a1c..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Migrations/TodoDbContextModelSnapshot.cs +++ /dev/null @@ -1,179 +0,0 @@ -// -using System; -using DistDemoApp; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Volo.Abp.EntityFrameworkCore; - -#nullable disable - -namespace DistDemoApp.Migrations -{ - [DbContext(typeof(TodoDbContext))] - partial class TodoDbContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "10.0.2") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("DistDemoApp.TodoItem", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Text") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); - - b.HasKey("Id"); - - b.ToTable("TodoItems"); - }); - - modelBuilder.Entity("DistDemoApp.TodoSummary", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasMaxLength(40) - .HasColumnType("nvarchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("Day") - .HasColumnType("tinyint"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("Month") - .HasColumnType("tinyint"); - - b.Property("TotalCount") - .HasColumnType("int"); - - b.Property("Year") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("TodoSummaries"); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.IncomingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.Property("HandledTime") - .HasColumnType("datetime2"); - - b.Property("MessageId") - .IsRequired() - .HasColumnType("nvarchar(450)"); - - b.Property("NextRetryTime") - .HasColumnType("datetime2"); - - b.Property("RetryCount") - .HasColumnType("int"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("MessageId"); - - b.HasIndex("Status", "CreationTime"); - - b.ToTable("AbpEventInbox", (string)null); - }); - - modelBuilder.Entity("Volo.Abp.EntityFrameworkCore.DistributedEvents.OutgoingEventRecord", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("EventData") - .IsRequired() - .HasColumnType("varbinary(max)"); - - b.Property("EventName") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("ExtraProperties") - .IsRequired() - .HasColumnType("nvarchar(max)") - .HasColumnName("ExtraProperties"); - - b.HasKey("Id"); - - b.HasIndex("CreationTime"); - - b.ToTable("AbpEventOutbox", (string)null); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Program.cs b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Program.cs deleted file mode 100644 index 3cee486e96..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/Program.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Volo.Abp; -using Volo.Abp.Threading; - -namespace DistDemoApp -{ - public class Program - { - public static void Main(string[] args) - { - using (var application = AbpApplicationFactory.Create(options => - { - options.UseAutofac(); - options.Services.AddSerilog((_, _) => - { - }); - options.Services.AddLogging(c => c.AddSerilog()); - })) - { - Log.Information("Starting DistDemoApp.EfCoreRabbitMq."); - application.Initialize(); - - AsyncHelper.RunSync( - () => application - .ServiceProvider - .GetRequiredService().CreateTodoItemAsync() - ); - - application.Shutdown(); - } - } - } -} diff --git a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/appsettings.json b/test/DistEvents/DistDemoApp.EfCoreRabbitMq/appsettings.json deleted file mode 100644 index 91cc668167..0000000000 --- a/test/DistEvents/DistDemoApp.EfCoreRabbitMq/appsettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ConnectionStrings": { - "Default": "Server=localhost,1433;Database=DistEventsDemo;User Id=sa;Password=AbpDemo_123456;TrustServerCertificate=True" - }, - "RabbitMQ": { - "Connections": { - "Default": { - "HostName": "localhost" - } - }, - "EventBus": { - "ClientName": "DistDemoApp", - "ExchangeName": "DistDemo" - } - }, - "Redis": { - "Configuration": "127.0.0.1" - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj b/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj deleted file mode 100644 index ad384a51dd..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoApp.MongoDbKafka.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - Exe - net10.0 - DistDemoApp - MongoDb - - - - - - - - - - - - - - - - - $(DefineConstants);DISTDEMO_USE_MONGODB - - - - $(DefineConstants);DISTDEMO_USE_EFCORE - - - - - Always - - - - diff --git a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoAppMongoDbKafkaModule.cs b/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoAppMongoDbKafkaModule.cs deleted file mode 100644 index b9439da27b..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbKafka/DistDemoAppMongoDbKafkaModule.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Volo.Abp.EventBus.Kafka; -using Volo.Abp.Kafka; -using Volo.Abp.Modularity; - -namespace DistDemoApp -{ -#if DISTDEMO_USE_MONGODB - [DependsOn( - typeof(DistDemoAppMongoDbInfrastructureModule), - typeof(AbpEventBusKafkaModule), - typeof(DistDemoAppSharedModule) - )] -#else - [DependsOn( - typeof(DistDemoAppEntityFrameworkCoreInfrastructureModule), - typeof(AbpEventBusKafkaModule), - typeof(DistDemoAppSharedModule) - )] -#endif - public class DistDemoAppMongoDbKafkaModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { -#if DISTDEMO_USE_MONGODB - context.ConfigureDistDemoMongoInfrastructure(); -#else - context.ConfigureDistDemoEntityFrameworkInfrastructure(); -#endif - - Configure(options => - { - options.Connections.Default.BootstrapServers = "localhost:9092"; - }); - - Configure(options => - { - options.ConnectionName = "Default"; - options.TopicName = "DistDemoTopic"; - options.GroupId = "DistDemoApp"; - }); - } - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbKafka/Program.cs b/test/DistEvents/DistDemoApp.MongoDbKafka/Program.cs deleted file mode 100644 index 4d324bce0a..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbKafka/Program.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Volo.Abp; -using Volo.Abp.Threading; - -namespace DistDemoApp -{ - public class Program - { - public static void Main(string[] args) - { - using (var application = AbpApplicationFactory.Create(options => - { - options.UseAutofac(); - options.Services.AddSerilog((_, _) => - { - }); - options.Services.AddLogging(c => c.AddSerilog()); - })) - { - Log.Information("Starting DistDemoApp.MongoDbKafka."); - - application.Initialize(); - - AsyncHelper.RunSync( - () => application - .ServiceProvider - .GetRequiredService().CreateTodoItemAsync() - ); - - application.Shutdown(); - } - - } - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbKafka/appsettings.json b/test/DistEvents/DistDemoApp.MongoDbKafka/appsettings.json deleted file mode 100644 index d6d1351b25..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbKafka/appsettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ConnectionStrings": { - "Default": "mongodb://localhost:27017/DistEventsDemo?retryWrites=false" - }, - "Kafka": { - "Connections": { - "Default": { - "BootstrapServers": "localhost:9092" - } - }, - "EventBus": { - "GroupId": "DistDemoApp", - "TopicName": "DistDemoTopic" - } - }, - "Redis": { - "Configuration": "127.0.0.1" - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj b/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj deleted file mode 100644 index 49b6d118d2..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoApp.MongoDbRebus.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - Exe - net10.0 - DistDemoApp - MongoDb - - - - - - - - - - - - - - - - - $(DefineConstants);DISTDEMO_USE_MONGODB - - - - $(DefineConstants);DISTDEMO_USE_EFCORE - - - - - Always - - - - diff --git a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoAppMongoDbRebusModule.cs b/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoAppMongoDbRebusModule.cs deleted file mode 100644 index 702ffc3f62..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbRebus/DistDemoAppMongoDbRebusModule.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Rebus.Transport.InMem; -using Volo.Abp.EventBus.Rebus; -using Volo.Abp.Modularity; - -namespace DistDemoApp -{ -#if DISTDEMO_USE_MONGODB - [DependsOn( - typeof(DistDemoAppMongoDbInfrastructureModule), - typeof(AbpEventBusRebusModule), - typeof(DistDemoAppSharedModule) - )] -#else - [DependsOn( - typeof(DistDemoAppEntityFrameworkCoreInfrastructureModule), - typeof(AbpEventBusRebusModule), - typeof(DistDemoAppSharedModule) - )] -#endif - public class DistDemoAppMongoDbRebusModule : AbpModule - { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - PreConfigure(options => - { - options.InputQueueName = "eventbus"; - options.Configurer = rebusConfigurer => - { - rebusConfigurer.Transport(t => t.UseInMemoryTransport(new InMemNetwork(), "eventbus")); - }; - }); - } - - public override void ConfigureServices(ServiceConfigurationContext context) - { -#if DISTDEMO_USE_MONGODB - context.ConfigureDistDemoMongoInfrastructure(); -#else - context.ConfigureDistDemoEntityFrameworkInfrastructure(); -#endif - } - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbRebus/Program.cs b/test/DistEvents/DistDemoApp.MongoDbRebus/Program.cs deleted file mode 100644 index 17a11b5f17..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbRebus/Program.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Volo.Abp; -using Volo.Abp.Threading; - -namespace DistDemoApp -{ - public class Program - { - public static void Main(string[] args) - { - using (var application = AbpApplicationFactory.Create(options => - { - options.UseAutofac(); - options.Services.AddSerilog((_, _) => - { - }); - options.Services.AddLogging(c => c.AddSerilog()); - })) - { - Log.Information("Starting DistDemoApp.MongoDbRebus."); - - application.Initialize(); - - AsyncHelper.RunSync( - () => application - .ServiceProvider - .GetRequiredService().CreateTodoItemAsync() - ); - - application.Shutdown(); - } - - } - } -} diff --git a/test/DistEvents/DistDemoApp.MongoDbRebus/appsettings.json b/test/DistEvents/DistDemoApp.MongoDbRebus/appsettings.json deleted file mode 100644 index d6d1351b25..0000000000 --- a/test/DistEvents/DistDemoApp.MongoDbRebus/appsettings.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ConnectionStrings": { - "Default": "mongodb://localhost:27017/DistEventsDemo?retryWrites=false" - }, - "Kafka": { - "Connections": { - "Default": { - "BootstrapServers": "localhost:9092" - } - }, - "EventBus": { - "GroupId": "DistDemoApp", - "TopicName": "DistDemoTopic" - } - }, - "Redis": { - "Configuration": "127.0.0.1" - } -} diff --git a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoApp.Persistence.EntityFrameworkCore.csproj b/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoApp.Persistence.EntityFrameworkCore.csproj deleted file mode 100644 index 2adc9e976e..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoApp.Persistence.EntityFrameworkCore.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net10.0 - DistDemoApp - EntityFrameworkCore - - - - - - - - - - - - diff --git a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoAppEntityFrameworkCoreInfrastructureModule.cs b/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoAppEntityFrameworkCoreInfrastructureModule.cs deleted file mode 100644 index 1c7c094953..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoAppEntityFrameworkCoreInfrastructureModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.EntityFrameworkCore.SqlServer; -using Volo.Abp.Modularity; - -namespace DistDemoApp; - -[DependsOn( - typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(DistDemoAppSharedModule) -)] -public class DistDemoAppEntityFrameworkCoreInfrastructureModule : AbpModule -{ -} diff --git a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoEntityFrameworkServiceCollectionExtensions.cs b/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoEntityFrameworkServiceCollectionExtensions.cs deleted file mode 100644 index f2aa5f874e..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/DistDemoEntityFrameworkServiceCollectionExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.Modularity; - -namespace DistDemoApp; - -public static class DistDemoEntityFrameworkServiceCollectionExtensions -{ - public static void ConfigureDistDemoEntityFrameworkInfrastructure(this ServiceConfigurationContext context) - { - context.Services.AddAbpDbContext(options => - { - options.AddDefaultRepositories(); - }); - - context.Services.Configure(options => - { - options.UseSqlServer(); - }); - } -} diff --git a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContext.cs b/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContext.cs deleted file mode 100644 index a352e4a5b0..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContext.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore.DistributedEvents; - -namespace DistDemoApp; - -public class TodoDbContext : AbpDbContext, IHasEventOutbox, IHasEventInbox -{ - public DbSet TodoItems { get; set; } = null!; - - public DbSet TodoSummaries { get; set; } = null!; - - public DbSet OutgoingEvents { get; set; } = null!; - - public DbSet IncomingEvents { get; set; } = null!; - - public TodoDbContext(DbContextOptions options) - : base(options) - { - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - base.OnModelCreating(modelBuilder); - - modelBuilder.ConfigureEventOutbox(); - modelBuilder.ConfigureEventInbox(); - - modelBuilder.Entity(b => - { - b.Property(x => x.Text).IsRequired().HasMaxLength(128); - }); - } -} diff --git a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContextFactory.cs b/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContextFactory.cs deleted file mode 100644 index 082c85bb29..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.EntityFrameworkCore/TodoDbContextFactory.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.IO; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Design; -using Microsoft.Extensions.Configuration; - -namespace DistDemoApp; - -public class TodoDbContextFactory : IDesignTimeDbContextFactory -{ - public TodoDbContext CreateDbContext(string[] args) - { - var configuration = BuildConfiguration(); - - var builder = new DbContextOptionsBuilder() - .UseSqlServer(configuration.GetConnectionString("Default")); - - return new TodoDbContext(builder.Options); - } - - private static IConfigurationRoot BuildConfiguration() - { - var builder = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json", optional: false); - - return builder.Build(); - } -} diff --git a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoApp.Persistence.MongoDb.csproj b/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoApp.Persistence.MongoDb.csproj deleted file mode 100644 index 8c9e3e14c5..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoApp.Persistence.MongoDb.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net10.0 - DistDemoApp - MongoDb - - - - - - - - diff --git a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoAppMongoDbInfrastructureModule.cs b/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoAppMongoDbInfrastructureModule.cs deleted file mode 100644 index 390badca6f..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoAppMongoDbInfrastructureModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; -using Volo.Abp.MongoDB; - -namespace DistDemoApp; - -[DependsOn( - typeof(AbpMongoDbModule), - typeof(DistDemoAppSharedModule) -)] -public class DistDemoAppMongoDbInfrastructureModule : AbpModule -{ -} diff --git a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoDbContext.cs b/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoDbContext.cs deleted file mode 100644 index 4c63400dc3..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoDbContext.cs +++ /dev/null @@ -1,26 +0,0 @@ -using MongoDB.Driver; -using Volo.Abp.Data; -using Volo.Abp.MongoDB; -using Volo.Abp.MongoDB.DistributedEvents; - -namespace DistDemoApp; - -[ConnectionStringName("Default")] -public class DistDemoMongoDbContext : AbpMongoDbContext, IHasEventOutbox, IHasEventInbox -{ - public IMongoCollection TodoItems => Collection(); - - public IMongoCollection TodoSummaries => Collection(); - - public IMongoCollection OutgoingEvents - { - get => Collection(); - set { } - } - - public IMongoCollection IncomingEvents - { - get => Collection(); - set { } - } -} diff --git a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoServiceCollectionExtensions.cs b/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoServiceCollectionExtensions.cs deleted file mode 100644 index 48a8285b54..0000000000 --- a/test/DistEvents/DistDemoApp.Persistence.MongoDb/DistDemoMongoServiceCollectionExtensions.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Data; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.Modularity; -using Volo.Abp.MongoDB; -using Volo.Abp.MongoDB.DistributedEvents; - -namespace DistDemoApp; - -public static class DistDemoMongoServiceCollectionExtensions -{ - private const string DefaultMongoConnectionString = "mongodb://localhost:27017/DistEventsDemo?retryWrites=false"; - - public static void ConfigureDistDemoMongoInfrastructure(this ServiceConfigurationContext context) - { - context.Services.AddMongoDbContext(options => - { - options.AddDefaultRepositories(); - }); - - context.Services.Configure(options => - { - if (string.IsNullOrWhiteSpace(options.ConnectionStrings.Default)) - { - options.ConnectionStrings.Default = DefaultMongoConnectionString; - } - }); - - context.Services.Configure(options => - { - options.Outboxes.Configure(config => - { - config.UseMongoDbContext(); - }); - - options.Inboxes.Configure(config => - { - config.UseMongoDbContext(); - }); - }); - } -} diff --git a/test/DistEvents/DistDemoApp.Shared/DemoService.cs b/test/DistEvents/DistDemoApp.Shared/DemoService.cs deleted file mode 100644 index cc6d6f64c6..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DemoService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; - -namespace DistDemoApp -{ - public class DemoService : ITransientDependency - { - private readonly IDistEventScenarioRunner _scenarioRunner; - - public DemoService(IDistEventScenarioRunner scenarioRunner) - { - _scenarioRunner = scenarioRunner; - } - - public virtual async Task CreateTodoItemAsync() - { - await _scenarioRunner.RunAsync(DistEventScenarioProfile.Default()); - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj b/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj deleted file mode 100644 index 36d4d635ce..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DistDemoApp.Shared.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net10.0 - DistDemoApp - - - - - - - - - - - - - - - - - - diff --git a/test/DistEvents/DistDemoApp.Shared/DistDemoAppHostedService.cs b/test/DistEvents/DistDemoApp.Shared/DistDemoAppHostedService.cs deleted file mode 100644 index 90f27cb638..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DistDemoAppHostedService.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; -using Volo.Abp; - -namespace DistDemoApp -{ - public class DistDemoAppHostedService : IHostedService - { - private readonly IAbpApplicationWithExternalServiceProvider _application; - private readonly IServiceProvider _serviceProvider; - private readonly DemoService _demoService; - private readonly IHostApplicationLifetime _hostApplicationLifetime; - - public DistDemoAppHostedService( - IAbpApplicationWithExternalServiceProvider application, - IServiceProvider serviceProvider, - DemoService demoService, - IHostApplicationLifetime hostApplicationLifetime) - { - _application = application; - _serviceProvider = serviceProvider; - _demoService = demoService; - _hostApplicationLifetime = hostApplicationLifetime; - } - - public async Task StartAsync(CancellationToken cancellationToken) - { - await _demoService.CreateTodoItemAsync(); - } - - public Task StopAsync(CancellationToken cancellationToken) - { - _application.Shutdown(); - - return Task.CompletedTask; - } - } -} diff --git a/test/DistEvents/DistDemoApp.Shared/DistDemoAppSharedModule.cs b/test/DistEvents/DistDemoApp.Shared/DistDemoAppSharedModule.cs deleted file mode 100644 index 09c458bf85..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DistDemoAppSharedModule.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Medallion.Threading; -using Medallion.Threading.Redis; -using Microsoft.Extensions.DependencyInjection; -using StackExchange.Redis; -using Volo.Abp.Autofac; -using Volo.Abp.Domain; -using Volo.Abp.Domain.Entities.Events.Distributed; -using Volo.Abp.EventBus; -using Volo.Abp.Modularity; - -namespace DistDemoApp -{ - [DependsOn( - typeof(AbpAutofacModule), - typeof(AbpDddDomainModule), - typeof(AbpEventBusModule) - )] - public class DistDemoAppSharedModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - - // context.Services.AddHostedService(); - - Configure(options => - { - options.EtoMappings.Add(); - options.AutoEventSelectors.Add(); - }); - - context.Services.AddSingleton(sp => - { - var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); - }); - } - } -} diff --git a/test/DistEvents/DistDemoApp.Shared/DistEventScenarioProfile.cs b/test/DistEvents/DistDemoApp.Shared/DistEventScenarioProfile.cs deleted file mode 100644 index c6239cff31..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DistEventScenarioProfile.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace DistDemoApp; - -public class DistEventScenarioProfile -{ - public string Name { get; set; } = "default"; - - public string DynamicOnlyEventName { get; set; } = "dist-demo.dynamic-only"; - - public string DynamicOnlyMessage { get; set; } = "hello-dynamic"; - - public int TypedFromTypedValue { get; set; } = 7; - - public int TypedFromDynamicValue { get; set; } = 11; - - public bool EnableTypedFromTypedScenario { get; set; } = true; - - public bool EnableTypedFromDynamicScenario { get; set; } = true; - - public bool EnableDynamicOnlyScenario { get; set; } = true; - - public bool OnUnitOfWorkComplete { get; set; } = true; - - public bool UseOutbox { get; set; } = true; - - public bool UseUnitOfWork { get; set; } = true; - - public int WarmupDelayMs { get; set; } = 1500; - - public int TimeoutSeconds { get; set; } = 60; - - public static DistEventScenarioProfile Default() - { - return new DistEventScenarioProfile(); - } - - public static DistEventScenarioProfile DaprWeb() - { - return new DistEventScenarioProfile - { - Name = "dapr-web", - DynamicOnlyEventName = "dist-demo.dapr.dynamic-only", - DynamicOnlyMessage = "hello-dapr-web", - EnableTypedFromTypedScenario = false, - EnableTypedFromDynamicScenario = false, - EnableDynamicOnlyScenario = false - }; - } - - public static DistEventScenarioProfile AzureEmulator() - { - return new DistEventScenarioProfile - { - Name = "azure-emulator", - DynamicOnlyEventName = "DistDemoApp.Azure.DynamicOnly", - DynamicOnlyMessage = "hello-azure-emulator", - TypedFromTypedValue = 21, - TypedFromDynamicValue = 34 - }; - } -} diff --git a/test/DistEvents/DistDemoApp.Shared/DistEventScenarioRunner.cs b/test/DistEvents/DistDemoApp.Shared/DistEventScenarioRunner.cs deleted file mode 100644 index a4015a0012..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/DistEventScenarioRunner.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.EventBus; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.Uow; - -namespace DistDemoApp; - -public class DistEventScenarioRunner : IDistEventScenarioRunner, ITransientDependency -{ - private readonly IDistributedEventBus _distributedEventBus; - private readonly IUnitOfWorkManager _unitOfWorkManager; - - public DistEventScenarioRunner( - IDistributedEventBus distributedEventBus, - IUnitOfWorkManager unitOfWorkManager) - { - _distributedEventBus = distributedEventBus; - _unitOfWorkManager = unitOfWorkManager; - } - - public async Task RunAsync(DistEventScenarioProfile profile) - { - var typedEventName = EventNameAttribute.GetNameOrDefault(); - - var typedFromTypedPublish = profile.EnableTypedFromTypedScenario - ? new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously) - : null; - var typedFromDynamicPublish = profile.EnableTypedFromDynamicScenario - ? new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously) - : null; - var dynamicOnlyPublish = profile.EnableDynamicOnlyScenario - ? new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously) - : null; - - using var typedSubscription = _distributedEventBus.Subscribe(eventData => - { - if (typedFromTypedPublish != null && eventData.Value == profile.TypedFromTypedValue) - { - typedFromTypedPublish.TrySetResult(eventData.Value); - } - - if (typedFromDynamicPublish != null && eventData.Value == profile.TypedFromDynamicValue) - { - typedFromDynamicPublish.TrySetResult(eventData.Value); - } - - return Task.CompletedTask; - }); - - IDisposable? dynamicOnlySubscription = null; - if (profile.EnableDynamicOnlyScenario) - { - dynamicOnlySubscription = _distributedEventBus.Subscribe( - profile.DynamicOnlyEventName, - new SingleInstanceHandlerFactory( - new ActionEventHandler(eventData => - { - var converted = DynamicEventDataConverter.ConvertToLooseObject(eventData); - if (converted is Dictionary payload && - payload.TryGetValue("Message", out var message) && - message?.ToString() == profile.DynamicOnlyMessage) - { - dynamicOnlyPublish!.TrySetResult(true); - } - - return Task.CompletedTask; - }))); - } - - await Task.Delay(profile.WarmupDelayMs); - - if (profile.UseUnitOfWork) - { - using var uow = _unitOfWorkManager.Begin(); - await PublishScenarioEventsAsync(profile, typedEventName); - await uow.CompleteAsync(); - } - else - { - await PublishScenarioEventsAsync(profile, typedEventName); - } - - if (typedFromTypedPublish != null) - { - await typedFromTypedPublish.Task.WaitAsync(TimeSpan.FromSeconds(profile.TimeoutSeconds)); - } - - if (typedFromDynamicPublish != null) - { - await typedFromDynamicPublish.Task.WaitAsync(TimeSpan.FromSeconds(profile.TimeoutSeconds)); - } - - if (dynamicOnlyPublish != null) - { - await dynamicOnlyPublish.Task.WaitAsync(TimeSpan.FromSeconds(profile.TimeoutSeconds)); - } - - dynamicOnlySubscription?.Dispose(); - - Console.WriteLine($"All distributed event scenarios passed ({profile.Name})."); - } - - private async Task PublishScenarioEventsAsync(DistEventScenarioProfile profile, string typedEventName) - { - if (profile.EnableTypedFromTypedScenario) - { - await _distributedEventBus.PublishAsync( - new ProviderScenarioEvent { Value = profile.TypedFromTypedValue }, - onUnitOfWorkComplete: profile.OnUnitOfWorkComplete, - useOutbox: profile.UseOutbox); - } - - if (profile.EnableTypedFromDynamicScenario) - { - await _distributedEventBus.PublishAsync( - typedEventName, - new { Value = profile.TypedFromDynamicValue }, - onUnitOfWorkComplete: profile.OnUnitOfWorkComplete, - useOutbox: profile.UseOutbox); - } - - if (profile.EnableDynamicOnlyScenario) - { - await _distributedEventBus.PublishAsync( - profile.DynamicOnlyEventName, - new { Message = profile.DynamicOnlyMessage }, - onUnitOfWorkComplete: profile.OnUnitOfWorkComplete, - useOutbox: profile.UseOutbox); - } - } -} diff --git a/test/DistEvents/DistDemoApp.Shared/IDistEventScenarioRunner.cs b/test/DistEvents/DistDemoApp.Shared/IDistEventScenarioRunner.cs deleted file mode 100644 index 6961ecdbaf..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/IDistEventScenarioRunner.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace DistDemoApp; - -public interface IDistEventScenarioRunner -{ - Task RunAsync(DistEventScenarioProfile profile); -} diff --git a/test/DistEvents/DistDemoApp.Shared/ProviderScenarioEvent.cs b/test/DistEvents/DistDemoApp.Shared/ProviderScenarioEvent.cs deleted file mode 100644 index 08dd2102c2..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/ProviderScenarioEvent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.EventBus; - -namespace DistDemoApp; - -[EventName("DistDemoApp.ProviderScenarioEvent")] -public class ProviderScenarioEvent -{ - public int Value { get; set; } -} diff --git a/test/DistEvents/DistDemoApp.Shared/TodoEventHandler.cs b/test/DistEvents/DistDemoApp.Shared/TodoEventHandler.cs deleted file mode 100644 index 7a69ceed1e..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/TodoEventHandler.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities.Events.Distributed; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.Uow; - -namespace DistDemoApp -{ - public class TodoEventHandler : - IDistributedEventHandler>, - IDistributedEventHandler>, - ITransientDependency - { - private readonly IRepository _todoSummaryRepository; - - public TodoEventHandler(IRepository todoSummaryRepository) - { - _todoSummaryRepository = todoSummaryRepository; - } - - [UnitOfWork] - public virtual async Task HandleEventAsync(EntityCreatedEto eventData) - { - var dateTime = eventData.Entity.CreationTime; - var todoSummary = await _todoSummaryRepository.FindAsync( - x => x.Year == dateTime.Year && - x.Month == dateTime.Month && - x.Day == dateTime.Day - ); - - if (todoSummary == null) - { - todoSummary = await _todoSummaryRepository.InsertAsync(new TodoSummary(dateTime)); - } - else - { - todoSummary.Increase(); - await _todoSummaryRepository.UpdateAsync(todoSummary); - } - - Console.WriteLine("Increased total count: " + todoSummary); - } - - public async Task HandleEventAsync(EntityDeletedEto eventData) - { - var dateTime = eventData.Entity.CreationTime; - var todoSummary = await _todoSummaryRepository.FirstOrDefaultAsync( - x => x.Year == dateTime.Year && - x.Month == dateTime.Month && - x.Day == dateTime.Day - ); - - if (todoSummary != null) - { - todoSummary.Decrease(); - await _todoSummaryRepository.UpdateAsync(todoSummary); - Console.WriteLine("Decreased total count: " + todoSummary); - } - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.Shared/TodoItem.cs b/test/DistEvents/DistDemoApp.Shared/TodoItem.cs deleted file mode 100644 index 9257791efd..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/TodoItem.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using Volo.Abp.Domain.Entities.Auditing; - -namespace DistDemoApp -{ - public class TodoItem : CreationAuditedAggregateRoot - { - public string Text { get; set; } - - public override string ToString() - { - return $"{base.ToString()}, Text = {Text}"; - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.Shared/TodoItemEto.cs b/test/DistEvents/DistDemoApp.Shared/TodoItemEto.cs deleted file mode 100644 index d593a10347..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/TodoItemEto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Volo.Abp.EventBus; - -namespace DistDemoApp -{ - [EventName("todo-item")] - public class TodoItemEto - { - public DateTime CreationTime { get; set; } - public string Text { get; set; } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.Shared/TodoItemObjectMapper.cs b/test/DistEvents/DistDemoApp.Shared/TodoItemObjectMapper.cs deleted file mode 100644 index 167c8e114f..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/TodoItemObjectMapper.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Volo.Abp.DependencyInjection; -using Volo.Abp.ObjectMapping; - -namespace DistDemoApp -{ - public class TodoItemObjectMapper : IObjectMapper, ISingletonDependency - { - public TodoItemEto Map(TodoItem source) - { - return new TodoItemEto - { - Text = source.Text, - CreationTime = source.CreationTime - }; - } - - public TodoItemEto Map(TodoItem source, TodoItemEto destination) - { - destination.Text = source.Text; - destination.CreationTime = source.CreationTime; - return destination; - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistDemoApp.Shared/TodoSummary.cs b/test/DistEvents/DistDemoApp.Shared/TodoSummary.cs deleted file mode 100644 index 70eaee1847..0000000000 --- a/test/DistEvents/DistDemoApp.Shared/TodoSummary.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using Volo.Abp.Domain.Entities; - -namespace DistDemoApp -{ - public class TodoSummary : AggregateRoot - { - public int Year { get; private set; } - public byte Month { get; private set; } - public byte Day { get; private set; } - public int TotalCount { get; private set; } - - private TodoSummary() - { - - } - - public TodoSummary(DateTime dateTime, int initialCount = 1) - { - Year = dateTime.Year; - Month = (byte)dateTime.Month; - Day = (byte)dateTime.Day; - TotalCount = initialCount; - } - - public void Increase(int amount = 1) - { - TotalCount += amount; - } - - public void Decrease(int amount = 1) - { - TotalCount -= amount; - } - - public override string ToString() - { - return $"{base.ToString()}, {Year}-{Month:00}-{Day:00}: {TotalCount}"; - } - } -} \ No newline at end of file diff --git a/test/DistEvents/DistEventsDemo.slnx b/test/DistEvents/DistEventsDemo.slnx deleted file mode 100644 index d31f2b3262..0000000000 --- a/test/DistEvents/DistEventsDemo.slnx +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/test/DistEvents/dapr/components/pubsub.yaml b/test/DistEvents/dapr/components/pubsub.yaml deleted file mode 100644 index 669a6149b5..0000000000 --- a/test/DistEvents/dapr/components/pubsub.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: dapr.io/v1alpha1 -kind: Component -metadata: - name: pubsub -spec: - type: pubsub.redis - version: v1 - metadata: - - name: redisHost - value: redis:6379 - - name: redisPassword - value: "" diff --git a/test/DistEvents/docker-compose.yml b/test/DistEvents/docker-compose.yml deleted file mode 100644 index 916b6542f7..0000000000 --- a/test/DistEvents/docker-compose.yml +++ /dev/null @@ -1,131 +0,0 @@ -services: - rabbitmq: - image: rabbitmq:3.13-management - container_name: distevents-rabbitmq - ports: - - "5672:5672" - - "15672:15672" - environment: - RABBITMQ_DEFAULT_USER: guest - RABBITMQ_DEFAULT_PASS: guest - - zookeeper: - image: confluentinc/cp-zookeeper:7.6.0 - container_name: distevents-zookeeper - ports: - - "2181:2181" - environment: - ZOOKEEPER_CLIENT_PORT: "2181" - ZOOKEEPER_TICK_TIME: "2000" - - kafka: - image: confluentinc/cp-kafka:7.6.0 - container_name: distevents-kafka - depends_on: - - zookeeper - ports: - - "9092:9092" - environment: - KAFKA_BROKER_ID: "1" - KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181" - KAFKA_LISTENERS: "PLAINTEXT://0.0.0.0:9092" - KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:9092" - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "PLAINTEXT:PLAINTEXT" - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1" - KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true" - - mongodb: - image: mongo:7 - container_name: distevents-mongodb - command: ["mongod", "--replSet", "rs0", "--bind_ip_all"] - ports: - - "27017:27017" - healthcheck: - test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"] - interval: 5s - timeout: 3s - retries: 20 - - mongodb-rs-init: - image: mongo:7 - container_name: distevents-mongodb-rs-init - depends_on: - mongodb: - condition: service_healthy - restart: "no" - command: - [ - "mongosh", - "--host", "mongodb:27017", - "--quiet", - "--eval", - "try { rs.status() } catch (e) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" - ] - - redis: - image: redis:7-alpine - container_name: distevents-redis - ports: - - "6379:6379" - - dapr-placement: - image: daprio/dapr:1.14.4 - container_name: distevents-dapr-placement - command: ["./placement", "-port", "50006"] - ports: - - "50006:50006" - - daprd: - image: daprio/dapr:1.14.4 - container_name: distevents-daprd - depends_on: - - redis - - dapr-placement - command: - [ - "./daprd", - "--app-id", "dist-demo-dapr", - "--app-port", "8090", - "--app-channel-address", "host.docker.internal", - "--app-protocol", "http", - "--resources-path", "/components", - "--placement-host-address", "dapr-placement:50006", - "--dapr-http-port", "3500", - "--dapr-grpc-port", "50001" - ] - volumes: - - ./dapr/components:/components - ports: - - "3500:3500" - - "50001:50001" - - servicebus-sql: - image: mcr.microsoft.com/azure-sql-edge:latest - container_name: distevents-servicebus-sql - environment: - ACCEPT_EULA: "Y" - MSSQL_SA_PASSWORD: "AbpDemo_123456" - - servicebus-emulator: - image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest - container_name: distevents-servicebus-emulator - depends_on: - - servicebus-sql - environment: - SQL_SERVER: servicebus-sql - MSSQL_SA_PASSWORD: "AbpDemo_123456" - ACCEPT_EULA: "Y" - volumes: - - ./servicebus-emulator/Config.json:/ServiceBus_Emulator/ConfigFiles/Config.json - ports: - - "5673:5672" - - "5300:5300" - - sqlserver: - image: mcr.microsoft.com/mssql/server:2022-latest - container_name: distevents-sqlserver - ports: - - "1433:1433" - environment: - ACCEPT_EULA: "Y" - MSSQL_SA_PASSWORD: "AbpDemo_123456" diff --git a/test/DistEvents/servicebus-emulator/Config.json b/test/DistEvents/servicebus-emulator/Config.json deleted file mode 100644 index 39908ff27d..0000000000 --- a/test/DistEvents/servicebus-emulator/Config.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "UserConfig": { - "Namespaces": [ - { - "Name": "sbemulatorns", - "Topics": [ - { - "Name": "DistDemoAzureTopic", - "Subscriptions": [ - { - "Name": "DistDemoAzureSubscriber" - } - ] - } - ] - } - ], - "Logging": { - "Type": "File" - } - } -}