Skip to content

Commit 17869b1

Browse files
committed
Adding .NET 9 build output support
Only running maven when doing a .NET 8 build as we don't want to run it in parallel, else one will fail due to file locking
1 parent 99a909f commit 17869b1

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Directory.Build.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project>
2-
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
54
<LangVersion>latest</LangVersion>
65

76
<ImplicitUsings>enable</ImplicitUsings>
87
<Nullable>enable</Nullable>
8+
<WarningsAsErrors>true</WarningsAsErrors>
99

10+
<IsPackable>false</IsPackable>
11+
</PropertyGroup>
12+
13+
<PropertyGroup>
1014
<AspireVersion>8.2.0</AspireVersion>
1115
<AspNetCoreVersion>8.0.7</AspNetCoreVersion>
1216
<OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
17+
</PropertyGroup>
1318

14-
<IsPackable>false</IsPackable>
15-
</PropertyGroup>
1619
</Project>

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5+
56
<ItemGroup>
67
<!-- Aspire packages -->
78
<PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
@@ -28,7 +29,7 @@
2829
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
2930
<PackageVersion Include="xunit" Version="2.9.0" />
3031
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
31-
<!-- External packages -->
32+
<!-- Integration packages dependencies -->
3233
<PackageVersion Include="OllamaSharp" Version="3.0.7" />
3334
</ItemGroup>
3435
</Project>

examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Java\CommunityToolkit.Aspire.Hosting.Java.csproj" IsAspireProjectResource="false" />
2020
</ItemGroup>
2121

22-
<Target Name="PublishRunMaven" AfterTargets="Build">
22+
<Target Name="PublishRunMaven" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net8.0'">
2323
<!-- As part of publishing, ensure the Java app is freshly built -->
2424
<Exec WorkingDirectory="$(JavaAppRoot)" Command="./mvnw --quiet clean package" />
2525
</Target>

0 commit comments

Comments
 (0)