Update .net framework to 7.0.x + update packages to resolve the secur…

…ity alerts (#232) * Update .net framework to 7.0.x + update packages to resolve the security alerts * Update .net framework * Fix build
microsoft · Nov 1, 2023 · 2136c82 · 2136c82
1 parent d8106e1
commit 2136c82
Show file tree

Hide file tree

Showing 36 changed files with 202 additions and 117 deletions.
diff --git a/.github/workflows/build_net.yml b/.github/workflows/build_net.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
@@ -41,6 +41,7 @@ jobs:
         DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
     - name: Test
-      run: dotnet test PullRequestQuantifier.sln --configuration Release --verbosity normal --collect:"XPlat Code Coverage" --settings coverlet.runsettings.xml -r ./coverlet-results
+      run: dotnet test PullRequestQuantifier.sln --configuration Release --verbosity normal --collect:"XPlat Code Coverage" --settings coverlet.runsettings.xml --results-directory ./coverlet-results
+
 
     #todo upload artifacts to release
diff --git a/.github/workflows/build_net_core.yml b/.github/workflows/build_net_core.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
 
     - name: Install dependencies
       run: dotnet restore PullRequestQuantifier.sln
@@ -32,7 +32,7 @@ jobs:
       run: dotnet build PullRequestQuantifier.sln --configuration Release --no-restore
 
     - name: Test
-      run: dotnet test PullRequestQuantifier.sln --configuration Release --no-build --verbosity normal --collect:"XPlat Code Coverage" --settings coverlet.runsettings.xml -r ./coverlet-results
+      run: dotnet test PullRequestQuantifier.sln --configuration Release --no-build --verbosity normal --collect:"XPlat Code Coverage" --settings coverlet.runsettings.xml --results-directory ./coverlet-results
 
     - name: Upload coverage
       env:

diff --git a/.github/workflows/feedback_service.yml b/.github/workflows/feedback_service.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore src/PullRequestQuantifier.Feedback.Service/PullRequestQuantifier.Feedback.Service.csproj
       env:

diff --git a/.github/workflows/github_client.yml b/.github/workflows/github_client.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore src/Clients/PullRequestQuantifier.GitHub.Client/PullRequestQuantifier.GitHub.Client.csproj
       env:

diff --git a/.github/workflows/repository_service.yml b/.github/workflows/repository_service.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore src/PullRequestQuantifier.Repository.Service/PullRequestQuantifier.Repository.Service.csproj
       env:

diff --git a/.github/workflows/vscode_client.yml b/.github/workflows/vscode_client.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.401
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore src/Clients/PullRequestQuantifier.VsCode.Client/PullRequestQuantifier.VsCode.Client.csproj
       env:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
 
     <!-- Prevent NerdBank from loading in mono (which omnisharp uses on linux) /-->
     <GenerateAssemblyVersionInfo Condition="'$(MSBuildRuntimeType)'=='Mono'">false</GenerateAssemblyVersionInfo>
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" Condition="'$(StyleCopEnabled)'=='true'" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="*" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="*" PrivateAssets="All" Condition="'$(StyleCopEnabled)'=='true'" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ context **to drive a optimal PR experience**.
 
 ### Prerequisites
 
-- [.NET 5.0 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/5.0) is required for the framework to work properly.
+- [.NET 7.0 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) is required for the framework to work properly.
 
 #
 

diff --git a/src/Clients/PullRequestQuantifier.Client.Tests/PullRequestQuantifier.Client.Tests.csproj b/src/Clients/PullRequestQuantifier.Client.Tests/PullRequestQuantifier.Client.Tests.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="1.3.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/Clients/PullRequestQuantifier.Client/PullRequestQuantifier.Client.csproj b/src/Clients/PullRequestQuantifier.Client/PullRequestQuantifier.Client.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Text.Json" Version="5.0.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="13.2.6" />
-    <PackageReference Include="Ignore" Version="0.1.32" />
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-    <PackageReference Include="YamlDotNet" Version="9.1.4" />
-    <PackageReference Include="Stubble.Core" Version="1.9.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
+    <PackageReference Include="Ignore" Version="0.1.50" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
+    <PackageReference Include="YamlDotNet" Version="13.7.1" />
+    <PackageReference Include="Stubble.Core" Version="1.10.8" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,6 +34,10 @@
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
     <!--
       The following solves the problem that 'dotnet pack' does not include the DLLs from referenced projects.
       See https://github.com/NuGet/Home/issues/3891 for a description of the problem

diff --git a/...ullRequestQuantifier.GitHub.Client.Tests/PullRequestQuantifier.GitHub.Client.Tests.csproj b/...ullRequestQuantifier.GitHub.Client.Tests/PullRequestQuantifier.GitHub.Client.Tests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="Moq" Version="4.15.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.13" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Moq" Version="4.20.69" />
+        <PackageReference Include="xunit" Version="2.5.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="1.3.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/Clients/PullRequestQuantifier.GitHub.Client/PullRequestQuantifier.GitHub.Client.csproj b/src/Clients/PullRequestQuantifier.GitHub.Client/PullRequestQuantifier.GitHub.Client.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
-        <PackageReference Include="GitHubJwt" Version="0.0.4" />
-        <PackageReference Include="Octokit" Version="0.48.0" />
-        <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.0" />
+        <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.16.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.13" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+        <PackageReference Include="GitHubJwt" Version="0.0.6" />
+        <PackageReference Include="Octokit" Version="8.1.1" />
+        <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Clients/PullRequestQuantifier.GitHub.Common.Tests/GitHubClientAdapterFactoryTests.cs b/src/Clients/PullRequestQuantifier.GitHub.Common.Tests/GitHubClientAdapterFactoryTests.cs
@@ -36,7 +36,7 @@ public GitHubClientAdapterFactoryTests()
                 }
             };
 
-            mockGitHubJwtFactory.Setup(f => f.CreateEncodedJwtToken()).Returns(Guid.NewGuid().ToString);
+            mockGitHubJwtFactory.Setup(f => f.CreateEncodedJwtToken(null)).Returns(Guid.NewGuid().ToString);
         }
 
         [Fact]

diff --git a/...ullRequestQuantifier.GitHub.Common.Tests/PullRequestQuantifier.GitHub.Common.Tests.csproj b/...ullRequestQuantifier.GitHub.Common.Tests/PullRequestQuantifier.GitHub.Common.Tests.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Moq" Version="4.15.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -24,4 +24,8 @@
     <ProjectReference Include="..\PullRequestQuantifier.GitHub.Common\PullRequestQuantifier.GitHub.Common.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Clients/PullRequestQuantifier.GitHub.Common/PullRequestQuantifier.GitHub.Common.csproj b/src/Clients/PullRequestQuantifier.GitHub.Common/PullRequestQuantifier.GitHub.Common.csproj
@@ -6,12 +6,15 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GitHubJwt" Version="0.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Octokit" Version="0.48.0" />
+    <PackageReference Include="GitHubJwt" Version="0.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Octokit" Version="8.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\PullRequestQuantifier.Common\PullRequestQuantifier.Common.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Clients/PullRequestQuantifier.Local.Client/PullRequestQuantifier.Local.Client.csproj b/src/Clients/PullRequestQuantifier.Local.Client/PullRequestQuantifier.Local.Client.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -18,4 +18,8 @@
     <ProjectReference Include="..\PullRequestQuantifier.Client\PullRequestQuantifier.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Clients/PullRequestQuantifier.Local.Context/PullRequestQuantifier.Local.Context.csproj b/src/Clients/PullRequestQuantifier.Local.Context/PullRequestQuantifier.Local.Context.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
@@ -11,4 +11,8 @@
     <ProjectReference Include="..\PullRequestQuantifier.Client\PullRequestQuantifier.Client.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Clients/PullRequestQuantifier.VsCode.Client/PullRequestQuantifier.VsCode.Client.csproj b/src/Clients/PullRequestQuantifier.VsCode.Client/PullRequestQuantifier.VsCode.Client.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <NodeJsRoot>pull-request-quantifier\</NodeJsRoot>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     </PropertyGroup>
@@ -43,5 +43,9 @@
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
         </None>
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/Clients/PullRequestQuantifier.Vsix.Client/PullRequestQuantifier.Vsix.Client.csproj b/src/Clients/PullRequestQuantifier.Vsix.Client/PullRequestQuantifier.Vsix.Client.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -21,7 +22,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PullRequestQuantifier.Vsix.Client</RootNamespace>
     <AssemblyName>PullRequestQuantifier.Vsix.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>

diff --git a/src/PullRequestQuantifier.Abstractions.Tests/PullRequestQuantifier.Abstractions.Tests.csproj b/src/PullRequestQuantifier.Abstractions.Tests/PullRequestQuantifier.Abstractions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -11,13 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -56,4 +56,8 @@
     <Folder Include="Git" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
 </Project>