diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dbe8f7a..08a75344 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,46 +7,28 @@ defaults: jobs: build: - name: Build ${{ matrix.rid }} - runs-on: ${{ matrix.os }} + name: Build + runs-on: ubuntu-latest strategy: fail-fast: false - matrix: - include: - - os: windows-latest - rid: win-x64 - - os: windows-latest - rid: win-x86 - - os: macos-latest - rid: osx-x64 - - os: ubuntu-latest - rid: linux-x64 steps: - uses: actions/checkout@v4 - name: Build run: | - dotnet build -c Release -r ${{ matrix.rid }} -p:InstallYetAnotherHttpHandler=false + dotnet build -c Release - run: | mkdir -p tmp/Plugins - cp -r Dependencies/NuGetDependencies/${{ matrix.rid }} tmp/Plugins + cp -r Plugins tmp/Plugins + mkdir -p tmp/YetAnotherHttpHandler + cp -r YetAnotherHttpHandler tmp/YetAnotherHttpHandler - uses: actions/upload-artifact@v4 with: - name: Plugins-${{ matrix.rid }} + name: Plugins path: tmp - install-yetanotherhttphandler: - name: Install YetAnotherHttpHandler - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: dotnet build /t:InstallYetAnotherHttpHandler - - uses: actions/upload-artifact@v4 - with: - name: YetAnotherHttpHandler - path: Dependencies dispatch: runs-on: ubuntu-latest - needs: [ build, install-yetanotherhttphandler ] + needs: [ build] if: github.repository == 'VisualPinball/VisualPinball.Engine.Mpf' && github.ref == 'refs/heads/master' && github.event_name == 'push' steps: - uses: peter-evans/repository-dispatch@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b67952ba..c62ca4fa 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - merge-multiple: true github-token: ${{ secrets.GITHUB_TOKEN }} run-id: ${{ github.event.client_payload.artifacts_run_id }} - uses: actions/setup-node@v4 diff --git a/.gitignore b/.gitignore index 4f73c241..5e338559 100644 --- a/.gitignore +++ b/.gitignore @@ -357,8 +357,10 @@ VisualPinball.Engine.Mpf/machine/data/ # macOS meta files *.DS_Store -Dependencies/ -Dependencies.meta +Plugins/* +!Plugins/*.meta -Runtime/GrpcInterface/Generated/ -Runtime/GrpcInterface/Generated.meta \ No newline at end of file +YetAnotherHttpHandler/ + +Runtime/GrpcInterface/Generated/* +!Runtime/GrpcInterface/Generated/*.meta diff --git a/Plugins.meta b/Plugins.meta new file mode 100644 index 00000000..9a437be7 --- /dev/null +++ b/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c11a4d09fc63594ec8d350ffcc6e64b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Google.Protobuf.dll.meta b/Plugins/Google.Protobuf.dll.meta new file mode 100644 index 00000000..bd8a9ee8 --- /dev/null +++ b/Plugins/Google.Protobuf.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 3288c73a499fb6a76a683aa33fac3f91 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Grpc.Core.Api.dll.meta b/Plugins/Grpc.Core.Api.dll.meta new file mode 100644 index 00000000..dfe6bcf4 --- /dev/null +++ b/Plugins/Grpc.Core.Api.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: e74698e52619b0b7398bdbd55c54e9ad +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Grpc.Net.Client.dll.meta b/Plugins/Grpc.Net.Client.dll.meta new file mode 100644 index 00000000..4f869bb5 --- /dev/null +++ b/Plugins/Grpc.Net.Client.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: c70612fcb787688e89e3d485938e5d07 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Grpc.Net.Common.dll.meta b/Plugins/Grpc.Net.Common.dll.meta new file mode 100644 index 00000000..e316cedc --- /dev/null +++ b/Plugins/Grpc.Net.Common.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: fd44334b287bdaf619df52e5cc24e618 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Microsoft.Extensions.Logging.Abstractions.dll.meta b/Plugins/Microsoft.Extensions.Logging.Abstractions.dll.meta new file mode 100644 index 00000000..fdffd524 --- /dev/null +++ b/Plugins/Microsoft.Extensions.Logging.Abstractions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 28bf55fad48564da185fafcd0f4b17f2 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Buffers.dll.meta b/Plugins/System.Buffers.dll.meta new file mode 100644 index 00000000..5d66cf0d --- /dev/null +++ b/Plugins/System.Buffers.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 773d8ff25f263e0b59fdebbb62a2ac91 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Diagnostics.DiagnosticSource.dll.meta b/Plugins/System.Diagnostics.DiagnosticSource.dll.meta new file mode 100644 index 00000000..9bf21e43 --- /dev/null +++ b/Plugins/System.Diagnostics.DiagnosticSource.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 3012040f4310f1b55bf30161b4cb3ce5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.IO.Pipelines.dll.meta b/Plugins/System.IO.Pipelines.dll.meta new file mode 100644 index 00000000..a0aba4e7 --- /dev/null +++ b/Plugins/System.IO.Pipelines.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 9a6ca7fa3d46fcc08af15bb91b9c7d8d +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Memory.dll.meta b/Plugins/System.Memory.dll.meta new file mode 100644 index 00000000..227c1b56 --- /dev/null +++ b/Plugins/System.Memory.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: c8311e1af921f76d7a91205e73edef38 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Numerics.Vectors.dll.meta b/Plugins/System.Numerics.Vectors.dll.meta new file mode 100644 index 00000000..7c4206a9 --- /dev/null +++ b/Plugins/System.Numerics.Vectors.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 7b0ca2a2784cfe40c9c23d1f73b59a48 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta b/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta new file mode 100644 index 00000000..848fa9ef --- /dev/null +++ b/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: d6c1af8f9043b428099529ae657dc242 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/System.Threading.Tasks.Extensions.dll.meta b/Plugins/System.Threading.Tasks.Extensions.dll.meta new file mode 100644 index 00000000..a35ef419 --- /dev/null +++ b/Plugins/System.Threading.Tasks.Extensions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: acebd1c0c382d27d097b90fa0035ddde +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/VisualPinball.Engine.Mpf.deps.json.meta b/Plugins/VisualPinball.Engine.Mpf.deps.json.meta new file mode 100644 index 00000000..d34510b6 --- /dev/null +++ b/Plugins/VisualPinball.Engine.Mpf.deps.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9b47dc01fee502b69870505f0462175 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/VisualPinball.Engine.Mpf.dll.meta b/Plugins/VisualPinball.Engine.Mpf.dll.meta new file mode 100644 index 00000000..571c9626 --- /dev/null +++ b/Plugins/VisualPinball.Engine.Mpf.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 1c65f21e37e50cc75bb018fa690377b6 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/VisualPinball.Engine.Mpf.pdb.meta b/Plugins/VisualPinball.Engine.Mpf.pdb.meta new file mode 100644 index 00000000..1447cfb7 --- /dev/null +++ b/Plugins/VisualPinball.Engine.Mpf.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76af570fcd1183e8d89754923ff046bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GrpcInterface/Generated.meta b/Runtime/GrpcInterface/Generated.meta new file mode 100644 index 00000000..af1fb60b --- /dev/null +++ b/Runtime/GrpcInterface/Generated.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67f1bee1a9788765d918810dff983c09 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GrpcInterface/Generated/Platform.cs.meta b/Runtime/GrpcInterface/Generated/Platform.cs.meta new file mode 100644 index 00000000..68cfa888 --- /dev/null +++ b/Runtime/GrpcInterface/Generated/Platform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e342596d12d23444d9c57405b5ba74cd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GrpcInterface/Generated/PlatformGrpc.cs.meta b/Runtime/GrpcInterface/Generated/PlatformGrpc.cs.meta new file mode 100644 index 00000000..bd111b60 --- /dev/null +++ b/Runtime/GrpcInterface/Generated/PlatformGrpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 930dc83ac4bcbfefab1c034945dbcc57 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Engine.Mpf.csproj b/VisualPinball.Engine.Mpf.csproj index 904744f5..bea74504 100644 --- a/VisualPinball.Engine.Mpf.csproj +++ b/VisualPinball.Engine.Mpf.csproj @@ -18,14 +18,6 @@ - - - win-x64 - win-x86 - osx - linux-x64 - - true @@ -52,12 +44,12 @@ - + - + @@ -69,17 +61,16 @@ - + - - - - - + + + + - + - - + + diff --git a/YetAnotherHttpHandler.meta b/YetAnotherHttpHandler.meta new file mode 100644 index 00000000..ad448304 --- /dev/null +++ b/YetAnotherHttpHandler.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6a400bb2ab580909688a28ccdae929 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: