Skip to content

Commit e667265

Browse files
bart-vmwarebart-vmware
authored
Package updates (#381)
* Update DotSettings files from Steeltoe * Package updates, fix build warnings * Update MySql.Data version (tested locally)
1 parent bebe759 commit e667265

File tree

51 files changed

+124
-194
lines changed

Some content is hidden

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

51 files changed

+124
-194
lines changed

‎Configuration/src/ConfigurationProviders/Models/ErrorViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Steeltoe.Samples.ConfigurationProviders.Models;
22

3-
public class ErrorViewModel
3+
public sealed class ErrorViewModel
44
{
55
public string? RequestId { get; set; }
66

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
77
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A975FB7_002D401B_002D41BB_002D96A4_002D1DF0036888A9/@EntryIndexedValue">ExplicitlyExcluded</s:String>
88
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=557AFE26_002DB89D_002D497D_002D92B6_002D8268D04396E5_002Fd_003AActuators_002Fd_003AHeapDump_002Fd_003ADotNetHeapDump/@EntryIndexedValue">ExplicitlyExcluded</s:String>
9-
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=557AFE26_002DB89D_002D497D_002D92B6_002D8268D04396E5_002Fd_003AActuators_002Fd_003AMetrics_002Fd_003ASystemDiagnosticsMetrics/@EntryIndexedValue">ExplicitlyExcluded</s:String>
109
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=5CC834D7_002DC501_002D4FEC_002D9244_002DE829584192FB_002Ff_003AConfigurationSchemaAttributes_002Ecs/@EntryIndexedValue">ExplicitlyExcluded</s:String>
1110
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=5CC834D7_002DC501_002D4FEC_002D9244_002DE829584192FB_002Ff_003AConfigurationSchemaAttribute_002Ecs/@EntryIndexedValue">ExplicitlyExcluded</s:String>
1211
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=C4C38F83_002D8410_002D443C_002D9599_002DACFB5FA7CD2D/@EntryIndexedValue">ExplicitlyExcluded</s:String>
1312
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=C4C38F83_002D8410_002D443C_002D9599_002DACFB5FA7CD2D_002Ff_003AConfigurationSchemaAttributes_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FCommon_003Fsrc_003FAbstractions_003FConfigurationSchemaAttributes_002Ecs/@EntryIndexedValue">ExplicitlyExcluded</s:String>
1413
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=DC1BC61A_002DE0FA_002D4CF9_002D9F24_002DD4C564A07836_002Ff_003ADirectory_002EBuild_002Etargets_002Fl_003A_002E_002E_003FDirectory_002EBuild_002Etargets/@EntryIndexedValue">ExplicitlyExcluded</s:String>
1514
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=2A975FB7_002D401B_002D41BB_002D96A4_002D1DF0036888A9/@EntryIndexedValue">2A975FB7-401B-41BB-96A4-1DF0036888A9</s:String>
1615
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=557AFE26_002DB89D_002D497D_002D92B6_002D8268D04396E5_002Fd_003AActuators_002Fd_003AHeapDump_002Fd_003ADotNetHeapDump/@EntryIndexedValue">557AFE26-B89D-497D-92B6-8268D04396E5/d:Actuators/d:HeapDump/d:DotNetHeapDump</s:String>
17-
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=557AFE26_002DB89D_002D497D_002D92B6_002D8268D04396E5_002Fd_003AActuators_002Fd_003AMetrics_002Fd_003ASystemDiagnosticsMetrics/@EntryIndexedValue">557AFE26-B89D-497D-92B6-8268D04396E5/d:Actuators/d:Metrics/d:SystemDiagnosticsMetrics</s:String>
1816
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=61812938_002D5132_002D4AB6_002DB48D_002D2DF4189B3E37_002Ff_003AConfigurationSchemaAttributes_002Ecs/@EntryIndexedValue">61812938-5132-4AB6-B48D-2DF4189B3E37/f:ConfigurationSchemaAttributes.cs</s:String>
1917
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=C4C38F83_002D8410_002D443C_002D9599_002DACFB5FA7CD2D/@EntryIndexedValue">C4C38F83-8410-443C-9599-ACFB5FA7CD2D</s:String>
2018
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=C4C38F83_002D8410_002D443C_002D9599_002DACFB5FA7CD2D_002Ff_003AConfigurationSchemaAttributes_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FCommon_003Fsrc_003FAbstractions_003FConfigurationSchemaAttributes_002Ecs/@EntryIndexedValue">C4C38F83-8410-443C-9599-ACFB5FA7CD2D/f:ConfigurationSchemaAttributes.cs/l:..?..?..?Common?src?Abstractions?ConfigurationSchemaAttributes.cs</s:String>

‎Connectors/src/CosmosDb/Controllers/HomeController.cs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Diagnostics;
1+
using System.Diagnostics;
22
using System.Runtime.CompilerServices;
33
using System.Text.Json;
44
using Microsoft.AspNetCore.Mvc;
@@ -11,16 +11,14 @@
1111

1212
namespace Steeltoe.Samples.CosmosDb.Controllers;
1313

14-
public class HomeController : Controller
14+
public sealed class HomeController(ConnectorFactory<CosmosDbOptions, CosmosClient> connectorFactory) : Controller
1515
{
16-
private readonly ILogger<HomeController> _logger;
17-
private readonly Connector<CosmosDbOptions, CosmosClient> _connector;
18-
19-
public HomeController(ILogger<HomeController> logger, ConnectorFactory<CosmosDbOptions, CosmosClient> connectorFactory)
16+
private static readonly JsonSerializerOptions SerializerOptions = new()
2017
{
21-
_logger = logger;
22-
_connector = connectorFactory.Get();
23-
}
18+
WriteIndented = true
19+
};
20+
21+
private readonly Connector<CosmosDbOptions, CosmosClient> _connector = connectorFactory.Get();
2422

2523
public async Task<IActionResult> Index(CancellationToken cancellationToken)
2624
{
@@ -31,10 +29,7 @@ public async Task<IActionResult> Index(CancellationToken cancellationToken)
3129
var model = new CosmosDbViewModel
3230
{
3331
ConnectionString = _connector.Options.ConnectionString,
34-
OptionsJson = JsonSerializer.Serialize(client.ClientOptions, new JsonSerializerOptions
35-
{
36-
WriteIndented = true
37-
}),
32+
OptionsJson = JsonSerializer.Serialize(client.ClientOptions, SerializerOptions),
3833
Database = _connector.Options.Database
3934
};
4035

@@ -46,7 +41,7 @@ public async Task<IActionResult> Index(CancellationToken cancellationToken)
4641
return View(model);
4742
}
4843

49-
private async IAsyncEnumerable<SampleObject> GetAllAsync(Container container, [EnumeratorCancellation] CancellationToken cancellationToken)
44+
private static async IAsyncEnumerable<SampleObject> GetAllAsync(Container container, [EnumeratorCancellation] CancellationToken cancellationToken)
5045
{
5146
using FeedIterator<SampleObject> iterator = container.GetItemLinqQueryable<SampleObject>().ToFeedIterator();
5247

‎Connectors/src/CosmosDb/Models/CosmosDbViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Steeltoe.Samples.CosmosDb.Data;
1+
using Steeltoe.Samples.CosmosDb.Data;
22

33
namespace Steeltoe.Samples.CosmosDb.Models;
44

@@ -8,5 +8,5 @@ public sealed class CosmosDbViewModel
88
public string? OptionsJson { get; set; }
99
public string? Database { get; set; }
1010

11-
public List<SampleObject> SampleObjects { get; set; } = [];
11+
public List<SampleObject> SampleObjects { get; } = [];
1212
}

‎Connectors/src/CosmosDb/Models/ErrorViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Steeltoe.Samples.CosmosDb.Models;
22

3-
public class ErrorViewModel
3+
public sealed class ErrorViewModel
44
{
55
public string? RequestId { get; set; }
66

‎Connectors/src/CosmosDb/Steeltoe.Samples.CosmosDb.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.40.*" />
10+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.47.*" />
11+
<PackageReference Include="Newtonsoft.Json" Version="13.0.*" />
1112
<PackageReference Include="Steeltoe.Connectors" Version="$(SteeltoeVersion)" />
1213
<PackageReference Include="Steeltoe.Management.Endpoint" Version="$(SteeltoeVersion)" />
1314
</ItemGroup>

‎Connectors/src/MongoDb/Controllers/HomeController.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Diagnostics;
1+
using System.Diagnostics;
22
using Microsoft.AspNetCore.Mvc;
33
using MongoDB.Driver;
44
using Steeltoe.Connectors;
@@ -8,16 +8,9 @@
88

99
namespace Steeltoe.Samples.MongoDb.Controllers;
1010

11-
public class HomeController : Controller
11+
public sealed class HomeController(ConnectorFactory<MongoDbOptions, IMongoClient> connectorFactory) : Controller
1212
{
13-
private readonly ILogger<HomeController> _logger;
14-
private readonly Connector<MongoDbOptions, IMongoClient> _connector;
15-
16-
public HomeController(ILogger<HomeController> logger, ConnectorFactory<MongoDbOptions, IMongoClient> connectorFactory)
17-
{
18-
_logger = logger;
19-
_connector = connectorFactory.Get();
20-
}
13+
private readonly Connector<MongoDbOptions, IMongoClient> _connector = connectorFactory.Get();
2114

2215
public async Task<IActionResult> Index(CancellationToken cancellationToken)
2316
{

‎Connectors/src/MongoDb/Models/ErrorViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Steeltoe.Samples.MongoDb.Models;
22

3-
public class ErrorViewModel
3+
public sealed class ErrorViewModel
44
{
55
public string? RequestId { get; set; }
66

‎Connectors/src/MongoDb/Models/MongoDbViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Steeltoe.Samples.MongoDb.Data;
1+
using Steeltoe.Samples.MongoDb.Data;
22

33
namespace Steeltoe.Samples.MongoDb.Models;
44

‎Connectors/src/MongoDb/Steeltoe.Samples.MongoDb.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="MongoDB.Driver" Version="2.25.*" />
10+
<PackageReference Include="MongoDB.Driver" Version="3.2.*" />
1111
<PackageReference Include="Steeltoe.Connectors" Version="$(SteeltoeVersion)" />
1212
<PackageReference Include="Steeltoe.Management.Endpoint" Version="$(SteeltoeVersion)" />
1313
</ItemGroup>

0 commit comments

Comments
 (0)