Skip to content

Use NET SDK with no Aspire workload in auto-gen pipelines #4690

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
vhvb1989 merged 2 commits into from
Jan 14, 2025
Merged

Use NET SDK with no Aspire workload in auto-gen pipelines #4690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d1886f
use net8 and net9 with no workload for pipelines
vhvb1989 Jan 10, 2025
54e8a12
update snapshots
vhvb1989 Jan 14, 2025
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
12 changes: 6 additions & 6 deletions cli/azd/pkg/pipeline/pipeline_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,13 +972,13 @@ func generatePipelineDefinition(path string, props projectProperties) error {
}
builder := strings.Builder{}
err = tmpl.Execute(&builder, struct {
BranchName string
FedCredLogIn bool
InstallDotNetAspire bool
BranchName string
FedCredLogIn bool
InstallDotNetForAspire bool
}{
BranchName: props.BranchName,
FedCredLogIn: props.AuthType == AuthTypeFederated,
InstallDotNetAspire: props.HasAppHost,
BranchName: props.BranchName,
FedCredLogIn: props.AuthType == AuthTypeFederated,
InstallDotNetForAspire: props.HasAppHost,
})
if err != nil {
return fmt.Errorf("executing template: %w", err)
Expand Down
12 changes: 7 additions & 5 deletions ...peline/testdata/Test_promptForCiFiles-no_files_-_azdo_selected_-_App_host_-_fed_Cred.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ steps:
- pwsh: |
azd config set auth.useAzCliAuth "true"
displayName: Configure AZD to Use AZ CLI Authentication.
- task: Bash@3
displayName: Install .NET Aspire workload
- task: UseDotNet@2
inputs:
targetType: 'inline'
script: |
dotnet workload install aspire
version: '8.x'
displayName: Set up .NET 8
- task: UseDotNet@2
inputs:
version: '9.x'
displayName: Set up .NET 9

- task: AzureCLI@2
displayName: Provision Infrastructure
Expand Down
8 changes: 6 additions & 2 deletions ...line/testdata/Test_promptForCiFiles-no_files_-_github_selected_-_App_host_-_fed_Cred.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ jobs:
uses: actions/checkout@v4
- name: Install azd
uses: Azure/setup-azd@v2
- name: Install .NET Aspire workload
run: dotnet workload install aspire
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.x.x
9.x.x

- name: Log in with Azure (Federated Credentials)
run: |
Expand Down
14 changes: 8 additions & 6 deletions cli/azd/resources/pipeline/.azdo/azure-dev.ymlt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ steps:
- pwsh: |
azd config set auth.useAzCliAuth "true"
displayName: Configure AZD to Use AZ CLI Authentication.
{{- if .InstallDotNetAspire}}
- task: Bash@3
displayName: Install .NET Aspire workload
{{- if .InstallDotNetForAspire}}
- task: UseDotNet@2
inputs:
targetType: 'inline'
script: |
dotnet workload install aspire
Comment thread
vhvb1989 marked this conversation as resolved.
version: '8.x'
displayName: Set up .NET 8
- task: UseDotNet@2
inputs:
version: '9.x'
displayName: Set up .NET 9
{{ end }}
- task: AzureCLI@2
displayName: Provision Infrastructure
Expand Down
10 changes: 7 additions & 3 deletions cli/azd/resources/pipeline/.github/azure-dev.ymlt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ jobs:
uses: actions/checkout@v4
- name: Install azd
uses: Azure/setup-azd@v2
{{- if .InstallDotNetAspire}}
- name: Install .NET Aspire workload
run: dotnet workload install aspire
{{- if .InstallDotNetForAspire}}
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.x.x
9.x.x
{{ end }}
{{- if .FedCredLogIn }}
- name: Log in with Azure (Federated Credentials)
Expand Down