Merge pull request #449 from microsoft/pete-dev

Pete dev
microsoft · Dec 2, 2024 · 685470f · 685470f
2 parents 3b1372e + bcc9482
commit 685470f
Show file tree

Hide file tree

Showing 82 changed files with 2,044 additions and 266 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -79,7 +79,8 @@
               "BuildSettingsApp",
               "BuildUserToolsSharedComponents",
               "CreateVersionIncludes",
-              "Prerequisites"
+              "Prerequisites",
+              "ZipPowershellDevUtilities"
             ]
           }
         },
@@ -104,7 +105,8 @@
               "BuildSettingsApp",
               "BuildUserToolsSharedComponents",
               "CreateVersionIncludes",
-              "Prerequisites"
+              "Prerequisites",
+              "ZipPowershellDevUtilities"
             ]
           }
         },

diff --git a/build/nuke_build/Build.cs b/build/nuke_build/Build.cs
@@ -514,6 +514,7 @@ class Build : NukeBuild
                     {
                         Path.Combine(solutionDir, "mididiag"),
                         Path.Combine(solutionDir, "midiusbinfo"),
+                        Path.Combine(solutionDir, "midimdnsinfo"),
                     };
 
                 foreach (var projectFolder in toolsDirectories)
@@ -547,15 +548,6 @@ class Build : NukeBuild
                 }
 
 
-
-
-
-
-
-
-
-
-
                 MSBuildTasks.MSBuild(_ => _
                     .SetTargetPath(AppSdkSolutionFolder / "app-sdk-tools-and-tests.sln")
                     .SetMaxCpuCount(14)
@@ -581,12 +573,10 @@ class Build : NukeBuild
                     stagingPlatform = "Arm64";
                 }
 
-                // MIDI diagnostics app
+                // MIDI utilities
                 FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / stagingPlatform / Configuration.Release / $"mididiag.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true);
-                //FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / stagingPlatform / Configuration.Release / $"mididiag.exe.manifest", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true);
-
-                // MIDI USB info utility
                 FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "midiusbinfo" / stagingPlatform / Configuration.Release / $"midiusbinfo.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true);
+                FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "midimdnsinfo" / stagingPlatform / Configuration.Release / $"midimdnsinfo.exe", AppSdkStagingFolder / stagingPlatform, FileExistsPolicy.Overwrite, true);
             }
         });
 
@@ -1536,6 +1526,15 @@ void UpdatePackagesConfigForCPPProject(string configFilePath)
 
 
 
+    Target ZipPowershellDevUtilities => _ => _
+        .DependsOn(Prerequisites)
+        .DependsOn(CreateVersionIncludes)
+        .Executes(() =>
+        {
+            var regHelpersFolder = RootDirectory / "src" / "dev-tools" / "reg-helpers";
+
+            regHelpersFolder.ZipTo(ThisReleaseFolder / $"dev-pre-setup-scripts.zip");
+        });
 
 
 
@@ -1553,6 +1552,7 @@ void UpdatePackagesConfigForCPPProject(string configFilePath)
       //  .DependsOn(BuildAndPackageElectronProjection)
         .DependsOn(BuildCppSamples)
         .DependsOn(BuildCSharpSamples)
+        .DependsOn(ZipPowershellDevUtilities)
         .Executes(() =>
         {
             if (BuiltInBoxInstallers.Count > 0)

diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi
@@ -1,4 +1,4 @@
 <Include>
   <?define SetupVersionName="Developer Preview 8 Arm64" ?>
-  <?define SetupVersionNumber="1.0.2-preview-8.241125-206" ?>
+  <?define SetupVersionNumber="1.0.2-preview-8.241128-2138" ?>
 </Include>
diff --git 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.241125-206";
+		public const string BuildFullVersion = "1.0.2-preview-8.241128-2138";
 		public const string VersionMajor = "1";
 		public const string VersionMinor = "0";
 		public const string VersionRevision = "2";
-		public const string VersionDateNumber = "241125";
-		public const string VersionTimeNumber = "206";
+		public const string VersionDateNumber = "241128";
+		public const string VersionTimeNumber = "2138";
 	}
 }
 
diff --git 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.241125-206"
+#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_FULL         L"1.0.2-preview-8.241128-2138"
 #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"241125"
-#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER  L"206"
+#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_DATE_NUMBER  L"241128"
+#define WINDOWS_MIDI_SERVICES_BUILD_VERSION_TIME_NUMBER  L"2138"
 
 #endif
 
diff --git a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj
@@ -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-8.241125-206</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/basics/main.cpp b/samples/cpp-winrt/basics/main.cpp
@@ -39,7 +39,12 @@ namespace init = Microsoft::Windows::Devices::Midi2::Initialization;
 
 int main()
 {
-    // initialize the threading before calling the bootstrapper or any WinRT code
+    // initialize the thread before calling the bootstrapper or any WinRT code. You may also
+    // be able to leave this out and call RoInitialize() or CoInitializeEx() before creating
+    // the initializer.
+    //winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // MTA by default
     winrt::init_apartment();
 
     // this is the initializer in the bootstrapper hpp file

diff --git a/samples/cpp-winrt/basics/packages.config b/samples/cpp-winrt/basics/packages.config
@@ -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-8.241125-206" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241128-2138" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj b/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj
@@ -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-8.241125-206</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/loopback-endpoints/main.cpp b/samples/cpp-winrt/loopback-endpoints/main.cpp
@@ -84,6 +84,12 @@ bool CreateLoopbackEndpoints()
 
 int main()
 {
+    // initialize the thread before calling the bootstrapper or any WinRT code. You may also
+    // be able to leave this out and call RoInitialize() or CoInitializeEx() before creating
+    // the initializer.
+    //winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // MTA by default
     winrt::init_apartment();
 
     // this is the initializer in the bootstrapper hpp file

diff --git a/samples/cpp-winrt/loopback-endpoints/packages.config b/samples/cpp-winrt/loopback-endpoints/packages.config
@@ -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-8.241125-206" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241128-2138" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/send-speed/main.cpp b/samples/cpp-winrt/send-speed/main.cpp
@@ -58,6 +58,12 @@ void DisplaySingleResult(std::wstring label, uint64_t totalTime, uint64_t errorC
 
 int main()
 {
+    // initialize the thread before calling the bootstrapper or any WinRT code. You may also
+    // be able to leave this out and call RoInitialize() or CoInitializeEx() before creating
+    // the initializer.
+    //winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // MTA by default
     winrt::init_apartment();
 
     // this is the initializer in the bootstrapper hpp file

diff --git a/samples/cpp-winrt/send-speed/packages.config b/samples/cpp-winrt/send-speed/packages.config
@@ -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-8.241125-206" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241128-2138" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj b/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj
@@ -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-8.241125-206</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/static-enum-endpoints/main.cpp b/samples/cpp-winrt/static-enum-endpoints/main.cpp
@@ -37,6 +37,12 @@ std::string BooleanToString(bool value)
 
 int main()
 {
+    // initialize the thread before calling the bootstrapper or any WinRT code. You may also
+    // be able to leave this out and call RoInitialize() or CoInitializeEx() before creating
+    // the initializer.
+    //winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // MTA by default
     winrt::init_apartment();
 
     // this is the initializer in the bootstrapper hpp file

diff --git a/samples/cpp-winrt/static-enum-endpoints/packages.config b/samples/cpp-winrt/static-enum-endpoints/packages.config
@@ -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-8.241125-206" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241128-2138" targetFramework="native" />
 </packages>
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
@@ -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-8.241125-206</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/watch-endpoints/main.cpp b/samples/cpp-winrt/watch-endpoints/main.cpp
@@ -40,6 +40,12 @@ std::string BooleanToString(bool value)
 
 int main()
 {
+    // initialize the thread before calling the bootstrapper or any WinRT code. You may also
+    // be able to leave this out and call RoInitialize() or CoInitializeEx() before creating
+    // the initializer.
+    //winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // MTA by default
     winrt::init_apartment();
 
     // this is the initializer in the bootstrapper hpp file

diff --git a/samples/cpp-winrt/watch-endpoints/packages.config b/samples/cpp-winrt/watch-endpoints/packages.config
@@ -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-8.241125-206" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.2-preview-8.241128-2138" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj b/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj
@@ -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-8.241125-206</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.2-preview-8.241128-2138</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>