Skip to content

Commit 11fe282

Browse files
bart-vmwarebart-vmware
authored
Sync up from SteeltoeOSS/Steeltoe#1637 and reformat solutions (#434)
1 parent c0a4da9 commit 11fe282

File tree

21 files changed

+458
-437
lines changed

21 files changed

+458
-437
lines changed

‎Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSliceWithRangeIndexer/@EntryIndexedValue">WARNING</s:String>
8585
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSubstringWithRangeIndexer/@EntryIndexedValue">WARNING</s:String>
8686
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithPrimaryConstructorParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
87+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateLocalFunctionsWithJumpStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
8788
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyStringInterpolation/@EntryIndexedValue">WARNING</s:String>
8889
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyStringComparison/@EntryIndexedValue">WARNING</s:String>
8990
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
@@ -165,6 +166,7 @@
165166
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PRIMARY_CONSTRUCTOR_PARAMETERS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
166167
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CssFormatter/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
167168
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/HtmlFormatter/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
169+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/HtmlFormatter/TagsAreNotIndentedInside/@EntryValue"></s:String>
168170
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/INDENT_SIZE/@EntryValue">2</s:Int64>
169171
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
170172
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/TAB_WIDTH/@EntryValue">2</s:Int64>
@@ -194,8 +196,7 @@
194196
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TagAttributesFormat/@EntryValue">OnSingleLine</s:String>
195197
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/USE_INDENT_FROM_VS/@EntryValue">False</s:Boolean>
196198
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WRAP_LIMIT/@EntryValue">160</s:Int64>
197-
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
198-
&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
199+
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
199200
&lt;TypePattern DisplayName="Non-reorderable types" RemoveRegions="All"&gt;&#xD;
200201
&lt;TypePattern.Match&gt;&#xD;
201202
&lt;Or&gt;&#xD;
@@ -219,7 +220,7 @@
219220
&lt;HasMember&gt;&#xD;
220221
&lt;And&gt;&#xD;
221222
&lt;Kind Is="Method" /&gt;&#xD;
222-
&lt;HasAttribute Name="Xunit.FactAttribute" Inherited="True" /&gt;&#xD;
223+
&lt;HasAttribute Inherited="True" Name="Xunit.FactAttribute" /&gt;&#xD;
223224
&lt;/And&gt;&#xD;
224225
&lt;/HasMember&gt;&#xD;
225226
&lt;/And&gt;&#xD;
@@ -231,7 +232,7 @@
231232
&lt;/And&gt;&#xD;
232233
&lt;/Entry.Match&gt;&#xD;
233234
&lt;Entry.SortBy&gt;&#xD;
234-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
235+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
235236
&lt;/Entry.SortBy&gt;&#xD;
236237
&lt;/Entry&gt;&#xD;
237238
&lt;Group DisplayName="Fields"&gt;&#xD;
@@ -244,7 +245,7 @@
244245
&lt;/And&gt;&#xD;
245246
&lt;/Entry.Match&gt;&#xD;
246247
&lt;Entry.SortBy&gt;&#xD;
247-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
248+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
248249
&lt;/Entry.SortBy&gt;&#xD;
249250
&lt;/Entry&gt;&#xD;
250251
&lt;Entry DisplayName="Static"&gt;&#xD;
@@ -258,7 +259,7 @@
258259
&lt;/And&gt;&#xD;
259260
&lt;/Entry.Match&gt;&#xD;
260261
&lt;Entry.SortBy&gt;&#xD;
261-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
262+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
262263
&lt;/Entry.SortBy&gt;&#xD;
263264
&lt;/Entry&gt;&#xD;
264265
&lt;Entry DisplayName="Instance Readonly"&gt;&#xD;
@@ -272,7 +273,7 @@
272273
&lt;/And&gt;&#xD;
273274
&lt;/Entry.Match&gt;&#xD;
274275
&lt;Entry.SortBy&gt;&#xD;
275-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
276+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
276277
&lt;/Entry.SortBy&gt;&#xD;
277278
&lt;/Entry&gt;&#xD;
278279
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -288,7 +289,7 @@
288289
&lt;/And&gt;&#xD;
289290
&lt;/Entry.Match&gt;&#xD;
290291
&lt;Entry.SortBy&gt;&#xD;
291-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
292+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
292293
&lt;/Entry.SortBy&gt;&#xD;
293294
&lt;/Entry&gt;&#xD;
294295
&lt;/Group&gt;&#xD;
@@ -301,7 +302,7 @@
301302
&lt;/And&gt;&#xD;
302303
&lt;/Entry.Match&gt;&#xD;
303304
&lt;Entry.SortBy&gt;&#xD;
304-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
305+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
305306
&lt;/Entry.SortBy&gt;&#xD;
306307
&lt;/Entry&gt;&#xD;
307308
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -314,7 +315,7 @@
314315
&lt;/And&gt;&#xD;
315316
&lt;/Entry.Match&gt;&#xD;
316317
&lt;Entry.SortBy&gt;&#xD;
317-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
318+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
318319
&lt;/Entry.SortBy&gt;&#xD;
319320
&lt;/Entry&gt;&#xD;
320321
&lt;/Group&gt;&#xD;
@@ -325,7 +326,7 @@
325326
&lt;/And&gt;&#xD;
326327
&lt;/Entry.Match&gt;&#xD;
327328
&lt;Entry.SortBy&gt;&#xD;
328-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
329+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
329330
&lt;/Entry.SortBy&gt;&#xD;
330331
&lt;/Entry&gt;&#xD;
331332
&lt;Group DisplayName="Events"&gt;&#xD;
@@ -337,7 +338,7 @@
337338
&lt;/And&gt;&#xD;
338339
&lt;/Entry.Match&gt;&#xD;
339340
&lt;Entry.SortBy&gt;&#xD;
340-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
341+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
341342
&lt;/Entry.SortBy&gt;&#xD;
342343
&lt;/Entry&gt;&#xD;
343344
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -350,7 +351,7 @@
350351
&lt;/And&gt;&#xD;
351352
&lt;/Entry.Match&gt;&#xD;
352353
&lt;Entry.SortBy&gt;&#xD;
353-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
354+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
354355
&lt;/Entry.SortBy&gt;&#xD;
355356
&lt;/Entry&gt;&#xD;
356357
&lt;/Group&gt;&#xD;
@@ -365,7 +366,7 @@
365366
&lt;/Or&gt;&#xD;
366367
&lt;/Entry.Match&gt;&#xD;
367368
&lt;Entry.SortBy&gt;&#xD;
368-
&lt;Kind Order="Constructor" /&gt;&#xD;
369+
&lt;Kind Is="0" Order="Constructor" /&gt;&#xD;
369370
&lt;/Entry.SortBy&gt;&#xD;
370371
&lt;/Entry&gt;&#xD;
371372
&lt;Entry DisplayName="Test methods" Priority="100"&gt;&#xD;
@@ -375,6 +376,8 @@
375376
&lt;Or&gt;&#xD;
376377
&lt;HasAttribute Name="Xunit.FactAttribute" /&gt;&#xD;
377378
&lt;HasAttribute Name="Xunit.TheoryAttribute" /&gt;&#xD;
379+
&lt;HasAttribute Name="FactSkippedOnPlatform" /&gt;&#xD;
380+
&lt;HasAttribute Name="TheorySkippedOnPlatform" /&gt;&#xD;
378381
&lt;/Or&gt;&#xD;
379382
&lt;/And&gt;&#xD;
380383
&lt;/Entry.Match&gt;&#xD;
@@ -396,7 +399,7 @@
396399
&lt;/And&gt;&#xD;
397400
&lt;/Entry.Match&gt;&#xD;
398401
&lt;Entry.SortBy&gt;&#xD;
399-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
402+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
400403
&lt;/Entry.SortBy&gt;&#xD;
401404
&lt;/Entry&gt;&#xD;
402405
&lt;Entry DisplayName="Nested types"&gt;&#xD;
@@ -413,7 +416,7 @@
413416
&lt;/And&gt;&#xD;
414417
&lt;/Entry.Match&gt;&#xD;
415418
&lt;Entry.SortBy&gt;&#xD;
416-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
419+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
417420
&lt;/Entry.SortBy&gt;&#xD;
418421
&lt;/Entry&gt;&#xD;
419422
&lt;Group DisplayName="Fields"&gt;&#xD;
@@ -426,7 +429,7 @@
426429
&lt;/And&gt;&#xD;
427430
&lt;/Entry.Match&gt;&#xD;
428431
&lt;Entry.SortBy&gt;&#xD;
429-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
432+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
430433
&lt;/Entry.SortBy&gt;&#xD;
431434
&lt;/Entry&gt;&#xD;
432435
&lt;Entry DisplayName="Static"&gt;&#xD;
@@ -440,7 +443,7 @@
440443
&lt;/And&gt;&#xD;
441444
&lt;/Entry.Match&gt;&#xD;
442445
&lt;Entry.SortBy&gt;&#xD;
443-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
446+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
444447
&lt;/Entry.SortBy&gt;&#xD;
445448
&lt;/Entry&gt;&#xD;
446449
&lt;Entry DisplayName="Instance Readonly"&gt;&#xD;
@@ -454,7 +457,7 @@
454457
&lt;/And&gt;&#xD;
455458
&lt;/Entry.Match&gt;&#xD;
456459
&lt;Entry.SortBy&gt;&#xD;
457-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
460+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
458461
&lt;/Entry.SortBy&gt;&#xD;
459462
&lt;/Entry&gt;&#xD;
460463
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -470,7 +473,7 @@
470473
&lt;/And&gt;&#xD;
471474
&lt;/Entry.Match&gt;&#xD;
472475
&lt;Entry.SortBy&gt;&#xD;
473-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
476+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
474477
&lt;/Entry.SortBy&gt;&#xD;
475478
&lt;/Entry&gt;&#xD;
476479
&lt;/Group&gt;&#xD;
@@ -483,7 +486,7 @@
483486
&lt;/And&gt;&#xD;
484487
&lt;/Entry.Match&gt;&#xD;
485488
&lt;Entry.SortBy&gt;&#xD;
486-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
489+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
487490
&lt;/Entry.SortBy&gt;&#xD;
488491
&lt;/Entry&gt;&#xD;
489492
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -496,7 +499,7 @@
496499
&lt;/And&gt;&#xD;
497500
&lt;/Entry.Match&gt;&#xD;
498501
&lt;Entry.SortBy&gt;&#xD;
499-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
502+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
500503
&lt;/Entry.SortBy&gt;&#xD;
501504
&lt;/Entry&gt;&#xD;
502505
&lt;/Group&gt;&#xD;
@@ -507,7 +510,7 @@
507510
&lt;/And&gt;&#xD;
508511
&lt;/Entry.Match&gt;&#xD;
509512
&lt;Entry.SortBy&gt;&#xD;
510-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
513+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
511514
&lt;/Entry.SortBy&gt;&#xD;
512515
&lt;/Entry&gt;&#xD;
513516
&lt;Group DisplayName="Events"&gt;&#xD;
@@ -519,7 +522,7 @@
519522
&lt;/And&gt;&#xD;
520523
&lt;/Entry.Match&gt;&#xD;
521524
&lt;Entry.SortBy&gt;&#xD;
522-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
525+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
523526
&lt;/Entry.SortBy&gt;&#xD;
524527
&lt;/Entry&gt;&#xD;
525528
&lt;Entry DisplayName="Instance"&gt;&#xD;
@@ -532,7 +535,7 @@
532535
&lt;/And&gt;&#xD;
533536
&lt;/Entry.Match&gt;&#xD;
534537
&lt;Entry.SortBy&gt;&#xD;
535-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
538+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
536539
&lt;/Entry.SortBy&gt;&#xD;
537540
&lt;/Entry&gt;&#xD;
538541
&lt;/Group&gt;&#xD;
@@ -555,7 +558,7 @@
555558
&lt;/And&gt;&#xD;
556559
&lt;/Entry.Match&gt;&#xD;
557560
&lt;Entry.SortBy&gt;&#xD;
558-
&lt;Access /&gt;&#xD;
561+
&lt;Access Is="0" /&gt;&#xD;
559562
&lt;/Entry.SortBy&gt;&#xD;
560563
&lt;/Entry&gt;&#xD;
561564
&lt;/Group&gt;&#xD;
@@ -576,7 +579,7 @@
576579
&lt;/And&gt;&#xD;
577580
&lt;/Entry.Match&gt;&#xD;
578581
&lt;Entry.SortBy&gt;&#xD;
579-
&lt;Access Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
582+
&lt;Access Is="0" Order="Private Internal Protected ProtectedInternal Public" /&gt;&#xD;
580583
&lt;/Entry.SortBy&gt;&#xD;
581584
&lt;/Entry&gt;&#xD;
582585
&lt;Entry DisplayName="Nested types"&gt;&#xD;

‎Connectors/src/CosmosDb/Views/Home/Index.cshtml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,40 @@
2222
<div class="table-responsive">
2323
<table class="table table-bordered table-primary mb-0">
2424
<tbody>
25-
<tr>
26-
<th>Connection String</th>
27-
<td>@Model.ConnectionString</td>
28-
</tr>
29-
<tr>
30-
<th>Options</th>
31-
<td>
32-
<pre>@Html.Raw(Model.OptionsJson)</pre>
33-
</td>
34-
</tr>
35-
<tr>
36-
<th>Database</th>
37-
<td>@Model.Database</td>
38-
</tr>
25+
<tr>
26+
<th>Connection String</th>
27+
<td>@Model.ConnectionString</td>
28+
</tr>
29+
<tr>
30+
<th>Options</th>
31+
<td>
32+
<pre>@Html.Raw(Model.OptionsJson)</pre>
33+
</td>
34+
</tr>
35+
<tr>
36+
<th>Database</th>
37+
<td>@Model.Database</td>
38+
</tr>
3939
</tbody>
4040
</table>
4141
</div>
4242

4343
<h4 class="mt-3">Objects stored in CosmosDB container</h4>
4444
<table class="table table-bordered table-primary">
4545
<thead>
46-
<tr>
47-
<th scope="col">Id</th>
48-
<th scope="col">Text</th>
49-
</tr>
50-
</thead>
51-
<tbody>
52-
@foreach (SampleObject sampleObject in Model.SampleObjects)
53-
{
5446
<tr>
55-
<td>@sampleObject.Id</td>
56-
<td>@sampleObject.Text</td>
47+
<th scope="col">Id</th>
48+
<th scope="col">Text</th>
5749
</tr>
58-
}
50+
</thead>
51+
<tbody>
52+
@foreach (SampleObject sampleObject in Model.SampleObjects)
53+
{
54+
<tr>
55+
<td>@sampleObject.Id</td>
56+
<td>@sampleObject.Text</td>
57+
</tr>
58+
}
5959
</tbody>
6060
</table>
6161
</div>

‎Connectors/src/MongoDb/Views/Home/Index.cshtml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
<h4>MongoDB server info</h4>
1515
<table class="table table-bordered table-primary">
1616
<thead>
17-
<tr>
18-
<th scope="col">Connection String</th>
19-
<th scope="col">Database</th>
20-
</tr>
17+
<tr>
18+
<th scope="col">Connection String</th>
19+
<th scope="col">Database</th>
20+
</tr>
2121
</thead>
2222
<tbody>
23-
<tr>
24-
<td>@Model.ConnectionString</td>
25-
<td>@Model.Database</td>
26-
</tr>
23+
<tr>
24+
<td>@Model.ConnectionString</td>
25+
<td>@Model.Database</td>
26+
</tr>
2727
</tbody>
2828
</table>
2929

3030
<h4>Objects stored in MongoDB collection</h4>
3131
<table class="table table-bordered table-primary">
3232
<thead>
33-
<tr>
34-
<th scope="col">Id</th>
35-
<th scope="col">Text</th>
36-
</tr>
37-
</thead>
38-
<tbody>
39-
@foreach (SampleObject sampleObject in Model.SampleObjects)
40-
{
4133
<tr>
42-
<td>@sampleObject.Id</td>
43-
<td>@sampleObject.Text</td>
34+
<th scope="col">Id</th>
35+
<th scope="col">Text</th>
4436
</tr>
45-
}
37+
</thead>
38+
<tbody>
39+
@foreach (SampleObject sampleObject in Model.SampleObjects)
40+
{
41+
<tr>
42+
<td>@sampleObject.Id</td>
43+
<td>@sampleObject.Text</td>
44+
</tr>
45+
}
4646
</tbody>
4747
</table>
4848
</div>

0 commit comments

Comments
 (0)