Skip to content

Commit 7cdb217

Browse files
[main] Source code updates from dotnet/aspnetcore (#8228)
[main] Source code updates from dotnet/aspnetcore - Resolve conflicts - Fixup - Skip Components testing targets in product builds Co-authored-by: Copilot <[email protected]>
1 parent 2a60552 commit 7cdb217

103 files changed

Lines changed: 4218 additions & 836 deletions

File tree

Some content is hidden

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

‎src/aspnetcore/AspNetCore.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
</Folder>
114114
<Folder Name="/src/Components/Testing/">
115115
<Project Path="src/Components/Testing/gen/Microsoft.AspNetCore.Components.Testing.Generators.csproj" />
116+
<Project Path="src/Components/Testing/nativeaot/Microsoft.AspNetCore.Components.Testing.NativeAot.csproj" />
116117
<Project Path="src/Components/Testing/src/Microsoft.AspNetCore.Components.Testing.csproj" />
117118
<Project Path="src/Components/Testing/tasks/Microsoft.AspNetCore.Components.Testing.Tasks.csproj" />
118119
<Project Path="src/Components/Testing/test/Microsoft.AspNetCore.Components.Testing.Tests.csproj" />

‎src/aspnetcore/eng/Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"
3434
Exclude="$(RepoRoot)src\Components\WebAssembly\testassets\WasmLinkerTest\*.*proj;
3535
$(RepoRoot)src\Components\WebView\Samples\PhotinoPlatform\testassets\PhotinoTestApp\*.*proj;
36+
$(RepoRoot)src\Components\Testing\testassets\TestApp.E2E.Tests\TestApp.E2E.Tests.csproj;
3637
$(RepoRoot)src\Http\Routing\test\testassets\RoutingSandbox\*.*proj;
3738
$(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Client\*.*proj;
3839
$(RepoRoot)src\Security\Authentication\Negotiate\test\testassets\Negotiate.Server\*.*proj;

‎src/aspnetcore/eng/Dependencies.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ may be turned into `<PackageReference>` items in projects.
229229
<LatestPackageReference Include="NuGet.Versioning" />
230230
<LatestPackageReference Include="Photino.NET" />
231231
<LatestPackageReference Include="Microsoft.Playwright" />
232+
<LatestPackageReference Include="Microsoft.Playwright.TestAdapter" />
232233
<LatestPackageReference Include="Polly" />
233234
<LatestPackageReference Include="Polly.Extensions.Http" />
234235
<LatestPackageReference Include="SharpFuzz" />
@@ -247,10 +248,11 @@ may be turned into `<PackageReference>` items in projects.
247248
<LatestPackageReference Include="xunit.assert" />
248249
<LatestPackageReference Include="xunit.extensibility.core" />
249250
<LatestPackageReference Include="xunit.extensibility.execution" />
250-
<!-- Components.Testing (xUnit V3 + Playwright + YARP) -->
251251
<LatestPackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
252252
<LatestPackageReference Include="xunit.v3.extensibility.core" Version="$(XunitV3ExtensibilityCoreVersion)" />
253-
<LatestPackageReference Include="Microsoft.Playwright.Xunit.v3" Version="$(MicrosoftPlaywrightXunitV3Version)" />
253+
<!-- Components.Testing (MSTest on MTP + Playwright + YARP) -->
254+
<LatestPackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
255+
<LatestPackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingExtensionsTrxReportVersion)" />
254256
<LatestPackageReference Include="Yarp.ReverseProxy" Version="$(YarpReverseProxyVersion)" />
255257
<LatestPackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
256258
<LatestPackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" />

‎src/aspnetcore/eng/Version.Details.props‎

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

‎src/aspnetcore/eng/Version.Details.xml‎

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

‎src/aspnetcore/eng/Versions.props‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
<OpenTelemetryInstrumentationRuntimeVersion>1.15.1</OpenTelemetryInstrumentationRuntimeVersion>
186186
<PhotinoNETVersion>2.5.2</PhotinoNETVersion>
187187
<MicrosoftPlaywrightVersion>1.61.0</MicrosoftPlaywrightVersion>
188+
<MicrosoftPlaywrightTestAdapterVersion>$(MicrosoftPlaywrightVersion)</MicrosoftPlaywrightTestAdapterVersion>
188189
<PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
189190
<PollyVersion>7.2.4</PollyVersion>
190191
<SeleniumSupportVersion>4.45.0</SeleniumSupportVersion>
@@ -204,10 +205,13 @@
204205
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
205206
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
206207
<XUnitRunnerVisualStudioVersion>3.1.3</XUnitRunnerVisualStudioVersion>
207-
<!-- xUnit v3 packages (used by Components.Testing E2E infrastructure) -->
208+
<!-- xUnit v3 packages (used by Components.Testing library unit tests) -->
208209
<XunitV3Version>3.2.2</XunitV3Version>
209210
<XunitV3ExtensibilityCoreVersion>$(XunitV3Version)</XunitV3ExtensibilityCoreVersion>
210-
<MicrosoftPlaywrightXunitV3Version>1.58.0</MicrosoftPlaywrightXunitV3Version>
211+
<!-- MSTest + MTP packages (used by Components.Testing E2E infrastructure) -->
212+
<MSTestVersion>4.2.3</MSTestVersion>
213+
<MSTestTestFrameworkVersion>$(MSTestVersion)</MSTestTestFrameworkVersion>
214+
<MicrosoftTestingExtensionsTrxReportVersion>2.2.3</MicrosoftTestingExtensionsTrxReportVersion>
211215
<!-- Components.Testing dependencies -->
212216
<YarpReverseProxyVersion>2.3.0</YarpReverseProxyVersion>
213217
<MicrosoftDataSqlClientVersion>7.0.0</MicrosoftDataSqlClientVersion>

‎src/aspnetcore/eng/common/core-templates/stages/renovate.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ resources:
8181
extends:
8282
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
8383
parameters:
84+
settings:
85+
networkIsolationPolicy: Permissive
8486
pool: ${{ parameters.pool }}
8587
sdl:
8688
sourceAnalysisPool: ${{ parameters.sdlPool }}

‎src/aspnetcore/eng/tools/DependabotDiscovery/DependabotDiscovery.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,16 @@
5858
<PackageReference Include="Microsoft.OpenApi" Version="$(MicrosoftOpenApiVersion)" />
5959
<PackageReference Include="Microsoft.OpenApi.YamlReader" Version="$(MicrosoftOpenApiYamlReaderVersion)" />
6060
<PackageReference Include="Microsoft.Playwright" Version="$(MicrosoftPlaywrightVersion)" />
61-
<PackageReference Include="Microsoft.Playwright.Xunit.v3" Version="$(MicrosoftPlaywrightXunitV3Version)" />
61+
<PackageReference Include="Microsoft.Playwright.TestAdapter" Version="$(MicrosoftPlaywrightTestAdapterVersion)" />
62+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingExtensionsTrxReportVersion)" />
6263
<PackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationVersion)" />
6364
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
6465
<PackageReference Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32Version)" />
6566
<PackageReference Include="ModelContextProtocol" Version="$(ModelContextProtocolVersion)" />
6667
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
6768
<PackageReference Include="Mono.TextTemplating" Version="$(MonoTextTemplatingVersion)" />
6869
<PackageReference Include="Moq" Version="$(MoqVersion)" />
70+
<PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
6971
<PackageReference Include="NSwag.ApiDescription.Client" Version="$(NSwagApiDescriptionClientVersion)" />
7072
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
7173
<PackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonVersion)" />

‎src/aspnetcore/eng/tools/HelixTestRunner/TestRunner.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ public async Task<int> RunTestsAsync()
244244
}
245245

246246
var uploadRoot = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT") ?? Directory.GetCurrentDirectory();
247+
EnvironmentVariables["E2E_ARTIFACTS_DIR"] = Path.Combine(uploadRoot, "test-artifacts");
247248
var diagLog = Path.Combine(uploadRoot, "vstest.log");
248249

249250
// Pass all target assemblies to a single dotnet test invocation.

‎src/aspnetcore/global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"jdk": "latest"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26405.103",
26-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26405.103",
27-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26405.103",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26406.108",
26+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26406.108",
27+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26406.108",
2828
"Microsoft.Build.NoTargets": "3.7.0",
2929
"Microsoft.Build.Traversal": "3.4.0",
3030
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6"

0 commit comments

Comments
 (0)