Skip to content

Commit e9d0db2

Browse files
Psychlist1972Psychlist1972
authored
Merge pull request #474 from microsoft/pete-dev
Final DP8 Updates
2 parents 061158c + 65790cc commit e9d0db2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+634
-469
lines changed

‎.nuke/build.schema.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
"BuildUserToolsSharedComponents",
8181
"CreateVersionIncludes",
8282
"Prerequisites",
83-
"ZipPowershellDevUtilities"
83+
"ZipPowershellDevUtilities",
84+
"ZipWdmaud2"
8485
]
8586
}
8687
},
@@ -106,7 +107,8 @@
106107
"BuildUserToolsSharedComponents",
107108
"CreateVersionIncludes",
108109
"Prerequisites",
109-
"ZipPowershellDevUtilities"
110+
"ZipPowershellDevUtilities",
111+
"ZipWdmaud2"
110112
]
111113
}
112114
},

‎build/nuke_build/Build.cs

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ class Build : NukeBuild
128128

129129
string[] SdkPlatforms => new string[] { "x64", "Arm64EC" };
130130
string[] ServiceAndApiPlatforms => new string[] { "x64", "Arm64" };
131-
string[] ServiceAndApiPlatformsAll => new string[] { "x64", "Arm64", "Arm64EC" };
131+
string[] ServiceAndApiPlatformsAll => new string[] { "x64", "Arm64", "Arm64EC" }; // the order here matters because the dependencies in the solution aren't perfect
132132
string[] ToolsPlatforms => new string[] { "x64", "Arm64" };
133-
string[] NativeSamplesPlatforms => new string[] { "x64", "Arm64EC", "Arm64" };
133+
string[] NativeSamplesPlatforms => new string[] { "x64", "Arm64", "Arm64EC" };
134134
string[] ManagedSamplesPlatforms => new string[] { "x64", "Arm64" };
135135
string[] InstallerPlatforms => new string[] { "x64", "Arm64" };
136136

@@ -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);
@@ -1538,12 +1536,33 @@ void UpdatePackagesConfigForCPPProject(string configFilePath)
15381536
regHelpersFolder.ZipTo(ThisReleaseFolder / $"dev-pre-setup-scripts.zip");
15391537
});
15401538

1539+
Target ZipWdmaud2 => _ => _
1540+
.DependsOn(Prerequisites)
1541+
.DependsOn(BuildServiceAndPlugins)
1542+
.Executes(() =>
1543+
{
1544+
var zipRoot = (StagingRootFolder / "wdmaud2").CreateOrCleanDirectory();
1545+
1546+
var arm64 = (zipRoot / "arm64").CreateOrCleanDirectory();
1547+
var x64 = (zipRoot / "x64").CreateOrCleanDirectory();
1548+
1549+
string driverFile = "wdmaud2.drv";
1550+
1551+
CopyFile(ApiStagingFolder / "arm64" / driverFile, arm64 / driverFile, FileExistsPolicy.Fail, false);
1552+
CopyFile(ApiStagingFolder / "x64" / driverFile, x64 / driverFile, FileExistsPolicy.Fail, false);
1553+
1554+
// todo: add takeown / copy scripts
1555+
1556+
zipRoot.ZipTo(ThisReleaseFolder / $"wdmaud2-winmm-shim-driver.zip");
1557+
1558+
});
15411559

15421560

15431561
Target BuildAndPublishAll => _ => _
15441562
.DependsOn(Prerequisites)
15451563
.DependsOn(CreateVersionIncludes)
15461564
.DependsOn(BuildServiceAndPlugins)
1565+
.DependsOn(ZipWdmaud2)
15471566
.DependsOn(BuildServiceAndPluginsInstaller)
15481567
.DependsOn(BuildInDevelopmentServicePlugins)
15491568
.DependsOn(BuildInDevelopmentServicePluginsInstaller)

‎build/replace_wdmaud2_x64.bat

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@echo off
2+
echo This is for copying build artifacts into the system for testing.
3+
echo This will only replace the github-built Windows service and components
4+
echo If you are using the in-box service or dism-deployed service, this will not work.
5+
echo This must be run as administrator.
6+
7+
set servicepath="%ProgramFiles%\Windows MIDI Services\Service"
8+
set apipath="%ProgramFiles%\Windows MIDI Services\API"
9+
set dmppath="%ProgramFiles%\Windows MIDI Services\"
10+
set buildoutput="%midi_repo_root%src\api\VSFiles\x64\Release"
11+
12+
echo Stopping midisrv
13+
net stop midisrv
14+
15+
echo stopping AEB
16+
net stop /Y AudioEndpointBuilder
17+
18+
timeout 3
19+
%midi_repo_root%build\sfpcopy %buildoutput%\wdmaud2.drv %windir%\system32\wdmaud2.drv
20+
21+
net start audiosrv
22+
23+
pause

‎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.241217-1713" ?>
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.241217-1713";
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 = "241217";
14-
public const string VersionTimeNumber = "1713";
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.241217-1713"
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"241217"
13-
#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER L"1713"
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.241217-1713</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.241217-1713" 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.241217-1713</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.241217-1713" targetFramework="native" />
4+
<package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241219-1336" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)