Skip to content

Template tests: Create dev cert only once #31012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaoK merged 19 commits into from
Mar 19, 2021
Merged

Template tests: Create dev cert only once #31012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7acb62c
Update AspNetProcess.cs
HaoK Mar 18, 2021
359fc66
Update Project.cs
HaoK Mar 18, 2021
63adce1
Create dev cert on project creation instead of in AspNetProcess
HaoK Mar 18, 2021
83ead3b
Update BlazorServerTemplateTest.cs
HaoK Mar 18, 2021
ffe22d7
Update BlazorWasmTemplateTest.cs
HaoK Mar 18, 2021
f5bbfbe
Update DevelopmentCertificate.cs
HaoK Mar 18, 2021
b5f9fd4
Update DevelopmentCertificate.cs
HaoK Mar 18, 2021
a8e2b1a
Create the dev cert once in the project fixture
HaoK Mar 18, 2021
ad79fd1
Update ProjectFactoryFixture.cs
HaoK Mar 18, 2021
b6187b5
Update AspNetProcess.cs
HaoK Mar 18, 2021
1aa5487
Update ProjectFactoryFixture.cs
HaoK Mar 18, 2021
31ec81e
Update Project.cs
HaoK Mar 18, 2021
07dbac0
Update DevelopmentCertificate.cs
HaoK Mar 19, 2021
feb1a8c
Update AspNetProcess.cs
HaoK Mar 19, 2021
ad9782e
Update Project.cs
HaoK Mar 19, 2021
cd314ee
Update AspNetProcess.cs
HaoK Mar 19, 2021
04919ec
Update BlazorServerTemplateTest.cs
HaoK Mar 19, 2021
b64c83d
Update BlazorWasmTemplateTest.cs
HaoK Mar 19, 2021
7fb50a1
Update BlazorWasmTemplateTest.cs
HaoK Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ProjectTemplates/Shared/AspNetProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class AspNetProcess : IDisposable
internal ProcessEx Process { get; }

public AspNetProcess(
DevelopmentCertificate cert,
ITestOutputHelper output,
string workingDirectory,
string dllPath,
Expand All @@ -44,8 +45,7 @@ public AspNetProcess(
bool usePublishedAppHost = false,
ILogger logger = null)
{
_developmentCertificate = DevelopmentCertificate.Create(workingDirectory);

_developmentCertificate = cert;
_output = output;
_httpClient = new HttpClient(new HttpClientHandler()
{
Expand Down
5 changes: 3 additions & 2 deletions src/ProjectTemplates/Shared/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class Project : IDisposable
public string TemplateOutputDir { get; set; }
public string TargetFramework { get; set; } = GetAssemblyMetadata("Test.DefaultTargetFramework");
public string RuntimeIdentifier { get; set; } = string.Empty;
public static DevelopmentCertificate DevCert { get; } = DevelopmentCertificate.Create(AppContext.BaseDirectory);

public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", TargetFramework, RuntimeIdentifier);
public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", TargetFramework, RuntimeIdentifier, "publish");
Expand Down Expand Up @@ -178,7 +179,7 @@ internal AspNetProcess StartBuiltProjectAsync(bool hasListeningUri = true, ILogg
}

var projectDll = Path.Combine(TemplateBuildDir, $"{ProjectName}.dll");
return new AspNetProcess(Output, TemplateOutputDir, projectDll, environment, published: false, hasListeningUri: hasListeningUri, logger: logger);
return new AspNetProcess(DevCert, Output, TemplateOutputDir, projectDll, environment, published: false, hasListeningUri: hasListeningUri, logger: logger);
}

internal AspNetProcess StartPublishedProjectAsync(bool hasListeningUri = true, bool usePublishedAppHost = false)
Expand All @@ -193,7 +194,7 @@ internal AspNetProcess StartPublishedProjectAsync(bool hasListeningUri = true, b
};

var projectDll = Path.Combine(TemplatePublishDir, $"{ProjectName}.dll");
return new AspNetProcess(Output, TemplatePublishDir, projectDll, environment, published: true, hasListeningUri: hasListeningUri, usePublishedAppHost: usePublishedAppHost);
return new AspNetProcess(DevCert, Output, TemplatePublishDir, projectDll, environment, published: true, hasListeningUri: hasListeningUri, usePublishedAppHost: usePublishedAppHost);
}

internal async Task<ProcessResult> RunDotNetEfCreateMigrationAsync(string migrationName)
Expand Down