CommunityToolkit · aaronpowell · Sep 24, 2024 · Sep 24, 2024 · Sep 24, 2024 · Sep 24, 2024
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,11 @@
 
   "features": {
     "ghcr.io/azure/azure-dev/azd:latest": {},
-    "ghcr.io/devcontainers/features/dotnet:latest": {},
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "version": "8.0",
+      "additionalVersions": "9.0",
+      "workloads": "aspire"
+    },
     "ghcr.io/devcontainers/features/github-cli:latest": {},
     "ghcr.io/devcontainers/features/java:latest": {
       "installGradle": true,

diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -4,10 +4,6 @@ sudo apt-get update && \
     sudo apt clean -y && \
     sudo rm -rf /var/lib/apt/lists/*
 
-## Install .NET Aspire workload
-sudo dotnet workload install aspire
-sudo dotnet workload update --from-previous-sdk
-
 ## Install dev certs
 dotnet tool update -g linux-dev-certs
 dotnet linux-dev-certs install

diff --git a/.github/workflows/ci-test-reporting.yml b/.github/workflows/ci-test-reporting.yml
@@ -18,7 +18,7 @@ jobs:
         uses: phoenix-actions/test-reporting@v15
         id: test-report
         with:
-          name: ".NET Test report"
-          path: "*.trx"
+          name: ".NET Test report $1"
+          path: "**/*.trx"
           reporter: dotnet-trx
-          artifact: test-results
+          artifact: /test-results-(.*)/
diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml
@@ -12,7 +12,12 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [
+          windows-latest
+          , ubuntu-latest
+          #, macos-latest
+          ]
+      fail-fast: false
     runs-on: "${{ matrix.os }}"
     env:
       DOTNET_CONFIGURATION: Release
@@ -91,7 +96,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.os }}
           path: |
             ${{ github.workspace }}/test-results/**
 

diff --git a/.github/workflows/dotnet-main.yml b/.github/workflows/dotnet-main.yml
@@ -12,7 +12,12 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [
+          windows-latest
+          , ubuntu-latest
+          #, macos-latest
+          ]
+      fail-fast: false
     runs-on: "${{ matrix.os }}"
     env:
       DOTNET_CONFIGURATION: Release
@@ -90,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.os }}
           path: |
             ${{ github.workspace }}/test-results/**
 

diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -13,7 +13,12 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [
+          windows-latest
+          , ubuntu-latest
+          #, macos-latest
+          ]
+      fail-fast: false
     runs-on: "${{ matrix.os }}"
     env:
       DOTNET_CONFIGURATION: Release
@@ -90,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.os }}
           path: |
             ${{ github.workspace }}/test-results/**
 

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ test-results
 TestResults
 nuget
 .pnpm-store
+
+*.binlog
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,16 +1,19 @@
 <Project>
-  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <WarningsAsErrors>true</WarningsAsErrors>
 
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <AspireVersion>8.2.0</AspireVersion>
     <AspNetCoreVersion>8.0.7</AspNetCoreVersion>
     <OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
+  </PropertyGroup>
 
-    <IsPackable>false</IsPackable>
-</PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+  <Target Name="_SetVSTestLogger" BeforeTargets="VSTest" Condition=" '$(TrxLogFileNameSuffix)' != '' ">
+  <PropertyGroup>
+    <VSTestLogger>trx%3BLogFileName=$(AssemblyName)-$(TargetFramework).trx</VSTestLogger>
+  </PropertyGroup>
+  </Target>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
+
   <ItemGroup>
     <!-- Aspire packages -->
     <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
@@ -28,7 +29,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <!-- External packages -->
+    <!-- Integration packages dependencies -->
     <PackageVersion Include="OllamaSharp" Version="3.0.7" />
   </ItemGroup>
 </Project>
diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+</Project>
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Java\CommunityToolkit.Aspire.Hosting.Java.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
-  <Target Name="PublishRunMaven" AfterTargets="Build">
+  <Target Name="PublishRunMaven" AfterTargets="Build" Condition="'$(TargetFramework)' == 'net8.0'">
     <!-- As part of publishing, ensure the Java app is freshly built -->
     <Exec WorkingDirectory="$(JavaAppRoot)" Command="./mvnw --quiet clean package" />
   </Target>

diff --git a/...odeJS.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost.csproj b/...odeJS.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>

diff --git a/...olkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj b/...olkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>

diff --git a/...ting.Ollama.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Ollama.ServiceDefaults.csproj b/...ting.Ollama.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Ollama.ServiceDefaults.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>

diff --git a/...munityToolkit.Aspire.Hosting.Ollama.Web/CommunityToolkit.Aspire.Hosting.Ollama.Web.csproj b/...munityToolkit.Aspire.Hosting.Ollama.Web/CommunityToolkit.Aspire.Hosting.Ollama.Web.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...tyToolkit.Aspire.StaticWebApps.ApiApp/CommunityToolkit.Aspire.StaticWebApps.ApiApp.csproj b/...tyToolkit.Aspire.StaticWebApps.ApiApp/CommunityToolkit.Aspire.StaticWebApps.ApiApp.csproj
@@ -4,10 +4,4 @@
     <ProjectReference Include="..\CommunityToolkit.Aspire.StaticWebApps.ServiceDefaults\CommunityToolkit.Aspire.StaticWebApps.ServiceDefaults.csproj" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
 </Project>
diff --git a/...taticWebApps.ServiceDefaults/CommunityToolkit.Aspire.StaticWebApps.ServiceDefaults.csproj b/...taticWebApps.ServiceDefaults/CommunityToolkit.Aspire.StaticWebApps.ServiceDefaults.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>

diff --git a/global.json b/global.json
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.Tests/SwaHostingComponentTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.Tests/SwaHostingComponentTests.cs
@@ -1,3 +1,4 @@
+#if NET8_0
 using CommunityToolkit.Aspire.Testing;
 using FluentAssertions;
 using System.Net;
@@ -13,7 +14,7 @@ public async Task CanAccessFrontendSuccessfully()
     {
         var httpClient = fixture.CreateHttpClient("swa");
 
-        await fixture.App.WaitForTextAsync("Azure Static Web Apps emulator started", "swa").WaitAsync(TimeSpan.FromSeconds(30));
+        await fixture.App.WaitForTextAsync("Azure Static Web Apps emulator started", "swa").WaitAsync(TimeSpan.FromMinutes(5));
 
         var response = await httpClient.GetAsync("/");
 
@@ -25,7 +26,7 @@ public async Task CanAccessApiSuccessfully()
     {
         var httpClient = fixture.CreateHttpClient("swa");
 
-        await fixture.App.WaitForTextAsync("Azure Static Web Apps emulator started", "swa").WaitAsync(TimeSpan.FromSeconds(30));
+        await fixture.App.WaitForTextAsync("Azure Static Web Apps emulator started", "swa").WaitAsync(TimeSpan.FromMinutes(5));
 
         var response = await httpClient.GetAsync("/api/weather");
 
@@ -36,4 +37,5 @@ public async Task CanAccessApiSuccessfully()
     }
 
     record WeatherForecast(DateTime Date, int TemperatureC, string Summary);
-}
+}
+#endif
diff --git a/...ng.NodeJS.Extensions.Tests/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.Tests.csproj b/...ng.NodeJS.Extensions.Tests/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj
@@ -1,9 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
 </Project>