Skip to content

Commit 6a44438

Browse files
gfsgfs
authored
Bump Dependencies, Add Net 9 target, Remove Net 6 and 7 Targets (#727)
* Update Dependencies and Build Targets * Update Pipelines for Net 9 * Switch to MSTest SDK per #719 * One more bump * Revert change to MSTest.SDK Does not seem to work properly and makes managing dependencies more difficult.
1 parent 7915e00 commit 6a44438

File tree

8 files changed

+37
-30
lines changed

8 files changed

+37
-30
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,9 @@ paket-files/
264264
__pycache__/
265265
*.pyc
266266

267+
# Mac OS Metadata
268+
**/.DS_Store
269+
267270
Application Insights/
268271
*.sqlite-journal
269272
Tools/

‎Benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ReleaseVersion>0.0.0-placeholder</ReleaseVersion>
77
<LangVersion>10.0</LangVersion>
88
<Nullable>enable</Nullable>

‎Cli/Cli.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageIcon>icon-128.png</PackageIcon>
2525
<IncludeSymbols>true</IncludeSymbols>
2626
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
27+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
2828
</PropertyGroup>
2929

3030
<ItemGroup>
@@ -37,11 +37,9 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
41-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
42-
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.68" />
43-
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.68" />
40+
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.73" />
41+
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.73" />
4442
<PackageReference Include="Sarif.Sdk" Version="4.5.4" />
45-
<PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.2.23201" />
43+
<PackageReference Include="Tewr.Blazor.FileReader" Version="3.4.0.24340" />
4644
</ItemGroup>
4745
</Project>

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning">
5-
<Version>3.6.146</Version>
5+
<Version>3.7.115</Version>
66
<PrivateAssets>all</PrivateAssets>
77
</PackageReference>
88
</ItemGroup>

‎Lib/Lib.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2222
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2323
<ReleaseVersion>2.1-alpha</ReleaseVersion>
24-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
24+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
2525
</PropertyGroup>
2626

2727
<Target Name="CopyLicenseNotice" AfterTargets="AfterBuild">
@@ -35,32 +35,32 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="MedallionShell" Version="1.6.2" />
38-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
39-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
40-
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.68" />
41-
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.32" />
38+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
39+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
40+
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.73" />
41+
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.34" />
4242
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
43-
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
43+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.1" />
4444
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
45-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
45+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.1" />
4646
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
47-
<PackageReference Include="Serilog" Version="4.1.0" />
47+
<PackageReference Include="Serilog" Version="4.2.0" />
4848
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
4949
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
5050
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
51-
<PackageReference Include="System.Management" Version="9.0.0" />
51+
<PackageReference Include="System.Management" Version="9.0.1" />
5252
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
5353
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
54-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0" />
54+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.1" />
5555
<PackageReference Include="System.Runtime" Version="4.3.1" />
5656
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
57-
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0" />
57+
<PackageReference Include="System.Threading.AccessControl" Version="9.0.1" />
5858
<PackageReference Include="System.Net.Security" Version="4.3.2" />
5959
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
6060
<PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />
6161
<PackageReference Include="CommandLineParser" Version="2.9.1" />
6262
<PackageReference Include="Microsoft.TSS" Version="2.1.1" />
63-
<PackageReference Include="PeNet" Version="4.1.0" />
63+
<PackageReference Include="PeNet" Version="4.1.1" />
6464
</ItemGroup>
6565
<ItemGroup>
6666
<EmbeddedResource Include="..\analyses.json" Link="analyses.json" />

‎Pipelines/asa-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ resources:
3030

3131
variables:
3232
BuildConfiguration: 'Release'
33-
DotnetVersion: '8.0.x'
34-
DotnetTargetFramework: 'net8.0'
33+
DotnetVersion: '9.0.x'
34+
DotnetTargetFramework: 'net9.0'
3535

3636
extends:
3737
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -47,7 +47,7 @@ extends:
4747
- template: dotnet-test-job.yml@templates
4848
parameters:
4949
jobName: 'dotnet_test_windows'
50-
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
50+
dotnetVersions: ['8.0.x','9.0.x']
5151
poolName: MSSecurity-1ES-Build-Agents-Pool
5252
poolImage: MSSecurity-1ES-Windows-2022
5353
poolOs: windows

‎Pipelines/asa-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ resources:
1515

1616
variables:
1717
BuildConfiguration: 'Release'
18-
DotnetVersion: '8.0.x'
19-
DotnetTargetFramework: 'net8.0'
18+
DotnetVersion: '9.0.x'
19+
DotnetTargetFramework: 'net9.0'
2020

2121
extends:
2222
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -37,7 +37,7 @@ extends:
3737
- template: dotnet-test-job.yml@templates
3838
parameters:
3939
jobName: 'dotnet_test_windows'
40-
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
40+
dotnetVersions: ['8.0.x','9.0.x']
4141
poolName: MSSecurity-1ES-Build-Agents-Pool
4242
poolImage: MSSecurity-1ES-Windows-2022
4343
poolOs: windows

‎Tests/Tests.csproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IsPackable>false</IsPackable>
55
<AssemblyName>AsaTests</AssemblyName>
66
<ReleaseVersion>0.0.0-placeholder</ReleaseVersion>
7-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<ItemGroup>
@@ -13,9 +13,15 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
18-
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
17+
<PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
18+
<PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
19+
<PackageReference Update="MSTest.Analyzers" Version="3.7.1">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
<PackageReference Update="Microsoft.Testing.Extensions.TrxReport" Version="1.5.1" />
24+
<PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
1925
</ItemGroup>
2026

2127
<ItemGroup>

0 commit comments

Comments
 (0)