Merge pull request #169 from microsoft/pete-dev

Sync for release
microsoft · Dec 18, 2023 · ae3b826 · ae3b826
2 parents 76a450c + 59be138
commit ae3b826
Show file tree

Hide file tree

Showing 27 changed files with 53 additions and 126 deletions.
diff --git 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
@@ -103,16 +103,6 @@
              threading="Both"
              trustLevel="Base"
              />
-          <class
-             activatableClassId="Windows.Devices.Midi2.MidiCIMessageUtility"
-             threading="Both"
-             trustLevel="Base"
-             />
-          <class
-             activatableClassId="Windows.Devices.Midi2.IMidiCIMessageUtilityStatics"
-             threading="Both"
-             trustLevel="Base"
-             />
           <class
              activatableClassId="Windows.Devices.Midi2.MidiFunctionBlock"
              threading="Both"

diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi
@@ -1,4 +1,4 @@
 <Include>
   <?define SetupVersionName="Developer Preview" ?>
-  <?define SetupVersionNumber="1.0.23351.1516" ?>
+  <?define SetupVersionNumber="1.0.23351.2023" ?>
 </Include>
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
@@ -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
@@ -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/...i-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj b/...i-developers/app-developers/samples/cpp-winrt/api-client-basics/api-client-basics.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" />
+  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" />
   <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -150,15 +150,15 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" />
+    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets'))" />
   </Target>
 </Project>
diff --git a/...tarted/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config b/...tarted/midi-developers/app-developers/samples/cpp-winrt/api-client-basics/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0104" targetFramework="native" />
+  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0114" targetFramework="native" />
 </packages>
diff --git a/...lopers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj b/...lopers/app-developers/samples/cpp-winrt/api-enum-endpoints/api-enum-endpoints-cpp.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" />
+  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" />
   <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -150,15 +150,15 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" />
+    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets'))" />
   </Target>
 </Project>
diff --git a/...arted/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config b/...arted/midi-developers/app-developers/samples/cpp-winrt/api-enum-endpoints/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0104" targetFramework="native" />
+  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0114" targetFramework="native" />
 </packages>
diff --git a/...pers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj b/...pers/app-developers/samples/cpp-winrt/api-watch-endpoints/api-watch-endpoints-cpp.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" />
+  <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" />
   <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -150,15 +150,15 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" />
+    <Import Project="packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets" Condition="Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.props'))" />
-    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0104\build\native\Windows.Devices.Midi2.targets'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.props'))" />
+    <Error Condition="!Exists('packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Windows.Devices.Midi2.1.0.0-preview.2-0114\build\native\Windows.Devices.Midi2.targets'))" />
   </Target>
 </Project>
diff --git a/...rted/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config b/...rted/midi-developers/app-developers/samples/cpp-winrt/api-watch-endpoints/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0104" targetFramework="native" />
+  <package id="Windows.Devices.Midi2" version="1.0.0-preview.2-0114" targetFramework="native" />
 </packages>
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
@@ -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/)
diff --git a/...n/electron-api-basics/.vscode/launch.json → ...s/electron-api-basics/.vscode/launch.json b/...n/electron-api-basics/.vscode/launch.json → ...s/electron-api-basics/.vscode/launch.json
diff --git a/...s/electron/electron-api-basics/index.html → ...lectron-js/electron-api-basics/index.html b/...s/electron/electron-api-basics/index.html → ...lectron-js/electron-api-basics/index.html
diff --git a/...ples/electron/electron-api-basics/main.js → ...s/electron-js/electron-api-basics/main.js b/...ples/electron/electron-api-basics/main.js → ...s/electron-js/electron-api-basics/main.js
diff --git a/...ron/electron-api-basics/package-lock.json → ...-js/electron-api-basics/package-lock.json b/...ron/electron-api-basics/package-lock.json → ...-js/electron-api-basics/package-lock.json
diff --git a/...electron/electron-api-basics/package.json → ...ctron-js/electron-api-basics/package.json b/...electron/electron-api-basics/package.json → ...ctron-js/electron-api-basics/package.json
diff --git a/...s/electron/electron-api-basics/preload.js → ...lectron-js/electron-api-basics/preload.js b/...s/electron/electron-api-basics/preload.js → ...lectron-js/electron-api-basics/preload.js