From 91db1789f8b4fef254b2efdf835fd74ac4e1a209 Mon Sep 17 00:00:00 2001 From: Pete Brown Date: Wed, 18 Dec 2024 20:15:09 -0500 Subject: [PATCH] DP8 prep --- .nuke/build.schema.json | 6 ++++-- build/nuke_build/Build.cs | 21 +++++++++++++++++++ build/staging/version/BundleInfo.wxi | 2 +- .../version/WindowsMidiServicesVersion.cs | 4 ++-- .../version/WindowsMidiServicesVersion.h | 4 ++-- .../basics/client-basics-cpp.vcxproj | 2 +- samples/cpp-winrt/basics/packages.config | 2 +- .../loopback-endpoints-cpp.vcxproj | 2 +- .../loopback-endpoints/packages.config | 2 +- samples/cpp-winrt/send-speed/packages.config | 2 +- .../send-speed/send-speed-cpp.vcxproj | 2 +- .../simple-app-to-app-midi/packages.config | 2 +- .../simple-app-to-app-cpp.vcxproj | 2 +- .../static-enum-endpoints/packages.config | 2 +- .../static-enum-endpoints-cpp.vcxproj | 2 +- .../cpp-winrt/watch-endpoints/packages.config | 2 +- .../watch-endpoints-cpp.vcxproj | 2 +- 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 +- .../api-package/WindowsMidiServices.wxs | 18 +++++++++------- 24 files changed, 58 insertions(+), 33 deletions(-) diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index a39174ae..c19c277b 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -80,7 +80,8 @@ "BuildUserToolsSharedComponents", "CreateVersionIncludes", "Prerequisites", - "ZipPowershellDevUtilities" + "ZipPowershellDevUtilities", + "ZipWdmaud2" ] } }, @@ -106,7 +107,8 @@ "BuildUserToolsSharedComponents", "CreateVersionIncludes", "Prerequisites", - "ZipPowershellDevUtilities" + "ZipPowershellDevUtilities", + "ZipWdmaud2" ] } }, diff --git a/build/nuke_build/Build.cs b/build/nuke_build/Build.cs index 6d9178ac..db99a211 100644 --- a/build/nuke_build/Build.cs +++ b/build/nuke_build/Build.cs @@ -1538,12 +1538,33 @@ void UpdatePackagesConfigForCPPProject(string configFilePath) regHelpersFolder.ZipTo(ThisReleaseFolder / $"dev-pre-setup-scripts.zip"); }); + Target ZipWdmaud2 => _ => _ + .DependsOn(Prerequisites) + .DependsOn(BuildServiceAndPlugins) + .Executes(() => + { + var zipRoot = (StagingRootFolder / "wdmaud2").CreateOrCleanDirectory(); + + var arm64 = (zipRoot / "arm64").CreateOrCleanDirectory(); + var x64 = (zipRoot / "x64").CreateOrCleanDirectory(); + + string driverFile = "wdmaud2.drv"; + + CopyFile(ApiStagingFolder / "arm64" / driverFile, arm64 / driverFile, FileExistsPolicy.Fail, false); + CopyFile(ApiStagingFolder / "x64" / driverFile, x64 / driverFile, FileExistsPolicy.Fail, false); + + // todo: add takeown / copy scripts + + zipRoot.ZipTo(ThisReleaseFolder / $"wdmaud2-winmm-shim-driver.zip"); + + }); Target BuildAndPublishAll => _ => _ .DependsOn(Prerequisites) .DependsOn(CreateVersionIncludes) .DependsOn(BuildServiceAndPlugins) + .DependsOn(ZipWdmaud2) .DependsOn(BuildServiceAndPluginsInstaller) .DependsOn(BuildInDevelopmentServicePlugins) .DependsOn(BuildInDevelopmentServicePluginsInstaller) diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index 327997f1..83f545da 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 f19fb79f..36ad2acb 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.241218-1434"; + public const string BuildFullVersion = "1.0.2-preview-8.241218-1759"; public const string VersionMajor = "1"; public const string VersionMinor = "0"; public const string VersionRevision = "2"; public const string VersionDateNumber = "241218"; - public const string VersionTimeNumber = "1434"; + public const string VersionTimeNumber = "1759"; } } diff --git a/build/staging/version/WindowsMidiServicesVersion.h b/build/staging/version/WindowsMidiServicesVersion.h index 73fcfadf..f0ba035a 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.241218-1434" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL L"1.0.2-preview-8.241218-1759" #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"241218" -#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1434" +#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1759" #endif diff --git a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj index 9f4f14e6..9357a1d1 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true false diff --git a/samples/cpp-winrt/basics/packages.config b/samples/cpp-winrt/basics/packages.config index 39d14fb1..37d82809 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 f1260e18..478c7e36 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/samples/cpp-winrt/loopback-endpoints/packages.config b/samples/cpp-winrt/loopback-endpoints/packages.config index 39d14fb1..37d82809 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 39d14fb1..37d82809 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 a2eabc98..0814ecfb 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 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 39d14fb1..37d82809 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 b855d631..3cce86ce 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-8.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/samples/cpp-winrt/static-enum-endpoints/packages.config b/samples/cpp-winrt/static-enum-endpoints/packages.config index 39d14fb1..37d82809 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 1fcbb358..ede76052 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/samples/cpp-winrt/watch-endpoints/packages.config b/samples/cpp-winrt/watch-endpoints/packages.config index 39d14fb1..37d82809 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 ad1caa39..3a6c7cf6 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/src/app-sdk/mididiag/mididiag.vcxproj b/src/app-sdk/mididiag/mididiag.vcxproj index 03a736f9..0523dff6 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/src/app-sdk/mididiag/packages.config b/src/app-sdk/mididiag/packages.config index 99cd754e..068148e3 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 0b815fda..723341da 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/src/app-sdk/midimdnsinfo/packages.config b/src/app-sdk/midimdnsinfo/packages.config index 99cd754e..068148e3 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 e6882d72..30160e06 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.241218-1434 + Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241218-1759 true true true diff --git a/src/app-sdk/midiusbinfo/packages.config b/src/app-sdk/midiusbinfo/packages.config index 99cd754e..068148e3 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/oob-setup/api-package/WindowsMidiServices.wxs b/src/oob-setup/api-package/WindowsMidiServices.wxs index 2e474d3e..dfff9bfc 100644 --- a/src/oob-setup/api-package/WindowsMidiServices.wxs +++ b/src/oob-setup/api-package/WindowsMidiServices.wxs @@ -62,10 +62,10 @@ - - + + @@ -93,11 +95,11 @@ - + @@ -163,7 +165,7 @@ - +