Skip to content

Commit e973236

Browse files
SteveSandersonMSSteveSandersonMS
authored
Components E2E test cleanup (dotnet#39349)
1 parent 57f283c commit e973236

Some content is hidden

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

61 files changed

+10
-3486
lines changed

Diff for: ‎AspNetCore.sln

-8
Original file line numberDiff line numberDiff line change
@@ -477,12 +477,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{5FE1
477477
EndProject
478478
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerApp", "src\Components\Samples\BlazorServerApp\BlazorServerApp.csproj", "{8DE6625B-C9E4-4949-A75C-89E3FF556724}"
479479
EndProject
480-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ignitor", "Ignitor", "{9E6FF2AC-6424-49A5-8189-623FFB2A9B4C}"
481-
EndProject
482-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "src\Components\Ignitor\src\Ignitor.csproj", "{BE5D6903-34B9-4C29-85A2-811A7EA06DAF}"
483-
EndProject
484-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "src\Components\Ignitor\test\Ignitor.Test.csproj", "{F3F89B56-66A9-4EBC-8658-80785827237E}"
485-
EndProject
486480
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarkapps", "{0CE1CC26-98CE-4022-A81C-E32AAFC9B819}"
487481
EndProject
488482
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wasm.Performance", "Wasm.Performance", "{6276A9A0-791B-49C1-AD8F-50AC47CDC196}"
@@ -1448,8 +1442,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "src\SiteE
14481442
EndProject
14491443
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomBasePathApp", "src\Components\WebAssembly\testassets\CustomBasePathApp\CustomBasePathApp.csproj", "{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}"
14501444
EndProject
1451-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgnitorSample", "src\Components\Samples\IgnitorSample\IgnitorSample.csproj", "{CAFD1885-B87B-4A7A-8BE6-86B0C238C2B1}"
1452-
EndProject
14531445
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests.Utils", "src\SignalR\common\testassets\Tests.Utils\Microsoft.AspNetCore.SignalR.Tests.Utils.csproj", "{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}"
14541446
EndProject
14551447
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1}"

Diff for: ‎eng/ProjectReferences.props

-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Authorization" ProjectPath="$(RepoRoot)src\Components\Authorization\src\Microsoft.AspNetCore.Components.Authorization.csproj" />
139139
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" />
140140
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Forms" ProjectPath="$(RepoRoot)src\Components\Forms\src\Microsoft.AspNetCore.Components.Forms.csproj" />
141-
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
142141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Server" ProjectPath="$(RepoRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" />
143142
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />
144143
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />

Diff for: ‎eng/targets/ResolveReferences.targets

+1-2
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,14 @@
267267
Remove compile-time assets for packages that overlap Microsoft.Internal.Runtime.AspNetCore.Transport. Serviced packages
268268
may otherwise increase the referenced version. Avoid this because change reduces compatible runtime versions.
269269
That's not a big deal within the shared framework but can cause problems for shipped packages. Leave test
270-
projects and Ignitor alone because they may transitively reference newer netstandard assemblies and need a
270+
projects alone because they may transitively reference newer netstandard assemblies and need a
271271
net5.0 assembly with the same version. (This can happen in implementation projects but is less likely.)
272272
-->
273273
<Target Name="RemoveExtensionsCompileAssets"
274274
AfterTargets="ResolvePackageAssets"
275275
Condition=" '$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)' != '' AND
276276
'$(IsServicingBuild)' == 'true' AND
277277
'$(IsImplementationProject)' == 'true' AND
278-
'$(MSBuildProjectName)' != 'Ignitor' AND
279278
'$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Runtime' AND
280279
($(_CompileTfmUsingReferenceAssemblies) OR
281280
('$(IsTargetingPackBuilding)' != 'false' AND '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref')) ">

Diff for: ‎src/Components/.vscode/launch.json

-17
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,6 @@
2424
"ASPNETCORE_ENVIRONMENT": "Development"
2525
},
2626
},
27-
{
28-
"name": "IgnitorSample",
29-
"type": "coreclr",
30-
"preLaunchTask": "IgnitorSample-build",
31-
"request": "launch",
32-
"program": "${workspaceFolder}/../../artifacts/bin/IgnitorSample/Debug/${env:TARGET}/IgnitorSample.dll",
33-
"args": [],
34-
"cwd": "${workspaceFolder}",
35-
"stopAtEntry": false,
36-
"serverReadyAction": {
37-
"action": "openExternally",
38-
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
39-
},
40-
"env": {
41-
"ASPNETCORE_ENVIRONMENT": "Development"
42-
},
43-
},
4427
{
4528
"name": "BasicTestApp",
4629
"type": "coreclr",

Diff for: ‎src/Components/.vscode/tasks.json

-14
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,6 @@
1515
"isDefault": true
1616
}
1717
},
18-
{
19-
"label": "IgnitorSample-build",
20-
"command": "dotnet",
21-
"type": "process",
22-
"args": [
23-
"build",
24-
"${workspaceFolder}/Samples/IgnitorSample/IgnitorSample.csproj"
25-
],
26-
"problemMatcher": "$msCompile",
27-
"group": {
28-
"kind": "build",
29-
"isDefault": true
30-
}
31-
},
3218
{
3319
"label": "BasicTestApp-build",
3420
"command": "dotnet",

Diff for: ‎src/Components/Components.slnf

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
"src\\Components\\Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj",
1414
"src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
1515
"src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
16-
"src\\Components\\Ignitor\\src\\Ignitor.csproj",
17-
"src\\Components\\Ignitor\\test\\Ignitor.Test.csproj",
1816
"src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
1917
"src\\Components\\Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
2018
"src\\Components\\Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",

Diff for: ‎src/Components/Components/src/RenderTree/ArrayBuilderExtensions.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
5-
#if IGNITOR
6-
namespace Ignitor;
7-
#else
84
namespace Microsoft.AspNetCore.Components.RenderTree;
9-
#endif
105

116
internal static class ArrayBuilderExtensions
127
{

Diff for: ‎src/Components/Components/src/RenderTree/ArrayBuilderSegment.cs

-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55

66
using System.Collections;
77

8-
#if IGNITOR
9-
namespace Ignitor;
10-
#else
118
namespace Microsoft.AspNetCore.Components.RenderTree;
12-
#endif
139

1410
/// <summary>
1511
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/ArrayRange.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#if IGNITOR
5-
namespace Ignitor;
6-
#else
74
namespace Microsoft.AspNetCore.Components.RenderTree;
8-
#endif
95

106
/// <summary>
117
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/EventFieldInfo.cs

-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree;
1111
// Information supplied with an event notification that can be used to update an existing
1212
// render tree to match the latest UI state when a form field has mutated. To determine
1313
// which field has been mutated, the renderer matches it based on the event handler ID.
14-
#if IGNITOR
15-
internal class EventFieldInfo
16-
#else
1714
public class EventFieldInfo
18-
#endif
1915
{
2016
/// <summary>
2117
/// Identifies the component whose render tree contains the affected form field.

Diff for: ‎src/Components/Components/src/RenderTree/RenderBatch.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#if IGNITOR
5-
namespace Ignitor;
6-
#else
74
namespace Microsoft.AspNetCore.Components.RenderTree;
8-
#endif
95

106
/// <summary>
117
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/RenderTreeDiff.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#if IGNITOR
5-
namespace Ignitor;
6-
#else
74
namespace Microsoft.AspNetCore.Components.RenderTree;
8-
#endif
95

106
/// <summary>
117
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/RenderTreeEdit.cs

-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33

44
using System.Runtime.InteropServices;
55

6-
#if IGNITOR
7-
namespace Ignitor;
8-
#else
96
namespace Microsoft.AspNetCore.Components.RenderTree;
10-
#endif
117

128
/// <summary>
139
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/RenderTreeEditType.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#if IGNITOR
5-
namespace Ignitor;
6-
#else
74
namespace Microsoft.AspNetCore.Components.RenderTree;
8-
#endif
95

106
/// <summary>
117
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/Components/src/RenderTree/RenderTreeFrame.cs

-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@
55

66
using System.Diagnostics.CodeAnalysis;
77
using System.Runtime.InteropServices;
8-
#if !IGNITOR
98
using Microsoft.AspNetCore.Components.Rendering;
10-
#endif
119
using Microsoft.AspNetCore.Internal;
1210

13-
#if IGNITOR
14-
namespace Ignitor;
15-
#else
1611
namespace Microsoft.AspNetCore.Components.RenderTree;
17-
#endif
1812

1913
/// <summary>
2014
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
@@ -145,9 +139,7 @@ public struct RenderTreeFrame
145139
[FieldOffset(8)] internal int ComponentSubtreeLengthField;
146140
[FieldOffset(12)] internal int ComponentIdField;
147141
[FieldOffset(16)]
148-
#if !IGNITOR
149142
[DynamicallyAccessedMembers(Internal.LinkerFlags.Component)]
150-
#endif
151143
internal Type ComponentTypeField;
152144
[FieldOffset(24)] internal ComponentState ComponentStateField;
153145
[FieldOffset(32)] internal object ComponentKeyField;

Diff for: ‎src/Components/Components/src/RenderTree/RenderTreeFrameType.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#if IGNITOR
5-
namespace Ignitor;
6-
#else
74
namespace Microsoft.AspNetCore.Components.RenderTree;
8-
#endif
95

106
/// <summary>
117
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

Diff for: ‎src/Components/ComponentsNoDeps.slnf

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
"src\\Components\\Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj",
1212
"src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
1313
"src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
14-
"src\\Components\\Ignitor\\src\\Ignitor.csproj",
15-
"src\\Components\\Ignitor\\test\\Ignitor.Test.csproj",
1614
"src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
17-
"src\\Components\\Samples\\IgnitorSample\\IgnitorSample.csproj",
1815
"src\\Components\\Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
1916
"src\\Components\\Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",
2017
"src\\Components\\WebAssembly\\Authentication.Msal\\src\\Microsoft.Authentication.WebAssembly.Msal.csproj",

0 commit comments

Comments
 (0)