From c5360b7ffe75db082bcf24cb35855b8f0ebf1a5b Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 7 Apr 2021 15:51:15 -0700
Subject: [PATCH] [release/2.1] Update branding to 2.1.28 (#3855)
* Update branding to 2.1.28
* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
- align with xunit package version
* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
- default locale on newer agents is unloved `C.UTF-8`
* !flaky fix! Double compaction timeouts
---
eng/Dependencies.props | 36 ++++++++++++------------
eng/PatchConfig.props | 2 +-
eng/templates/default-build.yml | 5 +++-
src/Caching/Memory/test/CapacityTests.cs | 10 +++----
version.props | 4 +--
5 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index a57318b8f9e..033dcb8b528 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -6,7 +6,7 @@
2.1.7-build-20200221.1
- 2.1.23
+ 2.1.26
2.0.3
4.5.3
4.5.1
@@ -17,7 +17,7 @@
4.5.3
4.5.2
4.5.0
- 4.5.0
+ 4.5.1
4.5.4
4.5.0
@@ -41,34 +41,34 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 613cba5ec20..fc4e7bc02ba 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -22,7 +22,7 @@
Microsoft.Extensions.Configuration.AzureKeyVault;
-
+
diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml
index e74e3749fd6..84563d35fcf 100644
--- a/eng/templates/default-build.yml
+++ b/eng/templates/default-build.yml
@@ -47,7 +47,7 @@ jobs:
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'macOS')) }}:
vmImage: macOS-10.14
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-18.04
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
vmImage: vs2017-win2016
${{ if ne(variables['System.TeamProject'], 'public') }}:
@@ -60,6 +60,9 @@ jobs:
DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
BuildScriptArgs: ${{ parameters.buildArgs }}
BuildConfiguration: ${{ parameters.configuration }}
+ LC_ALL: 'en_US.UTF-8'
+ LANG: 'en_US.UTF-8'
+ LANGUAGE: 'en_US.UTF-8'
VSTS_OVERWRITE_TEMP: false # Workaround for https://github.com/dotnet/core-eng/issues/2812
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
_SignType:
diff --git a/src/Caching/Memory/test/CapacityTests.cs b/src/Caching/Memory/test/CapacityTests.cs
index bccf795b655..f4c7419ee33 100644
--- a/src/Caching/Memory/test/CapacityTests.cs
+++ b/src/Caching/Memory/test/CapacityTests.cs
@@ -137,7 +137,7 @@ public async Task DoNotAddIfSizeOverflows()
Assert.Null(cache.Get("key1"));
// Wait for compaction to complete
- Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
+ Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));
// Compaction removes old item
Assert.Null(cache.Get("key"));
@@ -172,7 +172,7 @@ public async Task ExceedsCapacityCompacts()
cache.Set("key2", "value2", new MemoryCacheEntryOptions { Size = 5 });
// Wait for compaction to complete
- Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
+ Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));
Assert.Null(cache.Get("key"));
Assert.Null(cache.Get("key2"));
@@ -264,7 +264,7 @@ public async Task AddingReplacementWhenTotalSizeExceedsCapacityDoesNotUpdateRemo
cache.Set("key", "value1", new MemoryCacheEntryOptions { Size = 5 });
// Wait for compaction to complete
- Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
+ Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));
Assert.Null(cache.Get("key"));
Assert.Equal(0, cache.Size);
@@ -336,7 +336,7 @@ public async Task ExpiringEntryDecreasesCacheSize()
Assert.Null(cache.Get("key"));
// Wait for compaction to complete
- Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
+ Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));
Assert.Equal(0, cache.Size);
}
@@ -408,4 +408,4 @@ public void NoCompactionWhenNoMaximumEntriesCountSpecified()
Assert.Equal(6, cache.Count);
}
}
-}
\ No newline at end of file
+}
diff --git a/version.props b/version.props
index f1578ee0b51..4660ae9b91a 100644
--- a/version.props
+++ b/version.props
@@ -2,8 +2,8 @@
2
1
- 27
- true
+ 28
+ false
servicing