Skip to content

Commit e039d49

Browse files
javiercnjaviercn
committed
Make test work on the CI
1 parent 165e34e commit e039d49

File tree

6 files changed

+70
-2
lines changed

6 files changed

+70
-2
lines changed

‎src/Components/Blazor.sln

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
9393
EndProject
9494
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests", "Blazor\WebAssembly.Authentication\test\Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj", "{E450CCAC-6E03-4306-9919-47AB0EE98657}"
9595
EndProject
96+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Server", "Blazor\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj", "{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}"
97+
EndProject
98+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Client", "Blazor\testassets\Wasm.Authentication.Client\Wasm.Authentication.Client.csproj", "{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}"
99+
EndProject
100+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Shared", "Blazor\testassets\Wasm.Authentication.Shared\Wasm.Authentication.Shared.csproj", "{A82A1C13-C452-423A-9287-A7E52F6A43E8}"
101+
EndProject
96102
Global
97103
GlobalSection(SolutionConfigurationPlatforms) = preSolution
98104
Debug|Any CPU = Debug|Any CPU
@@ -463,6 +469,42 @@ Global
463469
{E450CCAC-6E03-4306-9919-47AB0EE98657}.Release|x64.Build.0 = Release|Any CPU
464470
{E450CCAC-6E03-4306-9919-47AB0EE98657}.Release|x86.ActiveCfg = Release|Any CPU
465471
{E450CCAC-6E03-4306-9919-47AB0EE98657}.Release|x86.Build.0 = Release|Any CPU
472+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
473+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
474+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|x64.ActiveCfg = Debug|Any CPU
475+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|x64.Build.0 = Debug|Any CPU
476+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|x86.ActiveCfg = Debug|Any CPU
477+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Debug|x86.Build.0 = Debug|Any CPU
478+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
479+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|Any CPU.Build.0 = Release|Any CPU
480+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|x64.ActiveCfg = Release|Any CPU
481+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|x64.Build.0 = Release|Any CPU
482+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|x86.ActiveCfg = Release|Any CPU
483+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB}.Release|x86.Build.0 = Release|Any CPU
484+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
485+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
486+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|x64.ActiveCfg = Debug|Any CPU
487+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|x64.Build.0 = Debug|Any CPU
488+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|x86.ActiveCfg = Debug|Any CPU
489+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Debug|x86.Build.0 = Debug|Any CPU
490+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
491+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|Any CPU.Build.0 = Release|Any CPU
492+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|x64.ActiveCfg = Release|Any CPU
493+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|x64.Build.0 = Release|Any CPU
494+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|x86.ActiveCfg = Release|Any CPU
495+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8}.Release|x86.Build.0 = Release|Any CPU
496+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
497+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
498+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|x64.ActiveCfg = Debug|Any CPU
499+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|x64.Build.0 = Debug|Any CPU
500+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|x86.ActiveCfg = Debug|Any CPU
501+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Debug|x86.Build.0 = Debug|Any CPU
502+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
503+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|Any CPU.Build.0 = Release|Any CPU
504+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|x64.ActiveCfg = Release|Any CPU
505+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|x64.Build.0 = Release|Any CPU
506+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|x86.ActiveCfg = Release|Any CPU
507+
{A82A1C13-C452-423A-9287-A7E52F6A43E8}.Release|x86.Build.0 = Release|Any CPU
466508
EndGlobalSection
467509
GlobalSection(SolutionProperties) = preSolution
468510
HideSolutionNode = FALSE
@@ -510,6 +552,9 @@ Global
510552
{C4D74173-702B-428A-B689-1A9AF51CE356} = {B29FB58D-FAE5-405E-9695-BCF93582BE9A}
511553
{E5C5D4E9-2442-4C4C-94E7-1EDB8ADAD1FE} = {C4D74173-702B-428A-B689-1A9AF51CE356}
512554
{E450CCAC-6E03-4306-9919-47AB0EE98657} = {C4D74173-702B-428A-B689-1A9AF51CE356}
555+
{B88282F3-1DEF-4B06-8AD6-5A9EF6BAFEEB} = {CBD2BB24-3EC3-4950-ABE4-8C521D258DCD}
556+
{7EF0A33A-3E96-4DF5-973C-257CFE6F79D8} = {CBD2BB24-3EC3-4950-ABE4-8C521D258DCD}
557+
{A82A1C13-C452-423A-9287-A7E52F6A43E8} = {CBD2BB24-3EC3-4950-ABE4-8C521D258DCD}
513558
EndGlobalSection
514559
GlobalSection(ExtensibilityGlobals) = postSolution
515560
SolutionGuid = {27A36094-AA50-4FFD-ADE6-C055E391F741}

‎src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<!-- This is so that we add the FrameworkReference to Microsoft.AspNetCore.App -->
66
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
7+
<DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
78

89
</PropertyGroup>
910

‎src/Components/Blazor/testassets/Wasm.Authentication.Server/Wasm.Authentication.Server.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<LangVersion>7.3</LangVersion>
66
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
7+
<DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
78
</PropertyGroup>
89

910
<ItemGroup>
@@ -21,4 +22,10 @@
2122
<ProjectReference Include="..\Wasm.Authentication.Shared\Wasm.Authentication.Shared.csproj" />
2223
</ItemGroup>
2324

25+
<Target Name="GetStaticWebAssetsManifest" Returns="@(_SWAManifest)" AfterTargets="GenerateStaticWebAssetsManifest">
26+
<ItemGroup>
27+
<_SWAManifest Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\$(_GeneratedStaticWebAssetsDevelopmentManifest)'))" />
28+
</ItemGroup>
29+
</Target>
30+
2431
</Project>

‎src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@
4747
<ProjectReference Include="..\..\Blazor\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
4848
</ItemGroup>
4949

50+
<Target Name="CopyReferencedProjectStaticWebAssetsManifest" BeforeTargets="Compile">
51+
<MSBuild
52+
Projects="..\..\Blazor\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj"
53+
Targets="GetStaticWebAssetsManifest">
54+
<Output TaskParameter="TargetOutputs" ItemName="_SWAManifest" />
55+
</MSBuild>
56+
<ItemGroup>
57+
<ContentWithTargetPath Include="@(_SWAManifest)">
58+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59+
<TargetPath>Wasm.Authentication.Server.StaticWebAssets.xml</TargetPath>
60+
</ContentWithTargetPath>
61+
</ItemGroup>
62+
</Target>
63+
5064
<!-- Shared testing infrastructure for running E2E tests using selenium -->
5165
<Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.targets" />
5266

‎src/Components/test/E2ETest/Tests/WebAssemblyAuthenticationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public WebAssemblyAuthenticationTests(
4747
_serverFixture.Environment = AspNetEnvironment.Development;
4848
_serverFixture.ApplicationAssembly = typeof(Program).Assembly;
4949

50-
string _staticWebAssetsFile = ResolveStaticWebAssetsManifest();
50+
//string _staticWebAssetsFile = ResolveStaticWebAssetsManifest();
5151

5252
_serverFixture.AdditionalArguments.Clear();
53-
_serverFixture.AdditionalArguments.AddRange(new[] { "--staticwebassets", _staticWebAssetsFile });
53+
//_serverFixture.AdditionalArguments.AddRange(new[] { "--staticwebassets", _staticWebAssetsFile });
5454

5555
_serverFixture.BuildWebHostMethod = args => Program.CreateHostBuilder(args)
5656
.ConfigureServices(services => SetupTestDatabase<ApplicationDbContext>(services, _connection))

‎src/Components/test/testassets/TestServer/Components.TestServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<!-- This is so that we add the FrameworkReference to Microsoft.AspNetCore.App -->
66
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
7+
<DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
78
</PropertyGroup>
89

910
<ItemGroup>

0 commit comments

Comments
 (0)