Skip to content

Commit ec039b3

Browse files
martincostellomartincostello
committed
Merge branch 'main' into gh-60628 
2 parents 5019aad + bf73e6e commit ec039b3

File tree

206 files changed

+598
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+598
-308
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ parameters:
4747
variables:
4848
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
4949
value: true
50+
- name: GRADLE_USER_HOME
51+
value: $(Build.SourcesDirectory)/.gradle
5052
- name: _TeamName
5153
value: AspNetCore
5254
- name: _PublishUsingPipelines

‎.azure/pipelines/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ parameters:
3131
variables:
3232
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
3333
value: true
34+
- name: GRADLE_USER_HOME
35+
value: $(Build.SourcesDirectory)/.gradle
3436
- name: _TeamName
3537
value: AspNetCore
3638
- name: _PublishUsingPipelines

‎.azure/pipelines/template-tests-pr.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ pr:
1717
paths:
1818
include:
1919
- src/ProjectTemplates/*
20+
- src/Components/*
21+
- src/Mvc/*
2022

2123
variables:
2224
- name: _UseHelixOpenQueues
@@ -45,6 +47,8 @@ jobs:
4547
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
4648
/p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
4749
displayName: Run build.cmd helix target
50+
env:
51+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
4852
artifacts:
4953
- name: Helix_logs
5054
path: artifacts/log/

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ artifacts/
33
bin/
44
obj/
55
.dotnet/
6+
.gradle/
67
.nuget/
78
.packages/
89
.tools/

‎eng/Version.Details.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,5 +440,22 @@
440440
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
441441
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
442442
</Dependency>
443+
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
444+
<Dependency Name="Microsoft.Build" Version="17.12.36">
445+
<Uri>https://github.com/dotnet/msbuild</Uri>
446+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
447+
</Dependency>
448+
<Dependency Name="Microsoft.Build.Framework" Version="17.12.36">
449+
<Uri>https://github.com/dotnet/msbuild</Uri>
450+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
451+
</Dependency>
452+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.12.36">
453+
<Uri>https://github.com/dotnet/msbuild</Uri>
454+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
455+
</Dependency>
456+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.12.36">
457+
<Uri>https://github.com/dotnet/msbuild</Uri>
458+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
459+
</Dependency>
443460
</ToolsetDependencies>
444461
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@
155155
<MicrosoftEntityFrameworkCoreToolsVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreToolsVersion>
156156
<MicrosoftEntityFrameworkCoreVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreVersion>
157157
<MicrosoftEntityFrameworkCoreDesignVersion>10.0.0-preview.7.25351.105</MicrosoftEntityFrameworkCoreDesignVersion>
158+
<!-- Packages from dotnet/msbuild -->
159+
<MicrosoftBuildVersion>17.12.36</MicrosoftBuildVersion>
160+
<MicrosoftBuildFrameworkVersion>17.12.36</MicrosoftBuildFrameworkVersion>
161+
<MicrosoftBuildTasksCoreVersion>17.12.36</MicrosoftBuildTasksCoreVersion>
162+
<MicrosoftBuildUtilitiesCoreVersion>17.12.36</MicrosoftBuildUtilitiesCoreVersion>
158163
<!-- Packages from dotnet/sdk -->
159164
<MicrosoftDotNetHotReloadAgentVersion>10.0.100-preview.7.25351.105</MicrosoftDotNetHotReloadAgentVersion>
160165
<MicrosoftDotNetHotReloadAgentDataVersion>10.0.100-preview.7.25351.105</MicrosoftDotNetHotReloadAgentDataVersion>
@@ -224,10 +229,6 @@
224229
<!-- Partner teams -->
225230
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
226231
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
227-
<MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
228-
<MicrosoftBuildFrameworkVersion>17.8.29</MicrosoftBuildFrameworkVersion>
229-
<MicrosoftBuildTasksCoreVersion>17.8.29</MicrosoftBuildTasksCoreVersion>
230-
<MicrosoftBuildUtilitiesCoreVersion>17.8.29</MicrosoftBuildUtilitiesCoreVersion>
231232
<!--
232233
Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
233234
framework in current .NET SDKs.

‎src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ internal sealed class UnsupportedJavaScriptRuntime : IJSRuntime
1717
ValueTask<TValue> IJSRuntime.InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, object?[]? args)
1818
=> throw new InvalidOperationException(Message);
1919

20-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, object?[]? args)
20+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
2121
=> throw new InvalidOperationException(Message);
2222

23-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
23+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
2424
=> throw new InvalidOperationException(Message);
2525

2626
public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)

‎src/Components/Server/test/ProtectedBrowserStorageTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,15 +365,15 @@ public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToke
365365
public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args)
366366
=> InvokeAsync<TValue>(identifier, cancellationToken: CancellationToken.None, args: args);
367367

368-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, object[] args)
368+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
369369
{
370-
Invocations.Add((identifier, args, JSCallType.NewCall));
370+
Invocations.Add((identifier, args, JSCallType.ConstructorCall));
371371
return (ValueTask<IJSObjectReference>)NextInvocationResult;
372372
}
373373

374-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, CancellationToken cancellationToken, object[] args)
374+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
375375
{
376-
Invocations.Add((identifier, args, JSCallType.NewCall));
376+
Invocations.Add((identifier, args, JSCallType.ConstructorCall));
377377
return (ValueTask<IJSObjectReference>)NextInvocationResult;
378378
}
379379

‎src/Components/Web.JS/src/Services/NavigationEnhancement.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ function enhancedNavigationIsEnabledForForm(form: HTMLFormElement): boolean {
455455
function retryEnhancedNavAsFullPageLoad(internalDestinationHref: string) {
456456
// The ? trick here is the same workaround as described in #10839, and without it, the user
457457
// would not be able to use the back button afterwards.
458+
console.warn(`Enhanced navigation failed for destination ${internalDestinationHref}. Falling back to full page load.`);
458459
history.replaceState(null, '', internalDestinationHref + '?');
459460
location.replace(internalDestinationHref);
460461
}

‎src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticationServiceTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,10 @@ public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
549549
public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
550550
=> throw new NotImplementedException();
551551

552-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, object[] args)
552+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
553553
=> throw new NotImplementedException();
554554

555-
public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, CancellationToken cancellationToken, object[] args)
555+
public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
556556
=> throw new NotImplementedException();
557557

558558
public ValueTask SetValueAsync<TValue>(string identifier, TValue value)

0 commit comments

Comments
 (0)