From da3d10105e40078acbc1f65c3e92a0d1446e847d Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Wed, 26 Jun 2024 21:05:19 +0300 Subject: [PATCH 1/2] Use DOTNET_CONTAINER_* --- cli/azd/pkg/tools/dotnet/dotnet.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cli/azd/pkg/tools/dotnet/dotnet.go b/cli/azd/pkg/tools/dotnet/dotnet.go index b936be1a1d4..b5721dfac61 100644 --- a/cli/azd/pkg/tools/dotnet/dotnet.go +++ b/cli/azd/pkg/tools/dotnet/dotnet.go @@ -197,6 +197,9 @@ func (cli *dotNetCli) PublishContainer( ) runArgs = runArgs.WithEnv([]string{ + fmt.Sprintf("DOTNET_CONTAINER_REGISTRY_UNAME=%s", username), + fmt.Sprintf("DOTNET_CONTAINER_REGISTRY_PWORD=%s", password), + // also set the legacy < .NET 9 vars fmt.Sprintf("SDK_CONTAINER_REGISTRY_UNAME=%s", username), fmt.Sprintf("SDK_CONTAINER_REGISTRY_PWORD=%s", password), }) From 85f8ae2b29e81842af55a6ac9503d900fc4046c9 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Tue, 6 Aug 2024 23:02:20 +0300 Subject: [PATCH 2/2] Update cli/azd/pkg/tools/dotnet/dotnet.go --- cli/azd/pkg/tools/dotnet/dotnet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/azd/pkg/tools/dotnet/dotnet.go b/cli/azd/pkg/tools/dotnet/dotnet.go index b5721dfac61..48752b768f8 100644 --- a/cli/azd/pkg/tools/dotnet/dotnet.go +++ b/cli/azd/pkg/tools/dotnet/dotnet.go @@ -199,7 +199,7 @@ func (cli *dotNetCli) PublishContainer( runArgs = runArgs.WithEnv([]string{ fmt.Sprintf("DOTNET_CONTAINER_REGISTRY_UNAME=%s", username), fmt.Sprintf("DOTNET_CONTAINER_REGISTRY_PWORD=%s", password), - // also set the legacy < .NET 9 vars + // legacy variables for dotnet SDK version < 8.0.400 fmt.Sprintf("SDK_CONTAINER_REGISTRY_UNAME=%s", username), fmt.Sprintf("SDK_CONTAINER_REGISTRY_PWORD=%s", password), })