Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a9d5f5

Browse files
authored
Merge pull request#1873 from jzabroski/patchSystemDataSqlClient
Patch system data sql client
2 parents4026fc1 +d1561e6 commit1a9d5f5

File tree

3 files changed

+11
-39
lines changed

3 files changed

+11
-39
lines changed

‎src/FluentMigrator.Runner.Core/IProfileLoader.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
// limitations under the License.
1515
#endregion
1616

17-
usingSystem;
18-
usingSystem.Collections.Generic;
19-
20-
usingFluentMigrator.Infrastructure;
21-
2217
usingJetBrains.Annotations;
2318

2419
namespaceFluentMigrator.Runner
@@ -33,14 +28,5 @@ public interface IProfileLoader
3328
/// </summary>
3429
/// <param name="runner">The migration runner</param>
3530
voidApplyProfiles([NotNull]IMigrationRunnerrunner);
36-
37-
/// <summary>
38-
/// Find all profile name tagged migrations in the given assembly collection
39-
/// </summary>
40-
/// <param name="assemblies">The assemblies to load the profile tagged migrations from</param>
41-
/// <param name="profile">The profile name to search the migrations for</param>
42-
/// <returns>The found migrations</returns>
43-
[Obsolete]
44-
IEnumerable<IMigration>FindProfilesIn(IAssemblyCollectionassemblies,stringprofile);
4531
}
4632
}

‎src/FluentMigrator.Runner.Core/ProfileLoader.cs‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,45 +37,31 @@ namespace FluentMigrator.Runner
3737
/// </summary>
3838
publicclassProfileLoader:IProfileLoader
3939
{
40-
[CanBeNull]
41-
privatereadonlyIServiceProvider_serviceProvider;
42-
43-
[Obsolete]
44-
[CanBeNull]
45-
privatereadonlyIMigrationRunnerConventions_conventions;
46-
4740
/// <summary>
4841
/// Initializes a new instance of the <see cref="ProfileLoader"/> class.
4942
/// </summary>
5043
/// <param name="options">The runner options</param>
5144
/// <param name="source">The profile source</param>
5245
/// <param name="serviceProvider">The service provider</param>
46+
[Obsolete("Use the other constructor")]
5347
publicProfileLoader(
5448
[NotNull]IOptions<RunnerOptions>options,
5549
[NotNull]IProfileSourcesource,
5650
[NotNull]IServiceProviderserviceProvider)
5751
{
58-
_serviceProvider=serviceProvider;
5952
Profiles=source.GetProfiles(options.Value.Profile).ToList();
6053
}
6154

62-
/// <inheritdoc />
63-
[Obsolete]
64-
publicIEnumerable<IMigration>FindProfilesIn(IAssemblyCollectionassemblies,stringprofile)
55+
/// <summary>
56+
/// Initializes a new instance of the <see cref="ProfileLoader"/> class.
57+
/// </summary>
58+
/// <param name="options">The runner options</param>
59+
/// <param name="source">The profile source</param>
60+
publicProfileLoader(
61+
[NotNull]IOptions<RunnerOptions>options,
62+
[NotNull]IProfileSourcesource)
6563
{
66-
if(string.IsNullOrEmpty(profile)||_conventions==null)
67-
yieldbreak;
68-
69-
IEnumerable<Type>matchedTypes=assemblies.GetExportedTypes()
70-
.Where(t=>_conventions.TypeIsProfile(t)&&t.GetOneAttribute<ProfileAttribute>().ProfileName.ToLower()==profile.ToLower())
71-
.OrderBy(x=>x.Name);
72-
73-
foreach(vartypeinmatchedTypes)
74-
{
75-
if(type.FullName==null)
76-
continue;
77-
yieldreturntype.Assembly.CreateInstance(type.FullName)asIMigration;
78-
}
64+
Profiles=source.GetProfiles(options.Value.Profile).ToList();
7965
}
8066

8167
/// <summary>

‎src/FluentMigrator.Runner.SqlServer/FluentMigrator.Runner.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReferenceInclude="Microsoft.Data.SqlClient">
21-
<Version>5.1.4</Version>
21+
<Version>5.2.2</Version>
2222
</PackageReference>
2323
</ItemGroup>
2424
<ItemGroup>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp