From 5ca6fea0a2f672988d9c6e28a743ecbb2ada8708 Mon Sep 17 00:00:00 2001 From: June Rhodes Date: Mon, 23 Dec 2024 15:04:18 +1100 Subject: [PATCH] Move native library projects to separate uet-native repository (#103) Ref #102. --- .github/actions/download-artifact/action.yml | 15 - .github/actions/upload-artifact/action.yml | 23 -- .github/workflows/uet.yml | 260 ------------------ UET/Lib/Common.Build.props | 1 - .../NativeMethods.json | 4 - .../NativeMethods.txt | 12 - .../Redpoint.AutoDiscovery.Win32.csproj | 22 -- .../NativeMethods.json | 4 - .../NativeMethods.txt | 12 - .../Redpoint.AutoDiscovery.Win64.csproj | 22 -- .../Redpoint.AutoDiscovery.csproj | 29 +- UET/Redpoint.Logging.Mac.Native/README.md | 3 - .../Redpoint.Logging.Mac.Native.nuspec | 24 -- .../build/Redpoint.Logging.Mac.Native.targets | 21 -- .../Redpoint.Logging.Mac.Native.targets | 4 - UET/Redpoint.Logging.Mac.Native/logging.c | 5 - .../osx-arm64/native/libLogging.arm64.dylib | Bin 33651 -> 0 bytes .../osx-x64/native/libLogging.x64.dylib | Bin 33224 -> 0 bytes .../Redpoint.Logging.Mac.csproj | 19 +- UET/UET.sln | 14 - UET/uet/uet.csproj | 8 - 21 files changed, 3 insertions(+), 499 deletions(-) delete mode 100644 UET/Redpoint.AutoDiscovery.Win32/NativeMethods.json delete mode 100644 UET/Redpoint.AutoDiscovery.Win32/NativeMethods.txt delete mode 100644 UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj delete mode 100644 UET/Redpoint.AutoDiscovery.Win64/NativeMethods.json delete mode 100644 UET/Redpoint.AutoDiscovery.Win64/NativeMethods.txt delete mode 100644 UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj delete mode 100644 UET/Redpoint.Logging.Mac.Native/README.md delete mode 100644 UET/Redpoint.Logging.Mac.Native/Redpoint.Logging.Mac.Native.nuspec delete mode 100644 UET/Redpoint.Logging.Mac.Native/build/Redpoint.Logging.Mac.Native.targets delete mode 100644 UET/Redpoint.Logging.Mac.Native/buildTransitive/Redpoint.Logging.Mac.Native.targets delete mode 100644 UET/Redpoint.Logging.Mac.Native/logging.c delete mode 100644 UET/Redpoint.Logging.Mac.Native/runtimes/osx-arm64/native/libLogging.arm64.dylib delete mode 100644 UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/native/libLogging.x64.dylib diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml index 4d6a1768..972cfce5 100644 --- a/.github/actions/download-artifact/action.yml +++ b/.github/actions/download-artifact/action.yml @@ -18,21 +18,6 @@ runs: path: "" merge-multiple: true - - name: Download AutoDiscovery - if: ${{ inputs.UET_ARTIFACT_NAME == 'autodiscovery' }} - uses: actions/download-artifact@v4 - with: - name: autodiscovery - path: UET/ - merge-multiple: true - - name: Download Mac Logging - if: ${{ inputs.UET_ARTIFACT_NAME == 'mac-logging' }} - uses: actions/download-artifact@v4 - with: - name: mac-logging - path: UET/ - merge-multiple: true - - name: Download UEFS Win if: ${{ inputs.UET_ARTIFACT_NAME == 'uefs-win' }} uses: actions/download-artifact@v4 diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index d1ffe780..7c841144 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -19,29 +19,6 @@ runs: path: | package.version - - name: Upload AutoDiscovery - if: ${{ inputs.UET_ARTIFACT_NAME == 'autodiscovery' }} - uses: actions/upload-artifact@v4 - with: - name: autodiscovery - if-no-files-found: error - path: | - UET/Redpoint.AutoDiscovery.Win64/bin/x64/Debug/${{ inputs.UET_FRAMEWORK_TARGET }}/** - UET/Redpoint.AutoDiscovery.Win32/bin/x86/Debug/${{ inputs.UET_FRAMEWORK_TARGET }}/** - UET/Redpoint.AutoDiscovery.Win64/bin/x64/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/** - UET/Redpoint.AutoDiscovery.Win32/bin/x86/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/** - UET/Redpoint.AutoDiscovery/bin/Release/Redpoint.AutoDiscovery.*.nupkg - - name: Upload Mac Logging - if: ${{ inputs.UET_ARTIFACT_NAME == 'mac-logging' }} - uses: actions/upload-artifact@v4 - with: - name: mac-logging - if-no-files-found: error - path: | - UET/Redpoint.Logging.Mac.Native/runtimes/osx-arm64/libLogging.arm64.dylib - UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/libLogging.x64.dylib - UET/Redpoint.Logging.Mac/bin/Redpoint.Logging.Mac.Native.*.nupkg - - name: Upload UEFS Win if: ${{ inputs.UET_ARTIFACT_NAME == 'uefs-win' }} uses: actions/upload-artifact@v4 diff --git a/.github/workflows/uet.yml b/.github/workflows/uet.yml index d2937818..c0b60fe1 100644 --- a/.github/workflows/uet.yml +++ b/.github/workflows/uet.yml @@ -34,110 +34,6 @@ jobs: with: UET_ARTIFACT_NAME: timestamp UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - prereq-autodiscovery: - name: "Build AutoDiscovery" - runs-on: windows-latest - needs: - - timestamp - env: - UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install .NET SDK - uses: ./.github/actions/dotnet-sdk - with: - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Build AutoDiscovery - shell: pwsh - run: | - Write-Host "Building Redpoint.AutoDiscovery version '${env:UET_PACKAGE_VERSION}'..." - dotnet ` - msbuild ` - -restore ` - -p:RuntimeIdentifier=win-x86 ` - -p:Configuration=Debug ` - -p:Platform=x86 ` - "-p:BaseUetVersion=${env:UET_PACKAGE_VERSION}" ` - "-p:PackageVersion=${env:UET_PACKAGE_VERSION}" ` - UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj - if ($LastExitCode -ne 0) { exit $LastExitCode } - dotnet ` - msbuild ` - -restore ` - -p:RuntimeIdentifier=win-x86 ` - -p:Configuration=Release ` - -p:Platform=x86 ` - "-p:BaseUetVersion=${env:UET_PACKAGE_VERSION}" ` - "-p:PackageVersion=${env:UET_PACKAGE_VERSION}" ` - UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj - if ($LastExitCode -ne 0) { exit $LastExitCode } - dotnet ` - msbuild ` - -restore ` - -p:RuntimeIdentifier=win-x64 ` - -p:Configuration=Debug ` - -p:Platform=x64 ` - "-p:BaseUetVersion=${env:UET_PACKAGE_VERSION}" ` - "-p:PackageVersion=${env:UET_PACKAGE_VERSION}" ` - UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj - if ($LastExitCode -ne 0) { exit $LastExitCode } - dotnet ` - msbuild ` - -restore ` - -p:RuntimeIdentifier=win-x64 ` - -p:Configuration=Release ` - -p:Platform=x64 ` - "-p:BaseUetVersion=${env:UET_PACKAGE_VERSION}" ` - "-p:PackageVersion=${env:UET_PACKAGE_VERSION}" ` - UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj - if ($LastExitCode -ne 0) { exit $LastExitCode } - dotnet ` - msbuild ` - -restore ` - -t:Publish ` - -p:Configuration=Release ` - -p:Platform=AnyCPU ` - -p:UsePrebuiltLibsForAutoDiscovery=true ` - "-p:BaseUetVersion=${env:UET_PACKAGE_VERSION}" ` - "-p:PackageVersion=${env:UET_PACKAGE_VERSION}" ` - UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj - if ($LastExitCode -ne 0) { exit $LastExitCode } - - name: Upload AutoDiscovery Package - uses: ./.github/actions/upload-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - prereq-mac-logging: - name: "Build Mac Logging" - runs-on: macos-latest - needs: - - timestamp - env: - UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install .NET SDK - uses: ./.github/actions/dotnet-sdk - with: - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Build Mac Logging - run: | - echo "Package version: $UET_PACKAGE_VERSION" - dotnet msbuild -t:BuildNativeMacLibraries -p:Configuration=Release -p:BaseUetVersion=$UET_PACKAGE_VERSION -p:PackageVersion=$UET_PACKAGE_VERSION UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj - dotnet msbuild -t:BuildAndReferenceNupkg -p:Configuration=Release -p:BaseUetVersion=$UET_PACKAGE_VERSION -p:PackageVersion=$UET_PACKAGE_VERSION UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj - - name: Upload Mac Logging Package - uses: ./.github/actions/upload-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} test-stringenum-trimmed: name: "Test StringEnum Trimmed" @@ -168,8 +64,6 @@ jobs: runs-on: windows-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -181,16 +75,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UEFS Client shell: pwsh run: | @@ -230,8 +114,6 @@ jobs: runs-on: macos-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -243,16 +125,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UEFS Client shell: pwsh run: | @@ -295,8 +167,6 @@ jobs: runs-on: windows-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -308,16 +178,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Shim shell: pwsh run: | @@ -343,8 +203,6 @@ jobs: runs-on: macos-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -356,16 +214,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Shim shell: pwsh run: | @@ -391,8 +239,6 @@ jobs: runs-on: ubuntu-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -404,16 +250,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Shim shell: pwsh run: | @@ -439,8 +275,6 @@ jobs: runs-on: windows-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -452,16 +286,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 1 shell: pwsh run: | @@ -487,8 +311,6 @@ jobs: runs-on: macos-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -500,16 +322,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 1 shell: pwsh run: | @@ -538,8 +350,6 @@ jobs: runs-on: ubuntu-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -551,16 +361,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 1 shell: pwsh run: | @@ -586,8 +386,6 @@ jobs: runs-on: windows-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -599,16 +397,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Install WinFsp shell: pwsh run: | @@ -652,8 +440,6 @@ jobs: runs-on: macos-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging env: UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} steps: @@ -665,16 +451,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build and Test Libraries on macOS run: | set -e @@ -686,8 +462,6 @@ jobs: runs-on: windows-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging - pass-1-win - pass-1-mac - pass-1-linux @@ -702,16 +476,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 1 uses: ./.github/actions/download-artifact with: @@ -753,8 +517,6 @@ jobs: runs-on: macos-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging - pass-1-win - pass-1-mac - pass-1-linux @@ -769,16 +531,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 1 uses: ./.github/actions/download-artifact with: @@ -823,8 +575,6 @@ jobs: runs-on: ubuntu-latest needs: - timestamp - - prereq-autodiscovery - - prereq-mac-logging - pass-1-win - pass-1-mac - pass-1-linux @@ -839,16 +589,6 @@ jobs: uses: ./.github/actions/dotnet-sdk with: UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download AutoDiscovery - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: autodiscovery - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - - name: Download Mac Logging - uses: ./.github/actions/download-artifact - with: - UET_ARTIFACT_NAME: mac-logging - UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 1 uses: ./.github/actions/download-artifact with: diff --git a/UET/Lib/Common.Build.props b/UET/Lib/Common.Build.props index b4b683d7..f19e0118 100644 --- a/UET/Lib/Common.Build.props +++ b/UET/Lib/Common.Build.props @@ -4,7 +4,6 @@ None - $(MSBuildThisFileDirectory)../Redpoint.Logging.Mac/bin;$(MSBuildThisFileDirectory)../Redpoint.AutoDiscovery/bin/$(Configuration) diff --git a/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.json b/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.json deleted file mode 100644 index e1360a4d..00000000 --- a/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://aka.ms/CsWin32.schema.json", - "public": true -} \ No newline at end of file diff --git a/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.txt b/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.txt deleted file mode 100644 index 6bc1c614..00000000 --- a/UET/Redpoint.AutoDiscovery.Win32/NativeMethods.txt +++ /dev/null @@ -1,12 +0,0 @@ -DnsServiceRegister -DnsServiceRegisterCancel -DnsServiceDeRegister -DnsServiceBrowse -DnsServiceBrowseCancel -DnsServiceConstructInstance -DnsServiceFreeInstance -DnsFree -DNS_QUERY_OPTIONS -DNS_REQUEST_PENDING -DNS_TYPE -WIN32_ERROR \ No newline at end of file diff --git a/UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj b/UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj deleted file mode 100644 index 2edb47ce..00000000 --- a/UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Redpoint.AutoDiscovery.Win32 - Redpoint.AutoDiscovery.Win32 - x86 - x86 - - - - - - - - - - - - - diff --git a/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.json b/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.json deleted file mode 100644 index e1360a4d..00000000 --- a/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://aka.ms/CsWin32.schema.json", - "public": true -} \ No newline at end of file diff --git a/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.txt b/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.txt deleted file mode 100644 index 6bc1c614..00000000 --- a/UET/Redpoint.AutoDiscovery.Win64/NativeMethods.txt +++ /dev/null @@ -1,12 +0,0 @@ -DnsServiceRegister -DnsServiceRegisterCancel -DnsServiceDeRegister -DnsServiceBrowse -DnsServiceBrowseCancel -DnsServiceConstructInstance -DnsServiceFreeInstance -DnsFree -DNS_QUERY_OPTIONS -DNS_REQUEST_PENDING -DNS_TYPE -WIN32_ERROR \ No newline at end of file diff --git a/UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj b/UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj deleted file mode 100644 index 2bd4433f..00000000 --- a/UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Redpoint.AutoDiscovery.Win64 - Redpoint.AutoDiscovery.Win64 - x64 - x64 - - - - - - - - - - - - - diff --git a/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj b/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj index 31a715f5..8fead42a 100644 --- a/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj +++ b/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj @@ -11,33 +11,8 @@ - - - - - SDWin32 - - - SDWin64 - - - - - - ..\Redpoint.AutoDiscovery.Win32\bin\x86\$(Configuration)\$(TargetFramework)\win-x86\Redpoint.AutoDiscovery.Win32.dll - SDWin32 - - - ..\Redpoint.AutoDiscovery.Win64\bin\x64\$(Configuration)\$(TargetFramework)\win-x64\Redpoint.AutoDiscovery.Win64.dll - SDWin64 - - - - - - - - + + diff --git a/UET/Redpoint.Logging.Mac.Native/README.md b/UET/Redpoint.Logging.Mac.Native/README.md deleted file mode 100644 index 347ce4d5..00000000 --- a/UET/Redpoint.Logging.Mac.Native/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Redpoint.Logging.Mac.Native - -Provides native binaries for the Redpoint.Logging.Mac library. \ No newline at end of file diff --git a/UET/Redpoint.Logging.Mac.Native/Redpoint.Logging.Mac.Native.nuspec b/UET/Redpoint.Logging.Mac.Native/Redpoint.Logging.Mac.Native.nuspec deleted file mode 100644 index 71db8251..00000000 --- a/UET/Redpoint.Logging.Mac.Native/Redpoint.Logging.Mac.Native.nuspec +++ /dev/null @@ -1,24 +0,0 @@ - - - - Redpoint.Logging.Mac.Native - 0.0.0 - June Rhodes - MIT - https://licenses.nuget.org/MIT - Provides native libraries for Redpoint.Logging.Mac. - Redpoint Games - logging, macos - - PackageIcon.png - README.md - - - - - - - - - - \ No newline at end of file diff --git a/UET/Redpoint.Logging.Mac.Native/build/Redpoint.Logging.Mac.Native.targets b/UET/Redpoint.Logging.Mac.Native/build/Redpoint.Logging.Mac.Native.targets deleted file mode 100644 index cf579fc9..00000000 --- a/UET/Redpoint.Logging.Mac.Native/build/Redpoint.Logging.Mac.Native.targets +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PreserveNewest - libLogging.x64.dylib - false - Redpoint.Logging.Mac.Native - PreserveNewest - false - - - PreserveNewest - libLogging.arm64.dylib - false - Redpoint.Logging.Mac.Native - PreserveNewest - false - - - diff --git a/UET/Redpoint.Logging.Mac.Native/buildTransitive/Redpoint.Logging.Mac.Native.targets b/UET/Redpoint.Logging.Mac.Native/buildTransitive/Redpoint.Logging.Mac.Native.targets deleted file mode 100644 index 6e70c5bf..00000000 --- a/UET/Redpoint.Logging.Mac.Native/buildTransitive/Redpoint.Logging.Mac.Native.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/UET/Redpoint.Logging.Mac.Native/logging.c b/UET/Redpoint.Logging.Mac.Native/logging.c deleted file mode 100644 index 93956aa5..00000000 --- a/UET/Redpoint.Logging.Mac.Native/logging.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -extern void redpoint_os_log(os_log_t log, int log_type, const char* message) { - os_log_with_type(log, log_type, "%{public}s", message); -} \ No newline at end of file diff --git a/UET/Redpoint.Logging.Mac.Native/runtimes/osx-arm64/native/libLogging.arm64.dylib b/UET/Redpoint.Logging.Mac.Native/runtimes/osx-arm64/native/libLogging.arm64.dylib deleted file mode 100644 index 84aea0e581e36802cb48378548121405371dabe8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33651 zcmeI5e`wTo7{{OQ-F`ZCl0%EM9i_D*=B8sfu=RDDGI6<~`(sq{@wT0}W4F6;cgr7B z{K};iNjdP35W)>dDiw?{m{>FjB8%|0M5&-QDL64B`vE&?t>^iEKeujM<{#C6?+-lp z`8?0(`99z0`}%zD&*$^GeCO653yBQkmcvrWl5i6pp(SFX2UuR>S*4mcwKUtN*+1rN zm9(DCW|1sCtyIjnH>MTt=Ek$C^_-mvk?5|!+$E5esVWtX^|VH3O!MMB?M$uG9v17F z@$z&${&u@56^;hO{%9-`2>IDEH{PI*SD^jVx>je!7MoH%p*?|6y9$JMhi!c}zabs3 zNe2);Ge2#f>0}*VXHlwdWAjE;+qi9qvl^y$xl7MWNg{$(R#Yi}IAa;^8qdSNb~Byl zwPx=TiI;AYS3QeT4O_Nt-Bh%vlEB`jxOHytM0%et&znt3`0>BT?2 zS9v(EmGSer^Q=S3u6%{d?v3iQ=QfV=W!G*RsvSBC&~Nmo2i#_U9WF?kCt{ z=P%RT#A7{+#B%n*WBm6qXiZNvvWCA{WXHZ}%-2;~lV-rK^eBtO`NSg1f?Ic<88;Q`;Hjab`SeVoO5wCnVCzTk$-a+QM1eyvCmZR=5w5P--ugXov!8hxs;mV z_uj}gQ}twRFEOa9MEY#1s?Xv+pQ`dWe#s)LN^%Y*8)=fCv!CbM+@U2dGexfAtM+(7 z#(1$aUftW>(;5u49prL%DdAngA}zC*nqjG#=elTH4(s}I(WT~iAy*X_IhDo62>X6w_{0uAG1C_OY?>hEw;7|8M7qFF*X$wSk0X et@`r&lkPK*Sk+e=ukKm)#T(N<$5tF@toaiZ?AH+h diff --git a/UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/native/libLogging.x64.dylib b/UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/native/libLogging.x64.dylib deleted file mode 100644 index a975c6dd529269d8cae88bbddd14dc249ed91f88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33224 zcmeI5O=w(I6vxlxLj!G`L0u?{9fVZ0kbZ@dE^H^-DK8jnp(zwfxyfWEld;p8VLmXS z3_PiUj6+C%mmib9v6(8m9{@4h-S)t%k_FPwMp|J?J= z-1ob0mgl}-AO7|Dd6CGVh&%^-0oI0Cl^8}Mufon-@1IBi&x#B zqdTSU!%OY#v+Ir;lPz{_1N6V=izC*yL~y@T_8rlD zVbgW#GZ-^7eddGYsp;??@m)m1^-g!(CTQ2aAEVHRV6XJ~^SRVaF`LDvj4vOX7*DUj zfe@Jx@$DPxi)=t2b$SCj4y`OT*KI#|ug`uevJ9>JcNV5CT!Z!+-}Am{Kvz42`|&?{ zs=Wq}{?4PjKm74Hb>f%njRRkN6Fczp5%}UT%`LJQHfqO~U1VbL9eC{ebs9}0CSjT@ zcn{vf-zOpmYnAdrJhR%ll}a^pW&FK=D2VJwyyofnA|vSEc3PjCjRZ)51W14cNPq-L zfCNZ@1W14cNPq-LfCNZ@1W14cNPq-LfCNZ@1W14cNPq-LfCNZ@1W14cNPq-LfCNZ@ z1W14cNPq-LfCNZ@1W14cNPq-LfCQd3f%9JDckkMtb6#_J8nv}vQ@loU$7|H@HEMUf z#`%udOx}a5-AvwDOKy72dOLcvwz>U17Pb+Iu4+yC{nNN0u8p{_KTmG1C2x4^_1}=B z)Uo2)11w=@O9r+Qk;qnJ;LWYX;0Urj@EYFG zrCYK)Hiuhw$3C{#Jg#F`OSM!!w@^pfyVe!I4%61%YwfVs&Z9osT383KT5FH@;?9`8 z8zL-EmY5&ZDaZVv_BiId8gJi5@j?P5KmsH{0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{ z0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{0wh2J zBtQZrKmsH{0wnOv3B>UW`VDtI_dvga9-IY$0b2O2_wZZg`h9YV;f#ZX4uYof5gZ&4 z*$O`ApjV z1d^I^CS5A#3RM>-FAqwq9?rMwZM*D?aJ&)mrF1fw(en(Vn9(y4w7mp_w6Utk`t)R< vKHaA^pEA;OBy_BNLXDxs<*9Z4UnG#n0b0uBOPR7ce9Rm%hs~rpIw5}pkN_V@ diff --git a/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj b/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj index 43a7a3be..4dba5d1f 100644 --- a/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj +++ b/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj @@ -1,15 +1,5 @@  - - - - /opt/homebrew/bin/mono "$(MSBuildThisFileDirectory)nuget.exe" - "$(MSBuildThisFileDirectory)nuget.exe" - - - - - @@ -20,8 +10,7 @@ - - + @@ -36,10 +25,4 @@ logging, macos - - - - - - \ No newline at end of file diff --git a/UET/UET.sln b/UET/UET.sln index d76850ed..bf76e3a7 100644 --- a/UET/UET.sln +++ b/UET/UET.sln @@ -249,10 +249,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Redpoint.Unreal", "Redpoint EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Redpoint.Windows", "Redpoint.Windows", "{0BF83468-3C95-4B7E-AE5A-01E54464DC93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redpoint.AutoDiscovery.Win32", "Redpoint.AutoDiscovery.Win32\Redpoint.AutoDiscovery.Win32.csproj", "{8698C501-2B45-47BE-B1DD-4766BEB65AB0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redpoint.AutoDiscovery.Win64", "Redpoint.AutoDiscovery.Win64\Redpoint.AutoDiscovery.Win64.csproj", "{CB1C52D0-C27E-46EB-A9BA-54478A50B6C5}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Redpoint.Rfs", "Redpoint.Rfs", "{71CE6D4C-CA5F-42F3-8B7D-0A8DA1AE0774}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redpoint.Rfs.WinFsp", "Redpoint.Rfs.WinFsp\Redpoint.Rfs.WinFsp.csproj", "{AAB64112-C522-4FD2-8A28-84E7B17EFE92}" @@ -763,14 +759,6 @@ Global {A60B5F84-4B02-438F-8500-9DF59428764C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A60B5F84-4B02-438F-8500-9DF59428764C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A60B5F84-4B02-438F-8500-9DF59428764C}.Release|Any CPU.Build.0 = Release|Any CPU - {8698C501-2B45-47BE-B1DD-4766BEB65AB0}.Debug|Any CPU.ActiveCfg = Debug|x86 - {8698C501-2B45-47BE-B1DD-4766BEB65AB0}.Debug|Any CPU.Build.0 = Debug|x86 - {8698C501-2B45-47BE-B1DD-4766BEB65AB0}.Release|Any CPU.ActiveCfg = Release|x86 - {8698C501-2B45-47BE-B1DD-4766BEB65AB0}.Release|Any CPU.Build.0 = Release|x86 - {CB1C52D0-C27E-46EB-A9BA-54478A50B6C5}.Debug|Any CPU.ActiveCfg = Debug|x64 - {CB1C52D0-C27E-46EB-A9BA-54478A50B6C5}.Debug|Any CPU.Build.0 = Debug|x64 - {CB1C52D0-C27E-46EB-A9BA-54478A50B6C5}.Release|Any CPU.ActiveCfg = Release|x64 - {CB1C52D0-C27E-46EB-A9BA-54478A50B6C5}.Release|Any CPU.Build.0 = Release|x64 {AAB64112-C522-4FD2-8A28-84E7B17EFE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AAB64112-C522-4FD2-8A28-84E7B17EFE92}.Debug|Any CPU.Build.0 = Debug|Any CPU {AAB64112-C522-4FD2-8A28-84E7B17EFE92}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -953,8 +941,6 @@ Global {3D2A0A14-A380-4C22-90A4-5C8A34D3408D} = {39698A12-7C9B-47F5-BA1A-9F4884A770AF} {F1AA2392-EC8D-4A7F-A6BB-E2125D668FDC} = {345BF757-ABB7-4869-8797-B1E11A484650} {A60B5F84-4B02-438F-8500-9DF59428764C} = {345BF757-ABB7-4869-8797-B1E11A484650} - {8698C501-2B45-47BE-B1DD-4766BEB65AB0} = {345BF757-ABB7-4869-8797-B1E11A484650} - {CB1C52D0-C27E-46EB-A9BA-54478A50B6C5} = {345BF757-ABB7-4869-8797-B1E11A484650} {AAB64112-C522-4FD2-8A28-84E7B17EFE92} = {71CE6D4C-CA5F-42F3-8B7D-0A8DA1AE0774} {19CBD6A9-7EEA-4DF9-8FEE-C5C6E5481745} = {F2440C79-EF37-46B2-8CF8-A3272E2BBD0E} {7CCFE33C-98C5-4DC3-9F25-5AE5AE349960} = {F2440C79-EF37-46B2-8CF8-A3272E2BBD0E} diff --git a/UET/uet/uet.csproj b/UET/uet/uet.csproj index ad3059d7..ff9973bc 100644 --- a/UET/uet/uet.csproj +++ b/UET/uet/uet.csproj @@ -23,7 +23,6 @@ - @@ -73,16 +72,9 @@ - - - - - - - Embedded\win-x64\uet.exe