Skip to content
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

Jump to bottom

[IGNORE] add 9.0 templates #5686

Closed
wants to merge 89 commits into from
Closed

[IGNORE] add 9.0 templates #5686

wants to merge 89 commits into from

Conversation

radical
Copy link
Member

@radical radical commented Sep 11, 2024 •
edited by dotnet-policy-service bot
Loading

Description

Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No
  • Does the change require an update in our Aspire docs?
    • Yes
      • Link to aspire-docs issue:
    • No
Microsoft Reviewers: Open in CodeFlow

@radical
wip
bffcd7a
@radical
Merge remote-tracking branch 'origin/main' into templates9
be10dc2
@radical
Merge remote-tracking branch 'origin/main' into templates9
706d776
@radical
Initial - templates for aspire9
511c916 
- rename `src/Aspire.ProjectTemplates` to `src/Aspire.ProjectTemplates.net8`
- duplicate `src/Aspire.ProjectTemplates8` to `src/Aspire.ProjectTemplates.net9`
    - update the `-f` parameter to `net9.0`
    - update the precedence
    - update `identity` to be like `Aspire.ServiceDefaults.CSharp.9.0`
@radical
rename Aspire.ProjectTemplates.netX to Aspire.ProjectTemplates.9.0.netX
a5d6f68
@build-analysis build-analysis bot mentioned this pull request Sep 19, 2024
Open
@build-analysis build-analysis bot mentioned this pull request Sep 20, 2024
Open
3 tasks
@radical
Merge remote-tracking branch 'origin/main' into templates9
be4a5cf 
# Conflicts:
#	Aspire.sln
@radical
wip
bf1597e
@radical
Merge remote-tracking branch 'origin/main' into templates9
6cd2f0e
@radical
Merge remote-tracking branch 'origin/main' into templates9
632fa97 
# Conflicts:
#	Aspire.sln
@radical
Squashed commit of the following:
8bca53b 
commit b2bc12a99f9ec0c43c3a5dcd30a4dfc2854da14d
Merge: 179de4b 56b44c5
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 17:29:17 2024 -0400

    Merge remote-tracking branch 'origin/main' into RemoveWorkload

commit 179de4b
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 05:17:35 2024 -0400

    trust dev-certs on windows

commit f9c2c87
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 04:17:11 2024 -0400

    revert .runsettings change

commit d8b4772
Merge: 19b7aef d5d3d99
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 04:09:22 2024 -0400

    Merge remote-tracking branch 'origin/main' into RemoveWorkload

commit 19b7aef
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 03:56:32 2024 -0400

    fix dcp location

commit de17fe1
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 03:22:11 2024 -0400

    fix e2e run

commit c9f838e
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 03:19:35 2024 -0400

    fix helix run for playground, and workload

commit e111467
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 02:32:30 2024 -0400

    fix helix run

commit 8305549
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 02:28:24 2024 -0400

    Remove duplicate log messages

commit 3357722
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 02:14:01 2024 -0400

    fix workloads helix submission

commit 17a813f
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 01:57:45 2024 -0400

    Trying to fix e2e

commit 7f57289
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 01:54:54 2024 -0400

    fix helix

commit 0b6cda5
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 01:36:18 2024 -0400

    Fix yml

commit f57fafc
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 01:24:24 2024 -0400

    Skip install workloads step

commit c37c97e
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 01:08:28 2024 -0400

    Remove step to install workloads, and the corresponding project file

commit c918bcd
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 00:50:19 2024 -0400

    Remove duplicate log messages

commit 97df055
Author: Ankit Jain <radical@gmail.com>
Date:   Tue Sep 24 00:49:20 2024 -0400

    Fix workload tests to workload without a custom dotnet

commit 9c3ead0
Merge: 70c8ac7 570db52
Author: Ankit Jain <radical@gmail.com>
Date:   Mon Sep 23 18:30:06 2024 -0400

    Merge remote-tracking branch 'origin/main' into RemoveWorkload

commit 70c8ac7
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Mon Sep 23 15:04:14 2024 -0700

    Stop installing Aspire workload on dotnet CLI

commit 9bb8742
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Mon Sep 23 13:47:21 2024 -0700

    Add Aspire Project templates after dotnet environment is set

commit 2d28b53
Merge: 66fc9f3 af5fee3
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sun Sep 22 10:21:43 2024 -0700

    Merge branch main into RemoveWorkload

commit 66fc9f3
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sun Sep 22 09:30:31 2024 -0700

    Pass correct version to templates

commit f1eeadc
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sat Sep 21 10:09:23 2024 -0700

    Move installation of templates to happen after setting environment variables.

commit 9b89794
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sat Sep 21 08:59:42 2024 -0700

    Ensure the sources are set to install the templates

commit c1dd81e
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sat Sep 21 08:12:37 2024 -0700

    Add force argument to ensure templates used are the ones produced by the build

commit 8cc0454
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Sat Sep 21 07:15:32 2024 -0700

    Add precommands on the right place

commit 37daa0f
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Fri Sep 20 16:17:36 2024 -0700

    Add pre and post steps to fix workload tests

commit 2c6813c
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Fri Sep 20 14:12:52 2024 -0700

    Move RID tool to new folder

commit 6d94129
Merge: 0dfc156 dc1eeaa
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Fri Sep 20 13:53:46 2024 -0700

    Merge branch main into RemoveWorkload

commit 0dfc156
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Fri Sep 20 13:29:18 2024 -0700

    Bringing back isAspireHost and switching to a sdk defined property instead.

commit 044246c
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Fri Sep 20 09:06:49 2024 -0700

    Disable source build, do cleanup and fix template install

commit f1031f1
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Thu Sep 19 16:50:58 2024 -0700

    Removing the step to build workloads and don't install workload

commit c69fa40
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Thu Sep 19 13:32:43 2024 -0700

    Tests building and non-helix tests are passing

commit 371d893
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Thu Sep 19 09:26:06 2024 -0700

    Playground apps compiling and working

commit a174f30
Author: Jose Perez Rodriguez <joperezr@microsoft.com>
Date:   Wed Sep 18 22:38:52 2024 +0000

    WIP: Initial work to remove workload

# Conflicts:
#	src/Microsoft.NET.Sdk.Aspire/WorkloadManifest.in.json
#	tests/Shared/WorkloadTesting/AspireProject.cs
#	tests/Shared/WorkloadTesting/DotNetNewCommand.cs
#	tests/Shared/WorkloadTesting/TestOutputWrapper.cs
@radical
update tests
727ba56
@radical
Merge remote-tracking branch 'origin/main' into templates9
5fdb6a2 
# Conflicts:
#	tests/Shared/WorkloadTesting/AspireProject.cs
#	tests/Shared/WorkloadTesting/BuildEnvironment.cs
#	tests/Shared/WorkloadTesting/DotNetNewCommand.cs
@radical
wip
bede50d
@radical
fix template tests
e23edb1
@radical
fix sln
3dda5d7
@radical
wip
50fd973
@radical
Merge remote-tracking branch 'origin/main' into templates9
2dbf9fb
@radical
wip
d5f45a2
@radical
Fix path to Aspire.RuntimeIdentifier.Tool.csproj
27b34da 
From
`src\Aspire.Hosting.Sdk\Aspire.RuntimeIdentifier.Tool\Aspire.RuntimeIdentifier.Tool.csproj`
->
`src\Aspire.AppHost.Sdk\Aspire.RuntimeIdentifier.Tool\Aspire.RuntimeIdentifier.Tool.csproj`
@radical
wip
52bacae
@radical
wip
05a85a0
@radical
wip
5c6e4c9
@radical
wip
aaddf63
@radical
Copy link
Member Author

radical commented Oct 1, 2024

Closing in favor of #6058 .

@radical radical closed this Oct 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eerhardt eerhardt Awaiting requested review from eerhardt eerhardt will be requested when the pull request is marked ready for review eerhardt is a code owner

Assignees
No one assigned
Labels
area-templates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@radical