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

Add templates for 9.0 #6058

Merged
merged 25 commits into from
Oct 3, 2024
Merged

Add templates for 9.0 #6058

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
16d1b7b
Rename Aspire.ProjectTemplates to Aspire.ProjectTemplates.9.0.net8
radical Oct 1, 2024
10d0a5b
Add Aspire.ProjectTemplates.9.0.net8
radical Oct 1, 2024
bfbfa37
Update Aspire.sln, and Build.props
radical Oct 1, 2024
d4c36a6
Update property names for previous runtime versions used for testing
radical Oct 1, 2024
2acf79c
Use dotnet-tests instead of dotnet-latest
radical Oct 1, 2024
6074c51
build changes - FIXME: elaborate
radical Oct 1, 2024
3be33b4
Add new new-and-build template tests
radical Oct 1, 2024
13d1e42
update workload tests
radical Oct 1, 2024
f89a403
re-enable workload tests on windows
radical Oct 1, 2024
f432076
cleanup
radical Oct 1, 2024
d5642aa
remove -net8 run of the workload tests
radical Oct 1, 2024
b52cd28
rename TemplateTests.cs to BuildAndRunTemplateTests.cs
radical Oct 1, 2024
43f69af
remove unused targets
radical Oct 1, 2024
c89fc40
Fix windows build
radical Oct 2, 2024
b504b3a
fix
radical Oct 2, 2024
9ef8554
correctly exclude projecttemplate projects
radical Oct 2, 2024
b31c32c
fix sdk install
radical Oct 2, 2024
18b6bb0
Add the ProjectTemplates projects to Hosting
radical Oct 2, 2024
af26f1d
Fix tests
radical Oct 2, 2024
fc17f09
Show test output by default for tests running from the assembly
radical Oct 2, 2024
2cfd0b5
Merge remote-tracking branch 'origin/main' into templates-9-with-tests
radical Oct 2, 2024
c2519c0
Use net9.0 natively in the 9.0.net9 templates
radical Oct 2, 2024
0a2fe6f
Use separate replacement tokens for extensions version for 8.x vs 9.x…
radical Oct 2, 2024
5579816
Update src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-empty/.t…
radical Oct 2, 2024
9975d3c
Merge remote-tracking branch 'upstream/main' into templates-9-with-tests
DamianEdwards Oct 3, 2024
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
3 changes: 3 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,8 @@
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>8.0.8</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>8.0.8</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftNETRuntimeWorkloadTestingInternalVersion>9.0.0-preview.5.24272.3</MicrosoftNETRuntimeWorkloadTestingInternalVersion>
<!-- for templates -->
<MicrosoftExtensionsHttpResiliencePackageVersionForNet8>$(MicrosoftExtensionsHttpResiliencePackageVersion)</MicrosoftExtensionsHttpResiliencePackageVersionForNet8>
<MicrosoftExtensionsHttpResiliencePackageVersionForNet9>$(MicrosoftExtensionsHttpResiliencePackageVersion)</MicrosoftExtensionsHttpResiliencePackageVersionForNet9>
DamianEdwards marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net8/Aspire.ProjectTemplates.9.0.net8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<WriteLinesToFile File="%(TemplateProjectFiles.DestinationFile)"
Lines="$([System.IO.File]::ReadAllText('%(TemplateProjectFiles.FullPath)')
.Replace('!!REPLACE_WITH_LATEST_VERSION!!', '$(PackageVersion)')
.Replace('!!REPLACE_WITH_EXTENSIONS_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersion)'))"
.Replace('!!REPLACE_WITH_EXTENSIONS_8_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersionForNet8)'))"
Overwrite="true" />
</Target>

Expand Down
2 changes: 1 addition & 1 deletion ...pire-empty/AspireApplication.1.ServiceDefaults/AspireApplication.1.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_8_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion ...ProjectTemplates.9.0.net8/templates/aspire-servicedefaults/Aspire.ServiceDefaults1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_8_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion ...e-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_8_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/Aspire.ProjectTemplates.9.0.net9.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<WriteLinesToFile File="%(TemplateProjectFiles.DestinationFile)"
Lines="$([System.IO.File]::ReadAllText('%(TemplateProjectFiles.FullPath)')
.Replace('!!REPLACE_WITH_LATEST_VERSION!!', '$(PackageVersion)')
.Replace('!!REPLACE_WITH_EXTENSIONS_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersion)'))"
.Replace('!!REPLACE_WITH_EXTENSIONS_9_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersionForNet9)'))"
Overwrite="true" />
</Target>

Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-apphost/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-apphost/Aspire.AppHost1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-empty/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion ...et9/templates/aspire-empty/AspireApplication.1.AppHost/AspireApplication.1.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand Down
4 changes: 2 additions & 2 deletions ...pire-empty/AspireApplication.1.ServiceDefaults/AspireApplication.1.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_9_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-mstest/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-mstest/Aspire.Tests.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-nunit/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-nunit/Aspire.Tests.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion ...ProjectTemplates.9.0.net9/templates/aspire-servicedefaults/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
4 changes: 2 additions & 2 deletions ...ProjectTemplates.9.0.net9/templates/aspire-servicedefaults/Aspire.ServiceDefaults1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_9_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-starter/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion ...rter/Aspire-StarterApplication.1.ApiService/Aspire-StarterApplication.1.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...re-starter/Aspire-StarterApplication.1.AppHost/Aspire-StarterApplication.1.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand Down
4 changes: 2 additions & 2 deletions ...e-StarterApplication.1.ServiceDefaults/Aspire-StarterApplication.1.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="!!REPLACE_WITH_EXTENSIONS_9_VERSION!!" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion ...aspire-starter/Aspire-StarterApplication.1.Tests/Aspire-StarterApplication.1.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion ...tes/aspire-starter/Aspire-StarterApplication.1.Web/Aspire-StarterApplication.1.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-xunit/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"description": "Target net9.0"
}
],
"replaces": "net8.0",
"replaces": "net9.0",
"defaultValue": "net9.0"
},
"hostIdentifier": {
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.ProjectTemplates.9.0.net9/templates/aspire-xunit/Aspire.Tests.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Loading