Skip to content

Commit deec515

Browse files
authored
Simplify new expression (IDE0090) (#15188)
1 parent 0a01a17 commit deec515

File tree

16 files changed

+51
-53
lines changed

16 files changed

+51
-53
lines changed

src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListQueryService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public async Task<AuditTrailEventQueryResult> QueryAsync(int page, int pageSize,
9595
var startOfWeek = CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek;
9696
options.AuditTrailDates = new List<SelectListItem>()
9797
{
98-
new SelectListItem(S["Any date"], string.Empty, options.Date == string.Empty),
98+
new(S["Any date"], string.Empty, options.Date == string.Empty),
9999
};
100100

101101
var dateTimeValue = ">@now-1";

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationContentsAdminListDisplayDriver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public override IDisplayResult Edit(ContentOptionsViewModel model, IUpdateModel
4242
var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
4343
var cultures = new List<SelectListItem>
4444
{
45-
new SelectListItem() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
45+
new() { Text = S["All cultures"], Value = "", Selected = string.IsNullOrEmpty(m.SelectedCulture) }
4646
};
4747
cultures.AddRange(supportedCultures.Select(culture => new SelectListItem() { Text = culture, Value = culture, Selected = culture == m.SelectedCulture }));
4848

src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public override void ConfigureServices(IServiceCollection services)
2121
Hidden = false,
2222
PartOptions = new GraphQLContentPartOption[] {
2323
// Content Part options attached to Content Type
24-
new GraphQLContentPartOption("TestContentPartA")
24+
new("TestContentPartA")
2525
{
2626
Collapse = false,
2727
Hidden = false

src/OrchardCore.Modules/OrchardCore.Placements/Controllers/AdminController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public async Task<IActionResult> Create(string suggestion, string returnUrl = nu
124124
return Forbid();
125125
}
126126

127-
var template = new PlacementNode[] { new PlacementNode() };
127+
var template = new PlacementNode[] { new() };
128128

129129
var viewModel = new EditShapePlacementViewModel
130130
{
@@ -146,7 +146,7 @@ public async Task<IActionResult> Edit(string shapeType, string displayType = nul
146146

147147
var placementNodes = (await _placementsManager.GetShapePlacementsAsync(shapeType))?.ToList() ?? new List<PlacementNode>();
148148

149-
if (!placementNodes.Any() || ShouldCreateNode(placementNodes, displayType, contentType, contentPart, differentiator))
149+
if (placementNodes.Count == 0 || ShouldCreateNode(placementNodes, displayType, contentType, contentPart, differentiator))
150150
{
151151
var generatedNode = new PlacementNode
152152
{

src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyContentsAdminListDisplayDriver.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public override async Task<IDisplayResult> EditAsync(ContentOptionsViewModel mod
8080
PopulateTermEntries(termEntries, taxonomy.As<TaxonomyPart>().Terms, 0);
8181
var terms = new List<SelectListItem>
8282
{
83-
new SelectListItem { Text = S["Clear filter"], Value = "" },
84-
new SelectListItem { Text = S["Show all"], Value = "Taxonomy:" + taxonomy.ContentItemId }
83+
new() { Text = S["Clear filter"], Value = "" },
84+
new() { Text = S["Show all"], Value = "Taxonomy:" + taxonomy.ContentItemId }
8585
};
8686

8787
foreach (var term in termEntries)

src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/OrchardCoreBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public OrchardCoreBuilder RegisterStartup<T>() where T : class, IStartup
2828

2929
/// <summary>
3030
/// This method gets called for each tenant. Use this method to add services to the container.
31-
/// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940
31+
/// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
3232
/// </summary>
3333
/// <param name="configure">The action to execute when configuring the services for a tenant.</param>
3434
/// <param name="order">The order of the action to execute. Lower values will be executed first.</param>

src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private IEnumerable<Module> GetModules()
4343
{
4444
var modules = new ConcurrentBag<Module>
4545
{
46-
new Module(_environment.ApplicationName, true),
46+
new(_environment.ApplicationName, true),
4747
};
4848

4949
var names = _moduleNamesProviders

src/OrchardCore/OrchardCore.Autoroute.Core/Indexes/AutoroutePartIndex.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ public void Describe(DescribeContext<ContentItem> context)
134134
var results = new List<AutoroutePartIndex>
135135
{
136136
// If the part is disabled or was removed, a record is still added but with a null path.
137-
new AutoroutePartIndex
138-
{
137+
new() {
139138
ContentItemId = contentItem.ContentItemId,
140139
Path = !partRemoved && !part.Disabled ? part.Path : null,
141140
Published = contentItem.Published,

src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByRoleNameIndex.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public override void Describe(DescribeContext<User> context)
3030
{
3131
return new UserByRoleNameIndex[]
3232
{
33-
new UserByRoleNameIndex
34-
{
33+
new() {
3534
RoleName = NormalizeKey("Authenticated"),
3635
Count = 1
3736
}

src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/TenantHttpClientFactory.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ private static class Log
377377
{
378378
public static class EventIds
379379
{
380-
public static readonly EventId CleanupCycleStart = new EventId(100, "CleanupCycleStart");
381-
public static readonly EventId CleanupCycleEnd = new EventId(101, "CleanupCycleEnd");
382-
public static readonly EventId CleanupItemFailed = new EventId(102, "CleanupItemFailed");
383-
public static readonly EventId HandlerExpired = new EventId(103, "HandlerExpired");
380+
public static readonly EventId CleanupCycleStart = new(100, "CleanupCycleStart");
381+
public static readonly EventId CleanupCycleEnd = new(101, "CleanupCycleEnd");
382+
public static readonly EventId CleanupItemFailed = new(102, "CleanupItemFailed");
383+
public static readonly EventId HandlerExpired = new(103, "HandlerExpired");
384384
}
385385

386386
private static readonly Action<ILogger, int, Exception?> _cleanupCycleStart = LoggerMessage.Define<int>(

src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ValueStopwatch.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private ValueStopwatch(long startTimestamp)
1717
_startTimestamp = startTimestamp;
1818
}
1919

20-
public static ValueStopwatch StartNew() => new ValueStopwatch(Stopwatch.GetTimestamp());
20+
public static ValueStopwatch StartNew() => new(Stopwatch.GetTimestamp());
2121

2222
public TimeSpan GetElapsedTime()
2323
{

test/OrchardCore.Tests/Localization/CultureDictionaryTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public void EnumerateCultureDictionary()
6161
var dictionary = new CultureDictionary("ar", PluralizationRule.Arabic);
6262
dictionary.MergeTranslations(new List<CultureDictionaryRecord>
6363
{
64-
new CultureDictionaryRecord("Hello", "مرحبا"),
65-
new CultureDictionaryRecord("Bye", "مع السلامة")
64+
new("Hello", "مرحبا"),
65+
new("Bye", "مع السلامة")
6666
});
6767

6868
// Act & Assert

test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void LocalizerReturnsCorrectPluralFormIfMultiplePluraflFormsAreSpecified(
261261
{
262262
SetupDictionary("en", new CultureDictionaryRecord[]
263263
{
264-
new CultureDictionaryRecord("míč", "ball", "{0} balls")
264+
new("míč", "ball", "{0} balls")
265265
}, PluralizationRule.English);
266266

267267
var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
@@ -280,7 +280,7 @@ public void LocalizerFallBackToParentCultureIfFallBackToParentUICulturesIsTrue(b
280280
{
281281
SetupDictionary("ar", new CultureDictionaryRecord[]
282282
{
283-
new CultureDictionaryRecord("hello", "مرحبا")
283+
new("hello", "مرحبا")
284284
}, PluralizationRule.Arabic);
285285

286286
SetupDictionary("ar-YE", Array.Empty<CultureDictionaryRecord>(), PluralizationRule.Arabic);
@@ -301,16 +301,16 @@ public void LocalizerReturnsGetAllStrings(bool includeParentCultures, string[] e
301301
{
302302
SetupDictionary("ar", new CultureDictionaryRecord[]
303303
{
304-
new CultureDictionaryRecord("Blog", "مدونة"),
305-
new CultureDictionaryRecord("Menu", "قائمة"),
306-
new CultureDictionaryRecord("Page", "صفحة"),
307-
new CultureDictionaryRecord("Article", "مقالة")
304+
new("Blog", "مدونة"),
305+
new("Menu", "قائمة"),
306+
new("Page", "صفحة"),
307+
new("Article", "مقالة")
308308
}, PluralizationRule.Arabic);
309309

310310
SetupDictionary("ar-YE", new CultureDictionaryRecord[]
311311
{
312-
new CultureDictionaryRecord("Blog", "مدونة"),
313-
new CultureDictionaryRecord("Product", "منتج")
312+
new("Blog", "مدونة"),
313+
new("Product", "منتج")
314314
}, PluralizationRule.Arabic);
315315

316316
var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, false, _logger.Object);

test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesPermissionsHandlerTests.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public async Task GrantsRolesPermissions(string required, bool authenticated, bo
2222
{
2323
RoleName = "Anonymous",
2424
RoleClaims = new List<RoleClaim> {
25-
new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = "AllowAnonymous" }
25+
new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAnonymous" }
2626
}
2727
},
2828
new Role
2929
{
3030
RoleName = "Authenticated",
3131
RoleClaims = new List<RoleClaim> {
32-
new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = "AllowAuthenticated" }
32+
new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAuthenticated" }
3333
}
3434
}
3535
);
@@ -73,7 +73,7 @@ public async Task GrantsInheritedPermissions()
7373
{
7474
RoleName = "Anonymous",
7575
RoleClaims = new List<RoleClaim> {
76-
new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = "Implicit2" }
76+
new() { ClaimType = Permission.ClaimType, ClaimValue = "Implicit2" }
7777
}
7878
}
7979
);
@@ -98,14 +98,14 @@ public async Task IsCaseIsensitive(string required, bool authenticated)
9898
{
9999
RoleName = "Anonymous",
100100
RoleClaims = new List<RoleClaim> {
101-
new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAnOnYmOuS" }
101+
new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAnOnYmOuS" }
102102
}
103103
},
104104
new Role
105105
{
106106
RoleName = "Authenticated",
107107
RoleClaims = new List<RoleClaim> {
108-
new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAuThEnTiCaTeD" }
108+
new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAuThEnTiCaTeD" }
109109
}
110110
}
111111
);

test/OrchardCore.Tests/Routing/AutorouteEntriesTests.cs

+15-15
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task ShouldGetContainedEntryByPath()
2222
// Act
2323
var initialEntries = new List<AutorouteEntry>()
2424
{
25-
new AutorouteEntry("container", "container-path"),
26-
new AutorouteEntry("container", "contained-path", "contained")
25+
new("container", "container-path"),
26+
new("container", "contained-path", "contained")
2727
};
2828

2929
entries.AddEntries(initialEntries);
@@ -56,8 +56,8 @@ public async Task ShouldGetEntryByContainedContentItemId()
5656
// Act
5757
var initialEntries = new List<AutorouteEntry>()
5858
{
59-
new AutorouteEntry("container", "container-path"),
60-
new AutorouteEntry("container", "contained-path", "contained")
59+
new("container", "container-path"),
60+
new("container", "contained-path", "contained")
6161
};
6262

6363
entries.AddEntries(initialEntries);
@@ -90,8 +90,8 @@ public async Task RemovesContainedEntriesWhenContainerRemoved()
9090
// Act
9191
var initialEntries = new List<AutorouteEntry>()
9292
{
93-
new AutorouteEntry("container", "container-path"),
94-
new AutorouteEntry("container", "contained-path", "contained")
93+
new("container", "container-path"),
94+
new("container", "contained-path", "contained")
9595
};
9696

9797
entries.AddEntries(initialEntries);
@@ -125,17 +125,17 @@ public async Task RemovesContainedEntriesWhenDeleted()
125125
// Act
126126
var initialEntries = new List<AutorouteEntry>()
127127
{
128-
new AutorouteEntry("container", "container-path"),
129-
new AutorouteEntry("container", "contained-path1", "contained1"),
130-
new AutorouteEntry("container", "contained-path2", "contained2")
128+
new("container", "container-path"),
129+
new("container", "contained-path1", "contained1"),
130+
new("container", "contained-path2", "contained2")
131131
};
132132

133133
entries.AddEntries(initialEntries);
134134

135135
var updatedEntries = new List<AutorouteEntry>()
136136
{
137-
new AutorouteEntry("container", "container-path"),
138-
new AutorouteEntry("container", "contained-path1", "contained1")
137+
new("container", "container-path"),
138+
new("container", "contained-path1", "contained1")
139139
};
140140

141141
entries.AddEntries(updatedEntries);
@@ -167,16 +167,16 @@ public async Task RemovesOldContainedPaths()
167167
// Act
168168
var initialEntries = new List<AutorouteEntry>()
169169
{
170-
new AutorouteEntry("container", "container-path"),
171-
new AutorouteEntry("container", "contained-path-old", "contained")
170+
new("container", "container-path"),
171+
new("container", "contained-path-old", "contained")
172172
};
173173

174174
entries.AddEntries(initialEntries);
175175

176176
var updatedEntries = new List<AutorouteEntry>()
177177
{
178-
new AutorouteEntry("container", "container-path"),
179-
new AutorouteEntry("container", "contained-path-new", "contained")
178+
new("container", "container-path"),
179+
new("container", "contained-path-new", "contained")
180180
};
181181

182182
entries.AddEntries(updatedEntries);

test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ public async Task CanExecuteSimpleWorkflow()
3232
WorkflowTypeId = IdGenerator.GenerateId(),
3333
Activities = new List<ActivityRecord>
3434
{
35-
new ActivityRecord { ActivityId = "1", IsStart = true, Name = addTask.Name, Properties = JObject.FromObject( new
35+
new() { ActivityId = "1", IsStart = true, Name = addTask.Name, Properties = JObject.FromObject( new
3636
{
3737
A = new WorkflowExpression<double>("input(\"A\")"),
3838
B = new WorkflowExpression<double>("input(\"B\")"),
3939
}) },
40-
new ActivityRecord { ActivityId = "2", Name = writeLineTask.Name, Properties = JObject.FromObject( new { Text = new WorkflowExpression<string>("lastResult().toString()") }) },
41-
new ActivityRecord { ActivityId = "3", Name = setOutputTask.Name, Properties = JObject.FromObject( new { Value = new WorkflowExpression<string>("lastResult()"), OutputName = "Sum" }) }
40+
new() { ActivityId = "2", Name = writeLineTask.Name, Properties = JObject.FromObject( new { Text = new WorkflowExpression<string>("lastResult().toString()") }) },
41+
new() { ActivityId = "3", Name = setOutputTask.Name, Properties = JObject.FromObject( new { Value = new WorkflowExpression<string>("lastResult()"), OutputName = "Sum" }) }
4242
},
4343
Transitions = new List<Transition>
4444
{
45-
new Transition{ SourceActivityId = "1", SourceOutcomeName = "Done", DestinationActivityId = "2" },
46-
new Transition{ SourceActivityId = "2", SourceOutcomeName = "Done", DestinationActivityId = "3" }
45+
new() { SourceActivityId = "1", SourceOutcomeName = "Done", DestinationActivityId = "2" },
46+
new() { SourceActivityId = "2", SourceOutcomeName = "Done", DestinationActivityId = "3" }
4747
}
4848
};
4949

0 commit comments

Comments
 (0)