diff --git a/build/dependencies.props b/build/dependencies.props
index b675bd2662..a1b165f0b0 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,24 +3,24 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.0-preview1-15651
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
- 2.1.0-preview1-27965
+ 2.1.0-preview1-15678
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
+ 2.1.0-preview1-28140
2.0.0
- 2.1.0-preview1-26016-05
+ 2.1.0-preview1-26115-03
15.3.0
4.7.49
2.3.1
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 2146d006d7..84f798d53f 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15661
-commithash:c9349d4c8a495d3085d9b879214d80f2f45e2193
+version:2.1.0-preview1-15678
+commithash:5347461137cb45a77ddcc0b55b2478092de43338
diff --git a/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
index dd32fb665f..d78581655c 100644
--- a/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
+++ b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
using System.Linq;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;
@@ -20,16 +21,8 @@ namespace Microsoft.Extensions.DependencyInjection
LocalizationServiceCollectionExtensions.AddLocalizationServices(collection);
// Assert
- var services = collection.ToList();
- Assert.Equal(2, services.Count);
-
- Assert.Equal(typeof(IStringLocalizerFactory), services[0].ServiceType);
- Assert.Equal(typeof(ResourceManagerStringLocalizerFactory), services[0].ImplementationType);
- Assert.Equal(ServiceLifetime.Singleton, services[0].Lifetime);
-
- Assert.Equal(typeof(IStringLocalizer<>), services[1].ServiceType);
- Assert.Equal(typeof(StringLocalizer<>), services[1].ImplementationType);
- Assert.Equal(ServiceLifetime.Transient, services[1].Lifetime);
+ AssertContainsSingle(collection, typeof(IStringLocalizerFactory), typeof(ResourceManagerStringLocalizerFactory));
+ AssertContainsSingle(collection, typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
}
[Fact]
@@ -43,20 +36,33 @@ namespace Microsoft.Extensions.DependencyInjection
collection,
options => options.ResourcesPath = "Resources");
- // Assert
- var services = collection.ToList();
- Assert.Equal(3, services.Count);
+ AssertContainsSingle(collection, typeof(IStringLocalizerFactory), typeof(ResourceManagerStringLocalizerFactory));
+ AssertContainsSingle(collection, typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
+ }
- Assert.Equal(typeof(IStringLocalizerFactory), services[0].ServiceType);
- Assert.Equal(typeof(ResourceManagerStringLocalizerFactory), services[0].ImplementationType);
- Assert.Equal(ServiceLifetime.Singleton, services[0].Lifetime);
+ private void AssertContainsSingle(
+ IServiceCollection services,
+ Type serviceType,
+ Type implementationType)
+ {
+ var matches = services
+ .Where(sd =>
+ sd.ServiceType == serviceType &&
+ sd.ImplementationType == implementationType)
+ .ToArray();
- Assert.Equal(typeof(IStringLocalizer<>), services[1].ServiceType);
- Assert.Equal(typeof(StringLocalizer<>), services[1].ImplementationType);
- Assert.Equal(ServiceLifetime.Transient, services[1].Lifetime);
-
- Assert.Equal(typeof(IConfigureOptions), services[2].ServiceType);
- Assert.Equal(ServiceLifetime.Singleton, services[2].Lifetime);
+ if (matches.Length == 0)
+ {
+ Assert.True(
+ false,
+ $"Could not find an instance of {implementationType} registered as {serviceType}");
+ }
+ else if (matches.Length > 1)
+ {
+ Assert.True(
+ false,
+ $"Found multiple instances of {implementationType} registered as {serviceType}");
+ }
}
}
}