[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
dotnet · Apr 7, 2021 · c5360b7 · c5360b7
1 parent e4f8396
commit c5360b7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
@@ -6,7 +6,7 @@
   <!-- These package versions may be overridden or updated by automation. -->
   <PropertyGroup Label="Package Versions: Auto">
     <InternalAspNetCoreSdkPackageVersion>2.1.7-build-20200221.1</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>2.1.23</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.26</MicrosoftNETCoreAppPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <SystemDataSqlClientPackageVersion>4.5.3</SystemDataSqlClientPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
@@ -17,7 +17,7 @@
     <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.3</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>4.5.2</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>4.5.1</SystemTextEncodingsWebPackageVersion>
     <SystemThreadingTasksExtensionsPackageVersion>4.5.4</SystemThreadingTasksExtensionsPackageVersion>
     <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
   </PropertyGroup>
@@ -41,34 +41,34 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' " Label="MSBuild">
-    <LatestPackageReference Include="Microsoft.Build" Version="15.6.82" />
-    <LatestPackageReference Include="Microsoft.Build.Framework" Version="15.6.82" />
-    <LatestPackageReference Include="Microsoft.Build.Tasks.Core" Version="15.6.82" />
-    <LatestPackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.82" />
+    <LatestPackageReference Include="Microsoft.Build" Version="15.6.85" />
+    <LatestPackageReference Include="Microsoft.Build.Framework" Version="15.6.85" />
+    <LatestPackageReference Include="Microsoft.Build.Tasks.Core" Version="15.6.85" />
+    <LatestPackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" />
   </ItemGroup>
 
   <ItemGroup Label="External dependencies">
-    <LatestPackageReference Include="BenchmarkDotNet" Version="0.10.13" />
+    <LatestPackageReference Include="BenchmarkDotNet" Version="0.10.14" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="2.1.0" />
-    <LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
+    <LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
     <LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="2.3.2" />
-    <LatestPackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.1" />
-    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.0" />
+    <LatestPackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
+    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
     <LatestPackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <LatestPackageReference Include="Moq" Version="4.10.0" />
+    <LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
+    <LatestPackageReference Include="Moq" Version="4.10.1" />
     <LatestPackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <LatestPackageReference Include="Polly.Extensions.Http" Version="2.0.1" />
     <LatestPackageReference Include="Polly" Version="6.0.1" />
     <LatestPackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
     <LatestPackageReference Include="Serilog.Sinks.File" Version="3.2.0" />
-    <LatestPackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" />
-    <LatestPackageReference Include="xunit.abstractions" Version="2.0.1" />
+    <LatestPackageReference Include="StackExchange.Redis.StrongName" Version="1.2.8" />
+    <LatestPackageReference Include="xunit.abstractions" Version="2.0.3" />
     <LatestPackageReference Include="xunit.analyzers" Version="0.10.0" />
-    <LatestPackageReference Include="xunit.assert" Version="2.3.1" />
-    <LatestPackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
-    <LatestPackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <LatestPackageReference Include="xunit" Version="2.4.0" />
+    <LatestPackageReference Include="xunit.assert" Version="2.4.1" />
+    <LatestPackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
+    <LatestPackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <LatestPackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -22,7 +22,7 @@
       Microsoft.Extensions.Configuration.AzureKeyVault;
     </PackagesInPatch>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.27' ">
+  <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.28' ">
     <PackagesInPatch>
     </PackagesInPatch>
   </PropertyGroup>

diff --git 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
@@ -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);
         }
     }
-}
+}
diff --git a/version.props b/version.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <MajorVersion>2</MajorVersion>
     <MinorVersion>1</MinorVersion>
-    <PatchVersion>27</PatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <PatchVersion>28</PatchVersion>
+    <ValidateBaseline>false</ValidateBaseline>
 
     <PreReleaseLabel>servicing</PreReleaseLabel>
     <PreReleaseBrandingLabel></PreReleaseBrandingLabel>