Skip to content

Commit 131d207

Browse files
authored
Revert "Use Random.Shared property (#31453)" (#31795)
This reverts commit 2458822. It breaks or templates, we can make this change once we are consuming an SDK version that has the right bits.
1 parent 8f56489 commit 131d207

File tree

25 files changed

+67
-50
lines changed

25 files changed

+67
-50
lines changed

src/Components/Samples/BlazorServerApp/Data/WeatherForecastService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ public class WeatherForecastService
1313

1414
public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
1515
{
16+
var rng = new Random();
1617
return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
1718
{
1819
Date = startDate.AddDays(index),
19-
TemperatureC = Random.Shared.Next(-20, 55),
20-
Summary = Summaries[Random.Shared.Next(Summaries.Length)]
20+
TemperatureC = rng.Next(-20, 55),
21+
Summary = Summaries[rng.Next(Summaries.Length)]
2122
}).ToArray());
2223
}
2324
}

src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Server/Data/WeatherForecastService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ public class WeatherForecastService : IWeatherForecastService
1515

1616
public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
1717
{
18+
var rng = new Random();
1819
return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
1920
{
2021
Date = startDate.AddDays(index),
21-
TemperatureC = Random.Shared.Next(-20, 55),
22-
Summary = Summaries[Random.Shared.Next(Summaries.Length)]
22+
TemperatureC = rng.Next(-20, 55),
23+
Summary = Summaries[rng.Next(Summaries.Length)]
2324
}).ToArray());
2425
}
2526
}

src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Controllers/WeatherForecastController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger)
2828
[HttpGet]
2929
public IEnumerable<WeatherForecast> Get()
3030
{
31+
var rng = new Random();
3132
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
3233
{
3334
Date = DateTime.Now.AddDays(index),
34-
TemperatureC = Random.Shared.Next(-20, 55),
35-
Summary = Summaries[Random.Shared.Next(Summaries.Length)]
35+
TemperatureC = rng.Next(-20, 55),
36+
Summary = Summaries[rng.Next(Summaries.Length)]
3637
})
3738
.ToArray();
3839
}

src/Components/benchmarkapps/BlazingPizza.Server/Pages/Map.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
@functions {
1111
private int locX;
1212
private int locY;
13+
private Random random = new Random();
1314
private Timer timer;
1415
private string locString;
1516

1617
protected override void OnInitialized()
1718
{
1819
timer = new Timer(_ =>
1920
{
20-
locX = Random.Shared.Next(1000);
21-
locY = Random.Shared.Next(1000);
21+
locX = random.Next(1000);
22+
locY = random.Next(1000);
2223
locString = $"{locX},{locY}";
2324

2425
InvokeAsync(() => StateHasChanged());

src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/TimerComponent.razor

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
@code
99
{
10+
Random random = new Random();
1011
Timer timer;
1112
int red = 128;
1213
int green = 128;
@@ -21,9 +22,9 @@
2122
{
2223
InvokeAsync(() =>
2324
{
24-
red = Random.Shared.Next(0, 256);
25-
green = Random.Shared.Next(0, 256);
26-
blue = Random.Shared.Next(0, 256);
25+
red = random.Next(0, 256);
26+
green = random.Next(0, 256);
27+
blue = random.Next(0, 256);
2728
StateHasChanged();
2829
BenchmarkEvent.Send(JSRuntime, "Finished updating color");
2930
});

src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</ul>
3232

3333
@code {
34+
Random rng = new Random();
3435
TodoItem[] todoItems = new[]
3536
{
3637
new TodoItem { Id = 1, Text = "First" },
@@ -42,7 +43,7 @@
4243

4344
void Shuffle()
4445
{
45-
todoItems = todoItems.OrderBy(x => Random.Shared.Next()).ToArray();
46+
todoItems = todoItems.OrderBy(x => rng.Next()).ToArray();
4647
}
4748

4849
class TodoItem

src/DataProtection/DataProtection/src/KeyManagement/KeyRingProvider.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,7 @@ private static TimeSpan GetRefreshPeriodWithJitter(TimeSpan refreshPeriod)
259259
// hit a single repository simultaneously. For instance, if the refresh period is 1 hour,
260260
// we'll return a value in the vicinity of 48 - 60 minutes. We use the Random class since
261261
// we don't need a secure PRNG for this.
262-
#if NET6_0_OR_GREATER
263-
var random = Random.Shared;
264-
#else
265-
var random = new Random();
266-
#endif
267-
return TimeSpan.FromTicks((long)(refreshPeriod.Ticks * (1.0d - (random.NextDouble() / 5))));
262+
return TimeSpan.FromTicks((long)(refreshPeriod.Ticks * (1.0d - (new Random().NextDouble() / 5))));
268263
}
269264

270265
private static DateTimeOffset Min(DateTimeOffset a, DateTimeOffset b)

src/Http/Routing/test/UnitTests/RouteCollectionTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ private static RouteCollection GetRouteCollectionWithNamedRoutes(IEnumerable<str
512512

513513
private static RouteCollection GetNestedRouteCollection(string[] routeNames)
514514
{
515-
int index = Random.Shared.Next(0, routeNames.Length - 1);
515+
var random = new Random();
516+
int index = random.Next(0, routeNames.Length - 1);
516517
var first = routeNames.Take(index).ToArray();
517518
var second = routeNames.Skip(index).ToArray();
518519

src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,9 @@ public async Task CheckSetEmailValidatesUser()
305305
var manager = CreateManager();
306306
manager.Options.User.RequireUniqueEmail = true;
307307
manager.UserValidators.Add(new UserValidator<TUser>());
308-
var email = "foo" + Random.Shared.Next() + "@example.com";
309-
var newEmail = "bar" + Random.Shared.Next() + "@example.com";
308+
var random = new Random();
309+
var email = "foo" + random.Next() + "@example.com";
310+
var newEmail = "bar" + random.Next() + "@example.com";
310311
var user = CreateTestUser(email: email);
311312
IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
312313
IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, newEmail));

src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ private static StringValues GenerateBetaFeatureOptions()
111111

112112
var threshold = 0.80; // 20% chance for each feature in beta.
113113

114+
var random = new Random();
114115
var values = new List<string>();
115116
for (var i = 0; i < features.Length; i++)
116117
{
117-
if (Random.Shared.NextDouble() > threshold)
118+
if (random.NextDouble() > threshold)
118119
{
119120
values.Add(features[i]);
120121
}

0 commit comments

Comments
 (0)