Skip to content

Commit 7863dd2

Browse files
ejsmithejsmith
committed
Update deps
1 parent cf13503 commit 7863dd2

File tree

9 files changed

+30
-25
lines changed

9 files changed

+30
-25
lines changed

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/Tests/Foundatio.Repositories.Elasticsearch.Tests/bin/Debug/netcoreapp2.1/Foundatio.Repositories.Elasticsearch.Tests.dll",
13+
"program": "${workspaceFolder}/Tests/Foundatio.Repositories.Elasticsearch.Tests/bin/Debug/netcoreapp2.2/Foundatio.Repositories.Elasticsearch.Tests.dll",
1414
"args": [],
1515
"cwd": "${workspaceFolder}/Tests/Foundatio.Repositories.Elasticsearch.Tests",
1616
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

‎Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM microsoft/dotnet:2.2.104-sdk AS build
1+
FROM mcr.microsoft.com/dotnet/core/sdk:2.2.105 AS build
22
WORKDIR /app
33

44
ARG VERSION_SUFFIX=0-dev
55
ENV VERSION_SUFFIX=$VERSION_SUFFIX
66

77
COPY ./*.sln ./NuGet.config ./
88
COPY ./*/*.props ./
9+
COPY ./LICENSE.txt ./LICENSE.txt
910

1011
# Copy the main source project files
1112
COPY src/*/*.csproj ./

‎appveyor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ services:
88
pull_requests:
99
do_not_increment_build_number: true
1010

11+
environment:
12+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
13+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
14+
1115
init:
1216
- git config --global core.autocrlf input
1317

‎src/Foundatio.Repositories.Elasticsearch/Foundatio.Repositories.Elasticsearch.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Compile Include="..\Foundatio.Repositories\Extensions\TaskExtensions.cs" Link="Extensions\TaskExtensions.cs" />
44
</ItemGroup>
55
<ItemGroup>
6-
<PackageReference Include="Foundatio.Jobs.Commands" Version="8.0.1965" />
7-
<PackageReference Include="Foundatio.Parsers.ElasticQueries" Version="5.6.445" />
6+
<PackageReference Include="Foundatio.Jobs.Commands" Version="8.1.2027" />
7+
<PackageReference Include="Foundatio.Parsers.ElasticQueries" Version="5.6.477" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\Foundatio.Repositories\Foundatio.Repositories.csproj" />

‎src/Foundatio.Repositories/Foundatio.Repositories.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="FluentValidation" Version="8.1.3" />
4-
<PackageReference Include="Foundatio" Version="8.0.1965" />
3+
<PackageReference Include="FluentValidation" Version="8.2.3" />
4+
<PackageReference Include="Foundatio" Version="8.1.2027" />
55
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
66
</ItemGroup>
77
</Project>

‎tests/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<IsPackable>False</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Foundatio.Logging.Xunit" Version="8.0.1965" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
8+
<PackageReference Include="Foundatio.Logging.Xunit" Version="8.1.2027" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
1010
<PackageReference Include="xunit" Version="2.4.1" />
1111
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1212
</ItemGroup>

‎tests/Foundatio.Repositories.Elasticsearch.Tests/AggregationQueryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ await _employeeRepository.AddAsync(new List<Employee> {
269269
[MemberData(nameof(DatesToCheck))]
270270
public async Task GetDateOffsetAggregationsAsync(DateTime utcNow) {
271271
using (TestSystemClock.Install()) {
272-
SystemClock.Test.SetFixedTime(utcNow);
272+
TestSystemClock.SetFrozenTime(utcNow);
273273

274274
var today = SystemClock.OffsetNow.Floor(TimeSpan.FromMilliseconds(1));
275275

‎tests/Foundatio.Repositories.Elasticsearch.Tests/IndexTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void CannotAddInvalidTypeToDailyIndex() {
2929
[MemberData(nameof(AliasesDatesToCheck))]
3030
public async Task CanCreateDailyAliasesAsync(DateTime utcNow) {
3131
using (TestSystemClock.Install()) {
32-
SystemClock.Test.SetFixedTime(utcNow);
32+
TestSystemClock.SetFrozenTime(utcNow);
3333
var index = new DailyEmployeeIndex(_configuration, 1);
3434
await index.DeleteAsync();
3535

@@ -65,7 +65,7 @@ public async Task CanCreateDailyAliasesAsync(DateTime utcNow) {
6565
[MemberData(nameof(AliasesDatesToCheck))]
6666
public async Task CanCreateMonthlyAliasesAsync(DateTime utcNow) {
6767
using (TestSystemClock.Install()) {
68-
SystemClock.Test.SetFixedTime(utcNow);
68+
TestSystemClock.SetFrozenTime(utcNow);
6969

7070
var index = new MonthlyEmployeeIndex(_configuration, 1);
7171
await index.DeleteAsync();
@@ -190,7 +190,7 @@ public async Task MaintainWillCreateAliasOnVersionedIndexAsync() {
190190
[Fact]
191191
public async Task MaintainWillCreateAliasesOnTimeSeriesIndexAsync() {
192192
using (TestSystemClock.Install()) {
193-
SystemClock.Test.SetFixedTime(SystemClock.UtcNow);
193+
TestSystemClock.SetFrozenTime(SystemClock.UtcNow);
194194
var version1Index = new DailyEmployeeIndex(_configuration, 1);
195195
await version1Index.DeleteAsync();
196196

@@ -260,7 +260,7 @@ public async Task MaintainDailyIndexesAsync() {
260260
await index.ConfigureAsync();
261261
var repository = new EmployeeRepository(index.Employee);
262262

263-
SystemClock.Test.SetFixedTime(DateTime.UtcNow.Subtract(TimeSpan.FromDays(15)));
263+
TestSystemClock.SetFrozenTime(DateTime.UtcNow.Subtract(TimeSpan.FromDays(15)));
264264
var employee = await repository.AddAsync(EmployeeGenerator.Generate(createdUtc: SystemClock.UtcNow), o => o.ImmediateConsistency());
265265
Assert.NotNull(employee?.Id);
266266

@@ -279,7 +279,7 @@ public async Task MaintainDailyIndexesAsync() {
279279
aliases.Sort();
280280
Assert.Equal(GetExpectedEmployeeDailyAliases(index, SystemClock.UtcNow, employee.CreatedUtc), String.Join(", ", aliases));
281281

282-
SystemClock.Test.SetFixedTime(DateTime.UtcNow.Subtract(TimeSpan.FromDays(9)));
282+
TestSystemClock.SetFrozenTime(DateTime.UtcNow.Subtract(TimeSpan.FromDays(9)));
283283
index.MaxIndexAge = TimeSpan.FromDays(10);
284284
await index.MaintainAsync();
285285
existsResponse = await _client.IndexExistsAsync(index.GetIndex(employee.CreatedUtc));
@@ -295,7 +295,7 @@ public async Task MaintainDailyIndexesAsync() {
295295
aliases.Sort();
296296
Assert.Equal(GetExpectedEmployeeDailyAliases(index, SystemClock.UtcNow, employee.CreatedUtc), String.Join(", ", aliases));
297297

298-
SystemClock.Test.SetFixedTime(DateTime.UtcNow);
298+
TestSystemClock.SetFrozenTime(DateTime.UtcNow);
299299
await index.MaintainAsync();
300300
existsResponse = await _client.IndexExistsAsync(index.GetIndex(employee.CreatedUtc));
301301
_logger.LogTraceRequest(existsResponse);
@@ -312,7 +312,7 @@ public async Task MaintainDailyIndexesAsync() {
312312
[Fact]
313313
public async Task MaintainMonthlyIndexesAsync() {
314314
using (TestSystemClock.Install()) {
315-
SystemClock.Test.SetFixedTime(new DateTime(2016, 8, 31, 0, 0, 0, DateTimeKind.Utc));
315+
TestSystemClock.SetFrozenTime(new DateTime(2016, 8, 31, 0, 0, 0, DateTimeKind.Utc));
316316
var index = new MonthlyEmployeeIndex(_configuration, 1) {
317317
MaxIndexAge = SystemClock.UtcNow.EndOfMonth() - SystemClock.UtcNow.SubtractMonths(4).StartOfMonth()
318318
};
@@ -375,7 +375,7 @@ public async Task MaintainMonthlyIndexesAsync() {
375375
[Fact]
376376
public async Task MaintainOnlyOldIndexesAsync() {
377377
using (TestSystemClock.Install()) {
378-
SystemClock.Test.SetFixedTime(SystemClock.UtcNow.EndOfYear());
378+
TestSystemClock.SetFrozenTime(SystemClock.UtcNow.EndOfYear());
379379

380380
var index = new MonthlyEmployeeIndex(_configuration, 1) {
381381
MaxIndexAge = SystemClock.UtcNow.EndOfMonth() - SystemClock.UtcNow.SubtractMonths(12).StartOfMonth()
@@ -400,7 +400,7 @@ public async Task MaintainOnlyOldIndexesAsync() {
400400
[Fact]
401401
public async Task MaintainOnlyOldIndexesWithNoExistingAliasesAsync() {
402402
using (TestSystemClock.Install()) {
403-
SystemClock.Test.SetFixedTime(SystemClock.UtcNow.EndOfYear());
403+
TestSystemClock.SetFrozenTime(SystemClock.UtcNow.EndOfYear());
404404

405405
var index = new MonthlyEmployeeIndex(_configuration, 1) {
406406
MaxIndexAge = SystemClock.UtcNow.EndOfMonth() - SystemClock.UtcNow.SubtractMonths(12).StartOfMonth()
@@ -426,7 +426,7 @@ public async Task MaintainOnlyOldIndexesWithNoExistingAliasesAsync() {
426426
[Fact]
427427
public async Task MaintainOnlyOldIndexesWithPartialAliasesAsync() {
428428
using (TestSystemClock.Install()) {
429-
SystemClock.Test.SetFixedTime(SystemClock.UtcNow.EndOfYear());
429+
TestSystemClock.SetFrozenTime(SystemClock.UtcNow.EndOfYear());
430430

431431
var index = new MonthlyEmployeeIndex(_configuration, 1) {
432432
MaxIndexAge = SystemClock.UtcNow.EndOfMonth() - SystemClock.UtcNow.SubtractMonths(12).StartOfMonth()
@@ -454,7 +454,7 @@ public async Task MaintainOnlyOldIndexesWithPartialAliasesAsync() {
454454
[MemberData(nameof(AliasesDatesToCheck))]
455455
public async Task DailyAliasMaxAgeAsync(DateTime utcNow) {
456456
using (TestSystemClock.Install()) {
457-
SystemClock.Test.SetFixedTime(utcNow);
457+
TestSystemClock.SetFrozenTime(utcNow);
458458
var index = new DailyEmployeeIndex(_configuration, 1) {
459459
MaxIndexAge = TimeSpan.FromDays(45)
460460
};
@@ -520,7 +520,7 @@ public async Task DailyAliasMaxAgeAsync(DateTime utcNow) {
520520
[MemberData(nameof(AliasesDatesToCheck))]
521521
public async Task MonthlyAliasMaxAgeAsync(DateTime utcNow) {
522522
using (TestSystemClock.Install()) {
523-
SystemClock.Test.SetFixedTime(utcNow);
523+
TestSystemClock.SetFrozenTime(utcNow);
524524

525525
var index = new MonthlyEmployeeIndex(_configuration, 1) {
526526
MaxIndexAge = TimeSpan.FromDays(90)
@@ -586,7 +586,7 @@ public async Task MonthlyAliasMaxAgeAsync(DateTime utcNow) {
586586
[MemberData(nameof(AliasesDatesToCheck))]
587587
public async Task DailyIndexMaxAgeAsync(DateTime utcNow) {
588588
using (TestSystemClock.Install()) {
589-
SystemClock.Test.SetFixedTime(utcNow);
589+
TestSystemClock.SetFrozenTime(utcNow);
590590

591591
var index = new DailyEmployeeIndex(_configuration, 1) {
592592
MaxIndexAge = TimeSpan.FromDays(1)
@@ -621,7 +621,7 @@ public async Task DailyIndexMaxAgeAsync(DateTime utcNow) {
621621
[MemberData(nameof(AliasesDatesToCheck))]
622622
public async Task MonthlyIndexMaxAgeAsync(DateTime utcNow) {
623623
using (TestSystemClock.Install()) {
624-
SystemClock.Test.SetFixedTime(utcNow);
624+
TestSystemClock.SetFrozenTime(utcNow);
625625

626626
var index = new MonthlyEmployeeIndex(_configuration, 1) {
627627
MaxIndexAge = SystemClock.UtcNow.EndOfMonth() - SystemClock.UtcNow.StartOfMonth()

‎tests/Foundatio.Repositories.Elasticsearch.Tests/RepositoryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public async Task SaveCollectionWithCachingAsync() {
492492
[Fact]
493493
public async Task SetCreatedAndModifiedTimesAsync() {
494494
using (TestSystemClock.Install()) {
495-
SystemClock.Test.SubtractTime(TimeSpan.FromMilliseconds(100));
495+
TestSystemClock.SubtractTime(TimeSpan.FromMilliseconds(100));
496496
var nowUtc = SystemClock.UtcNow;
497497
var employee = await _employeeRepository.AddAsync(EmployeeGenerator.Default);
498498
Assert.True(employee.CreatedUtc >= nowUtc);
@@ -502,7 +502,7 @@ public async Task SetCreatedAndModifiedTimesAsync() {
502502
var updatedUtc = employee.UpdatedUtc;
503503

504504
employee.Name = Guid.NewGuid().ToString();
505-
SystemClock.Test.AddTime(TimeSpan.FromMilliseconds(100));
505+
TestSystemClock.AddTime(TimeSpan.FromMilliseconds(100));
506506
employee = await _employeeRepository.SaveAsync(employee);
507507
Assert.Equal(createdUtc, employee.CreatedUtc);
508508
Assert.True(updatedUtc < employee.UpdatedUtc, $"Previous UpdatedUtc: {updatedUtc} Current UpdatedUtc: {employee.UpdatedUtc}");

0 commit comments

Comments
 (0)