Skip to content

Commit 65790cc

Browse files
Psychlist1972Psychlist1972
committed
Fix service transport initialization issue
1 parent 91db178 commit 65790cc

35 files changed

+557
-420
lines changed

‎build/nuke_build/Build.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class Build : NukeBuild
263263

264264
// This transport gets compiled to Arm64X and x64. The Arm64X output is in the Arm64EC folder
265265
stagingFiles.Add(ApiSolutionFolder / "vsfiles" / platform / Configuration.Release / $"Midi2.MidiSrvTransport.dll");
266-
266+
stagingFiles.Add(ApiSolutionFolder / "vsfiles" / platform / Configuration.Release / $"wdmaud2.drv");
267267

268268
// only in-proc files, like the MidiSrvTransport, are Arm64EC. For all the others
269269
// any reference to Arm64EC is just Arm64. We don't use any of the Arm64X output
@@ -283,8 +283,6 @@ class Build : NukeBuild
283283

284284
stagingFiles.Add(ApiSolutionFolder / "vsfiles" / servicePlatform / Configuration.Release / $"Midi2.SchedulerTransform.dll");
285285

286-
stagingFiles.Add(ApiSolutionFolder / "vsfiles" / servicePlatform / Configuration.Release / $"wdmaud2.drv");
287-
288286
foreach (var file in stagingFiles)
289287
{
290288
FileSystemTasks.CopyFileToDirectory(file, ApiStagingFolder / servicePlatform, FileExistsPolicy.Overwrite, true);

‎build/staging/version/BundleInfo.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<Include>
22
<?define SetupVersionName="Developer Preview 8 Arm64" ?>
3-
<?define SetupVersionNumber="1.0.2-preview-8.241218-1759" ?>
3+
<?define SetupVersionNumber="1.0.2-preview-8.241219-1336" ?>
44
</Include>

‎build/staging/version/WindowsMidiServicesVersion.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ public static class MidiBuildInformation
66
{
77
public const string Source = "GitHub Preview";
88
public const string Name = "Developer Preview 8";
9-
public const string BuildFullVersion = "1.0.2-preview-8.241218-1759";
9+
public const string BuildFullVersion = "1.0.2-preview-8.241219-1336";
1010
public const string VersionMajor = "1";
1111
public const string VersionMinor = "0";
1212
public const string VersionRevision = "2";
13-
public const string VersionDateNumber = "241218";
14-
public const string VersionTimeNumber = "1759";
13+
public const string VersionDateNumber = "241219";
14+
public const string VersionTimeNumber = "1336";
1515
}
1616
}
1717

‎build/staging/version/WindowsMidiServicesVersion.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#define WINDOWS_MIDI_SERVICES_BUILD_SOURCE L"GitHub Preview"
77
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_NAME L"Developer Preview 8"
8-
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-8.241218-1759"
8+
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-8.241219-1336"
99
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_MAJOR L"1"
1010
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_MINOR L"0"
1111
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_REVISION L"2"
12-
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER L"241218"
13-
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1759"
12+
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER L"241219"
13+
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1336"
1414

1515
#endif
1616

‎samples/cpp-winrt/basics/client-basics-cpp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<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')" />
44
<PropertyGroup Label="Globals">
5-
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759</WindowsMidiServicesSdkPackage>
5+
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241219-1336</WindowsMidiServicesSdkPackage>
66
<CppWinRTOptimized>true</CppWinRTOptimized>
77
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
88
<CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>

‎samples/cpp-winrt/basics/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
4-
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241218-1759" targetFramework="native" />
4+
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241219-1336" targetFramework="native" />
55
</packages>

‎samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<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')" />
44
<PropertyGroup Label="Globals">
5-
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759</WindowsMidiServicesSdkPackage>
5+
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241219-1336</WindowsMidiServicesSdkPackage>
66
<CppWinRTOptimized>true</CppWinRTOptimized>
77
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
88
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

‎samples/cpp-winrt/loopback-endpoints/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
4-
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241218-1759" targetFramework="native" />
4+
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241219-1336" targetFramework="native" />
55
</packages>

‎samples/cpp-winrt/send-speed/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
4-
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241218-1759" targetFramework="native" />
4+
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241219-1336" targetFramework="native" />
55
</packages>

‎samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<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')" />
44
<PropertyGroup Label="Globals">
5-
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759</WindowsMidiServicesSdkPackage>
5+
<WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241219-1336</WindowsMidiServicesSdkPackage>
66
<CppWinRTOptimized>true</CppWinRTOptimized>
77
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
88
<CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

0 commit comments

Comments
 (0)