From b32962764ad0204960111ec1915f4315565716f9 Mon Sep 17 00:00:00 2001
From: Bernhard Straub <bsoft@mandel-straub.de>
Date: Sat, 27 Apr 2024 09:13:07 +0200
Subject: [PATCH] Yet another fix for Github Actions

---
 .github/workflows/Build.yml        | 47 ++++++++++++++++++++----------
 .github/workflows/PublishNuget.yml |  2 +-
 .gitignore                         |  1 +
 DexieCloudNET/DexieCloudNET.csproj |  2 +-
 DexieNET/DexieNET.csproj           |  2 +-
 NuGet.config                       |  2 +-
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index ddfa66c..36f0234 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -9,29 +9,46 @@ on:
       - "**"
 
 jobs:
-  build:
+  job1:
+    name: Setup
     runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
 
-    - name: Setup .NET 7.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
+    steps:
+      - uses: actions/checkout@v4
+  
+      - name: Setup .NET 7.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+  
+      - name: Setup .NET 8.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
 
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
+  job2:
+    name: BuildDexieNET
+    runs-on: ubuntu-latest
+    needs: job1
 
+    steps:
     - name: BuildDexieNET
       run: dotnet build DexieNET/DexieNET.csproj -c Release
 
+  job3:
+    name: BuildDexieCloudNET
+    runs-on: ubuntu-latest
+    needs: [job1, job2]
+
+    steps:
     - name: BuildDexieCloudNET
-      run: dotnet build DexieNET/DexieCloudNET.csproj -c Release
+      run: dotnet build DexieCloudNET/DexieCloudNET.csproj -c Release
 
-    - name: Build
-      run: dotnet build -c Release
-      
+  job4:
+    name: BuildDexieNET
+    runs-on: ubuntu-latest
+    needs: [job1, job2, job3]
+
+    steps:
     - name: Test
       run: dotnet test -c Release
diff --git a/.github/workflows/PublishNuget.yml b/.github/workflows/PublishNuget.yml
index 1709bff..65405c7 100644
--- a/.github/workflows/PublishNuget.yml
+++ b/.github/workflows/PublishNuget.yml
@@ -5,7 +5,7 @@ on:
     types: [published]
 
 env:
-  NuGetDirectory: ${{ github.workspace}}/Nuget
+  NuGetDirectory: ${{ github.workspace}}/.nuget
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index 33157e1..bab02bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ DexieCloudNET/yarn/node_modules
 DexieCloudNET/yarn/src/**/*.js
 DexieCloudNET/wwwroot/
 DexieCloudNET/yarn/src/DexieNET
+.nuget
diff --git a/DexieCloudNET/DexieCloudNET.csproj b/DexieCloudNET/DexieCloudNET.csproj
index d16e384..f5ad69f 100644
--- a/DexieCloudNET/DexieCloudNET.csproj
+++ b/DexieCloudNET/DexieCloudNET.csproj
@@ -18,7 +18,7 @@
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<PackageTags>Dexie, Dexie Cloud, IndexedDB</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<PackageOutputPath>..\Nuget</PackageOutputPath>
+		<PackageOutputPath>..\.nuget</PackageOutputPath>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/DexieNET/DexieNET.csproj b/DexieNET/DexieNET.csproj
index ce54748..59ceb55 100644
--- a/DexieNET/DexieNET.csproj
+++ b/DexieNET/DexieNET.csproj
@@ -18,7 +18,7 @@
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<PackageTags>Dexie, IndexedDB</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<PackageOutputPath>..\Nuget</PackageOutputPath>
+		<PackageOutputPath>..\.nuget</PackageOutputPath>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/NuGet.config b/NuGet.config
index c7a97ce..0c7c17c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="local" value="Nuget" />
+    <add key="local" value=".nuget" />
   </packageSources>
 </configuration>
\ No newline at end of file