Skip to content

Commit

Permalink
Merge pull request #485 from microsoft/pete-dev
Browse files Browse the repository at this point in the history 
Fix sequence number issue. Recompile for DP9 NAMM Preview 2
  • Loading branch information
@Psychlist1972
Psychlist1972 authored Jan 13, 2025
2 parents f33b267 + 78a01c8 commit 289cd45
Show file tree
Hide file tree
Showing 26 changed files with 80 additions and 50 deletions.
2 changes: 1 addition & 1 deletion build/staging/version/BundleInfo.wxi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Include>
<?define SetupVersionName="Developer Preview 9 Arm64" ?>
<?define SetupVersionNumber="1.0.2-preview-9.250112-1659" ?>
<?define SetupVersionNumber="1.0.2-preview-9.250112-2036" ?>
</Include>
4 changes: 2 additions & 2 deletions build/staging/version/WindowsMidiServicesVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.250112-1659";
public const string BuildFullVersion = "1.0.2-preview-9.250112-2036";
public const string VersionMajor = "1";
public const string VersionMinor = "0";
public const string VersionRevision = "2";
public const string VersionDateNumber = "250112";
public const string VersionTimeNumber = "1659";
public const string VersionTimeNumber = "2036";
}
}

4 changes: 2 additions & 2 deletions build/staging/version/WindowsMidiServicesVersion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.250112-1659"
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-9.250112-2036"
#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"250112"
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1659"
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"2036"

#endif

2 changes: 1 addition & 1 deletion samples/cpp-winrt/basics/client-basics-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion samples/cpp-winrt/basics/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion samples/cpp-winrt/loopback-endpoints/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/send-speed/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion samples/cpp-winrt/simple-app-to-app-midi/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/simple-app-to-app-midi/simple-app-to-app-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion samples/cpp-winrt/static-enum-endpoints/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion samples/cpp-winrt/watch-endpoints/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
30 changes: 30 additions & 0 deletions src/api/Test/Midi2.Transport.NetworkMidi2.unittests/SequenceNumberTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,34 @@ void MidiSequenceNumberTests::TestWrappedDecrement()
VERIFY_ARE_EQUAL(a.Value(), 65535);
}

void MidiSequenceNumberTests::TestInitializedComparison()
{
MidiSequenceNumber a{ 0 };
MidiSequenceNumber b{ 0 };

a--; // gets us to max, which will be considered less than the 0 of b

VERIFY_IS_TRUE(b > a);
VERIFY_ARE_EQUAL(a.Value(), MidiSequenceNumber::Max());
VERIFY_ARE_EQUAL(b.Value(), (a + 1).Value());
VERIFY_ARE_EQUAL(a.Value(), (b - 1).Value());
}

void MidiSequenceNumberTests::TestBasicMath()
{
uint16_t val{ 100 };
MidiSequenceNumber a{ val };

a = val;
a = a - 50;
VERIFY_ARE_EQUAL(a.Value(), 50);

a = val;
a = a + 50;
VERIFY_ARE_EQUAL(a.Value(), 150);

a = val;
a = a - 101;
VERIFY_ARE_EQUAL(a.Value(), MidiSequenceNumber::Max());

}
2 changes: 2 additions & 0 deletions src/api/Test/Midi2.Transport.NetworkMidi2.unittests/SequenceNumberTests.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class MidiSequenceNumberTests
TEST_METHOD(TestSimpleDecrement);
TEST_METHOD(TestWrappedIncrement);
TEST_METHOD(TestWrappedDecrement);
TEST_METHOD(TestInitializedComparison);
TEST_METHOD(TestBasicMath);

private:

Expand Down
29 changes: 14 additions & 15 deletions src/api/Transport/UdpNetworkMidi2Transport/MidiNetworkConnection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,9 @@ MidiNetworkConnection::ResetSequenceNumbers()
return S_OK;
}

_Use_decl_annotations_
HRESULT
MidiNetworkConnection::EndActiveSession()
MidiNetworkConnection::EndActiveSession(bool respondWithByeReply)
{
TraceLoggingWrite(
MidiNetworkMidiTransportTelemetryProvider::Provider(),
Expand All @@ -259,12 +260,15 @@ MidiNetworkConnection::EndActiveSession()
RETURN_IF_FAILED(TransportState::Current().GetEndpointManager()->DeleteEndpoint(m_sessionDeviceInstanceId));
m_sessionDeviceInstanceId.clear();

// send bye reply
if (respondWithByeReply)
{
// send bye reply
auto lock = m_socketWriterLock.lock();
RETURN_IF_FAILED(m_writer->WriteUdpPacketHeader());
RETURN_IF_FAILED(m_writer->WriteCommandByeReply());
RETURN_IF_FAILED(m_writer->Send());
}

auto lock = m_socketWriterLock.lock();
RETURN_IF_FAILED(m_writer->WriteUdpPacketHeader());
RETURN_IF_FAILED(m_writer->WriteCommandByeReply());
RETURN_IF_FAILED(m_writer->Send());

// clear the association with the SWD
RETURN_IF_FAILED(TransportState::Current().DisassociateMidiEndpointFromConnection(m_sessionEndpointDeviceInterfaceId));
Expand Down Expand Up @@ -292,17 +296,12 @@ MidiNetworkConnection::HandleIncomingBye()

if (m_sessionActive)
{
RETURN_IF_FAILED(EndActiveSession());
RETURN_IF_FAILED(EndActiveSession(true));
}
else
{
// not an active session. Nothing to clean up
// but we should NAK the Bye saying there's no active session

auto lock = m_socketWriterLock.lock();
RETURN_IF_FAILED(m_writer->WriteUdpPacketHeader());
RETURN_IF_FAILED(m_writer->WriteCommandNAK(0, MidiNetworkCommandNAKReason::CommandNAKReason_CommandNotExpected, L"BYE received when there's no active session."));
RETURN_IF_FAILED(m_writer->Send());
// we ignore this (protocol says not to NAK)
}

return S_OK;
Expand Down Expand Up @@ -373,15 +372,15 @@ MidiNetworkConnection::HandleIncomingInvitationReplyAccepted(
m_sessionEndpointDeviceInterfaceId = internal::NormalizeEndpointInterfaceIdWStringCopy(newEndpointDeviceInterfaceId);
m_sessionDeviceInstanceId = internal::NormalizeDeviceInstanceIdWStringCopy(newDeviceInstanceId);

m_sessionActive = true;

// this is what the BiDi uses when it is created
RETURN_IF_FAILED(TransportState::Current().AssociateMidiEndpointWithConnection(m_sessionEndpointDeviceInterfaceId.c_str(), m_remoteHostName, m_remotePort.c_str()));

// protocol negotiation needs to happen here, not in the endpoint creation
// because we need to wire up the connection first. Bit of a race.

LOG_IF_FAILED(TransportState::Current().GetEndpointManager()->InitiateDiscoveryAndNegotiation(m_sessionEndpointDeviceInterfaceId));

m_sessionActive = true;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/api/Transport/UdpNetworkMidi2Transport/MidiNetworkConnection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class MidiNetworkConnection
HRESULT StartOutboundProcessingThreads();

HRESULT ResetSequenceNumbers();
HRESULT EndActiveSession();
HRESULT EndActiveSession(_In_ bool respondWithByeReply);

HRESULT RequestMissingPackets();

Expand Down
21 changes: 10 additions & 11 deletions src/api/Transport/UdpNetworkMidi2Transport/MidiSequenceNumber.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,44 +33,43 @@ class MidiSequenceNumber

MidiSequenceNumber operator+ (_In_ const MidiSequenceNumber value) const
{
uint32_t val = m_value + value.m_value;
uint32_t val = (m_value + value.m_value);

return MidiSequenceNumber(static_cast<uint16_t>(val % Max()));
return MidiSequenceNumber(static_cast<uint16_t>(val % (Max() + 1)));
}

MidiSequenceNumber operator+ (_In_ uint16_t const value) const
{
uint32_t val = m_value + value;
uint32_t val = (m_value + value);

return MidiSequenceNumber(static_cast<uint16_t>(val % Max()));
return MidiSequenceNumber(static_cast<uint16_t>(val % (Max() + 1)));
}


MidiSequenceNumber operator- (_In_ MidiSequenceNumber const value) const
{
int32_t val = m_value - value.m_value;
int32_t val = ((int32_t)m_value - (int32_t)value.m_value);

if (val >= 0)
{
return MidiSequenceNumber(static_cast<uint16_t>(val % Max()));
return MidiSequenceNumber(static_cast<uint16_t>(val % (Max() + 1)));
}
else
{
return MidiSequenceNumber(static_cast<uint16_t>(Max() - (val % Max())));
return MidiSequenceNumber(static_cast<uint16_t>(Max() - (val * -1)));
}
}

MidiSequenceNumber operator- (_In_ uint16_t const value) const
{
int32_t val = m_value - value;
int32_t val = ((int32_t)m_value - (int32_t)value);

if (val >= 0)
{
return MidiSequenceNumber(static_cast<uint16_t>(val % Max()));
return MidiSequenceNumber(static_cast<uint16_t>(val % (Max() + 1)));
}
else
{
return MidiSequenceNumber(static_cast<uint16_t>(Max() - (val % Max())));
return MidiSequenceNumber(static_cast<uint16_t>(Max() - (val * -1) + 1));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/app-sdk/mididiag/mididiag.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion src/app-sdk/mididiag/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240803.1" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion src/app-sdk/midimdnsinfo/midimdnsinfo.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion src/app-sdk/midimdnsinfo/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240803.1" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion src/app-sdk/midiusbinfo/midiusbinfo.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-1659</WindowsMidiServicesSdkPackage>
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-9.250112-2036</WindowsMidiServicesSdkPackage>
<CppWinRTOptimized>true</CppWinRTOptimized>
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
Expand Down
2 changes: 1 addition & 1 deletion src/app-sdk/midiusbinfo/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-1659" targetFramework="native" />
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-9.250112-2036" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240803.1" targetFramework="native" />
</packages>

0 comments on commit 289cd45

Please sign in to comment.