From a4660d48979d1171515cc347127c4f21a3d5df83 Mon Sep 17 00:00:00 2001 From: Pete Brown Date: Tue, 21 Jan 2025 18:52:15 -0500 Subject: [PATCH] fix connection issue on arm64 --- build/staging/version/BundleInfo.wxi | 2 +- build/staging/version/WindowsMidiServicesVersion.cs | 6 +++--- build/staging/version/WindowsMidiServicesVersion.h | 6 +++--- samples/cpp-winrt/basics/client-basics-cpp.vcxproj | 2 +- samples/cpp-winrt/basics/packages.config | 2 +- .../loopback-endpoints/loopback-endpoints-cpp.vcxproj | 2 +- samples/cpp-winrt/loopback-endpoints/packages.config | 2 +- samples/cpp-winrt/send-speed/packages.config | 2 +- samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj | 2 +- .../cpp-winrt/simple-app-to-app-midi/packages.config | 2 +- .../simple-app-to-app-cpp.vcxproj | 5 +---- .../cpp-winrt/static-enum-endpoints/packages.config | 2 +- .../static-enum-endpoints-cpp.vcxproj | 2 +- samples/cpp-winrt/watch-endpoints/packages.config | 2 +- .../watch-endpoints/watch-endpoints-cpp.vcxproj | 2 +- src/api/Midi2.sln | 11 +++++++---- src/app-sdk/mididiag/mididiag.vcxproj | 2 +- src/app-sdk/mididiag/packages.config | 2 +- src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj | 2 +- src/app-sdk/midimdnsinfo/packages.config | 2 +- src/app-sdk/midiusbinfo/midiusbinfo.vcxproj | 2 +- src/app-sdk/midiusbinfo/packages.config | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index a3d4a7be..ad340fe8 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 10090930..7b0d2334 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 9"; - public const string BuildFullVersion = "1.0.2-preview-9.250119-2129"; + public const string BuildFullVersion = "1.0.2-preview-9.250121-1820"; public const string VersionMajor = "1"; public const string VersionMinor = "0"; public const string VersionRevision = "2"; - public const string VersionDateNumber = "250119"; - public const string VersionTimeNumber = "2129"; + public const string VersionDateNumber = "250121"; + public const string VersionTimeNumber = "1820"; } } diff --git a/build/staging/version/WindowsMidiServicesVersion.h b/build/staging/version/WindowsMidiServicesVersion.h index 043dd140..9c262714 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 9" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-9.250119-2129" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-9.250121-1820" #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"250119" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"2129" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER L"250121" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1820" #endif diff --git a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj index f7650b87..09708f0d 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true false diff --git a/samples/cpp-winrt/basics/packages.config b/samples/cpp-winrt/basics/packages.config index 4f7d572e..712dd709 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 7334fa94..f6021629 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/samples/cpp-winrt/loopback-endpoints/packages.config b/samples/cpp-winrt/loopback-endpoints/packages.config index 4f7d572e..712dd709 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 4f7d572e..712dd709 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 52a593c1..36e4a8ef 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/samples/cpp-winrt/simple-app-to-app-midi/packages.config b/samples/cpp-winrt/simple-app-to-app-midi/packages.config index 4f7d572e..712dd709 100644 --- a/samples/cpp-winrt/simple-app-to-app-midi/packages.config +++ b/samples/cpp-winrt/simple-app-to-app-midi/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/cpp-winrt/simple-app-to-app-midi/simple-app-to-app-cpp.vcxproj b/samples/cpp-winrt/simple-app-to-app-midi/simple-app-to-app-cpp.vcxproj index 374e15ee..df679f33 100644 --- a/samples/cpp-winrt/simple-app-to-app-midi/simple-app-to-app-cpp.vcxproj +++ b/samples/cpp-winrt/simple-app-to-app-midi/simple-app-to-app-cpp.vcxproj @@ -2,7 +2,7 @@ - Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true @@ -148,9 +148,6 @@ - - false - diff --git a/samples/cpp-winrt/static-enum-endpoints/packages.config b/samples/cpp-winrt/static-enum-endpoints/packages.config index 4f7d572e..712dd709 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 fc29d509..c7cd501f 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/samples/cpp-winrt/watch-endpoints/packages.config b/samples/cpp-winrt/watch-endpoints/packages.config index 4f7d572e..712dd709 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 a0d240ab..9802dc24 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/src/api/Midi2.sln b/src/api/Midi2.sln index 79852dcf..9c288970 100644 --- a/src/api/Midi2.sln +++ b/src/api/Midi2.sln @@ -70,9 +70,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midi2.Service.unittests", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MidiSrv", "Service\Exe\MidiSrv.vcxproj", "{4F48735C-9364-462C-B207-2262D4E62589}" ProjectSection(ProjectDependencies) = postProject + {03009B2B-E3E8-49DC-A0D6-0FA90AE3B15B} = {03009B2B-E3E8-49DC-A0D6-0FA90AE3B15B} {093852BE-32B8-4EB8-814E-91410FFDB4F6} = {093852BE-32B8-4EB8-814E-91410FFDB4F6} {0E739771-0C0B-42EE-AADB-95E7E1E5A5ED} = {0E739771-0C0B-42EE-AADB-95E7E1E5A5ED} + {0F94A751-9159-4A88-8A71-347151124548} = {0F94A751-9159-4A88-8A71-347151124548} {206CEDBF-6343-4171-87A8-1DDDE6E2ED60} = {206CEDBF-6343-4171-87A8-1DDDE6E2ED60} + {22ABB513-5E77-474D-AA11-E56B8071EB4C} = {22ABB513-5E77-474D-AA11-E56B8071EB4C} {2480B077-46E5-42AE-9BDB-685AFF258529} = {2480B077-46E5-42AE-9BDB-685AFF258529} {366FA284-D8C0-4CC5-B9A3-917EAB967173} = {366FA284-D8C0-4CC5-B9A3-917EAB967173} {C31CEE7B-8BEC-46A6-A8FD-74BABB01A4FB} = {C31CEE7B-8BEC-46A6-A8FD-74BABB01A4FB} @@ -367,8 +370,8 @@ Global {4F48735C-9364-462C-B207-2262D4E62589}.Debug|x86.Build.0 = Debug|Win32 {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64.ActiveCfg = Release|ARM64 {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64.Build.0 = Release|ARM64 - {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64EC.Build.0 = Release|ARM64EC + {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64EC.ActiveCfg = Release|x64 + {4F48735C-9364-462C-B207-2262D4E62589}.Release|ARM64EC.Build.0 = Release|x64 {4F48735C-9364-462C-B207-2262D4E62589}.Release|Win32.ActiveCfg = Release|Win32 {4F48735C-9364-462C-B207-2262D4E62589}.Release|Win32.Build.0 = Release|Win32 {4F48735C-9364-462C-B207-2262D4E62589}.Release|x64.ActiveCfg = Release|x64 @@ -387,8 +390,8 @@ Global {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Debug|x86.Build.0 = Debug|Win32 {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64.ActiveCfg = Release|ARM64 {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64.Build.0 = Release|ARM64 - {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64EC.ActiveCfg = Release|x64 - {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64EC.Build.0 = Release|x64 + {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|ARM64EC.Build.0 = Release|ARM64EC {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|Win32.ActiveCfg = Release|Win32 {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|Win32.Build.0 = Release|Win32 {9991FF5B-E0F0-4373-A7C2-20B1EFDE5F70}.Release|x64.ActiveCfg = Release|x64 diff --git a/src/app-sdk/mididiag/mididiag.vcxproj b/src/app-sdk/mididiag/mididiag.vcxproj index 90e0bf70..a7d11a8c 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/src/app-sdk/mididiag/packages.config b/src/app-sdk/mididiag/packages.config index c5e373f7..2c326a3a 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/midimdnsinfo.vcxproj b/src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj index d5991300..450d057a 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/src/app-sdk/midimdnsinfo/packages.config b/src/app-sdk/midimdnsinfo/packages.config index c5e373f7..2c326a3a 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 fecb8cd6..54d106e7 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-9.250119-2129 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250121-1820 true true true diff --git a/src/app-sdk/midiusbinfo/packages.config b/src/app-sdk/midiusbinfo/packages.config index c5e373f7..2c326a3a 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