Update Dependencies, Add Net 9 Build, Remove Net 6/7 Builds (#602)

* Add Net 9.0 build, remove net 6.0 and net 7.0 builds * Update Dependencies * Refactor tests to use checked in test data files instead of dynamically generated test data to improve pipeline reliability of tests.
microsoft · Jan 22, 2025 · e70aef5 · e70aef5
1 parent 567ac2f
commit e70aef5
Show file tree

Hide file tree

Showing 62 changed files with 1,301 additions and 1,504 deletions.
diff --git a/.gitignore b/.gitignore
@@ -260,6 +260,9 @@ paket-files/
 __pycache__/
 *.pyc
 
+# Mac Metadata
+**/.DS_Store
+
 # App Inspector artifacts
 /AppInspector/Resources/defaultRulesPkd.json
 /AppInspector.Tests/output

diff --git a/AppInspector.Benchmarks/AppInspector.Benchmarks.csproj b/AppInspector.Benchmarks/AppInspector.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>10.0</LangVersion>
         <RootNamespace>ApplicationInspector.Benchmarks</RootNamespace>

diff --git a/AppInspector.CLI/AppInspector.CLI.csproj b/AppInspector.CLI/AppInspector.CLI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <RootNamespace>Microsoft.ApplicationInspector.CLI</RootNamespace>
         <AssemblyName>ApplicationInspector.CLI</AssemblyName>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -78,7 +78,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotLiquid" Version="2.3.0" />
+        <PackageReference Include="DotLiquid" Version="2.3.18" />
         <PackageReference Include="Sarif.Sdk" Version="4.5.4" />
         <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />

diff --git a/AppInspector.Common/AppInspector.Common.csproj b/AppInspector.Common/AppInspector.Common.csproj
@@ -26,11 +26,11 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <Nullable>enable</Nullable>
         <LangVersion>10.0</LangVersion>
-        <TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
 
 
     </ItemGroup>

diff --git a/AppInspector.Logging/AppInspector.Logging.csproj b/AppInspector.Logging/AppInspector.Logging.csproj
@@ -26,7 +26,7 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <Nullable>enable</Nullable>
         <LangVersion>10.0</LangVersion>
-        <TargetFrameworks>net7.0;net6.0;net8.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/AppInspector.RulesEngine/AppInspector.RulesEngine.csproj b/AppInspector.RulesEngine/AppInspector.RulesEngine.csproj
@@ -26,16 +26,16 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <Nullable>enable</Nullable>
         <LangVersion>10.0</LangVersion>
-        <TargetFrameworks>net7.0;net6.0;net8.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="gstocco.YamlDotNet.YamlPath" Version="1.0.26" />
         <PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
-        <PackageReference Include="Microsoft.CST.OAT" Version="1.2.70" />
+        <PackageReference Include="Microsoft.CST.OAT" Version="1.2.73" />
         <PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.34" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-        <PackageReference Include="YamlDotNet" Version="16.2.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/AppInspector.Tests/AppInspector.Tests.csproj b/AppInspector.Tests/AppInspector.Tests.csproj
@@ -4,7 +4,7 @@
         <OutputType>Library</OutputType>
         <Nullable>enable</Nullable>
         <LangVersion>10.0</LangVersion>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -14,13 +14,146 @@
         <None Update="TestData\FourWindowsOneLinux.zip">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
+        <None Update="TestData\TestTagDiffCmd\Rules\FindWindows.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestTagDiffCmd\Samples\FourWindowsNoLinux.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestTagDiffCmd\Samples\FourWindowsOneLinux.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\FourWindowsOneLinux.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\FourWindowsOneLinux.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\FourWindowsOneLinux.unknownextension">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <Compile Remove="TestData\TestAnalyzeCmd\Samples\JustA.cs" />
+        <None Include="TestData\TestAnalyzeCmd\Samples\JustA.cs">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <Compile Remove="TestData\TestAnalyzeCmd\Samples\JustB.cs" />
+        <None Include="TestData\TestAnalyzeCmd\Samples\JustB.cs">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <Compile Remove="TestData\TestAnalyzeCmd\Samples\JustC.cs" />
+        <None Include="TestData\TestAnalyzeCmd\Samples\JustC.cs">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\ThreeWindowsOneWindows2000.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\DependsOnChain.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\DependsOnOneWay.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\DependsOnTwoWay.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindows.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindowsWithAppliesTo.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindowsWithDoesNotApplyTo.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindowsWithFileRegex.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindowsWithOverride.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\FindWindowsWithOverrideRuleWithoutOverride.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Rules\HeavyRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\afile.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <Compile Remove="TestData\TestAnalyzeCmd\Samples\afile.js.cs" />
+        <None Include="TestData\TestAnalyzeCmd\Samples\afile.js.cs">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestAnalyzeCmd\Samples\adifferentfile.js">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestExportTagsCmd\Rules\TestRules.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\DependsOnTagMissingRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\InvalidFileRegexesRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\InvalidJsonValidRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\KnownLanguages.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\MustMatchRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\MustMatchRuleFail.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\MustNotMatchRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\MustNotMatchRuleFail.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\OverriddenDependsOnTagMissingRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\RuleWithoutDescription.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\SameId.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\ValidJsonInvalidRuleNoId.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestVerifyRulesCmd\Rules\ValidRules.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestLanguages\test_comments.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestLanguages\test_comments_invalid.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestLanguages\test_languages.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestLanguages\test_languages_invalid.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestRuleProcessor\Rules\MultiLineRule.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="TestData\TestRuleProcessor\Rules\MultiLineRule2.json">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
         <PackageReference Include="System.Reflection" Version="4.3.0" />
         <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />