Eliminate differences between dev and release file structure

Author: arthurkehrwald

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
           dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false
       - run: |
           mkdir -p tmp/Plugins
-          cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp/Plugins    
+          cp -r Plugins/${{ matrix.rid }} tmp/Plugins
       - uses: actions/upload-artifact@v4
         with:
           name: Plugins-${{ matrix.rid }}
@@ -39,10 +39,13 @@ jobs:
     steps:
         - uses: actions/checkout@v4
         - run: dotnet build /t:InstallYetAnotherHttpHandler
+        - run: |
+            mkdir -p tmp/YetAnotherHttpHandler
+            cp -r YetAnotherHttpHandler tmp/YetAnotherHttpHandler
         - uses: actions/upload-artifact@v4
           with:
             name: YetAnotherHttpHandler
-            path: Dependencies
+            path: tmp
 
   dispatch:
     runs-on: ubuntu-latest

.gitignore

@@ -357,8 +357,11 @@ VisualPinball.Engine.Mpf/machine/data/
 # macOS meta files
 *.DS_Store
 
-Dependencies/
-Dependencies.meta
+Plugins/
+Plugins.meta
+
+YetAnotherHttpHandler/
+YetAnotherHttpHandler.meta
 
 Runtime/GrpcInterface/Generated/
 Runtime/GrpcInterface/Generated.meta

VisualPinball.Engine.Mpf.csproj

@@ -52,12 +52,12 @@
     <Protobuf ProtoRoot="Runtime/GrpcInterface/" Include= "Runtime/GrpcInterface/*.proto" OutputDir="Runtime\GrpcInterface\Generated" GrpcServices="Client" />
   </ItemGroup>
 
-  <!-- Copy NuGet binaries to 'Dependencies/NuGetDependencies'-->
+  <!-- Copy NuGet binaries to 'Plugins'-->
   <Target Name="CopyNuGetDependencies" AfterTargets="AfterBuild">
     <ItemGroup>
       <OutputFiles Include="$(OutDir)/*.*"/>
     </ItemGroup>
-    <Copy SourceFiles="@(OutputFiles)" DestinationFolder="./Dependencies/NuGetDependencies/$(RuntimeIdentifier)" SkipUnchangedFiles="true"/>
+    <Copy SourceFiles="@(OutputFiles)" DestinationFolder="./Plugins/$(RuntimeIdentifier)" SkipUnchangedFiles="true"/>
   </Target>
 
   <!-- Delete build artifacts-->
@@ -69,17 +69,16 @@
     <RemoveDir Directories="@(BuildArtifacts)"/>
   </Target>
 
-  <!-- Download YetAnotherHttpHandler from GitHub and copy into Dependencies directory-->
+  <!-- Download YetAnotherHttpHandler from GitHub and copy into 'YetAnotherHttpHandler'-->
   <Target Name="InstallYetAnotherHttpHandler" AfterTargets="AfterBuild" Condition="'$(InstallYetAnotherHttpHandler)' == 'true'">
-    <RemoveDir Directories="Dependencies/tmp"/>
-    <MakeDir Directories="Dependencies"/>
-    <Exec Command="git clone --no-checkout --depth=1  --filter=tree:0 --branch $(YetAnotherHttpHandlerVersion) https://github.com/Cysharp/YetAnotherHttpHandler tmp" ConsoleToMSBuild="true" WorkingDirectory="Dependencies"/>
-    <Exec Command="git sparse-checkout set --no-cone /src/YetAnotherHttpHandler" ConsoleToMSBuild="true" WorkingDirectory="Dependencies/tmp"/>
-    <Exec Command="git checkout $(YetAnotherHttpHandlerVersion)" ConsoleToMSBuild="true" WorkingDirectory="Dependencies/tmp"/>
+    <RemoveDir Directories="tmp"/>
+    <Exec Command="git clone --no-checkout --depth=1  --filter=tree:0 --branch $(YetAnotherHttpHandlerVersion) https://github.com/Cysharp/YetAnotherHttpHandler tmp" ConsoleToMSBuild="true"/>
+    <Exec Command="git sparse-checkout set --no-cone /src/YetAnotherHttpHandler" ConsoleToMSBuild="true" WorkingDirectory="tmp"/>
+    <Exec Command="git checkout $(YetAnotherHttpHandlerVersion)" ConsoleToMSBuild="true" WorkingDirectory="tmp"/>
     <ItemGroup>
-      <PackageFiles Include="Dependencies/tmp/src/YetAnotherHttpHandler/**/*.*"/>
+      <PackageFiles Include="tmp/src/YetAnotherHttpHandler/**/*.*"/>
     </ItemGroup>
-    <Copy SourceFiles="@(PackageFiles)" DestinationFolder="Dependencies/YetAnotherHttpHandler/%(RecursiveDir)"/>
-    <RemoveDir Directories="Dependencies/tmp;obj"/>
+    <Copy SourceFiles="@(PackageFiles)" DestinationFolder="YetAnotherHttpHandler/%(RecursiveDir)"/>
+    <RemoveDir Directories="tmp;obj"/>
   </Target>
 </Project>