From 0d4f11221bc20b77e624d1afb1512a451900863b Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Wed, 20 Nov 2024 16:35:53 -0800 Subject: [PATCH 1/6] Convert to centralized package management --- .../Analyzer.BicepProcessor.UnitTests.csproj | 17 ++++------- .../Analyzer.BicepProcessor.csproj | 11 +++---- .../Analyzer.Cli.FunctionalTests.csproj | 14 ++------- src/Analyzer.Cli/Analyzer.Cli.csproj | 10 ++----- .../Analyzer.Core.BuiltInRuleTests.csproj | 16 ++++------ .../Analyzer.Core.UnitTests.csproj | 15 +++------- src/Analyzer.Core/Analyzer.Core.csproj | 9 ++---- ...yzer.JsonRuleEngine.FunctionalTests.csproj | 17 ++++------- .../Analyzer.JsonRuleEngine.UnitTests.csproj | 19 ++++-------- .../Analyzer.JsonRuleEngine.csproj | 10 ++----- ...yzer.PowerShellRuleEngine.UnitTests.csproj | 16 ++++------ .../Analyzer.PowerShellRuleEngine.csproj | 13 ++++---- .../Analyzer.Reports.UnitTests.csproj | 22 +++++--------- src/Analyzer.Reports/Analyzer.Reports.csproj | 12 +++----- ...nalyzer.TemplateProcessor.UnitTests.csproj | 16 ++++------ .../Analyzer.TemplateProcessor.csproj | 16 ++++------ src/Analyzer.Types/Analyzer.Types.csproj | 10 ++----- .../Analyzer.Utilities.UnitTests.csproj | 18 ++++------- .../Analyzer.Utilities.csproj | 8 ++--- src/Directory.Packages.props | 30 +++++++++++++++++++ 20 files changed, 115 insertions(+), 184 deletions(-) create mode 100644 src/Directory.Packages.props diff --git a/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj b/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj index c8c548f2..382568a6 100644 --- a/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj +++ b/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj @@ -1,29 +1,24 @@  - net8.0 - false - Microsoft.Azure.Templates.Analyzer.BicepProcessor.UnitTests - - - - - + + + + + + - - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj b/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj index 57990e20..f931ed00 100644 --- a/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj +++ b/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj @@ -1,18 +1,15 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.BicepProcessor Microsoft.Azure.Templates.Analyzer.BicepProcessor - - - - + + + - - + \ No newline at end of file diff --git a/src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj b/src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj index f3705722..5af39de3 100644 --- a/src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj +++ b/src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj @@ -1,33 +1,25 @@  - net8.0 - false - Microsoft.Azure.Cli.Analyzer.Cli.FunctionalTests - - - - + + + - - PreserveNewest - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.Cli/Analyzer.Cli.csproj b/src/Analyzer.Cli/Analyzer.Cli.csproj index 748e7004..ac43342f 100644 --- a/src/Analyzer.Cli/Analyzer.Cli.csproj +++ b/src/Analyzer.Cli/Analyzer.Cli.csproj @@ -1,21 +1,17 @@  - Exe net8.0 TemplateAnalyzer A command line interface for Microsoft.Azure.Templates.Analyzer.Core - an ARM and Bicep template scanner for security misconfigurations and best practices - - - - + + + - - \ No newline at end of file diff --git a/src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj b/src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj index 39c1b382..92ef0c8e 100644 --- a/src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj +++ b/src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj @@ -1,27 +1,21 @@  - net8.0 - false - - - - - + + + + - - PreserveNewest - - + \ No newline at end of file diff --git a/src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj b/src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj index dbb78ebc..867abb80 100644 --- a/src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj +++ b/src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj @@ -1,29 +1,22 @@  - net8.0 - false - Microsoft.Azure.Templates.Analyzer.Core.UnitTests - - - - - + + + + - - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.Core/Analyzer.Core.csproj b/src/Analyzer.Core/Analyzer.Core.csproj index e6abcbce..11f6faa5 100644 --- a/src/Analyzer.Core/Analyzer.Core.csproj +++ b/src/Analyzer.Core/Analyzer.Core.csproj @@ -1,16 +1,15 @@ - net8.0 Microsoft.Azure.Templates.Analyzer Microsoft.Azure.Templates.Analyzer.Core An ARM and Bicep template scanner for security misconfigurations and best practices - - + + + - @@ -18,11 +17,9 @@ - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj b/src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj index bd68ebb9..6a3c7f06 100644 --- a/src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj +++ b/src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj @@ -1,24 +1,17 @@  - net8.0 - false - Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.FunctionalTests - Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.FunctionalTests - - - - - + + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj b/src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj index 1171508c..c3d6d2f1 100644 --- a/src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj +++ b/src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj @@ -1,25 +1,18 @@ - net8.0 - false - Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.UnitTests - Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.UnitTests - - - - - - + + + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.JsonRuleEngine/Analyzer.JsonRuleEngine.csproj b/src/Analyzer.JsonRuleEngine/Analyzer.JsonRuleEngine.csproj index 7340fc68..7ea4136c 100644 --- a/src/Analyzer.JsonRuleEngine/Analyzer.JsonRuleEngine.csproj +++ b/src/Analyzer.JsonRuleEngine/Analyzer.JsonRuleEngine.csproj @@ -1,19 +1,15 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.JsonRuleEngine Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine - - - + + - - - + \ No newline at end of file diff --git a/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj b/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj index e2f2df1f..33c27202 100644 --- a/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj +++ b/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj @@ -1,27 +1,23 @@  - net8.0 - false - - - - - + + + + + + - - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj b/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj index ea1cefc4..fc0dd56b 100644 --- a/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj +++ b/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj @@ -1,27 +1,24 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.PowerShellRuleEngine Microsoft.Azure.Templates.Analyzer.RuleEngines.PowerShellEngine - - - - + + + + + - - PreserveNewest - \ No newline at end of file diff --git a/src/Analyzer.Reports.UnitTests/Analyzer.Reports.UnitTests.csproj b/src/Analyzer.Reports.UnitTests/Analyzer.Reports.UnitTests.csproj index f6419ad8..0ab51ac3 100644 --- a/src/Analyzer.Reports.UnitTests/Analyzer.Reports.UnitTests.csproj +++ b/src/Analyzer.Reports.UnitTests/Analyzer.Reports.UnitTests.csproj @@ -1,33 +1,25 @@  - net8.0 - false - Microsoft.Azure.Templates.Analyzer.Reports.UnitTests - Microsoft.Azure.Templates.Analyzer.Reports.UnitTests - PreserveNewest - - - - - - - + + + + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.Reports/Analyzer.Reports.csproj b/src/Analyzer.Reports/Analyzer.Reports.csproj index 5d8e5f0c..c1192eb6 100644 --- a/src/Analyzer.Reports/Analyzer.Reports.csproj +++ b/src/Analyzer.Reports/Analyzer.Reports.csproj @@ -1,19 +1,15 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.Reports Microsoft.Azure.Templates.Analyzer.Reports - - - - + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.TemplateProcessor.UnitTests/Analyzer.TemplateProcessor.UnitTests.csproj b/src/Analyzer.TemplateProcessor.UnitTests/Analyzer.TemplateProcessor.UnitTests.csproj index 460889f0..6c164262 100644 --- a/src/Analyzer.TemplateProcessor.UnitTests/Analyzer.TemplateProcessor.UnitTests.csproj +++ b/src/Analyzer.TemplateProcessor.UnitTests/Analyzer.TemplateProcessor.UnitTests.csproj @@ -1,22 +1,16 @@ - net8.0 - false - Microsoft.Azure.Templates.Analyzer.TemplateProcessor.UnitTests - - - - - + + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.TemplateProcessor/Analyzer.TemplateProcessor.csproj b/src/Analyzer.TemplateProcessor/Analyzer.TemplateProcessor.csproj index 6ed2dbc3..ec55f9b3 100644 --- a/src/Analyzer.TemplateProcessor/Analyzer.TemplateProcessor.csproj +++ b/src/Analyzer.TemplateProcessor/Analyzer.TemplateProcessor.csproj @@ -1,21 +1,17 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.TemplateProcessor Microsoft.Azure.Templates.Analyzer.TemplateProcessor - - - - - - + + + + + - - - + \ No newline at end of file diff --git a/src/Analyzer.Types/Analyzer.Types.csproj b/src/Analyzer.Types/Analyzer.Types.csproj index f71313e3..da105111 100644 --- a/src/Analyzer.Types/Analyzer.Types.csproj +++ b/src/Analyzer.Types/Analyzer.Types.csproj @@ -1,15 +1,11 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.Types Microsoft.Azure.Templates.Analyzer.Types - - - + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/Analyzer.Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj b/src/Analyzer.Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj index 1acb367f..a3ce5096 100644 --- a/src/Analyzer.Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj +++ b/src/Analyzer.Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj @@ -1,29 +1,21 @@  - net8.0 - false - Microsoft.Azure.Templates.Analyzer.Utilities.UnitTests - Microsoft.Azure.Templates.Analyzer.Utilities.UnitTests - - - - - + + + + - - - - + \ No newline at end of file diff --git a/src/Analyzer.Utilities/Analyzer.Utilities.csproj b/src/Analyzer.Utilities/Analyzer.Utilities.csproj index d46fee19..9b442e83 100644 --- a/src/Analyzer.Utilities/Analyzer.Utilities.csproj +++ b/src/Analyzer.Utilities/Analyzer.Utilities.csproj @@ -1,17 +1,13 @@  - net8.0 Microsoft.Azure.Templates.Analyzer.Utilities Microsoft.Azure.Templates.Analyzer.Utilities - - + - - - + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 00000000..3823c2d3 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,30 @@ + + + true + true + $(NoWarn);NU1507 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5b02620c1d32620c2491f660fef3ee93c0e01608 Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Wed, 20 Nov 2024 16:36:46 -0800 Subject: [PATCH 2/6] Added build config files to solution browser --- src/TemplateAnalyzer.sln | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/TemplateAnalyzer.sln b/src/TemplateAnalyzer.sln index f4e7fe2f..3decfc83 100644 --- a/src/TemplateAnalyzer.sln +++ b/src/TemplateAnalyzer.sln @@ -57,6 +57,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analyzer.Cli.FunctionalTest EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cli", "Cli", "{5138342A-33CC-42B8-BD9A-2B5CDCE71745}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A752218B-42B4-45A3-8119-1E4E6CA8E48E}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 474d5cbd8de7c2353f019d8c2c115e93e0c845ee Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Wed, 20 Nov 2024 18:48:26 -0800 Subject: [PATCH 3/6] Transitive security upgrades --- src/Directory.Packages.props | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 3823c2d3..6ba8e7c6 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -9,6 +9,7 @@ + @@ -23,8 +24,14 @@ - + - + + + + + + + \ No newline at end of file From bb224f6e2968bd4bfa500a49b13486cd82496cc0 Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Wed, 20 Nov 2024 18:51:08 -0800 Subject: [PATCH 4/6] Version update --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6ac961d4..ce74367c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - 0.8.0 + 0.8.1 Microsoft © Microsoft Corporation. All rights reserved. From 5f73eabc5780e6cc43790f341d6a518b1d9df691 Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Thu, 21 Nov 2024 16:50:14 -0800 Subject: [PATCH 5/6] Clean up and fix a warning --- .../Analyzer.BicepProcessor.UnitTests.csproj | 4 ++-- src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj | 2 +- src/Analyzer.Core/Analyzer.Core.csproj | 4 ++-- .../Analyzer.PowerShellRuleEngine.UnitTests.csproj | 4 ++-- .../Analyzer.PowerShellRuleEngine.csproj | 4 ++-- src/Directory.Packages.props | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj b/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj index 382568a6..9b55fde8 100644 --- a/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj +++ b/src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj b/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj index f931ed00..721cfe71 100644 --- a/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj +++ b/src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/Analyzer.Core/Analyzer.Core.csproj b/src/Analyzer.Core/Analyzer.Core.csproj index 11f6faa5..d3e3d03e 100644 --- a/src/Analyzer.Core/Analyzer.Core.csproj +++ b/src/Analyzer.Core/Analyzer.Core.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj b/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj index 33c27202..b7fb7c2f 100644 --- a/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj +++ b/src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj b/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj index fc0dd56b..1a4e4a01 100644 --- a/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj +++ b/src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 6ba8e7c6..6121cd4e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -31,6 +31,7 @@ + From f44ab083e190bfe6a53e43630c4739ff84f1af46 Mon Sep 17 00:00:00 2001 From: Adam Reynolds Date: Thu, 21 Nov 2024 17:26:03 -0800 Subject: [PATCH 6/6] More updates --- src/Analyzer.Core.NuGet/Analyzer.Core.nuspec | 8 ++++---- src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Analyzer.Core.NuGet/Analyzer.Core.nuspec b/src/Analyzer.Core.NuGet/Analyzer.Core.nuspec index bd5126fb..52d9fc1d 100644 --- a/src/Analyzer.Core.NuGet/Analyzer.Core.nuspec +++ b/src/Analyzer.Core.NuGet/Analyzer.Core.nuspec @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec b/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec index 4c2dad80..d346959f 100644 --- a/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec +++ b/src/Analyzer.Reports.NuGet/Analyzer.Reports.nuspec @@ -13,8 +13,8 @@ - - + +