Skip to content

Commit ea08bf0

Browse files
author
Mirroring
committed
Merge commit '89cfafc32ed9c221d21397a9ecb1be2cf1975606'
2 parents 61794b7 + 89cfafc commit ea08bf0

File tree

10 files changed

+355
-344
lines changed

10 files changed

+355
-344
lines changed

‎eng/Baseline.Designer.props‎

Lines changed: 213 additions & 213 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml‎

Lines changed: 106 additions & 106 deletions
Large diffs are not rendered by default.

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,12 @@
4242

4343
<!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
4444
<UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
45+
46+
<!-- Used only for RepoTasks -->
47+
<UsagePattern IdentityGlob="Microsoft.Build.Framework/17.8.29" />
48+
<UsagePattern IdentityGlob="Microsoft.Build.Tasks.Core/17.8.29" />
49+
<UsagePattern IdentityGlob="Microsoft.Build.Utilities.Core/17.8.29" />
50+
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.8.29" />
51+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
4552
</IgnorePatterns>
4653
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25316.2">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25428.6">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>3827e68e002064268d4be4b2d1d96048f9794808</Sha>
343+
<Sha>0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->

‎eng/Versions.props‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AspNetCorePatchVersion>21</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>
1313
</PreReleaseVersionIteration>
14-
<ValidateBaseline>false</ValidateBaseline>
14+
<ValidateBaseline>true</ValidateBaseline>
1515
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">7.1.2</IdentityModelVersion>
1616
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">7.*</IdentityModelVersion>
1717
<!--
@@ -168,7 +168,7 @@
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25202.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->
171-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25316.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
171+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25428.6</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
172172
<!-- Packages from dotnet/symreader -->
173173
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
174174
<!-- Packages from dotnet/runtime -->
@@ -198,8 +198,6 @@
198198
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
199199
<!-- Build tool dependencies -->
200200
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
201-
<!-- Manually updated version from 6.0.0 to address CVE-2021-43877 -->
202-
<RepoTasksSystemSecurityCryptographyXmlVersion>6.0.1</RepoTasksSystemSecurityCryptographyXmlVersion>
203201
<AnalyzersSystemTextJsonVersion>$(SystemTextJsonVersion)</AnalyzersSystemTextJsonVersion>
204202
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
205203
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
@@ -223,13 +221,12 @@
223221
<MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
224222
<!-- Partner teams -->
225223
<MicrosoftBCLHashCodeVersion>1.1.1</MicrosoftBCLHashCodeVersion>
226-
<MicrosoftBuildVersion>17.4.0</MicrosoftBuildVersion>
224+
<MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
227225
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
228-
<MicrosoftBuildFrameworkVersion>17.4.0</MicrosoftBuildFrameworkVersion>
229-
<MicrosoftBuildTasksCoreVersion>17.4.0</MicrosoftBuildTasksCoreVersion>
230-
<MicrosoftBuildUtilitiesCoreVersion>17.4.0</MicrosoftBuildUtilitiesCoreVersion>
226+
<MicrosoftBuildFrameworkVersion>17.8.29</MicrosoftBuildFrameworkVersion>
227+
<MicrosoftBuildTasksCoreVersion>17.8.29</MicrosoftBuildTasksCoreVersion>
228+
<MicrosoftBuildUtilitiesCoreVersion>17.8.29</MicrosoftBuildUtilitiesCoreVersion>
231229
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
232-
<MicrosoftBuildUtilitiesCoreVersion>17.4.0</MicrosoftBuildUtilitiesCoreVersion>
233230
<!--
234231
Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
235232
framework in current .NET SDKs.

‎eng/tools/RepoTasks/RepoTasks.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
3030
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
3131
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
32-
<!-- Manually updated version from 6.0.0 to address CVE-2021-43877 -->
33-
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(RepoTasksSystemSecurityCryptographyXmlVersion)" />
3432
</ItemGroup>
3533

3634
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.119"
3+
"version": "8.0.120"
44
},
55
"tools": {
6-
"dotnet": "8.0.119",
6+
"dotnet": "8.0.120",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

‎src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,21 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWeb
526526

527527
Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("LocationChanged/LocationChanging event (server-and-wasm)")).Click();
528528
Browser.Equal("Page with location changed components", () => Browser.Exists(By.TagName("h1")).Text);
529-
Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-server")).Text);
530-
Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-wasm")).Text);
529+
Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith(
530+
"/nav/location-changed/server-and-wasm",
531+
StringComparison.Ordinal));
532+
Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith(
533+
"/nav/location-changed/server-and-wasm",
534+
StringComparison.Ordinal));
531535

532536
Browser.Exists(By.Id($"update-query-string-{runtimeThatInvokedNavigation}")).Click();
533537

534-
Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-server")).Text);
535-
Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-wasm")).Text);
538+
Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith(
539+
"/nav/location-changed/server-and-wasm?query=1",
540+
StringComparison.Ordinal));
541+
Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith(
542+
"/nav/location-changed/server-and-wasm?query=1",
543+
StringComparison.Ordinal));
536544
}
537545

538546
[Theory]

‎src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,19 +1344,19 @@ public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
13441344
{
13451345
GoTo("forms/form-with-checkbox-and-radio-button");
13461346

1347-
Assert.False(Browser.Exists(By.Id("checkbox")).Selected);
1348-
Assert.False(Browser.Exists(By.Id("radio-button")).Selected);
1347+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected);
1348+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected);
13491349

13501350
Browser.Exists(By.Id("checkbox")).Click();
13511351
Browser.Exists(By.Id("radio-button")).Click();
13521352

1353-
Assert.True(Browser.Exists(By.Id("checkbox")).Selected);
1354-
Assert.True(Browser.Exists(By.Id("radio-button")).Selected);
1353+
WaitAssert.True(Browser, () => Browser.Exists(By.Id("checkbox")).Selected);
1354+
WaitAssert.True(Browser, () => Browser.Exists(By.Id("radio-button")).Selected);
13551355

13561356
Browser.Exists(By.Id("submit-button")).Click();
13571357

1358-
Assert.False(Browser.Exists(By.Id("checkbox")).Selected);
1359-
Assert.False(Browser.Exists(By.Id("radio-button")).Selected);
1358+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected);
1359+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected);
13601360
}
13611361

13621362
[Fact]

‎src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatter
184184
[ConditionalTheory]
185185
[SkipIfDockerNotPresent]
186186
[MemberData(nameof(TransportTypesAndProtocolTypes))]
187+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/63582")]
187188
public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName)
188189
{
189190
using (StartVerifiableLog())

0 commit comments

Comments
 (0)