Skip to content

Commit ec2ef08

Browse files
committed
Merge branch 'master' into development
# Conflicts: # Tests/AdvancedMapping.Repositories.Mapperly.Tests/modules.config # Tests/AdvancedMappingCrud.DbContext.ProjectTo.Tests/modules.config # Tests/AdvancedMappingCrud.DbContext.Tests/modules.config # Tests/AdvancedMappingCrud.Mongo.Tests/modules.config # Tests/AdvancedMappingCrud.Repositories.ProjectTo.Tests/modules.config # Tests/Application.Identity.AccountController.UserIdentity/modules.config # Tests/AspNetCore.Controllers.Secured/modules.config # Tests/AspNetCoreMvc/modules.config # Tests/AwsSecretsManager/modules.config # Tests/BasicAuditing.CustomUserId.Tests/modules.config # Tests/Blazor.ProductService/modules.config # Tests/BugSnagTest.ServiceHost/modules.config # Tests/CleanArchitecture.IdentityService/modules.config # Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config # Tests/CleanArchitecture.SingleFiles/modules.config # Tests/CosmosDB.Authentication/modules.config # Tests/CosmosDB.MultiTenancy.SeperateDB/modules.config # Tests/CosmosDBMultiTenancy/modules.config # Tests/Dapper.Tests/modules.config # Tests/EFCore.Lazy.Loading.Tests/modules.config # Tests/Entities.Constants.TestApplication/modules.config # Tests/EntityFramework.Application.LinqExtensions.Tests/modules.config # Tests/EntityFramework.SynchronousRepositories/modules.config # Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config # Tests/Google.Cloud.Storage.Multitenancy.SeperateAccount.Tests/modules.config # Tests/GraphQL.MongoDb.TestApplication/modules.config # Tests/Hangfire.Tests/modules.config # Tests/Kafka.Consumer/modules.config # Tests/Kafka.Producer/modules.config # Tests/MassTransit.AzureServiceBus/modules.config # Tests/MassTransit.RabbitMQ/modules.config # Tests/MassTransitFinbuckle.Test/modules.config # Tests/ModularMonolithAppTests/modules.config # Tests/MongoDb.MultiTenancy.SeperateDb/modules.config # Tests/MultipleDocumentStores/modules.config # Tests/OcelotTest/modules.config # Tests/OutputCachingRedis.Tests/modules.config # Tests/ProxyServiceTests.Proxy.AuthHeaderProvider/modules.config # Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config # Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config # Tests/Publish.CleanArchDapr.TestApplication/modules.config # Tests/SecurityConfig.Tests/modules.config # Tests/SignalR/modules.config # Tests/Solace.Tests/modules.config # Tests/Standard.AspNetCore.TestApplication/modules.config # Tests/Subscribe.CleanArchDapr.TestApplication/modules.config # Tests/Subscribe.MassTransit.OutboxEF/modules.config # Tests/Subscribe.MassTransit.OutboxMemory/modules.config # Tests/TableStorage.Tests/modules.config # Tests/WindowsServiceHost.Tests/modules.config # Tests/intent/Application.Identity.Jwt.TestApplication/modules.config # Tests/intent/Application.Identity.MSAL.TestApplication/modules.config # Tests/intent/GraphQL.CQRS.TestApplication/modules.config # Tests/intent/GrpcServer/modules.config
2 parents 4f94861 + 5e4111b commit ec2ef08

199 files changed

Lines changed: 296 additions & 180 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Modules/Intent.Modules.VisualStudio.Projects/Intent.Metadata/Module Builder/Intent.VisualStudio.Projects/Elements/Element Settings/00D1A9C2-B5F0-4AF3-8072-F6C62B433612.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
9898
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
9999
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
100+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
100101
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
101102
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
102103
</properties>
@@ -138,6 +139,7 @@
138139
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
139140
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" value="return false;" isActive="true" />
140141
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
142+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
141143
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
142144
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
143145
</properties>
@@ -179,6 +181,7 @@
179181
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
180182
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
181183
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
184+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
182185
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
183186
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
184187
</properties>
@@ -220,6 +223,7 @@
220223
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
221224
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
222225
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
226+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
223227
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
224228
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
225229
</properties>

Modules/Intent.Modules.VisualStudio.Projects/Intent.Metadata/Module Builder/Intent.VisualStudio.Projects/Elements/Element Settings/0FEBBF41-7C8E-4F98-85A5-F8B5236CFD7D.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
9898
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
9999
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
100+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
100101
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
101102
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
102103
</properties>
@@ -138,6 +139,7 @@
138139
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
139140
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" value="return false;" isActive="true" />
140141
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
142+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
141143
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
142144
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
143145
</properties>
@@ -179,6 +181,7 @@
179181
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
180182
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
181183
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
184+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
182185
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
183186
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
184187
</properties>

Modules/Intent.Modules.VisualStudio.Projects/Intent.Metadata/Module Builder/Intent.VisualStudio.Projects/Elements/Element Settings/0b49ae99-c1c2-46c7-a4e3-41591e0118e1.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
9898
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
9999
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
100+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
100101
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
101102
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
102103
</properties>
@@ -138,6 +139,7 @@
138139
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
139140
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" value="return false;" isActive="true" />
140141
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
142+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
141143
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
142144
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
143145
</properties>
@@ -179,6 +181,7 @@
179181
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
180182
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
181183
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
184+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
182185
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
183186
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
184187
</properties>
@@ -220,6 +223,7 @@
220223
<property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
221224
<property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
222225
<property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
226+
<property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
223227
<property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
224228
<property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
225229
</properties>

0 commit comments

Comments
 (0)