From f54e5b3c54253532764ae985f65e63033776e709 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:11:51 -0500 Subject: [PATCH 1/4] remove duplicate Microsoft.CodeAnalysis.NetAnalyzers since it's already in the directory.build.props --- Directory.Build.props | 2 +- src/GitHubExtension/GitHubExtension.csproj | 7 ------- src/GitHubExtensionServer/GitHubExtensionServer.csproj | 4 ---- src/Logging/DevHome.Logging.csproj | 8 -------- src/Telemetry/GitHubExtension.Telemetry.csproj | 7 ------- test/Console/GitHubExtension.TestConsole.csproj | 8 -------- test/GitHubExtension/GitHubExtension.Test.csproj | 6 ------ test/UITest/GitHubExtension.UITest.csproj | 6 ------ 8 files changed, 1 insertion(+), 47 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 58f5334..862c6f7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/GitHubExtension/GitHubExtension.csproj b/src/GitHubExtension/GitHubExtension.csproj index b3839c5..2f13028 100644 --- a/src/GitHubExtension/GitHubExtension.csproj +++ b/src/GitHubExtension/GitHubExtension.csproj @@ -147,13 +147,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - $(DefineConstants);CANARY_BUILD $(DefineConstants);STABLE_BUILD diff --git a/src/GitHubExtensionServer/GitHubExtensionServer.csproj b/src/GitHubExtensionServer/GitHubExtensionServer.csproj index bdf488c..34bc8b1 100644 --- a/src/GitHubExtensionServer/GitHubExtensionServer.csproj +++ b/src/GitHubExtensionServer/GitHubExtensionServer.csproj @@ -41,10 +41,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Logging/DevHome.Logging.csproj b/src/Logging/DevHome.Logging.csproj index b88a011..aea0939 100644 --- a/src/Logging/DevHome.Logging.csproj +++ b/src/Logging/DevHome.Logging.csproj @@ -18,12 +18,4 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/Telemetry/GitHubExtension.Telemetry.csproj b/src/Telemetry/GitHubExtension.Telemetry.csproj index 7b46d78..890ee78 100644 --- a/src/Telemetry/GitHubExtension.Telemetry.csproj +++ b/src/Telemetry/GitHubExtension.Telemetry.csproj @@ -18,11 +18,4 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/test/Console/GitHubExtension.TestConsole.csproj b/test/Console/GitHubExtension.TestConsole.csproj index 858ae27..ea28b5b 100644 --- a/test/Console/GitHubExtension.TestConsole.csproj +++ b/test/Console/GitHubExtension.TestConsole.csproj @@ -47,12 +47,4 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/test/GitHubExtension/GitHubExtension.Test.csproj b/test/GitHubExtension/GitHubExtension.Test.csproj index aa425c2..da8b009 100644 --- a/test/GitHubExtension/GitHubExtension.Test.csproj +++ b/test/GitHubExtension/GitHubExtension.Test.csproj @@ -30,10 +30,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/test/UITest/GitHubExtension.UITest.csproj b/test/UITest/GitHubExtension.UITest.csproj index 284309e..00d3901 100644 --- a/test/UITest/GitHubExtension.UITest.csproj +++ b/test/UITest/GitHubExtension.UITest.csproj @@ -24,10 +24,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - \ No newline at end of file From 06477a742514d3de5a7496d3056f467f96d9837e Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:56:52 -0500 Subject: [PATCH 2/4] update wasdk version to match DH and consolidate PackageReferences in shared project --- src/GitHubExtension/GitHubExtension.csproj | 31 +++++++++---------- .../GitHubExtensionServer.csproj | 6 ---- src/Logging/DevHome.Logging.csproj | 2 +- .../GitHubExtension.Telemetry.csproj | 2 +- .../GitHubExtension.TestConsole.csproj | 5 --- .../GitHubExtension.Test.csproj | 10 ++---- test/UITest/GitHubExtension.UITest.csproj | 3 +- 7 files changed, 21 insertions(+), 38 deletions(-) diff --git a/src/GitHubExtension/GitHubExtension.csproj b/src/GitHubExtension/GitHubExtension.csproj index 2f13028..6261384 100644 --- a/src/GitHubExtension/GitHubExtension.csproj +++ b/src/GitHubExtension/GitHubExtension.csproj @@ -1,6 +1,5 @@  - Library enable @@ -70,27 +69,27 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + diff --git a/src/GitHubExtensionServer/GitHubExtensionServer.csproj b/src/GitHubExtensionServer/GitHubExtensionServer.csproj index 34bc8b1..9893840 100644 --- a/src/GitHubExtensionServer/GitHubExtensionServer.csproj +++ b/src/GitHubExtensionServer/GitHubExtensionServer.csproj @@ -40,12 +40,6 @@ - - - - - - diff --git a/src/Logging/DevHome.Logging.csproj b/src/Logging/DevHome.Logging.csproj index aea0939..c14e691 100644 --- a/src/Logging/DevHome.Logging.csproj +++ b/src/Logging/DevHome.Logging.csproj @@ -16,6 +16,6 @@ - + diff --git a/src/Telemetry/GitHubExtension.Telemetry.csproj b/src/Telemetry/GitHubExtension.Telemetry.csproj index 890ee78..56428b5 100644 --- a/src/Telemetry/GitHubExtension.Telemetry.csproj +++ b/src/Telemetry/GitHubExtension.Telemetry.csproj @@ -16,6 +16,6 @@ - + diff --git a/test/Console/GitHubExtension.TestConsole.csproj b/test/Console/GitHubExtension.TestConsole.csproj index ea28b5b..cc2ab6f 100644 --- a/test/Console/GitHubExtension.TestConsole.csproj +++ b/test/Console/GitHubExtension.TestConsole.csproj @@ -39,11 +39,6 @@ False - - - - - diff --git a/test/GitHubExtension/GitHubExtension.Test.csproj b/test/GitHubExtension/GitHubExtension.Test.csproj index da8b009..25c16d1 100644 --- a/test/GitHubExtension/GitHubExtension.Test.csproj +++ b/test/GitHubExtension/GitHubExtension.Test.csproj @@ -10,23 +10,17 @@ true resources.pri + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + diff --git a/test/UITest/GitHubExtension.UITest.csproj b/test/UITest/GitHubExtension.UITest.csproj index 00d3901..62cfac2 100644 --- a/test/UITest/GitHubExtension.UITest.csproj +++ b/test/UITest/GitHubExtension.UITest.csproj @@ -10,17 +10,18 @@ true resources.pri + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From ca2e120c164275c1a2df56a69ab5158a6f658913 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:28:54 -0500 Subject: [PATCH 3/4] more consolidation: --- Directory.Build.props | 2 +- src/GitHubExtension/GitHubExtension.csproj | 25 +----------------- .../GitHubExtensionServer.csproj | 26 +------------------ src/Logging/DevHome.Logging.csproj | 6 +---- .../GitHubExtension.Telemetry.csproj | 5 ---- 5 files changed, 4 insertions(+), 60 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 862c6f7..b4a1e11 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/GitHubExtension/GitHubExtension.csproj b/src/GitHubExtension/GitHubExtension.csproj index 6261384..e51a1aa 100644 --- a/src/GitHubExtension/GitHubExtension.csproj +++ b/src/GitHubExtension/GitHubExtension.csproj @@ -5,6 +5,7 @@ enable enable Dev + portable @@ -150,28 +151,4 @@ $(DefineConstants);CANARY_BUILD $(DefineConstants);STABLE_BUILD - - - portable - - - - portable - - - - portable - - - - portable - - - - portable - - - - portable - diff --git a/src/GitHubExtensionServer/GitHubExtensionServer.csproj b/src/GitHubExtensionServer/GitHubExtensionServer.csproj index 9893840..5eb4554 100644 --- a/src/GitHubExtensionServer/GitHubExtensionServer.csproj +++ b/src/GitHubExtensionServer/GitHubExtensionServer.csproj @@ -26,6 +26,7 @@ false true Dev + portable @@ -37,7 +38,6 @@ - @@ -48,28 +48,4 @@ $(DefineConstants);CANARY_BUILD $(DefineConstants);STABLE_BUILD - - - portable - - - - portable - - - - portable - - - - portable - - - - portable - - - - portable - diff --git a/src/Logging/DevHome.Logging.csproj b/src/Logging/DevHome.Logging.csproj index c14e691..e6e1d30 100644 --- a/src/Logging/DevHome.Logging.csproj +++ b/src/Logging/DevHome.Logging.csproj @@ -1,4 +1,4 @@ - + @@ -14,8 +14,4 @@ Spectre - - - - diff --git a/src/Telemetry/GitHubExtension.Telemetry.csproj b/src/Telemetry/GitHubExtension.Telemetry.csproj index 56428b5..81b2beb 100644 --- a/src/Telemetry/GitHubExtension.Telemetry.csproj +++ b/src/Telemetry/GitHubExtension.Telemetry.csproj @@ -5,7 +5,6 @@ GitHubExtension.Telemetry x86;x64;arm64 win10-x86;win10-x64;win10-arm64 - true @@ -14,8 +13,4 @@ Spectre - - - - From d52e9a17b15979fa71b2706d4f2821ad78a539a6 Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Thu, 25 Jan 2024 09:54:22 -0500 Subject: [PATCH 4/4] put back newline --- src/GitHubExtension/GitHubExtension.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GitHubExtension/GitHubExtension.csproj b/src/GitHubExtension/GitHubExtension.csproj index e51a1aa..15c68e5 100644 --- a/src/GitHubExtension/GitHubExtension.csproj +++ b/src/GitHubExtension/GitHubExtension.csproj @@ -1,5 +1,6 @@  + Library enable