From 6a21b8ae4bef47fdab5ac15db54bd230be5c095b Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:11:23 -0400 Subject: [PATCH 1/3] consolidate nuget versions --- .../HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj | 2 +- .../test/DevSetupAgent.Test/DevSetupAgent.Test.csproj | 4 ++-- .../test/DevSetupEngine.Test/DevSetupEngine.Test.csproj | 6 +++--- .../test/HyperVExtension/HyperVExtension.UnitTest.csproj | 4 ++-- test/DevHome.Test.csproj | 4 ++-- ...Home.FileExplorerSourceControlIntegrationUnitTest.csproj | 4 ++-- .../DevHome.Dashboard.UnitTest.csproj | 4 ++-- tools/SampleTool/unittest/SampleTool.UnitTest.csproj | 4 ++-- .../DevHome.SetupFlow.UnitTest.csproj | 4 ++-- uitest/DevHome.UITest.csproj | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/extensions/HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj b/extensions/HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj index 76bde53539..81df6c692c 100644 --- a/extensions/HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj +++ b/extensions/HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj b/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj index 2aea746f32..cb30f864ba 100644 --- a/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj +++ b/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgent.Test.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/extensions/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj b/extensions/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj index 2a55f55415..b3ef05b6d9 100644 --- a/extensions/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj +++ b/extensions/HyperVExtension/test/DevSetupEngine.Test/DevSetupEngine.Test.csproj @@ -11,10 +11,10 @@ - - + + - + all diff --git a/extensions/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj b/extensions/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj index 639ad2c8f0..b0823926b7 100644 --- a/extensions/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj +++ b/extensions/HyperVExtension/test/HyperVExtension/HyperVExtension.UnitTest.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/test/DevHome.Test.csproj b/test/DevHome.Test.csproj index 58aa1d6e37..8a275f28a1 100644 --- a/test/DevHome.Test.csproj +++ b/test/DevHome.Test.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tools/Customization/DevHome.FileExplorerSourceControlIntegrationUnitTest/DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj b/tools/Customization/DevHome.FileExplorerSourceControlIntegrationUnitTest/DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj index 9bbea8d3eb..061a3efdd0 100644 --- a/tools/Customization/DevHome.FileExplorerSourceControlIntegrationUnitTest/DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj +++ b/tools/Customization/DevHome.FileExplorerSourceControlIntegrationUnitTest/DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj b/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj index 5f94624003..7940baaf98 100644 --- a/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj +++ b/tools/Dashboard/DevHome.Dashboard.UnitTest/DevHome.Dashboard.UnitTest.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tools/SampleTool/unittest/SampleTool.UnitTest.csproj b/tools/SampleTool/unittest/SampleTool.UnitTest.csproj index 49961984f3..43c6794fa5 100644 --- a/tools/SampleTool/unittest/SampleTool.UnitTest.csproj +++ b/tools/SampleTool/unittest/SampleTool.UnitTest.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tools/SetupFlow/DevHome.SetupFlow.UnitTest/DevHome.SetupFlow.UnitTest.csproj b/tools/SetupFlow/DevHome.SetupFlow.UnitTest/DevHome.SetupFlow.UnitTest.csproj index b8ab7fe662..c1b4a8ef42 100644 --- a/tools/SetupFlow/DevHome.SetupFlow.UnitTest/DevHome.SetupFlow.UnitTest.csproj +++ b/tools/SetupFlow/DevHome.SetupFlow.UnitTest/DevHome.SetupFlow.UnitTest.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/uitest/DevHome.UITest.csproj b/uitest/DevHome.UITest.csproj index 1c0fd0ffa9..fd69fb498a 100644 --- a/uitest/DevHome.UITest.csproj +++ b/uitest/DevHome.UITest.csproj @@ -27,8 +27,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + From 8320689e878f27a50e2f24d78ffaaa8f50b2920e Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:56:00 -0400 Subject: [PATCH 2/3] Update WindowsAppSDK to highest 1.5 version --- common/DevHome.Common.csproj | 2 +- extensions/CoreWidgetProvider/CoreWidgetProvider.csproj | 2 +- .../src/HyperVExtension.Common/HyperVExtension.Common.csproj | 2 +- .../HyperVExtension.HostGuestCommunication.csproj | 2 +- extensions/WSLExtension/WSLExtension.csproj | 2 +- src/DevHome.csproj | 2 +- tools/Utilities/IfeoTool/DevHome.IfeoTool.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/DevHome.Common.csproj b/common/DevHome.Common.csproj index f580193d5c..7731c5e9bd 100644 --- a/common/DevHome.Common.csproj +++ b/common/DevHome.Common.csproj @@ -46,7 +46,7 @@ - + diff --git a/extensions/CoreWidgetProvider/CoreWidgetProvider.csproj b/extensions/CoreWidgetProvider/CoreWidgetProvider.csproj index aa114bea22..30cc01aba9 100644 --- a/extensions/CoreWidgetProvider/CoreWidgetProvider.csproj +++ b/extensions/CoreWidgetProvider/CoreWidgetProvider.csproj @@ -24,7 +24,7 @@ all - + diff --git a/extensions/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj b/extensions/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj index 574f051abf..b588d2e4cb 100644 --- a/extensions/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj +++ b/extensions/HyperVExtension/src/HyperVExtension.Common/HyperVExtension.Common.csproj @@ -7,7 +7,7 @@ - + diff --git a/extensions/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj b/extensions/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj index de579611dd..e15c923ee1 100644 --- a/extensions/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj +++ b/extensions/HyperVExtension/src/HyperVExtension.HostGuestCommunication/HyperVExtension.HostGuestCommunication.csproj @@ -14,7 +14,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/extensions/WSLExtension/WSLExtension.csproj b/extensions/WSLExtension/WSLExtension.csproj index e526048ae3..d7e1274297 100644 --- a/extensions/WSLExtension/WSLExtension.csproj +++ b/extensions/WSLExtension/WSLExtension.csproj @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/src/DevHome.csproj b/src/DevHome.csproj index 222676547a..44174b692d 100644 --- a/src/DevHome.csproj +++ b/src/DevHome.csproj @@ -80,7 +80,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/tools/Utilities/IfeoTool/DevHome.IfeoTool.csproj b/tools/Utilities/IfeoTool/DevHome.IfeoTool.csproj index bed2b6125e..2e6b738e56 100644 --- a/tools/Utilities/IfeoTool/DevHome.IfeoTool.csproj +++ b/tools/Utilities/IfeoTool/DevHome.IfeoTool.csproj @@ -34,7 +34,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + From 48b7f678c9f50742234f0bfee762464455908db5 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 3 Oct 2024 13:24:42 -0400 Subject: [PATCH 3/3] fix assert in test --- .../test/DevSetupAgent.Test/DevSetupAgentIntegrationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgentIntegrationTest.cs b/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgentIntegrationTest.cs index 86450250d5..d51b77785a 100644 --- a/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgentIntegrationTest.cs +++ b/extensions/HyperVExtension/test/DevSetupAgent.Test/DevSetupAgentIntegrationTest.cs @@ -169,7 +169,7 @@ public void TestInvalidRequest() Assert.IsTrue(now - time < TimeSpan.FromSeconds(5)); var status = json.GetProperty("Status").GetUInt32(); - Assert.AreNotEqual(0, status); + Assert.AreNotEqual(0, status); } ///