Install yetanotherhttphandler

Author: arthurkehrwald

.github/workflows/build.yml

@@ -25,23 +25,17 @@ jobs:
       - uses: actions/checkout@v2
       - name: Build
         run: |
-          dotnet build -c Release -r ${{ matrix.rid }}
-      - run: |
-          mkdir tmp
-          cp -r Dependencies/${{ matrix.rid }} tmp/${{ matrix.rid }}
+          dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false
       - uses: actions/upload-artifact@v4
         with:
-          name: Dependencies-${{ matrix.rid }}
-          path: tmp/${{ matrix.rid }}
-  merge:
+          path: Dependencies/NuGetDependencies/${{ matrix.rid }}
+  install-yetanotherhttphandler:
     runs-on: ubuntu-latest
-    needs: build
     steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: Dependencies
-          pattern: Dependencies-*
+        - run: dotnet build /t:InstallYetAnotherHttpHandler
+        - uses: actions/upload-artifact@v4
+          with:
+            path: Dependencies/YetAnotherHttpHandler
 
   dispatch:
     runs-on: ubuntu-latest

.github/workflows/publish.yml

@@ -8,10 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: dawidd6/action-download-artifact@v4
+      - uses: actions/download-artifact@v4
         with:
-          workflow: build
-          run_id: ${{ github.event.client_payload.artifacts_run_id }}
+          merge-multiple: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.client_payload.artifacts_run_id }}
       - name: Publish
         run: |
           echo "//registry.visualpinball.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc

VisualPinball.Engine.Mpf.csproj

@@ -18,13 +18,23 @@
     <Compile Remove="**/*.cs" />
   </ItemGroup>
 
+  <!-- Specify runtime identifier-->
   <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' != 'x86'">win-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' == 'x86'">win-x86</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <InstallYetAnotherHttpHandler Condition="'$(InstallYetAnotherHttpHandler)' == ''">true</InstallYetAnotherHttpHandler>
+  </PropertyGroup>
+
+  <!-- Specify what version (commit tag) of YetAnotherHttpHandler to install-->
+  <PropertyGroup Condition="'$(YetAnotherHttpHandlerVersion)' == ''">
+    <YetAnotherHttpHandlerVersion>1.10.0</YetAnotherHttpHandlerVersion>
+  </PropertyGroup>
+
   <!-- Specify NuGet dependencies -->
   <ItemGroup>
     <PackageReference Include="Grpc.Tools" Version="2.69.0 ">
@@ -42,17 +52,32 @@
     <Protobuf Include="Runtime/GrpcInterface/*.proto" OutputDir="$(ProjectDir)" GrpcServices="Client" />
   </ItemGroup>
 
-  <!-- Copy binaries to 'Dependencies' and delete everything else after build-->
-  <Target Name="CopyDependencies" AfterTargets="AfterBuild">
+  <!-- Copy NuGet binaries to 'Dependencies/NuGetDependencies'-->
+  <Target Name="CopyNuGetDependencies" AfterTargets="AfterBuild">
     <ItemGroup>
-      <OutputFiles Include="$(OutDir)\*.*"/>
+      <OutputFiles Include="$(OutDir)/*.*"/>
     </ItemGroup>
+    <Copy SourceFiles="@(OutputFiles)" DestinationFolder="./Dependencies/NuGetDependencies/$(RuntimeIdentifier)" SkipUnchangedFiles="true"/>
+  </Target>
+
+  <!-- Delete build artifacts-->
+  <Target Name="DeleteBuildArtifacts" AfterTargets="AfterBuild" DependsOnTargets="CopyNuGetDependencies">
     <ItemGroup>
-      <BuildArtifacts Include=".\obj\"/>
-      <BuildArtifacts Include=".\bin\"/>
+      <BuildArtifacts Include="./obj/"/>
+      <BuildArtifacts Include="./bin/"/>
     </ItemGroup>
-
-    <Copy SourceFiles="@(OutputFiles)" DestinationFolder=".\Dependencies\$(RuntimeIdentifier)" SkipUnchangedFiles="true"/>
     <RemoveDir Directories="@(BuildArtifacts)"/>
   </Target>
+
+  <!-- Download YetAnotherHttpHandler from GitHub and copy into Dependencies directory-->
+  <Target Name="InstallYetAnotherHttpHandler" AfterTargets="AfterBuild" Condition="'$(InstallYetAnotherHttpHandler)' == 'true'">
+    <Exec Command="git clone --no-checkout --depth=1  --filter=tree:0 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"/>
+    <ItemGroup>
+      <PackageFiles Include="Dependencies/tmp/src/YetAnotherHttpHandler/**/*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(PackageFiles)" DestinationFolder="Dependencies/YetAnotherHttpHandler/%(RecursiveDir)"/>
+    <RemoveDir Directories="Dependencies/tmp"/>
+  </Target>
 </Project>