From 219d57adbe3b5af0bed07d851d9e6bdaadf8d5a1 Mon Sep 17 00:00:00 2001
From: Gino Canessa <gino.canessa@microsoft.com>
Date: Tue, 3 Sep 2024 10:03:02 -0500
Subject: [PATCH] Fix nuget packaging for Net 8.0 and FluentUI.

---
 .github/workflows/nuget-tool.yml   | 5 ++---
 src/fhir-candle/fhir-candle.csproj | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nuget-tool.yml b/.github/workflows/nuget-tool.yml
index 961cefa..a986b7b 100644
--- a/.github/workflows/nuget-tool.yml
+++ b/.github/workflows/nuget-tool.yml
@@ -19,11 +19,10 @@ jobs:
       with:
         dotnet-version: '8'
 
-        # Note that we need to pack twice because of an issue with staticwebassets.
     - name: Build and Publish
       run: |
         dotnet restore
         dotnet pack -c Release ./src/fhir-candle/fhir-candle.csproj
-        rm ./nupkg/*.nupkg
-        dotnet pack -c Release ./src/fhir-candle/fhir-candle.csproj
+        mv ./src/fhir-candle/bin/Release/net8.0/publish/wwwroot ./src/fhir-candle/bin/Release/net8.0/publish/staticwebassets
+        7z a ./nupkg/*.nupkg ./src/fhir-candle/bin/Release/net8.0/publish/staticwebassets/
         dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.GINOC_NUGET }} --source https://api.nuget.org/v3/index.json
diff --git a/src/fhir-candle/fhir-candle.csproj b/src/fhir-candle/fhir-candle.csproj
index 38225b2..33e9ecc 100644
--- a/src/fhir-candle/fhir-candle.csproj
+++ b/src/fhir-candle/fhir-candle.csproj
@@ -114,13 +114,13 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
+  <!--<ItemGroup>
     <None Include="bin\Release\net8.0\publish\wwwroot\**\*.*" Pack="true" PackagePath="staticwebassets\%(RecursiveDir)%(FileName)%(Extension)">
       <Link>wwwroot\_content\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       <IncludeInPackage>true</IncludeInPackage>
     </None>
-  </ItemGroup>
+  </ItemGroup>-->
 
   <ItemGroup>
     <Include Update="wwwroot\css\monaco.css" Pack="false">