Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converted to centralized package management and bump some package versions #376

Merged
merged 6 commits into from
Nov 22, 2024
Merged

Converted to centralized package management and bump some package versions #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d4f112
Convert to centralized package management
reynoldsa Nov 21, 2024
5b02620
Added build config files to solution browser
reynoldsa Nov 21, 2024
474d5cb
Transitive security upgrades
reynoldsa Nov 21, 2024
bb224f6
Version update
reynoldsa Nov 21, 2024
5f73eab
Clean up and fix a warning
Nov 22, 2024
f44ab08
More updates
Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

<AssemblyName>Microsoft.Azure.Templates.Analyzer.BicepProcessor.UnitTests</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
<PackageReference Include="System.IO.Abstractions" />
<PackageReference Include="Sarif.Sdk" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.BicepProcessor\Analyzer.BicepProcessor.csproj" />
<ProjectReference Include="..\Analyzer.Core\Analyzer.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Content Include="templates\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

</Project>
11 changes: 4 additions & 7 deletions src/Analyzer.BicepProcessor/Analyzer.BicepProcessor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Templates.Analyzer.BicepProcessor</AssemblyName>
<RootNamespace>Microsoft.Azure.Templates.Analyzer.BicepProcessor</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.TemplateProcessor\Analyzer.TemplateProcessor.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Bicep.Core" Version="0.25.53" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Azure.Bicep.Core" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>

</Project>
</Project>
14 changes: 3 additions & 11 deletions src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

<AssemblyName>Microsoft.Azure.Cli.Analyzer.Cli.FunctionalTests</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.Cli\Analyzer.Cli.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Tests\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<None Update="Tests\Invalid.bicep">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
10 changes: 3 additions & 7 deletions src/Analyzer.Cli/Analyzer.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>TemplateAnalyzer</AssemblyName>
<Description>A command line interface for Microsoft.Azure.Templates.Analyzer.Core - an ARM and Bicep template scanner for security misconfigurations and best practices</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="System.CommandLine" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.Core\Analyzer.Core.csproj" />
<ProjectReference Include="..\Analyzer.Reports\Analyzer.Reports.csproj" />
</ItemGroup>

</Project>
16 changes: 5 additions & 11 deletions src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
<PackageReference Include="coverlet.collector" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.Core\Analyzer.Core.csproj" />
<ProjectReference Include="..\Analyzer.Reports\Analyzer.Reports.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Tests\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</Project>
8 changes: 4 additions & 4 deletions src/Analyzer.Core.NuGet/Analyzer.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<dependency id="Newtonsoft.Json" version="13.0.3" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.1" />
<dependency id="Microsoft.PowerShell.SDK" version="7.4.1" />
<dependency id="Microsoft.PSRule.Rules.Azure" version="1.26.0-B0011" />
<dependency id="Microsoft.PSRule.SDK" version="2.8" />
<dependency id="Sarif.Sdk" version="2.4.12" />
<dependency id="System.IO.Abstractions" version="19.1.5" />
<dependency id="Microsoft.PSRule.Rules.Azure" version="1.33.2" />
<dependency id="Microsoft.PSRule.SDK" version="2.9.0" />
<dependency id="Sarif.Sdk" version="2.4.16" />
<dependency id="System.IO.Abstractions" version="20.0.4" />
</group>
</dependencies>

Expand Down
15 changes: 4 additions & 11 deletions src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

<AssemblyName>Microsoft.Azure.Templates.Analyzer.Core.UnitTests</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.Core\Analyzer.Core.csproj" />
<ProjectReference Include="..\Analyzer.Reports\Analyzer.Reports.csproj" />
</ItemGroup>

<ItemGroup>
<Content Include="templates\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

</Project>
9 changes: 3 additions & 6 deletions src/Analyzer.Core/Analyzer.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Microsoft.Azure.Templates.Analyzer</RootNamespace>
<AssemblyName>Microsoft.Azure.Templates.Analyzer.Core</AssemblyName>
<Description>An ARM and Bicep template scanner for security misconfigurations and best practices</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="System.IO.Abstractions" />
<PackageReference Include="Sarif.Sdk" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.JsonRuleEngine\Analyzer.JsonRuleEngine.csproj" />
<ProjectReference Include="..\Analyzer.PowerShellRuleEngine\Analyzer.PowerShellRuleEngine.csproj" />
<ProjectReference Include="..\Analyzer.TemplateProcessor\Analyzer.TemplateProcessor.csproj" />
<ProjectReference Include="..\Analyzer.BicepProcessor\Analyzer.BicepProcessor.csproj" />
<ProjectReference Include="..\Analyzer.Types\Analyzer.Types.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Rules\BuiltInRules.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
17 changes: 5 additions & 12 deletions src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

<AssemblyName>Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.FunctionalTests</AssemblyName>

<RootNamespace>Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.FunctionalTests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.JsonRuleEngine\Analyzer.JsonRuleEngine.csproj" />
</ItemGroup>

</Project>
</Project>
19 changes: 6 additions & 13 deletions src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>

<AssemblyName>Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.UnitTests</AssemblyName>

<RootNamespace>Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine.UnitTests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Moq" Version="4.15.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.JsonRuleEngine\Analyzer.JsonRuleEngine.csproj" />
</ItemGroup>

</Project>
</Project>
10 changes: 3 additions & 7 deletions src/Analyzer.JsonRuleEngine/Analyzer.JsonRuleEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Templates.Analyzer.JsonRuleEngine</AssemblyName>
<RootNamespace>Microsoft.Azure.Templates.Analyzer.RuleEngines.JsonEngine</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.Types\Analyzer.Types.csproj" />
<ProjectReference Include="..\Analyzer.Utilities\Analyzer.Utilities.csproj" />
</ItemGroup>

</Project>
</Project>
16 changes: 6 additions & 10 deletions src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Sarif.Sdk" />
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.PowerShellRuleEngine\Analyzer.PowerShellRuleEngine.csproj" />
<ProjectReference Include="..\Analyzer.TemplateProcessor\Analyzer.TemplateProcessor.csproj" />
</ItemGroup>

<ItemGroup>
<Content Include="templates\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

</Project>
13 changes: 5 additions & 8 deletions src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.Azure.Templates.Analyzer.PowerShellRuleEngine</AssemblyName>
<RootNamespace>Microsoft.Azure.Templates.Analyzer.RuleEngines.PowerShellEngine</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.1" />
<PackageReference Include="Microsoft.PSRule.Rules.Azure" Version="1.33.2" />
<PackageReference Include="Microsoft.PSRule.SDK" Version="2.9.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" />
<PackageReference Include="Microsoft.PSRule.Rules.Azure" />
<PackageReference Include="Microsoft.PSRule.SDK" />
<PackageReference Include="Sarif.Sdk" />
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analyzer.BicepProcessor\Analyzer.BicepProcessor.csproj" />
<ProjectReference Include="..\Analyzer.Types\Analyzer.Types.csproj" />
<ProjectReference Include="..\Analyzer.Utilities\Analyzer.Utilities.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="baselines\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Loading
Loading