Skip to content

Commit bd092d9

Browse files
gfsgfs
authored
Build for .NET 8 and update dependencies (#595)
* Update to net 8 * Update dependencies
1 parent 3d813a3 commit bd092d9

File tree

16 files changed

+1085
-3409
lines changed

16 files changed

+1085
-3409
lines changed

‎Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.0.26] - 2023-12-05
8+
### Dependencies
9+
Update dependencies.
10+
11+
### Framework
12+
Build using .NET 8
13+
714
## [1.0.25] - 2023-11-10
815
### Dependencies
916
Update dependencies. Resolves an issue with some xpath queries via AppInspector Rules engine https://github.com/microsoft/ApplicationInspector/pull/567

‎DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
66
<AssemblyName>devskim</AssemblyName>
77
<StartupObject>Microsoft.DevSkim.CLI.Program</StartupObject>
88
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
@@ -36,8 +36,8 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="CommandLineParser" Version="2.9.1" />
39-
<PackageReference Include="LibGit2Sharp" Version="0.28.0" />
40-
<PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.15" />
39+
<PackageReference Include="LibGit2Sharp" Version="0.29.0" />
40+
<PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.16" />
4141
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
4242
<PackageReference Include="Sarif.Sdk" Version="4.3.7" />
4343
</ItemGroup>

‎DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>DevSkim.LanguageServer</RootNamespace>
8-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
8+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1010
<Authors>Microsoft</Authors>
1111
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
1515
<PackageReference Include="CommandLineParser" Version="2.9.1" />
16-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1717
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
18-
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
18+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
1919
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
2020
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2121
</ItemGroup>

‎DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1313
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1414
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
1515
</ItemGroup>

‎DevSkim-DotNet/Microsoft.DevSkim.VisualStudio.SourceGenerator/Microsoft.DevSkim.VisualStudio.SourceGenerator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
1717
</ItemGroup>
1818

1919
</Project>

‎DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@
8585
</None>
8686
</ItemGroup>
8787
<ItemGroup>
88-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
88+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
8989
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client">
90-
<Version>17.7.20</Version>
90+
<Version>17.8.36</Version>
9191
</PackageReference>
9292
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol">
9393
<Version>17.2.8</Version>
9494
</PackageReference>
95-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.7.37357" ExcludeAssets="runtime">
95+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.8.37222" ExcludeAssets="runtime">
9696
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9797
</PackageReference>
98-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.6.2164">
98+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.8.2365">
9999
<PrivateAssets>all</PrivateAssets>
100100
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
101101
</PackageReference>
@@ -149,11 +149,11 @@
149149
</ItemGroup>
150150
<!-- Publish the language server binaries for Release -->
151151
<Target Name="BuildLanguageServer" BeforeTargets="IncludeLanguageServer" Condition=" '$(Configuration)' == 'Release' ">
152-
<Exec Command="dotnet publish -f net7.0 -c Release ..\Microsoft.DevSkim.LanguageServer -r win-x64 --sc -o generatedLanguageServerBinaries" />
152+
<Exec Command="dotnet publish -f net8.0 -c Release ..\Microsoft.DevSkim.LanguageServer -r win-x64 --sc -o generatedLanguageServerBinaries" />
153153
</Target>
154154
<!-- Publish the language server binaries for Debug -->
155155
<Target Name="BuildLanguageServerDebug" BeforeTargets="IncludeLanguageServer" Condition=" '$(Configuration)' == 'Debug' ">
156-
<Exec Command="dotnet publish -f net7.0 -c Debug ..\Microsoft.DevSkim.LanguageServer -r win-x64 --sc -o generatedLanguageServerBinaries" />
156+
<Exec Command="dotnet publish -f net8.0 -c Debug ..\Microsoft.DevSkim.LanguageServer -r win-x64 --sc -o generatedLanguageServerBinaries" />
157157
</Target>
158158
<!-- Include the published language server binaries -->
159159
<Target Name="IncludeLanguageServer" BeforeTargets="GetVsixSourceItems">

‎DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
55
<PackageId>Microsoft.CST.DevSkim</PackageId>
66
<PackageVersion>0.0.0</PackageVersion>
77
<PackageTags>Security Linter</PackageTags>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.15" />
27+
<PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.16" />
2828
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2929
</ItemGroup>
3030

‎DevSkim-VSCode-Plugin/client/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async function resolveDotNetPath(): Promise<string> {
2626
const result = await vscode.commands.executeCommand<any>(
2727
"dotnet.acquire",
2828
{
29-
version: "7.0",
29+
version: "8.0",
3030
requestingExtensionId: "MS-CST-E.vscode-devskim",
3131
}
3232
);

0 commit comments

Comments
 (0)