From bb0a9792f6bd5209a156439a64e038ec5e42284d Mon Sep 17 00:00:00 2001 From: Pete Brown Date: Sun, 17 Dec 2023 17:43:41 -0500 Subject: [PATCH 1/3] Update samples and documentation for preview Sync NuGet packages, registration entries, documentation, samples, etc. --- build/staging/version/BundleInfo.wxi | 2 +- .../app-developers/docs/midi-api-types.md | 5 +++- .../app-developers/samples/README.md | 4 +++ .../api-client-basics.vcxproj | 8 ++--- .../api-client-basics/packages.config | 2 +- .../api-enum-endpoints-cpp.vcxproj | 8 ++--- .../api-enum-endpoints/packages.config | 2 +- .../api-watch-endpoints-cpp.vcxproj | 8 ++--- .../api-watch-endpoints/packages.config | 2 +- .../samples/electron-js/README.md | 7 +++++ .../electron-api-basics/.vscode/launch.json | 0 .../electron-api-basics/index.html | 0 .../electron-api-basics/main.js | 0 .../electron-api-basics/package-lock.json | 0 .../electron-api-basics/package.json | 0 .../electron-api-basics/preload.js | 0 get-started/midi-users/docs/midi-console.md | 30 ++++++++++++------- .../nuget/Windows.Devices.Midi2.nuspec | 2 +- .../Midi2Client/MidiCIMessageUtility.cpp | 19 ------------ .../Client/Midi2Client/MidiCIMessageUtility.h | 26 ---------------- .../Midi2Client/MidiCIMessageUtility.idl | 27 ----------------- .../Midi2Client/WinRTActivationEntries.txt | 3 -- .../Midi2Client/Windows.Devices.Midi2.vcxproj | 7 ----- .../Windows.Devices.Midi2.vcxproj.filters | 3 -- src/user-tools/midi-console/Midi/Midi.csproj | 2 +- 25 files changed, 53 insertions(+), 114 deletions(-) create mode 100644 get-started/midi-developers/app-developers/samples/electron-js/README.md rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/.vscode/launch.json (100%) rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/index.html (100%) rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/main.js (100%) rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/package-lock.json (100%) rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/package.json (100%) rename get-started/midi-developers/app-developers/samples/{electron => electron-js}/electron-api-basics/preload.js (100%) delete mode 100644 src/api/Client/Midi2Client/MidiCIMessageUtility.cpp delete mode 100644 src/api/Client/Midi2Client/MidiCIMessageUtility.h delete mode 100644 src/api/Client/Midi2Client/MidiCIMessageUtility.idl diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index 63b91421..6ad4c466 100644 --- a/build/staging/version/BundleInfo.wxi +++ b/build/staging/version/BundleInfo.wxi @@ -1,4 +1,4 @@ - + diff --git a/get-started/midi-developers/app-developers/docs/midi-api-types.md b/get-started/midi-developers/app-developers/docs/midi-api-types.md index 48e0816b..d99fa83b 100644 --- a/get-started/midi-developers/app-developers/docs/midi-api-types.md +++ b/get-started/midi-developers/app-developers/docs/midi-api-types.md @@ -93,7 +93,7 @@ MIDI 1.0 had the concept of ports. Each port was just a single cable/jack from a In MIDI 2.0, what used to be a Port is now a Group address in the message data. Instead of speaking to N different enumerated entities for a device, the application speaks to a single bidirectional UMP endpoint which aggregates all of this information, much like the driver did behind the scenes in MIDI 1.0. We recognize that there are cases when the old model of MIDI Ports is more convenient for passing around in a DAW or similar app, particularly for incoming data. -To help, there are plugins which implement `IMidiEndpointMessageProcessingPlugin` and optionally one or both of `IMidiEndpointMessageListener` or `IMidiEndpointMessageResponder`. The API includes a few stock plugins, but developers are free to provide their own, or add to the SDK. +To help, there are plugins which implement `IMidiEndpointMessageProcessingPlugin`. The API includes a few stock plugins, but developers are free to provide their own, or add to the SDK. | Type | Description | | ----- | -- | @@ -128,6 +128,9 @@ Although we know there are many native libraries which can do message manipulati | ----- | -- | | MidiMessageUtility | A set of utilities for manipulating UMP data. | | MidiMessageBuilder | Builder for the major types of messages. This doesn't include builders for every possible message, as that is evolving. We may add that to the SDK. This builder is typically where you'd want to start when creating new messages. | +| MidiStreamMessageBuilder | Functions for creating and parsing Stream (type F) messages | +| MidiMessageConverter | Functions for converting MIDI Messages to/from bytestream messages, and Windows.Devices.Midi WinRT message types | +| MidiMessageTranslator | Functions for converting between MIDI 1.0 and MIDI 2.0 protocols, all in UMP | ## Metadata diff --git a/get-started/midi-developers/app-developers/samples/README.md b/get-started/midi-developers/app-developers/samples/README.md index fddcc8f8..03e97e22 100644 --- a/get-started/midi-developers/app-developers/samples/README.md +++ b/get-started/midi-developers/app-developers/samples/README.md @@ -1,3 +1,7 @@ # Samples Sample code showing how to use the SDK and API from various languages and development toolsets. + +- [C++ Examples](cpp-winrt/README.md) +- [C# Examples](csharp-net/README.md) +- [Electron NodeJS Examples](electron-js/README.md) diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj index ce1dbecd..50cc09e6 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj @@ -1,6 +1,6 @@ - + true @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - - + + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config index ac0328de..caaa3138 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj index 715efdb9..e033e910 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj @@ -1,6 +1,6 @@ - + true @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - - + + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config index ac0328de..caaa3138 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj index 80527eb1..43f2758a 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj @@ -1,6 +1,6 @@ - + true @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - - + + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config index ac0328de..caaa3138 100644 --- a/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config +++ b/get-started/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/electron-js/README.md b/get-started/midi-developers/app-developers/samples/electron-js/README.md new file mode 100644 index 00000000..c0e5bba4 --- /dev/null +++ b/get-started/midi-developers/app-developers/samples/electron-js/README.md @@ -0,0 +1,7 @@ +# Electron JavaScript Samples + +Experimental projection for Electron using NodeJS. If you use this projection for a MIDI application, please let us know on the [Windows MIDI Services Discord Server](https://aka.ms/mididiscord) + +## Samples + +- [Basics](electron-api-basics/) \ No newline at end of file diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/.vscode/launch.json b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/.vscode/launch.json similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/.vscode/launch.json rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/.vscode/launch.json diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/index.html b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/index.html similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/index.html rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/index.html diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/main.js b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/main.js similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/main.js rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/main.js diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/package-lock.json b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/package-lock.json similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/package-lock.json rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/package-lock.json diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/package.json b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/package.json similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/package.json rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/package.json diff --git a/get-started/midi-developers/app-developers/samples/electron/electron-api-basics/preload.js b/get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/preload.js similarity index 100% rename from get-started/midi-developers/app-developers/samples/electron/electron-api-basics/preload.js rename to get-started/midi-developers/app-developers/samples/electron-js/electron-api-basics/preload.js diff --git a/get-started/midi-users/docs/midi-console.md b/get-started/midi-users/docs/midi-console.md index c2ddea16..712bfd30 100644 --- a/get-started/midi-users/docs/midi-console.md +++ b/get-started/midi-users/docs/midi-console.md @@ -4,13 +4,17 @@ If you have the midi console installed, you can invoke it from any command promp ## General Information +### Commands vs Options + +MIDI Console commands are words with no symbol prefix. For example `endpoint` or `send-message-file`. Options are prefixed with two dashes if you use the full word, or a single dash if you use the single-letter abbreviation. For example `--help` or `-h`. There is no statement completion built in to the console, but there are some supported abbreviations for commands. These are not yet fully documented but are present in the Program.cs in the console source code. + ### "Ports" vs "Streams" In MIDI 1.0, specifically USB MIDI 1.0, a connected device would have a single input and single output stream. Inside that stream are packets of data with virtual cable numbers. Those numbers (16 total at most) identify the "port" the data is going to. Operating systems would then translate those into input and output ports. Those cable numbers were hidden from users. MIDI 2.0 does not have a concept of a port. Instead, you always work with the stream itself. The group number, which is in the MIDI message now, is the moral equivalent of that cable number. -So where you may have seen a device with 5 input and 5 output ports in the past, you will now see a single bidirectional UMP Endpoint stream with 5 input groups and 5 output groups. We know this can take some getting used to, but it enables us to use MIDI 1.0 devices as though they are MIDI 2.0 devices, and provide a unified API. +So where you may have seen a device with 5 input and 5 output ports in the past, you will now see a **single bidirectional UMP Endpoint stream** with 5 input groups and 5 output groups. We know this can take some getting used to, but it enables us to use MIDI 1.0 devices as though they are MIDI 2.0 devices, and provide a unified API. ### Help @@ -96,7 +100,7 @@ All of the above statements will return a list of all the user-focused UMP endpo ### Enumerate Classic Byte-stream (MIDI 1.0) Endpoints -This uses the old API. Its primary reason for existance is so you can see what's shown to older APIs vs what is shown for the new Windows MIDI Services API. As with the UMP endpoints, the commands have aliases, so the following are all equivalent +This uses the old WinRT API. Its primary reason for existance is so you can see what's shown to older APIs vs what is shown for the new Windows MIDI Services API. As with the UMP endpoints, the commands have aliases, so the following are all equivalent ``` midi enumerate bytestream-endpoints @@ -124,7 +128,7 @@ midi watch-endpoints midi watch ``` -Note that only UMP endpoints are watched for changes. The older MIDI API is not used here. When you want to stop watching the endpoints for changes, hit the `escape` key. +Note that only UMP endpoints (or bytestream endpoints converted to UMP by the new USB driver and service) are watched for changes. The older MIDI API is not used here. When you want to stop watching the endpoints for changes, hit the `escape` key. ## Single-Endpoint Commands @@ -146,6 +150,8 @@ In the Device Manager in Windows, you can only see a subset of properties for a midi endpoint properties ``` + + By default, only key properties are displayed. If you want to see the complete list of all properties for the endpoint device, its container, and its parent device, add the `--verbose` parameter. ``` @@ -158,7 +164,7 @@ As with other endpoint commands, if you provide the endpoint device Id, it will By default, every UMP Endpoint in Windows MIDI Services is multi-client. That means that more than one application can open a connection to the endpoint and send and/or receive messages. This also makes it possible to monitor all the incoming messages on an endpoint, even when that endpoint is in use by another application. -When run in verbose mode, the monitor will display each message as it arrives. It also displays helpful information about the type of the message, the group and channel when appropriate, the timestap offset from the previous message, and more. +When run in `verbose` mode, the monitor will display each message as it arrives. It also displays helpful information about the type of the message, the group and channel when appropriate, the timestap offset (from the previous message if it was received recently), and more. This requires a fairly wide console window to allow formatting each message to take up only a single line. In a narrow window the format will be a bit ugly. We recommend using the [Windows Terminal application](https://apps.microsoft.com/detail/9N0DX20HK701), which has support for zooming in and out using the mouse wheel, different fonts, and more. When run without the `--verbose` option, the monitor displays a count of the number of messages received. @@ -180,6 +186,8 @@ When you have completed monitoring an endpoint, hit the `escape` key to close th Sending a message to an endpoint is very helpful for testing, but can also be used in automation to, for example, change the current program, or set a MIDI CC value. It would be very easy for a person to build a batch file or PowerShell script which used midi.exe to synchronize different devices, or reset devices to a known state in preparation for a performance. +The message data beyond the message type (first 4 bits) is not pre-validated, so the data can be anything. However, the number of 32 bit words must match the message type per the MIDI 2.0 specification. + Send a single UMP32 message immediately ``` @@ -192,23 +200,25 @@ Send a single UMP64 message ten times midi endpoint send-message 0x41234567 0xDEADBEEF --count 10 ``` -Send a single UMP64 message 2 seconds from now (2 million microseconds) +Schedule a single UMP64 message 2 seconds from now (2 million microseconds). Offsets are in microseconds to provide more precise control. ``` midi endpoint send-message 0x41234567 0xFEEDF00D --offset-microseconds 2000000 ``` -Send a single UMP64 message fifteen times, but with a delay of two seconds in between each message +Send a single UMP64 message fifteen times, but with a delay of two seconds (2000 milliseconds) in between each message. Delays are in milliseconds because they are there primarily to prevent flooding with older devices. ``` midi endpoint send-message 0x41234567 0xDEADBEEF --count 15 --pause 2000 ``` +In general, we recommend sending messages in hexadecimal format (prefix `0x` followed by 8 hexadecimal digits)as it is easier to visually inspect the information being sent. The 1-4 MIDI words are in order from left to right, from 1 to 4. + ### Send a File full of Messages If you want to send a file full of messages, for SysEx or testing, for example, the console has provision for this. -The file needs to have one message per line, with 1-4 32 bit words as appropriate. There are options for delimeter (auto, space, comma, pipe, tab), word format (binary, hex, or decimal) as well as an option to change the group index. The latter is especially important when you have a SysEx file saved from one group and you want to send it on another group. +The file needs to have one message per line, with 1-4 32 bit words as appropriate. There are options for delimeter (auto, space, comma, pipe, tab), word format (binary, hex, or decimal) as well as an option to change the group index. The latter is especially important when you have a SysEx file saved from one group and you want to send it on another group. The file name can include system variables which require expansion. ``` midi endpoint send-message-file %userprofile%\Documents\SysExBank12.txt --new-group-index 5 @@ -269,10 +279,10 @@ F3345678h 12345678h 86754321h 86753099h ### Receive Message and Save to a File -TODO: This capability is a work-in-progress. +TODO: This capability is a work-in-progress and is not yet functional. ## Technical Information -The Windows MIDI Services Console app has been developed using C#, .NET 8, the MIT-licensed open source [Spectre.Console](https://spectreconsole.net/) library, and the Microsoft-developed open source [C#/WinRT](https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/) toolkit. +The Windows MIDI Services Console app has been developed using C#, .NET 8, the MIT-licensed open source [Spectre.Console](https://spectreconsole.net/) library, and the Microsoft-developed open source [C#/WinRT](https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/) toolkit. -It uses the same Windows MIDI Services MIDI API available to other desktop applications. Its full source code is available on our Github repo at https://aka.ms/midirepo . Pull-requests, feature requests, and bug reports welcome. +The console uses the same Windows MIDI Services WinRT APIs available to other desktop applications. Its full source code is available [on our Github repo](https://aka.ms/midirepo). Pull-requests, feature requests, and bug reports welcome. The project is open source, but we request that instead of forking it to create your own version, you consider contributing to the project. diff --git a/src/api/Client/Midi2Client-Projection/nuget/Windows.Devices.Midi2.nuspec b/src/api/Client/Midi2Client-Projection/nuget/Windows.Devices.Midi2.nuspec index fbe9d472..30f07a4f 100644 --- a/src/api/Client/Midi2Client-Projection/nuget/Windows.Devices.Midi2.nuspec +++ b/src/api/Client/Midi2Client-Projection/nuget/Windows.Devices.Midi2.nuspec @@ -2,7 +2,7 @@ Windows.Devices.Midi2 - 1.0.0-preview.2-0113 + 1.0.0-preview.2-0114 Microsoft Corporation Windows MIDI Services API. Minimum package necessary to use Windows MIDI Services from an app on a PC that has Windows MIDI Services installed. MIT diff --git a/src/api/Client/Midi2Client/MidiCIMessageUtility.cpp b/src/api/Client/Midi2Client/MidiCIMessageUtility.cpp deleted file mode 100644 index 801c6557..00000000 --- a/src/api/Client/Midi2Client/MidiCIMessageUtility.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License -// ============================================================================ -// This is part of the Windows MIDI Services App API and should be used -// in your Windows application via an official binary distribution. -// Further information: https://github.com/microsoft/MIDI/ -// ============================================================================ - -#include "pch.h" -#include "MidiCIMessageUtility.h" -#include "MidiCIMessageUtility.g.cpp" - -namespace winrt::Windows::Devices::Midi2::implementation -{ - void MidiCIMessageUtility::Foo() - { - throw hresult_not_implemented(); - } -} diff --git a/src/api/Client/Midi2Client/MidiCIMessageUtility.h b/src/api/Client/Midi2Client/MidiCIMessageUtility.h deleted file mode 100644 index fb4eaf0e..00000000 --- a/src/api/Client/Midi2Client/MidiCIMessageUtility.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License -// ============================================================================ -// This is part of the Windows MIDI Services App API and should be used -// in your Windows application via an official binary distribution. -// Further information: https://github.com/microsoft/MIDI/ -// ============================================================================ - -#pragma once -#include "MidiCIMessageUtility.g.h" - -namespace winrt::Windows::Devices::Midi2::implementation -{ - struct MidiCIMessageUtility - { - MidiCIMessageUtility() = default; - - static void Foo(); - }; -} -namespace winrt::Windows::Devices::Midi2::factory_implementation -{ - struct MidiCIMessageUtility : MidiCIMessageUtilityT - { - }; -} diff --git a/src/api/Client/Midi2Client/MidiCIMessageUtility.idl b/src/api/Client/Midi2Client/MidiCIMessageUtility.idl deleted file mode 100644 index d3881be3..00000000 --- a/src/api/Client/Midi2Client/MidiCIMessageUtility.idl +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License -// ============================================================================ -// This is part of the Windows MIDI Services App API and should be used -// in your Windows application via an official binary distribution. -// Further information: https://github.com/microsoft/MIDI/ -// ============================================================================ - -#include "midl_defines.h" -MIDI_IDL_IMPORT - -// this simply checks that the UMP packet type aligns with the number of words -// Beyond that, the API generally does not care what's in the UMP. This enables -// new messages to be defined without breaking the API - -import "MidiMessage64.idl"; -import "MidiMessage128.idl"; - -namespace Windows.Devices.Midi2 -{ - [MIDI_API_CONTRACT(1)] - static runtimeclass MidiCIMessageUtility - { - static void Foo(); // TODO: placeholder - - }; -} diff --git a/src/api/Client/Midi2Client/WinRTActivationEntries.txt b/src/api/Client/Midi2Client/WinRTActivationEntries.txt index 756fcda7..5cf4e6a9 100644 --- a/src/api/Client/Midi2Client/WinRTActivationEntries.txt +++ b/src/api/Client/Midi2Client/WinRTActivationEntries.txt @@ -40,9 +40,6 @@ Windows.Devices.Midi2.IMidiMessageTranslatorStatics | 0 | 0 | 0 Windows.Devices.Midi2.MidiMessageUtility | 0 | 0 | 0 Windows.Devices.Midi2.IMidiMessageUtilityStatics | 0 | 0 | 0 -Windows.Devices.Midi2.MidiCIMessageUtility | 0 | 0 | 0 -Windows.Devices.Midi2.IMidiCIMessageUtilityStatics | 0 | 0 | 0 - # Metadata Windows.Devices.Midi2.MidiFunctionBlock | 0 | 0 | 0 diff --git a/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj b/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj index 97b9ccbf..7ac8ab59 100644 --- a/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj +++ b/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj @@ -243,9 +243,6 @@ - - MidiCIMessageUtility.idl - MidiEndpointConnection.idl @@ -352,9 +349,6 @@ - - MidiCIMessageUtility.idl - MidiEndpointConnection.idl @@ -464,7 +458,6 @@ - diff --git a/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj.filters b/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj.filters index 6ef488c2..32db8b82 100644 --- a/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj.filters +++ b/src/api/Client/Midi2Client/Windows.Devices.Midi2.vcxproj.filters @@ -428,9 +428,6 @@ API\Messages\Utility - - API\Messages\Utility - API\BasicTypes diff --git a/src/user-tools/midi-console/Midi/Midi.csproj b/src/user-tools/midi-console/Midi/Midi.csproj index 5190402a..eaab3557 100644 --- a/src/user-tools/midi-console/Midi/Midi.csproj +++ b/src/user-tools/midi-console/Midi/Midi.csproj @@ -31,7 +31,7 @@ - + From e5708f8879bd9263dfa7628321121556a8547e63 Mon Sep 17 00:00:00 2001 From: Pete Brown Date: Sun, 17 Dec 2023 18:51:53 -0500 Subject: [PATCH 2/3] Updated activation artifacts --- build/staging/reg/WinRTActivationEntries.cs | 2 -- build/staging/reg/WinRTActivationEntries.xml | 10 ---------- build/staging/version/BundleInfo.wxi | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/build/staging/reg/WinRTActivationEntries.cs b/build/staging/reg/WinRTActivationEntries.cs index b6188386..136c10fa 100644 --- a/build/staging/reg/WinRTActivationEntries.cs +++ b/build/staging/reg/WinRTActivationEntries.cs @@ -26,8 +26,6 @@ class RegistryEntries new RegEntry{ ClassName="Windows.Devices.Midi2.IMidiMessageTranslatorStatics", ActivationType=0, Threading=0, TrustLevel=0 }, new RegEntry{ ClassName="Windows.Devices.Midi2.MidiMessageUtility", ActivationType=0, Threading=0, TrustLevel=0 }, new RegEntry{ ClassName="Windows.Devices.Midi2.IMidiMessageUtilityStatics", ActivationType=0, Threading=0, TrustLevel=0 }, - new RegEntry{ ClassName="Windows.Devices.Midi2.MidiCIMessageUtility", ActivationType=0, Threading=0, TrustLevel=0 }, - new RegEntry{ ClassName="Windows.Devices.Midi2.IMidiCIMessageUtilityStatics", ActivationType=0, Threading=0, TrustLevel=0 }, new RegEntry{ ClassName="Windows.Devices.Midi2.MidiFunctionBlock", ActivationType=0, Threading=0, TrustLevel=0 }, new RegEntry{ ClassName="Windows.Devices.Midi2.MidiUniqueId", ActivationType=0, Threading=0, TrustLevel=0 }, new RegEntry{ ClassName="Windows.Devices.Midi2.MidiGroupTerminalBlock", ActivationType=0, Threading=0, TrustLevel=0 }, diff --git a/build/staging/reg/WinRTActivationEntries.xml b/build/staging/reg/WinRTActivationEntries.xml index ebaddcfe..6185867f 100644 --- a/build/staging/reg/WinRTActivationEntries.xml +++ b/build/staging/reg/WinRTActivationEntries.xml @@ -103,16 +103,6 @@ threading="Both" trustLevel="Base" /> - - - + From 59be138e24d9a1e6efb0ac54fbd97492f18d49fd Mon Sep 17 00:00:00 2001 From: Pete Brown Date: Sun, 17 Dec 2023 21:02:51 -0500 Subject: [PATCH 3/3] Update BundleInfo.wxi --- build/staging/version/BundleInfo.wxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index 18c880c9..79c14e05 100644 --- a/build/staging/version/BundleInfo.wxi +++ b/build/staging/version/BundleInfo.wxi @@ -1,4 +1,4 @@ - +