diff --git a/.gitignore b/.gitignore index f7707d0d7..1ac25ae72 100644 --- a/.gitignore +++ b/.gitignore @@ -4,13 +4,15 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # binaries for staging builds -/build/**/*.dll -/build/**/*.exe -/build/**/*.winmd -/build/**/*.msi -/build/**/*.msix -/build/**/*.zip -/build/**/*.nupkg +*.dll +*.exe +*.msi +*.msix +*.zip +*.nupkg +build/release/**/*.* +build/staging/**/*.* +build/dependencies/**/*.* # Dump files *.etl diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 1415c0364..af6a2dc7c 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -66,9 +66,8 @@ "enum": [ "BuildAndPackAllAppSDKs", "BuildAndPublishAll", - "BuildAppSdkRuntimeInstaller", + "BuildAppSdkRuntimeAndToolsInstaller", "BuildConsoleApp", - "BuildConsoleAppInstaller", "BuildCppSamples", "BuildServiceAndPlugins", "BuildServiceAndPluginsInstaller", @@ -86,9 +85,8 @@ "enum": [ "BuildAndPackAllAppSDKs", "BuildAndPublishAll", - "BuildAppSdkRuntimeInstaller", + "BuildAppSdkRuntimeAndToolsInstaller", "BuildConsoleApp", - "BuildConsoleAppInstaller", "BuildCppSamples", "BuildServiceAndPlugins", "BuildServiceAndPluginsInstaller", diff --git a/build/nuke_build/Build.cs b/build/nuke_build/Build.cs index 554aaa75e..9584600c4 100644 --- a/build/nuke_build/Build.cs +++ b/build/nuke_build/Build.cs @@ -263,6 +263,7 @@ class Build : NukeBuild "Microsoft.Windows.Devices.Midi2.Messages", "Microsoft.Windows.Devices.Midi2.Endpoints.Loopback", "Microsoft.Windows.Devices.Midi2.Endpoints.Virtual", + "Microsoft.Windows.Devices.Midi2.Utilities.SysEx", "Microsoft.Windows.Devices.Midi2.Initialization" // this last one gets packed 100% in the nuget, including the impl }) { @@ -291,20 +292,43 @@ class Build : NukeBuild FileSystemTasks.CopyFileToDirectory(file, AppSdkStagingFolder / platform, FileExistsPolicy.Overwrite, true); } + } + + + + foreach(var targetPlatform in InProcPlatforms) + { + string sourcePlatform; + + if (targetPlatform.ToLower() == "arm64ec") + { + sourcePlatform = "Arm64"; + } + else + { + sourcePlatform = targetPlatform; + } + // MIDI diagnostics app - FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / platform / Configuration.Release / $"mididiag.exe", AppSdkStagingFolder / platform, FileExistsPolicy.Overwrite, true); - FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / platform / Configuration.Release / $"mididiag.exe.manifest", AppSdkStagingFolder / platform, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / sourcePlatform / Configuration.Release / $"mididiag.exe", AppSdkStagingFolder / targetPlatform, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "mididiag" / sourcePlatform / Configuration.Release / $"mididiag.exe.manifest", AppSdkStagingFolder / targetPlatform, FileExistsPolicy.Overwrite, true); + + // MIDI USB info utility + FileSystemTasks.CopyFileToDirectory(sdkOutputRootFolder / "midiusbinfo" / sourcePlatform / Configuration.Release / $"midiusbinfo.exe", AppSdkStagingFolder / targetPlatform, FileExistsPolicy.Overwrite, true); // sample manifest - FileSystemTasks.CopyFileToDirectory(AppSdkSolutionFolder / "MyMidiApp.exe.manifest", AppSdkStagingFolder / platform, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(AppSdkSolutionFolder / "MyMidiApp.exe.manifest", AppSdkStagingFolder / targetPlatform, FileExistsPolicy.Overwrite, true); + } }); - Target BuildAppSdkRuntimeInstaller => _ => _ + Target BuildAppSdkRuntimeAndToolsInstaller => _ => _ .DependsOn(Prerequisites) + .DependsOn(BuildConsoleApp) + //.DependsOn(BuildSettingsApp) .DependsOn(BuildAndPackAllAppSDKs) .Executes(() => { @@ -343,7 +367,7 @@ class Build : NukeBuild FileSystemTasks.CopyFile( setupSolutionFolder / "main-bundle" / "bin" / platform / Configuration.Release / "WindowsMidiServicesSdkRuntimeSetup.exe", - ThisReleaseFolder / $"Windows MIDI Services (App SDK Runtime) - {fullSetupVersionString}-{platform.ToLower()}.exe"); + ThisReleaseFolder / $"Windows MIDI Services (Tools and SDKs) {fullSetupVersionString}-{platform.ToLower()}.exe"); } @@ -515,6 +539,7 @@ void UpdateSetupBundleInfoIncludeFile(string platform) FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Messages.dll", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.dll", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.dll", stagingFolder, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Utilities.SysEx.dll", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Initialization.dll", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.pri", stagingFolder, FileExistsPolicy.Overwrite, true); @@ -525,6 +550,7 @@ void UpdateSetupBundleInfoIncludeFile(string platform) FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Messages.pri", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.pri", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.pri", stagingFolder, FileExistsPolicy.Overwrite, true); + FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Utilities.SysEx.pri", stagingFolder, FileExistsPolicy.Overwrite, true); FileSystemTasks.CopyFileToDirectory(runtimesFolder / "Microsoft.Windows.Devices.Midi2.Initialization.pri", stagingFolder, FileExistsPolicy.Overwrite, true); //FileSystemTasks.CopyFileToDirectory(consoleOutputFolder / "Microsoft.Windows.Devices.Midi2.winmd", stagingFolder, FileExistsPolicy.Overwrite, true); @@ -541,49 +567,49 @@ void UpdateSetupBundleInfoIncludeFile(string platform) }); - Target BuildConsoleAppInstaller => _ => _ - .DependsOn(BuildConsoleApp) - .DependsOn(BuildServiceAndPluginsInstaller) - .Executes(() => - { - // we build for Arm64 and x64. No EC required here - foreach (var platform in OutOfProcPlatforms) - { - //UpdateSetupBundleInfoIncludeFile(platform); // happens as part of service installer + //Target BuildConsoleAppInstaller => _ => _ + // .DependsOn(BuildConsoleApp) + // .DependsOn(BuildServiceAndPluginsInstaller) + // .Executes(() => + // { + // // we build for Arm64 and x64. No EC required here + // foreach (var platform in OutOfProcPlatforms) + // { + // //UpdateSetupBundleInfoIncludeFile(platform); // happens as part of service installer - string fullSetupVersionString = $"{SetupVersionName} {SetupBuildMajorMinor}.{SetupBuildDateNumber}.{SetupBuildTimeNumber}"; + // string fullSetupVersionString = $"{SetupVersionName} {SetupBuildMajorMinor}.{SetupBuildDateNumber}.{SetupBuildTimeNumber}"; - string solutionDir = ConsoleSetupSolutionFolder.ToString() + @"\"; + // string solutionDir = ConsoleSetupSolutionFolder.ToString() + @"\"; - var msbuildProperties = new Dictionary(); - msbuildProperties.Add("Platform", platform); - msbuildProperties.Add("SolutionDir", solutionDir); // to include trailing slash + // var msbuildProperties = new Dictionary(); + // msbuildProperties.Add("Platform", platform); + // msbuildProperties.Add("SolutionDir", solutionDir); // to include trailing slash - Console.Out.WriteLine($"----------------------------------------------------------------------"); - Console.Out.WriteLine($"SolutionDir: {solutionDir}"); - Console.Out.WriteLine($"Platform: {platform.ToLower()}"); + // Console.Out.WriteLine($"----------------------------------------------------------------------"); + // Console.Out.WriteLine($"SolutionDir: {solutionDir}"); + // Console.Out.WriteLine($"Platform: {platform.ToLower()}"); - var output = MSBuildTasks.MSBuild(_ => _ - .SetTargetPath(ConsoleSetupSolutionFolder / "midi-console-setup.sln") - .SetMaxCpuCount(14) - /*.SetOutDir(outputFolder) */ - /*.SetProcessWorkingDirectory(ApiSolutionFolder)*/ - /*.SetTargets("Build") */ - .SetProperties(msbuildProperties) - .SetConfiguration(Configuration.Release) - .EnableNodeReuse() - ); + // var output = MSBuildTasks.MSBuild(_ => _ + // .SetTargetPath(ConsoleSetupSolutionFolder / "midi-console-setup.sln") + // .SetMaxCpuCount(14) + // /*.SetOutDir(outputFolder) */ + // /*.SetProcessWorkingDirectory(ApiSolutionFolder)*/ + // /*.SetTargets("Build") */ + // .SetProperties(msbuildProperties) + // .SetConfiguration(Configuration.Release) + // .EnableNodeReuse() + // ); - // todo: it would be better to see if any of the sdk files have changed and only - // do this copy if a new setup file was created. Maybe do a before/after date/time check? - FileSystemTasks.CopyFile( - ConsoleSetupSolutionFolder / "console-main-bundle" / "bin" / platform / Configuration.Release / "WindowsMidiServicesConsoleSetup.exe", - ThisReleaseFolder / $"Windows MIDI Services (Console) - {fullSetupVersionString}-{platform.ToLower()}.exe"); - } + // // todo: it would be better to see if any of the sdk files have changed and only + // // do this copy if a new setup file was created. Maybe do a before/after date/time check? + // FileSystemTasks.CopyFile( + // ConsoleSetupSolutionFolder / "console-main-bundle" / "bin" / platform / Configuration.Release / "WindowsMidiServicesConsoleSetup.exe", + // ThisReleaseFolder / $"Windows MIDI Services (Console) - {fullSetupVersionString}-{platform.ToLower()}.exe"); + // } - }); + // }); Target BuildCppSamples => _ => _ .DependsOn(BuildAndPackAllAppSDKs) @@ -668,12 +694,10 @@ void UpdateSetupBundleInfoIncludeFile(string platform) .DependsOn(BuildServiceAndPlugins) .DependsOn(BuildServiceAndPluginsInstaller) .DependsOn(BuildAndPackAllAppSDKs) - .DependsOn(BuildAppSdkRuntimeInstaller) - .DependsOn(BuildCppSamples) - .DependsOn(BuildSettingsApp) - /*.DependsOn(BuildSettingsAppInstaller) */ .DependsOn(BuildConsoleApp) - .DependsOn(BuildConsoleAppInstaller) + .DependsOn(BuildSettingsApp) + .DependsOn(BuildAppSdkRuntimeAndToolsInstaller) + .DependsOn(BuildCppSamples) .Executes(() => { }); diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.dll index f3f9a6f2e..c57e01d1e 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.winmd index 58c58526d..2ff671556 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.CapabilityInquiry.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.dll index fbdfdadf7..cd6bf7855 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.winmd index 7cd6ccf6d..7399aefe7 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ClientPlugins.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.dll index b72ba60f8..3c7e4d4f6 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.winmd index 9dedfb21a..62f8cec5e 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Diagnostics.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.dll index 44eaf9d23..ee752e0e5 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.winmd index bd39ebd90..8b266795c 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Loopback.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.dll index 317bcaf8b..e7de8f5b1 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.winmd index b0e3e26b6..dc67d4a73 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Endpoints.Virtual.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll index f1ac32653..770dbbf77 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.winmd index 73e362122..cf7b8530f 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.dll index b8934dfd3..f964e9f1c 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.winmd index 8beaad36d..382966a53 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Messages.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.dll index 4c284c384..a966ea2d4 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.winmd index dadc36737..79ad09075 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.ServiceConfig.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll index 46ccecc41..950c8b906 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll differ diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.winmd b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.winmd index 357872c86..97cffa7ce 100644 Binary files a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.winmd and b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.winmd differ diff --git a/build/staging/app-sdk/Arm64EC/mididiag.exe b/build/staging/app-sdk/Arm64EC/mididiag.exe index bf4557d56..0937bef33 100644 Binary files a/build/staging/app-sdk/Arm64EC/mididiag.exe and b/build/staging/app-sdk/Arm64EC/mididiag.exe differ diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi index 0fd9c0607..e2ab1d9ca 100644 --- a/build/staging/version/BundleInfo.wxi +++ b/build/staging/version/BundleInfo.wxi @@ -1,4 +1,4 @@ - + diff --git a/samples/csharp-net/basics/client-basics-cs.exe.manifest b/samples/csharp-net/basics/client-basics-cs.exe.manifest index 678ef4374..5c97d286a 100644 --- a/samples/csharp-net/basics/client-basics-cs.exe.manifest +++ b/samples/csharp-net/basics/client-basics-cs.exe.manifest @@ -8,7 +8,7 @@ @@ -18,29 +18,21 @@ name="Microsoft.Windows.Devices.Midi2.MidiChannel" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" /> - - @@ -67,11 +59,11 @@ xmlns="urn:schemas-microsoft-com:winrt.v1" /> @@ -81,10 +73,6 @@ name="Microsoft.Windows.Devices.Midi2.CapabilityInquiry.MidiUniqueId" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" /> - @@ -104,37 +92,37 @@ @@ -149,7 +137,7 @@ threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" /> @@ -160,7 +148,7 @@ threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1" /> diff --git a/samples/csharp-net/csharp-net-samples.sln b/samples/csharp-net/csharp-net-samples.sln index 83b57d564..6b1b5272a 100644 --- a/samples/csharp-net/csharp-net-samples.sln +++ b/samples/csharp-net/csharp-net-samples.sln @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client-basics-cs", "basics\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "virtual-device-app-winui-cs", "virtual-device-app-winui\virtual-device-app-winui-cs.csproj", "{B2A27EAA-93BA-4FA4-AFDA-62CD5031950A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "virtual-device-app-wpf", "virtual-device-app-wpf\virtual-device-app-wpf.csproj", "{51C95EAA-B943-4DC6-92C8-855A6C50DBC1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 @@ -33,14 +31,6 @@ Global {B2A27EAA-93BA-4FA4-AFDA-62CD5031950A}.Release|ARM64.Build.0 = Release|ARM64 {B2A27EAA-93BA-4FA4-AFDA-62CD5031950A}.Release|x64.ActiveCfg = Release|x64 {B2A27EAA-93BA-4FA4-AFDA-62CD5031950A}.Release|x64.Build.0 = Release|x64 - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Debug|ARM64.Build.0 = Debug|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Debug|x64.ActiveCfg = Debug|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Debug|x64.Build.0 = Debug|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Release|ARM64.ActiveCfg = Release|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Release|ARM64.Build.0 = Release|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Release|x64.ActiveCfg = Release|Any CPU - {51C95EAA-B943-4DC6-92C8-855A6C50DBC1}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml b/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml index c105badb4..df398805f 100644 --- a/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml +++ b/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml @@ -12,10 +12,25 @@ + - + + + + + + + + + + + +