-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #376 from Azure/dev/adreynol/ta_sec_buildfix
Converted to centralized package management and bump some package versions
- Loading branch information
Showing
24 changed files
with
137 additions
and
191 deletions.
There are no files selected for viewing
17 changes: 6 additions & 11 deletions
17
src/Analyzer.BicepProcessor.UnitTests/Analyzer.BicepProcessor.UnitTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
14
src/Analyzer.Cli.FunctionalTests/Analyzer.Cli.FunctionalTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
16
src/Analyzer.Core.BuiltInRuleTests/Analyzer.Core.BuiltInRuleTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 4 additions & 11 deletions
15
src/Analyzer.Core.UnitTests/Analyzer.Core.UnitTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
17
src/Analyzer.JsonRuleEngine.FunctionalTests/Analyzer.JsonRuleEngine.FunctionalTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
19
src/Analyzer.JsonRuleEngine.UnitTests/Analyzer.JsonRuleEngine.UnitTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
16
src/Analyzer.PowerShellRuleEngine.UnitTests/Analyzer.PowerShellRuleEngine.UnitTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
13
src/Analyzer.PowerShellRuleEngine/Analyzer.PowerShellRuleEngine.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
Oops, something went wrong.