diff --git a/build/nuke_build/Build.cs b/build/nuke_build/Build.cs index 5be54882..abbaa78c 100644 --- a/build/nuke_build/Build.cs +++ b/build/nuke_build/Build.cs @@ -514,6 +514,7 @@ class Build : NukeBuild { Path.Combine(solutionDir, "mididiag"), Path.Combine(solutionDir, "midiusbinfo"), + Path.Combine(solutionDir, "midimdnsinfo"), }; foreach (var projectFolder in toolsDirectories) @@ -547,15 +548,6 @@ class Build : NukeBuild } - - - - - - - - - MSBuildTasks.MSBuild(_ => _ .SetTargetPath(AppSdkSolutionFolder / "app-sdk-tools-and-tests.sln") .SetMaxCpuCount(14) @@ -581,12 +573,10 @@ class Build : NukeBuild stagingPlatform = "Arm64"; } - // MIDI diagnostics app + // MIDI utilities FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / stagingPlatform / Configuration.Release / $"mididiag.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true); - //FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / stagingPlatform / Configuration.Release / $"mididiag.exe.manifest", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true); - - // MIDI USB info utility FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "midiusbinfo" / stagingPlatform / Configuration.Release / $"midiusbinfo.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "midimdnsinfo" / stagingPlatform / Configuration.Release / $"midimdnsinfo.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true); } }); diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index 240a54ee..c0084699 100644 --- a/build/staging/version/BundleInfo.wxi +++ b/build/staging/version/BundleInfo.wxi @@ -1,4 +1,4 @@ - + diff --git a/build/staging/version/WindowsMidiServicesVersion.cs b/build/staging/version/WindowsMidiServicesVersion.cs index 6b655b3d..55b25d45 100644 --- a/build/staging/version/WindowsMidiServicesVersion.cs +++ b/build/staging/version/WindowsMidiServicesVersion.cs @@ -6,12 +6,12 @@ public static class MidiBuildInformation { public const string Source = "GitHub Preview"; public const string Name = "Developer Preview 8"; - public const string BuildFullVersion = "1.0.2-preview-8.241127-1315"; + public const string BuildFullVersion = "1.0.2-preview-8.241128-2138"; public const string VersionMajor = "1"; public const string VersionMinor = "0"; public const string VersionRevision = "2"; - public const string VersionDateNumber = "241127"; - public const string VersionTimeNumber = "1315"; + public const string VersionDateNumber = "241128"; + public const string VersionTimeNumber = "2138"; } } diff --git a/build/staging/version/WindowsMidiServicesVersion.h b/build/staging/version/WindowsMidiServicesVersion.h index 3cc3c22b..55eb2434 100644 --- a/build/staging/version/WindowsMidiServicesVersion.h +++ b/build/staging/version/WindowsMidiServicesVersion.h @@ -5,12 +5,12 @@ #define WINDOWS_MIDI_SERVICES_BUILD_SOURCE L"GitHub Preview" #define WINDOWS_MIDI_SERVICES_BUILD_VERSION_NAME L"Developer Preview 8" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-8.241127-1315" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-8.241128-2138" #define WINDOWS_MIDI_SERVICES_BUILD_VERSION_MAJOR L"1" #define WINDOWS_MIDI_SERVICES_BUILD_VERSION_MINOR L"0" #define WINDOWS_MIDI_SERVICES_BUILD_VERSION_REVISION L"2" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER L"241127" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1315" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER L"241128" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"2138" #endif diff --git a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj index d8af6da7..3ba3bf0c 100644 --- a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj +++ b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true false diff --git a/samples/cpp-winrt/basics/packages.config b/samples/cpp-winrt/basics/packages.config index 9ca35a8f..3ab704bb 100644 --- a/samples/cpp-winrt/basics/packages.config +++ b/samples/cpp-winrt/basics/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj b/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj index 8d2ce510..f6a96c43 100644 --- a/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj +++ b/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/samples/cpp-winrt/loopback-endpoints/packages.config b/samples/cpp-winrt/loopback-endpoints/packages.config index 9ca35a8f..3ab704bb 100644 --- a/samples/cpp-winrt/loopback-endpoints/packages.config +++ b/samples/cpp-winrt/loopback-endpoints/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/send-speed/packages.config b/samples/cpp-winrt/send-speed/packages.config index 9ca35a8f..3ab704bb 100644 --- a/samples/cpp-winrt/send-speed/packages.config +++ b/samples/cpp-winrt/send-speed/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj b/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj index 4f63dfad..f5f6a41b 100644 --- a/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj +++ b/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/samples/cpp-winrt/static-enum-endpoints/packages.config b/samples/cpp-winrt/static-enum-endpoints/packages.config index 9ca35a8f..3ab704bb 100644 --- a/samples/cpp-winrt/static-enum-endpoints/packages.config +++ b/samples/cpp-winrt/static-enum-endpoints/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj b/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj index e41cc22a..04d584c4 100644 --- a/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj +++ b/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/samples/cpp-winrt/watch-endpoints/packages.config b/samples/cpp-winrt/watch-endpoints/packages.config index 9ca35a8f..3ab704bb 100644 --- a/samples/cpp-winrt/watch-endpoints/packages.config +++ b/samples/cpp-winrt/watch-endpoints/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj b/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj index 728d33c5..5f4114e8 100644 --- a/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj +++ b/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/src/app-sdk/app-sdk-tools-and-tests.sln b/src/app-sdk/app-sdk-tools-and-tests.sln index 02f1e843..ee92035f 100644 --- a/src/app-sdk/app-sdk-tools-and-tests.sln +++ b/src/app-sdk/app-sdk-tools-and-tests.sln @@ -141,8 +141,8 @@ Global {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|Any CPU.Build.0 = Release|x64 {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64.ActiveCfg = Release|ARM64 {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64.Build.0 = Release|ARM64 - {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64EC.Build.0 = Release|ARM64EC + {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64EC.ActiveCfg = Release|ARM64 + {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|ARM64EC.Build.0 = Release|ARM64 {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|x64.ActiveCfg = Release|x64 {C787073C-50F0-5CA0-D53C-12107196F2F0}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/src/app-sdk/mididiag/main.cpp b/src/app-sdk/mididiag/main.cpp index 37f23ebd..4e4b031b 100644 --- a/src/app-sdk/mididiag/main.cpp +++ b/src/app-sdk/mididiag/main.cpp @@ -986,8 +986,8 @@ void OutputSystemInfo(_In_ SYSTEM_INFO const& sysinfo) void OutputProcessAndNativeMachine() { - USHORT processMachine; - USHORT nativeMachine; + USHORT processMachine{ 0 }; + USHORT nativeMachine{ 0 }; HANDLE hProcess = ::GetCurrentProcess(); diff --git a/src/app-sdk/mididiag/mididiag.vcxproj b/src/app-sdk/mididiag/mididiag.vcxproj index bea533c1..ab7d0521 100644 --- a/src/app-sdk/mididiag/mididiag.vcxproj +++ b/src/app-sdk/mididiag/mididiag.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/src/app-sdk/mididiag/packages.config b/src/app-sdk/mididiag/packages.config index e478c203..f1552491 100644 --- a/src/app-sdk/mididiag/packages.config +++ b/src/app-sdk/mididiag/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/app-sdk/midimdnsinfo/main.cpp b/src/app-sdk/midimdnsinfo/main.cpp index b245ec09..b5139d8f 100644 --- a/src/app-sdk/midimdnsinfo/main.cpp +++ b/src/app-sdk/midimdnsinfo/main.cpp @@ -34,6 +34,10 @@ int __cdecl main() std::cout << dye::grey("===================================================================") << std::endl; + + + + std::cout << std::endl; return 0; diff --git a/src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj b/src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj index f4837f8a..6fdd86e5 100644 --- a/src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj +++ b/src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true @@ -10,7 +10,7 @@ 15.0 {C787073C-50F0-5CA0-D53C-12107196F2F0} Win32Proj - midiusbinfo + midimdnsinfo 10.0 10.0.20348.0 midimdnsinfo @@ -73,42 +73,42 @@ $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ $(IncludePath) - ..\..\api\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);..\..\api\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(LibraryPath) + $(LibraryPath) $(ExternalIncludePath);$(SolutionDir)..\api\inc;$(SolutionDir)..\api\vsfiles\intermediate\IDL\$(Platform)\$(Configuration) @@ -135,18 +135,9 @@ Console false - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib;midiks.lib;midikscommon.lib;midiksenum.lib - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib;midiks.lib;midikscommon.lib;midiksenum.lib - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib - - - - - WIN32;%(PreprocessorDefinitions) - stdcpp20 - - - ntdll.lib;%(AdditionalDependencies) + %(AdditionalDependencies);onecoreuap.lib; + %(AdditionalDependencies);onecoreuap.lib; + %(AdditionalDependencies);onecoreuap.lib; @@ -167,9 +158,9 @@ true true false - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib;midiks.lib;midikscommon.lib;midiksenum.lib - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib;midiks.lib;midikscommon.lib;midiksenum.lib - %(AdditionalDependencies);onecoreuap.lib;ksuser.lib;avrt.lib + %(AdditionalDependencies);onecoreuap.lib; + %(AdditionalDependencies);onecoreuap.lib; + %(AdditionalDependencies);onecoreuap.lib; diff --git a/src/app-sdk/midimdnsinfo/packages.config b/src/app-sdk/midimdnsinfo/packages.config index e478c203..f1552491 100644 --- a/src/app-sdk/midimdnsinfo/packages.config +++ b/src/app-sdk/midimdnsinfo/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/app-sdk/midiusbinfo/midiusbinfo.vcxproj b/src/app-sdk/midiusbinfo/midiusbinfo.vcxproj index 58e4c440..1b792fbb 100644 --- a/src/app-sdk/midiusbinfo/midiusbinfo.vcxproj +++ b/src/app-sdk/midiusbinfo/midiusbinfo.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241127-1315 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138 true true true diff --git a/src/app-sdk/midiusbinfo/packages.config b/src/app-sdk/midiusbinfo/packages.config index e478c203..f1552491 100644 --- a/src/app-sdk/midiusbinfo/packages.config +++ b/src/app-sdk/midiusbinfo/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/app-sdk/sdk-runtime-installer/sdk-package/WindowsMidiServicesSdkRedist.wxs b/src/app-sdk/sdk-runtime-installer/sdk-package/WindowsMidiServicesSdkRedist.wxs index a7e2a5cb..d8025391 100644 --- a/src/app-sdk/sdk-runtime-installer/sdk-package/WindowsMidiServicesSdkRedist.wxs +++ b/src/app-sdk/sdk-runtime-installer/sdk-package/WindowsMidiServicesSdkRedist.wxs @@ -65,7 +65,20 @@ Value="[TOOLSROOT_INSTALLFOLDER]" Permanent="no"/> - + + + + + + + + + + diff --git a/src/app-sdk/winrt/MidiNetworkEndpointManager.cpp b/src/app-sdk/winrt/MidiNetworkEndpointManager.cpp index 7517e3fb..b173d1c9 100644 --- a/src/app-sdk/winrt/MidiNetworkEndpointManager.cpp +++ b/src/app-sdk/winrt/MidiNetworkEndpointManager.cpp @@ -59,61 +59,52 @@ namespace winrt::Microsoft::Windows::Devices::Midi2::Endpoints::Network::impleme collections::IVector MidiNetworkEndpointManager::GetAdvertisedHosts() { - //var askFor = new String[]{ "System.Devices.Dnssd.HostName", - // "System.Devices.Dnssd.ServiceName", - // "System.Devices.Dnssd.InstanceName", - // "System.Devices.IpAddress", - // "System.Devices.Dnssd.PortNumber", - // "System.Devices.Dnssd.TextAttributes", - //}; + auto results = winrt::single_threaded_vector(); - - auto results = enumeration::DeviceInformation::FindAllAsync( + auto entries = enumeration::DeviceInformation::FindAllAsync( MidiNetworkUdpDnsSdQueryString(), MidiNetworkUdpDnsSdQueryAdditionalProperties()).get(); - if (results && results.Size() > 0) + if (entries && entries.Size() > 0) { - for (auto const& result : results) + + for (auto const& entry : entries) { - if (result.Properties().HasKey(L"System.Devices.Dnssd.ServiceName")) - { + MidiAdvertisedHost host; + if (entry.Properties().HasKey(L"System.Devices.Dnssd.ServiceName")) + { + host.ServiceType = L"Test Service Name"; } - if (result.Properties().HasKey(L"System.Devices.Dnssd.InstanceName")) + if (entry.Properties().HasKey(L"System.Devices.Dnssd.InstanceName")) { - + host.ServiceInstanceName = L"Test Instance Name"; } - if (result.Properties().HasKey(L"System.Devices.IpAddress")) + if (entry.Properties().HasKey(L"System.Devices.IpAddress")) { - + //host.Address = L""; } - if (result.Properties().HasKey(L"System.Devices.Dnssd.PortNumber")) + if (entry.Properties().HasKey(L"System.Devices.Dnssd.PortNumber")) { - + //host.Port = L""; } - if (result.Properties().HasKey(L"System.Devices.Dnssd.TextAttributes")) + if (entry.Properties().HasKey(L"System.Devices.Dnssd.TextAttributes")) { + // TODO: Parse out the text entries } + + results.Append(host); } } - //var askFor = new String[]{ "System.Devices.Dnssd.HostName", - // "System.Devices.Dnssd.ServiceName", - // "System.Devices.Dnssd.InstanceName", - // "System.Devices.IpAddress", - // "System.Devices.Dnssd.PortNumber", - // "System.Devices.Dnssd.TextAttributes", - //}; - //dw = DeviceInformation.CreateWatcher(queryString, askFor, DeviceInformationKind.AssociationEndpointService); - - throw hresult_not_implemented(); + // empty collection if nothing found + return results; } } diff --git a/src/user-tools/midi-console/Midi/Commands/Enumerate/EnumMdnsAdvertisementsCommand.cs b/src/user-tools/midi-console/Midi/Commands/Enumerate/EnumMdnsAdvertisementsCommand.cs new file mode 100644 index 00000000..6d2e4d70 --- /dev/null +++ b/src/user-tools/midi-console/Midi/Commands/Enumerate/EnumMdnsAdvertisementsCommand.cs @@ -0,0 +1,27 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License +// ============================================================================ +// This is part of Windows MIDI Services and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ + +using Microsoft.Windows.Devices.Midi2.Endpoints.Network; + +namespace Microsoft.Midi.ConsoleApp +{ + internal class EnumMdnsAdvertisementsCommand : Command + { + public sealed class Settings : CommandSettings + { + } + + public override int Execute(CommandContext context, Settings settings) + { + + + + return 0; + } + } +} diff --git a/src/user-tools/midi-console/Midi/Program.cs b/src/user-tools/midi-console/Midi/Program.cs index f36b0ba5..3db90356 100644 --- a/src/user-tools/midi-console/Midi/Program.cs +++ b/src/user-tools/midi-console/Midi/Program.cs @@ -69,6 +69,16 @@ .WithAlias("transports") .WithDescription(Strings.CommandEnumerateTransportPluginsDescription) .WithExample("enumerate", "transport-plugins") + .WithExample("enumerate", "transports") + ; + + enumerate.AddCommand("mdns-advertisements") + .WithAlias("mdns") + .WithAlias("network-midi") + .WithDescription(Strings.CommandEnumerateMdnsAdvertisementsDescription) + .WithExample("enumerate", "mdns-advertisements") + .WithExample("enumerate", "mdns") + .WithExample("enumerate", "network-midi") ; diff --git a/src/user-tools/midi-console/Midi/Resources/Strings.Designer.cs b/src/user-tools/midi-console/Midi/Resources/Strings.Designer.cs index da2ff39f..4655927b 100644 --- a/src/user-tools/midi-console/Midi/Resources/Strings.Designer.cs +++ b/src/user-tools/midi-console/Midi/Resources/Strings.Designer.cs @@ -177,6 +177,15 @@ internal static string CommandEnumerateLegacyEndpointsDescription { } } + /// + /// Looks up a localized string similar to List discovered MDNS advertisements for Network MIDI 2.0 (UDP) services on the network.. + /// + internal static string CommandEnumerateMdnsAdvertisementsDescription { + get { + return ResourceManager.GetString("CommandEnumerateMdnsAdvertisementsDescription", resourceCulture); + } + } + /// /// Looks up a localized string similar to List all MIDI transport plugins installed on this PC.. /// diff --git a/src/user-tools/midi-console/Midi/Resources/Strings.resx b/src/user-tools/midi-console/Midi/Resources/Strings.resx index 65e02fab..7ad25aff 100644 --- a/src/user-tools/midi-console/Midi/Resources/Strings.resx +++ b/src/user-tools/midi-console/Midi/Resources/Strings.resx @@ -875,4 +875,7 @@ Timestamp Failed to start up the SDK initializer (COM object may not be available or registered) + + List discovered MDNS advertisements for Network MIDI 2.0 (UDP) services on the network. + \ No newline at end of file