From f0d007dda1a58f2281310b0e1c30ff73fbba13d0 Mon Sep 17 00:00:00 2001
From: Oskar Gewalli <wallymathieu@users.noreply.github.com>
Date: Fri, 22 Sep 2023 08:34:34 +0300
Subject: [PATCH] Upgrade to use net7 and specify net7 in Azure DevOps

---
 azure-pipelines.yml                           |  2 +-
 .../JiraExport/jira-export.csproj             | 10 ++---
 .../Migration.Common.Log.csproj               | 11 +++---
 .../Migration.Common/Migration.Common.csproj  |  6 +--
 .../Migration.WIContract.csproj               |  4 +-
 .../WorkItemImport/wi-import.csproj           | 38 +++++++++----------
 .../Migration.Common.Tests.csproj             | 20 +++++-----
 .../Migration.Jira-Export.Tests.csproj        | 20 +++++-----
 .../Migration.WIContract.Tests.csproj         | 20 ++++++----
 .../Migration.Wi-Import.Tests.csproj          | 20 +++++-----
 10 files changed, 78 insertions(+), 73 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d756536d..f7b9530e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,7 +9,7 @@ variables:
   BuildConfiguration: 'release'
   major: 3
   minor: 0
-  dotNetVersion: '3.1.x'
+  dotNetVersion: '7.0.x'
 
 name: $(major).$(minor)$(rev:.r)
 
diff --git a/src/WorkItemMigrator/JiraExport/jira-export.csproj b/src/WorkItemMigrator/JiraExport/jira-export.csproj
index 60504d8f..1c052f6b 100644
--- a/src/WorkItemMigrator/JiraExport/jira-export.csproj
+++ b/src/WorkItemMigrator/JiraExport/jira-export.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>JiraExport</RootNamespace>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>C:\temp\jirapublish\</PublishUrl>
@@ -60,13 +60,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Atlassian.SDK" Version="12.1.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.Agent.Intercept" Version="2.4.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="RestSharp" Version="106.10.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />
diff --git a/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj b/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj
index 7929fc49..e4c031d5 100644
--- a/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj
+++ b/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <AssemblyTitle>Migration.Common.Log</AssemblyTitle>
     <Product>Migration.Common.Log</Product>
     <Copyright>Copyright ©  2019</Copyright>
@@ -13,10 +13,11 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Semver" Version="2.0.4" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Semver" Version="2.3.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />
diff --git a/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj b/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj
index a9816d5a..167b5ca0 100644
--- a/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj
+++ b/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <AssemblyTitle>Migration.Common</AssemblyTitle>
     <Product>Migration.Common</Product>
     <Copyright>Copyright (c) Solidify</Copyright>
@@ -17,8 +17,8 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj b/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj
index dd41c2a0..587967f9 100644
--- a/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj
+++ b/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <AssemblyTitle>Migration.WIContract</AssemblyTitle>
     <Product>Migration.WIContract</Product>
     <Copyright>Copyright (c) Solidify</Copyright>
@@ -17,7 +17,7 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/WorkItemMigrator/WorkItemImport/wi-import.csproj b/src/WorkItemMigrator/WorkItemImport/wi-import.csproj
index 097d6b55..aefc8595 100644
--- a/src/WorkItemMigrator/WorkItemImport/wi-import.csproj
+++ b/src/WorkItemMigrator/WorkItemImport/wi-import.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>WorkItemImport</RootNamespace>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -35,28 +35,26 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ben.Demystifier" Version="0.1.3" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.Agent.Intercept" Version="2.4.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.9.1" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.6" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.9" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="5.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="5.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
-    <PackageReference Include="Microsoft.TeamFoundation.DistributedTask.Common.Contracts" Version="16.153.0" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.153.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="16.153.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
-    <PackageReference Include="WindowsAzure.ServiceBus" Version="5.0.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.0.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.0.0" />
+    <PackageReference Include="Microsoft.TeamFoundation.DistributedTask.Common.Contracts" Version="16.205.1" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.205.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="16.205.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="7.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />
diff --git a/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj b/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj
index a620938a..dfc9c59e 100644
--- a/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj
+++ b/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.11.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="17.0.11" />
+    <PackageReference Include="AutoFixture" Version="4.18.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Migration.Common\Migration.Common.csproj" />
diff --git a/src/WorkItemMigrator/tests/Migration.Jira-Export.Tests/Migration.Jira-Export.Tests.csproj b/src/WorkItemMigrator/tests/Migration.Jira-Export.Tests/Migration.Jira-Export.Tests.csproj
index 831250d7..3ac9ee16 100644
--- a/src/WorkItemMigrator/tests/Migration.Jira-Export.Tests/Migration.Jira-Export.Tests.csproj
+++ b/src/WorkItemMigrator/tests/Migration.Jira-Export.Tests/Migration.Jira-Export.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <RootNamespace>Migration.Jira_Export.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Atlassian.SDK" Version="12.1.0" />
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.11.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="17.0.11" />
+    <PackageReference Include="AutoFixture" Version="4.18.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\JiraExport\jira-export.csproj" />
diff --git a/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj b/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj
index 2efd79e5..2e4971bd 100644
--- a/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj
+++ b/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj
@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="AutoFixture" Version="4.18.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.7.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Migration.WIContract\Migration.WIContract.csproj" />
diff --git a/src/WorkItemMigrator/tests/Migration.Wi-Import.Tests/Migration.Wi-Import.Tests.csproj b/src/WorkItemMigrator/tests/Migration.Wi-Import.Tests/Migration.Wi-Import.Tests.csproj
index 230e5e2a..6a953cd3 100644
--- a/src/WorkItemMigrator/tests/Migration.Wi-Import.Tests/Migration.Wi-Import.Tests.csproj
+++ b/src/WorkItemMigrator/tests/Migration.Wi-Import.Tests/Migration.Wi-Import.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <RootNamespace>Migration.Wi_Import.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Atlassian.SDK" Version="12.1.0" />
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.11.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="17.0.11" />
+    <PackageReference Include="AutoFixture" Version="4.18.0" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Migration.Common\Migration.Common.csproj" />