From b7761dfdd0c1b09d0db7b9d20bd3ace61b6211c5 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:12:25 -0400 Subject: [PATCH 1/6] Alphabetize DevHome.Common --- common/DevHome.Common.csproj | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj index b8a11d093..4746bc65b 100644 --- a/common/DevHome.Common.csproj +++ b/common/DevHome.Common.csproj @@ -8,6 +8,7 @@ true $(DevHomeSDKVersion) + @@ -21,6 +22,11 @@ + + + + + @@ -28,16 +34,17 @@ + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - - - + @@ -46,12 +53,6 @@ - - - - - - From db887f78460b1bea503ba7063e03df8096cff851 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:49:01 -0400 Subject: [PATCH 2/6] Format .csproj files --- .../DevSetupEngineProjection.csproj | 2 +- .../HyperVExtensionServer.csproj | 2 +- .../HyperVExtension.Telemetry.csproj | 2 +- .../DevSetupAgent.Test.csproj | 4 +-- .../HyperVExtension.UnitTest.csproj | 2 +- .../DevHome.Settings/DevHome.Settings.csproj | 2 +- src/DevHome.csproj | 2 +- .../DevHome.Telemetry.csproj | 36 +++++++++---------- .../DevHome.Customization.csproj | 2 +- ...Processes.ElevatedServer.Projection.csproj | 3 +- .../DevHome.SetupFlow.Common.csproj | 2 +- 11 files changed, 29 insertions(+), 30 deletions(-) diff --git a/HyperVExtension/src/DevSetupEngineProjection/DevSetupEngineProjection.csproj b/HyperVExtension/src/DevSetupEngineProjection/DevSetupEngineProjection.csproj index 5c1223b39..b44bff1bf 100644 --- a/HyperVExtension/src/DevSetupEngineProjection/DevSetupEngineProjection.csproj +++ b/HyperVExtension/src/DevSetupEngineProjection/DevSetupEngineProjection.csproj @@ -26,7 +26,7 @@ - + diff --git a/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj b/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj index 00e96d03b..aa6f6981f 100644 --- a/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj +++ b/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj @@ -15,7 +15,7 @@ false HyperVExtension.Program win10-x86;win10-x64;win10-arm64 - x86;x64;arm64 + x86;x64;arm64 $(SolutionDir)\src\Properties\PublishProfiles\win10-$(Platform).pubxml diff --git a/HyperVExtension/src/Telemetry/HyperVExtension.Telemetry.csproj b/HyperVExtension/src/Telemetry/HyperVExtension.Telemetry.csproj index 85707d3ac..467a65659 100644 --- a/HyperVExtension/src/Telemetry/HyperVExtension.Telemetry.csproj +++ b/HyperVExtension/src/Telemetry/HyperVExtension.Telemetry.csproj @@ -1,4 +1,4 @@ - + HyperVExtension.Telemetry diff --git a/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj b/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj index 2f029dfc3..c83c2f961 100644 --- a/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj +++ b/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj @@ -3,8 +3,8 @@ enable enable - win10-x86;win10-x64;win10-arm64 - x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + x86;x64;arm64 false true diff --git a/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj b/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj index cc28e3603..a29a675d6 100644 --- a/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj +++ b/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj @@ -2,7 +2,7 @@ HyperVExtension.UnitTest - win10-x86;win10-x64;win10-arm64 + win10-x86;win10-x64;win10-arm64 x86;x64;arm64 false enable diff --git a/settings/DevHome.Settings/DevHome.Settings.csproj b/settings/DevHome.Settings/DevHome.Settings.csproj index d2237fa82..de2199882 100644 --- a/settings/DevHome.Settings/DevHome.Settings.csproj +++ b/settings/DevHome.Settings/DevHome.Settings.csproj @@ -13,7 +13,7 @@ Always - Always + Always diff --git a/src/DevHome.csproj b/src/DevHome.csproj index 765d99386..40ff0e7d1 100644 --- a/src/DevHome.csproj +++ b/src/DevHome.csproj @@ -115,7 +115,7 @@ true - + <_DevHomeInternal_CppPlatform>$(Platform) diff --git a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj index f014a47e7..884f6cd6f 100644 --- a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj +++ b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj @@ -1,19 +1,19 @@ - - - - DevHome.Telemetry - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - true - - TELEMETRYEVENTSOURCE_PUBLIC - - - - - - - - - + + + + DevHome.Telemetry + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + true + + TELEMETRYEVENTSOURCE_PUBLIC + + + + + + + + + \ No newline at end of file diff --git a/tools/Customization/DevHome.Customization/DevHome.Customization.csproj b/tools/Customization/DevHome.Customization/DevHome.Customization.csproj index b576a8d5c..d0dd34f2d 100644 --- a/tools/Customization/DevHome.Customization/DevHome.Customization.csproj +++ b/tools/Customization/DevHome.Customization/DevHome.Customization.csproj @@ -36,7 +36,7 @@ - + diff --git a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection.csproj b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection.csproj index 69ae042b7..4438bed66 100644 --- a/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection.csproj +++ b/tools/QuietBackgroundProcesses/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection/DevHome.QuietBackgroundProcesses.ElevatedServer.Projection.csproj @@ -2,13 +2,12 @@ - + enable enable $(CppBaseOutDir)\DevHome.QuietBackgroundProcesses.Common\ - 10.0.19041.0 diff --git a/tools/SetupFlow/DevHome.SetupFlow.Common/DevHome.SetupFlow.Common.csproj b/tools/SetupFlow/DevHome.SetupFlow.Common/DevHome.SetupFlow.Common.csproj index 93838063d..21153fbde 100644 --- a/tools/SetupFlow/DevHome.SetupFlow.Common/DevHome.SetupFlow.Common.csproj +++ b/tools/SetupFlow/DevHome.SetupFlow.Common/DevHome.SetupFlow.Common.csproj @@ -51,7 +51,7 @@ none - True + True From ede8a267a0f82d67c4fc07ae8776f1c1707491da Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 15:04:06 -0400 Subject: [PATCH 3/6] Remove extra PackageReferences to Microsoft.WindowsAppSDK --- HyperVExtension/src/HyperVExtension/HyperVExtension.csproj | 1 - .../src/HyperVExtensionServer/HyperVExtensionServer.csproj | 1 - .../test/DevSetupAgent.Test/DevSetupAgent.Test.csproj | 1 - .../test/DevSetupEngine.Test/DevSetupEngine.Test.csproj | 1 - .../test/HyperVExtension/HyperVExtension.UnitTest.csproj | 1 - .../DevHome.Environments/DevHome.Environments.csproj | 1 - 6 files changed, 6 deletions(-) diff --git a/HyperVExtension/src/HyperVExtension/HyperVExtension.csproj b/HyperVExtension/src/HyperVExtension/HyperVExtension.csproj index 1314d36c0..4168026aa 100644 --- a/HyperVExtension/src/HyperVExtension/HyperVExtension.csproj +++ b/HyperVExtension/src/HyperVExtension/HyperVExtension.csproj @@ -30,7 +30,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj b/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj index aa6f6981f..6871dd137 100644 --- a/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj +++ b/HyperVExtension/src/HyperVExtensionServer/HyperVExtensionServer.csproj @@ -31,7 +31,6 @@ - diff --git a/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj b/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj index c83c2f961..372bd9bd6 100644 --- a/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj +++ b/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj @@ -13,7 +13,6 @@ - diff --git a/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj b/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj index 034310f2f..0378daeb3 100644 --- a/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj +++ b/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj @@ -15,7 +15,6 @@ - diff --git a/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj b/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj index a29a675d6..898887e9c 100644 --- a/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj +++ b/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj @@ -21,7 +21,6 @@ - diff --git a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj index a54478429..83bdd0759 100644 --- a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj +++ b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj @@ -11,7 +11,6 @@ - From c220654a6d535263f13ba23266ea3604649a208f Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 15:24:30 -0400 Subject: [PATCH 4/6] Remove duplicate CommunityToolkit references --- .../DevHome.Environments/DevHome.Environments.csproj | 5 ----- tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj | 3 --- 2 files changed, 8 deletions(-) diff --git a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj index 83bdd0759..6cb1a03af 100644 --- a/tools/Environments/DevHome.Environments/DevHome.Environments.csproj +++ b/tools/Environments/DevHome.Environments/DevHome.Environments.csproj @@ -9,13 +9,8 @@ - - - - - diff --git a/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj b/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj index 079631ccd..ceb04bc39 100644 --- a/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj +++ b/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj @@ -8,10 +8,7 @@ - - - From 45be14448c9a3840afaa4c831cb003a644518b6f Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 15:32:59 -0400 Subject: [PATCH 5/6] Update winappsdk since that's going to happen anyway --- .../src/HyperVExtension.Common/HyperVExtension.Common.csproj | 2 +- common/DevHome.Common.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj b/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj index 1da815972..0efc2965e 100644 --- a/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj +++ b/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj @@ -7,7 +7,7 @@ - + diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj index 4746bc65b..288165130 100644 --- a/common/DevHome.Common.csproj +++ b/common/DevHome.Common.csproj @@ -42,7 +42,7 @@ - + From f80ecd18f9dbc2e9191e16be81b4d12764fa1fc2 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:53:30 -0400 Subject: [PATCH 6/6] Revert line ending change on Telemetry.csproj --- .../DevHome.Telemetry.csproj | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj index 884f6cd6f..b56449c53 100644 --- a/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj +++ b/telemetry/DevHome.Telemetry/DevHome.Telemetry.csproj @@ -1,19 +1,19 @@ - - - - DevHome.Telemetry - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - true - - TELEMETRYEVENTSOURCE_PUBLIC - - - - - - - - - + + + + DevHome.Telemetry + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + true + + TELEMETRYEVENTSOURCE_PUBLIC + + + + + + + + + \ No newline at end of file