diff --git a/ControlApp/ControlApp.csproj b/ControlApp/ControlApp.csproj index 52b5253a..4ddb04a7 100644 --- a/ControlApp/ControlApp.csproj +++ b/ControlApp/ControlApp.csproj @@ -15,10 +15,11 @@ 3.0.0 Kanuan, Nefarius Copyright (c) 2024 Nefarius Software Solutions e.U. + Debug;Release - + @@ -27,27 +28,27 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + diff --git a/DSHMC/DSHMC.csproj b/DSHMC/DSHMC.csproj index 27ec6d95..3d342082 100644 --- a/DSHMC/DSHMC.csproj +++ b/DSHMC/DSHMC.csproj @@ -17,6 +17,7 @@ true false AnyCPU + Debug;Release FireShock.ico diff --git a/XInputBridge/Common.h b/XInputBridge/Common.h index 47347b4d..81cac8f3 100644 --- a/XInputBridge/Common.h +++ b/XInputBridge/Common.h @@ -30,42 +30,3 @@ // #include #include - -// -// OpenTelemetry -// -#if defined(SCPLIB_ENABLE_TELEMETRY) -#define HAVE_ABSEIL // fixes redefinitions of absl types -// gRPC exporter -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -namespace trace = opentelemetry::trace; -namespace nostd = opentelemetry::nostd; -namespace sdktrace = opentelemetry::sdk::trace; -namespace otlp = opentelemetry::exporter::otlp; -namespace sdkresource = opentelemetry::sdk::resource; - -// gRPC exporter -#include -#include - -#include -#include -#include -#include -#include -#include - -namespace sdklogs = opentelemetry::sdk::logs; -namespace logs = opentelemetry::logs; -#endif - diff --git a/XInputBridge/GlobalState.Util.cpp b/XInputBridge/GlobalState.Util.cpp index 7934b0ab..dcdc3264 100644 --- a/XInputBridge/GlobalState.Util.cpp +++ b/XInputBridge/GlobalState.Util.cpp @@ -267,17 +267,3 @@ std::optional GlobalState::GetDs3HidDeviceModeProperty(const std::wstri return hidDeviceMode; } - -#if defined(SCPLIB_ENABLE_TELEMETRY) -nostd::shared_ptr GlobalState::GetTracer() -{ - const auto provider = trace::Provider::GetTracerProvider(); - return provider->GetTracer(TRACER_NAME, OPENTELEMETRY_SDK_VERSION); -} - -nostd::shared_ptr GlobalState::GetLogger(const std::string& name) -{ - const auto provider = logs::Provider::GetLoggerProvider(); - return provider->GetLogger(name, LOGGER_NAME); -} -#endif diff --git a/XInputBridge/GlobalState.h b/XInputBridge/GlobalState.h index 56d390a6..8d4cdd89 100644 --- a/XInputBridge/GlobalState.h +++ b/XInputBridge/GlobalState.h @@ -83,11 +83,6 @@ class GlobalState static std::optional> InstanceIdToHidPaths(const std::wstring& InstanceId); static std::optional GetDs3HidDeviceModeProperty(const std::wstring& Ds3InstanceId); -#if defined(SCPLIB_ENABLE_TELEMETRY) - static nostd::shared_ptr GetTracer(); - static nostd::shared_ptr GetLogger(const std::string& name); -#endif - private: /** The states of each user index slot */ std::vector States{ DS3_DEVICES_MAX }; diff --git a/XInputBridge/README.md b/XInputBridge/README.md index aa15764b..0f946f13 100644 --- a/XInputBridge/README.md +++ b/XInputBridge/README.md @@ -86,20 +86,6 @@ Gets proxied to `C:\Windows\System32\XInput1_3.dll`. Gets proxied to `C:\Windows\System32\XInput1_3.dll`. -## OpenTelemetry - -The library can be built with `/D SCPLIB_ENABLE_TELEMETRY` which will pull in the [OpenTelemetry C++ Client](https://github.com/open-telemetry/opentelemetry-cpp) and register an [OTLP](https://opentelemetry.io/docs/specs/otlp/) exporter you can use in conjunction with e.g. [Jaeger Tracing](https://www.jaegertracing.io/) to visualize performance metrics. OTEL support isn't enabled by default as it inflates resulting binary size and most users will never need this functionality. - -### OTEL-enabled binaries - -If you need logging and tracing to hunt down errors or performance bottle-necks you can use an OTEL-enabled copy instead. It comes with all necessary prerequisites compiled in and therefore is like 20-50 times larger than the normal build. - -The DLL architecture has to match your game/emulator or it will result in errors. - -- [x64 (64-Bit Intel/AMD)](https://buildbot.nefarius.at/builds/DsHidMini/latest/bin/x64/OTEL/XInput1_3.dll) (most used) -- [x86 (32-Bit Intel/AMD)](https://buildbot.nefarius.at/builds/DsHidMini/latest/bin/x86/OTEL/XInput1_3.dll) -- [ARM64 (64-Bit ARM)](https://buildbot.nefarius.at/builds/DsHidMini/latest/bin/arm64/OTEL/XInput1_3.dll) - ## Sources & 3rd party credits This application benefits from these awesome projects ❤ (appearance in no special order): diff --git a/XInputBridge/XInputBridge.vcxproj b/XInputBridge/XInputBridge.vcxproj index e297a1ae..70e657c9 100644 --- a/XInputBridge/XInputBridge.vcxproj +++ b/XInputBridge/XInputBridge.vcxproj @@ -6,18 +6,6 @@ x64-windows-static - - Debug_OTEL - ARM64 - - - Debug_OTEL - Win32 - - - Debug_OTEL - x64 - Debug ARM64 @@ -26,18 +14,6 @@ Debug Win32 - - Release_OTEL - ARM64 - - - Release_OTEL - Win32 - - - Release_OTEL - x64 - Release ARM64 @@ -69,24 +45,12 @@ v143 Unicode - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary true v143 Unicode - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary false @@ -94,13 +58,6 @@ true Unicode - - DynamicLibrary - false - v143 - true - Unicode - DynamicLibrary false @@ -108,25 +65,12 @@ true Unicode - - DynamicLibrary - false - v143 - true - Unicode - DynamicLibrary true v143 Unicode - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary false @@ -134,13 +78,6 @@ true Unicode - - DynamicLibrary - false - v143 - true - Unicode - @@ -149,106 +86,56 @@ - - - - - - - - - - - - - - - - - - true XInput1_3 - - true - XInput1_3 - true XInput1_3 - - true - XInput1_3 - false XInput1_3 $(SolutionDir)bin\$(PlatformShortName)\ true - - false - XInput1_3 - $(SolutionDir)bin\$(PlatformShortName)\OTEL\ - true - false XInput1_3 $(SolutionDir)bin\$(PlatformShortName)\ true - - false - XInput1_3 - $(SolutionDir)bin\$(PlatformShortName)\OTEL\ - true - true XInput1_3 $(SolutionDir)bin\Debug\$(PlatformShortName)\ - - true - XInput1_3 - false XInput1_3 $(SolutionDir)bin\$(PlatformShortName)\ true - - false - XInput1_3 - $(SolutionDir)bin\$(PlatformShortName)\OTEL\ - true - - true + true - - Level3 @@ -267,24 +154,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - SCPLIB_ENABLE_TELEMETRY=1;WIN32;_DEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreadedDebug - stdcpp20 - - - Windows - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -303,24 +172,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - SCPLIB_ENABLE_TELEMETRY=1;WIN32;_DEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreadedDebug - stdcpp20 - - - Windows - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -343,28 +194,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - true - true - SCPLIB_ENABLE_TELEMETRY=1;WIN32;NDEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreaded - stdcpp20 - - - Windows - true - true - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -387,28 +216,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - true - true - SCPLIB_ENABLE_TELEMETRY=1;WIN32;NDEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreaded - stdcpp20 - - - Windows - true - true - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -427,24 +234,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - SCPLIB_ENABLE_TELEMETRY=1;_DEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreadedDebug - stdcpp20 - - - Windows - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -467,28 +256,6 @@ cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - true - true - true - SCPLIB_ENABLE_TELEMETRY=1;NDEBUG;XINPUTBRIDGE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - $(SolutionDir)include; - MultiThreaded - stdcpp20 - - - Windows - true - true - true - false - XInput.def - cfgmgr32.lib;Shlwapi.lib;crypt32.lib;ws2_32.lib;setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - diff --git a/XInputBridge/vcpkg.json b/XInputBridge/vcpkg.json index f7f5aa3c..5c959320 100644 --- a/XInputBridge/vcpkg.json +++ b/XInputBridge/vcpkg.json @@ -7,10 +7,6 @@ "dependencies": [ { "name": "hidapi" }, { "name": "abseil" }, - { "name": "winreg" }, - { - "name": "opentelemetry-cpp", - "features": [ "otlp-grpc" ] - } + { "name": "winreg" } ] } diff --git a/appveyor.yml b/appveyor.yml index 100108af..2890035a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: DmfRootPath: C:\projects\DMF DOMITO_INC_PATH: C:\projects\Domito\include DOMITO_LIB_PATH: C:\projects\Domito\lib - SCPLIB_ENABLE_TELEMETRY: "true" + SCPLIB_ENABLE_TELEMETRY: "false" platform: - x64 - ARM64 @@ -21,10 +21,6 @@ skip_commits: - '**/*.json' - 'setup/*' install: -#- cmd: vcpkg integrate install -#- cmd: vcpkg update -# manifest mode takes forever to build each commit so use global copy instead -- cmd: vcpkg install hidapi:%PLATFORM%-windows-static spdlog:%PLATFORM%-windows-static abseil:%PLATFORM%-windows-static winreg:%PLATFORM%-windows-static opentelemetry-cpp[otlp-grpc]:%PLATFORM%-windows-static - cmd: git submodule -q update --init - cmd: git clone -q https://github.com/microsoft/DMF.git C:\projects\DMF 2> nul || set ERRORLEVEL=0 - cmd: | diff --git a/build/_build.csproj b/build/_build.csproj index 0f63ec47..1810d5f5 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -11,6 +11,7 @@ false x64 x64 + Debug;Release diff --git a/dshidmini.sln b/dshidmini.sln index f8966d43..eb8172f8 100644 --- a/dshidmini.sln +++ b/dshidmini.sln @@ -41,34 +41,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlApp", "ControlApp\Co EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_OTEL|Any CPU = Debug_OTEL|Any CPU - Debug_OTEL|ARM64 = Debug_OTEL|ARM64 - Debug_OTEL|x64 = Debug_OTEL|x64 - Debug_OTEL|x86 = Debug_OTEL|x86 Debug|Any CPU = Debug|Any CPU Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release_OTEL|Any CPU = Release_OTEL|Any CPU - Release_OTEL|ARM64 = Release_OTEL|ARM64 - Release_OTEL|x64 = Release_OTEL|x64 - Release_OTEL|x86 = Release_OTEL|x86 Release|Any CPU = Release|Any CPU Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|Any CPU.ActiveCfg = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|Any CPU.Build.0 = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|Any CPU.Deploy.0 = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|ARM64.ActiveCfg = Debug|ARM64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|ARM64.Build.0 = Debug|ARM64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|ARM64.Deploy.0 = Debug|ARM64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.ActiveCfg = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.Build.0 = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.Deploy.0 = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x86.ActiveCfg = Release|Win32 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.ActiveCfg = Debug|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.Build.0 = Debug|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.Deploy.0 = Debug|x64 @@ -79,10 +61,6 @@ Global {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x64.Build.0 = Debug|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x64.Deploy.0 = Debug|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x86.ActiveCfg = Debug|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|Any CPU.ActiveCfg = Release|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|ARM64.ActiveCfg = Release|ARM64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|x64.ActiveCfg = Release|x64 - {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|x86.ActiveCfg = Release|Win32 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|Any CPU.ActiveCfg = Release|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|Any CPU.Build.0 = Release|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|Any CPU.Deploy.0 = Release|x64 @@ -93,30 +71,14 @@ Global {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x64.Build.0 = Release|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x64.Deploy.0 = Release|x64 {BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x86.ActiveCfg = Release|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|Any CPU.ActiveCfg = Debug|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|ARM64.ActiveCfg = Debug|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|x64.ActiveCfg = Debug|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|x86.ActiveCfg = Debug|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug|Any CPU.ActiveCfg = Debug|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug|ARM64.ActiveCfg = Debug|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug|x64.ActiveCfg = Debug|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug|x86.ActiveCfg = Debug|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release_OTEL|Any CPU.ActiveCfg = Release|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release_OTEL|ARM64.ActiveCfg = Release|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release_OTEL|x64.ActiveCfg = Release|x64 - {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release_OTEL|x86.ActiveCfg = Release|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release|Any CPU.ActiveCfg = Release|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release|ARM64.ActiveCfg = Release|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release|x64.ActiveCfg = Release|x64 {30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Release|x86.ActiveCfg = Release|x64 - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|Any CPU.ActiveCfg = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|Any CPU.Build.0 = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|ARM64.ActiveCfg = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|ARM64.Build.0 = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|x64.ActiveCfg = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|x64.Build.0 = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|x86.ActiveCfg = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug_OTEL|x86.Build.0 = Debug|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -125,22 +87,10 @@ Global {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|x64.Build.0 = Debug|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|x86.ActiveCfg = Debug|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Debug|x86.Build.0 = Debug|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release_OTEL|Any CPU.ActiveCfg = Release|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release_OTEL|ARM64.ActiveCfg = Release|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release_OTEL|x64.ActiveCfg = Release|Any CPU - {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release_OTEL|x86.ActiveCfg = Release|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release|Any CPU.ActiveCfg = Release|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release|ARM64.ActiveCfg = Release|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release|x64.ActiveCfg = Release|Any CPU {8C041739-B65C-4BE3-B068-B13ED698C72E}.Release|x86.ActiveCfg = Release|Any CPU - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|Any CPU.ActiveCfg = Debug_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|Any CPU.Build.0 = Debug_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|ARM64.ActiveCfg = Debug_OTEL|ARM64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|ARM64.Build.0 = Debug_OTEL|ARM64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|x64.ActiveCfg = Debug_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|x64.Build.0 = Debug_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|x86.ActiveCfg = Debug_OTEL|Win32 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug_OTEL|x86.Build.0 = Debug_OTEL|Win32 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|Any CPU.ActiveCfg = Debug|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|Any CPU.Build.0 = Debug|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -149,14 +99,6 @@ Global {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|x64.Build.0 = Debug|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|x86.ActiveCfg = Debug|Win32 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Debug|x86.Build.0 = Debug|Win32 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|Any CPU.ActiveCfg = Release_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|Any CPU.Build.0 = Release_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|ARM64.ActiveCfg = Release_OTEL|ARM64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|ARM64.Build.0 = Release_OTEL|ARM64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|x64.ActiveCfg = Release_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|x64.Build.0 = Release_OTEL|x64 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|x86.ActiveCfg = Release_OTEL|Win32 - {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release_OTEL|x86.Build.0 = Release_OTEL|Win32 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|Any CPU.ActiveCfg = Release|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|Any CPU.Build.0 = Release|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|ARM64.ActiveCfg = Release|ARM64 @@ -165,14 +107,6 @@ Global {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|x64.Build.0 = Release|x64 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|x86.ActiveCfg = Release|Win32 {DC58FE95-938F-4BFB-B434-C043C62E9EF5}.Release|x86.Build.0 = Release|Win32 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|Any CPU.ActiveCfg = Debug|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|Any CPU.Build.0 = Debug|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|ARM64.ActiveCfg = Debug|ARM64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|ARM64.Build.0 = Debug|ARM64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|x64.ActiveCfg = Debug_OTEL|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|x64.Build.0 = Debug_OTEL|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|x86.ActiveCfg = Debug_OTEL|Win32 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug_OTEL|x86.Build.0 = Debug_OTEL|Win32 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|Any CPU.ActiveCfg = Debug|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|Any CPU.Build.0 = Debug|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -181,10 +115,6 @@ Global {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|x64.Build.0 = Debug|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|x86.ActiveCfg = Debug|Win32 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Debug|x86.Build.0 = Debug|Win32 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release_OTEL|Any CPU.ActiveCfg = Release|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release_OTEL|ARM64.ActiveCfg = Release|ARM64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release_OTEL|x64.ActiveCfg = Release|x64 - {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release_OTEL|x86.ActiveCfg = Release|Win32 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|Any CPU.ActiveCfg = Release|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|Any CPU.Build.0 = Release|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|ARM64.ActiveCfg = Release|ARM64 @@ -193,14 +123,6 @@ Global {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|x64.Build.0 = Release|x64 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|x86.ActiveCfg = Release|Win32 {FEB89FC0-BF9B-43F3-8467-B3496D61B76E}.Release|x86.Build.0 = Release|Win32 - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|Any CPU.ActiveCfg = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|Any CPU.Build.0 = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|ARM64.ActiveCfg = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|ARM64.Build.0 = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|x64.ActiveCfg = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|x64.Build.0 = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|x86.ActiveCfg = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug_OTEL|x86.Build.0 = Debug|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -209,22 +131,10 @@ Global {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|x64.Build.0 = Debug|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|x86.ActiveCfg = Debug|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Debug|x86.Build.0 = Debug|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release_OTEL|Any CPU.ActiveCfg = Release|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release_OTEL|ARM64.ActiveCfg = Release|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release_OTEL|x64.ActiveCfg = Release|Any CPU - {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release_OTEL|x86.ActiveCfg = Release|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release|ARM64.ActiveCfg = Release|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release|x64.ActiveCfg = Release|Any CPU {7D07C49F-A5A8-44AD-83B5-1E5B1F3080AA}.Release|x86.ActiveCfg = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|Any CPU.ActiveCfg = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|Any CPU.Build.0 = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|ARM64.ActiveCfg = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|ARM64.Build.0 = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|x64.ActiveCfg = Debug|x64 - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|x64.Build.0 = Debug|x64 - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|x86.ActiveCfg = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug_OTEL|x86.Build.0 = Debug|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -233,14 +143,6 @@ Global {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|x64.Build.0 = Debug|x64 {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|x86.ActiveCfg = Debug|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Debug|x86.Build.0 = Debug|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|Any CPU.ActiveCfg = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|Any CPU.Build.0 = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|ARM64.ActiveCfg = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|ARM64.Build.0 = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|x64.ActiveCfg = Release|x64 - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|x64.Build.0 = Release|x64 - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|x86.ActiveCfg = Release|Any CPU - {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release_OTEL|x86.Build.0 = Release|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release|Any CPU.Build.0 = Release|Any CPU {AD47E724-2038-46EA-ACF9-C28B53D39A9A}.Release|ARM64.ActiveCfg = Release|Any CPU diff --git a/scpdlltester/scpdlltester.vcxproj b/scpdlltester/scpdlltester.vcxproj index 4bcc6fe1..0b105f5f 100644 --- a/scpdlltester/scpdlltester.vcxproj +++ b/scpdlltester/scpdlltester.vcxproj @@ -1,18 +1,6 @@ - - Debug_OTEL - ARM64 - - - Debug_OTEL - Win32 - - - Debug_OTEL - x64 - Debug ARM64 @@ -52,12 +40,6 @@ v143 Unicode - - Application - true - v143 - Unicode - Application false @@ -71,24 +53,12 @@ v143 Unicode - - Application - true - v143 - Unicode - Application true v143 Unicode - - Application - true - v143 - Unicode - Application false @@ -111,24 +81,15 @@ - - - - - - - - - @@ -139,15 +100,9 @@ $(SolutionDir)bin\Debug\$(PlatformShortName)\ - - $(SolutionDir)bin\Debug\$(PlatformShortName)\ - $(SolutionDir)bin\Debug\$(PlatformShortName)\ - - $(SolutionDir)bin\Debug\$(PlatformShortName)\ - Level3 @@ -160,18 +115,6 @@ true - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - Level3 @@ -200,18 +143,6 @@ true - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - Level3 @@ -224,18 +155,6 @@ true - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - Level3 diff --git a/setup/DsHidMini.Installer.csproj b/setup/DsHidMini.Installer.csproj index d60fb7d8..5b9e6100 100644 --- a/setup/DsHidMini.Installer.csproj +++ b/setup/DsHidMini.Installer.csproj @@ -5,6 +5,7 @@ net48 Nefarius.DsHidMini.Setup latest + Debug;Release 3.0.0