Skip to content

Commit f47e2e8

Browse files
Allow user secrets in dotnet-isolated projects (#3052)
* Adding dotnet isolated in user secrets flow * Removing blank line * Adding user secret in dotnet isolated
1 parent 639d198 commit f47e2e8

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/Azure.Functions.Cli/Actions/HostActions/StartHostAction.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ public override ICommandLineParserResult ParseArgs(string[] args)
179179
private async Task<IWebHost> BuildWebHost(ScriptApplicationHostOptions hostOptions, Uri listenAddress, Uri baseAddress, X509Certificate2 certificate)
180180
{
181181
LoggingFilterHelper loggingFilterHelper = new LoggingFilterHelper(_hostJsonConfig, VerboseLogging);
182-
if (GlobalCoreToolsSettings.CurrentWorkerRuntime == WorkerRuntime.dotnet)
182+
if (GlobalCoreToolsSettings.CurrentWorkerRuntime == WorkerRuntime.dotnet ||
183+
GlobalCoreToolsSettings.CurrentWorkerRuntime == WorkerRuntime.dotnetIsolated)
183184
{
184185
UserSecretsId = ProjectHelpers.GetUserSecretsId(hostOptions.ScriptPath, loggingFilterHelper, new LoggerFilterOptions());
185186
}

src/Azure.Functions.Cli/Helpers/ProjectHelpers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static string FindProjectFile(string path, LoggingFilterHelper loggingFil
4040
{
4141
foreach (FileInfo file in projectFiles)
4242
{
43-
if (string.Equals(projectFiles[0].Name, Constants.ExtenstionsCsProjFile, StringComparison.OrdinalIgnoreCase)) continue;
43+
if (string.Equals(file.Name, Constants.ExtenstionsCsProjFile, StringComparison.OrdinalIgnoreCase)) continue;
4444
logger.LogDebug($"Found {file.FullName}. Using for user secrets file configuration.");
4545
return file.FullName;
4646
}

test/Azure.Functions.Cli.Tests/E2E/StartTests.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -528,16 +528,18 @@ await CliTester.Run(new RunConfiguration
528528
}, _output);
529529
}
530530

531-
[Fact]
532-
public async Task start_with_user_secrets()
531+
[Theory]
532+
[InlineData("dotnet")]
533+
[InlineData("dotnet-isolated")]
534+
public async Task start_with_user_secrets(string language)
533535
{
534536
await CliTester.Run(new RunConfiguration[]
535537
{
536538
new RunConfiguration
537539
{
538540
Commands = new[]
539541
{
540-
"init . --worker-runtime dotnet",
542+
$"init . --worker-runtime {language}",
541543
"new --template \"Http trigger\" --name http1",
542544
"new --template \"Queue trigger\" --name queue1"
543545
},

0 commit comments

Comments
 (0)