diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d756536d..496b68f7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,14 +2,14 @@ resources: - repo: self pool: - vmimage: windows-2019 + vmimage: windows-latest variables: BuildPlatform: 'any cpu' BuildConfiguration: 'release' major: 3 minor: 0 - dotNetVersion: '3.1.x' + dotNetVersion: '6.0.x' name: $(major).$(minor)$(rev:.r) @@ -87,12 +87,14 @@ steps: condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) displayName: 'Copy JiraExport files' inputs: - SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\JiraExport\bin\$(BuildConfiguration)' + SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\JiraExport\bin\$(BuildConfiguration)\net6' Contents: | ApplicationInsights.config Atlassian.Jira.dll jira-export.exe + jira-export.dll jira-export.exe.config + jira-export.runtimeconfig.json Microsoft.AI.Agent.Intercept.dll Microsoft.AI.DependencyCollector.dll Microsoft.ApplicationInsights.dll @@ -103,6 +105,7 @@ steps: Newtonsoft.Json.dll RestSharp.dll Semver.dll + System.Configuration.ConfigurationManager.dll System.Diagnostics.DiagnosticSource.dll TargetFolder: '$(build.artifactstagingdirectory)\WorkItemMigrator' flattenFolders: true @@ -111,7 +114,7 @@ steps: condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) displayName: 'Copy WorkItemImport files' inputs: - SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\WorkItemImport\bin\$(BuildConfiguration)' + SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\WorkItemImport\bin\$(BuildConfiguration)\net6' Contents: | Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll @@ -129,6 +132,8 @@ steps: System.Net.Http.Formatting.dll wi-import.exe wi-import.exe.config + wi-import.dll + wi-import.runtimeconfig.json TargetFolder: '$(build.artifactstagingdirectory)\WorkItemMigrator' flattenFolders: true diff --git a/src/WorkItemMigrator/JiraExport/App.config b/src/WorkItemMigrator/JiraExport/App.config index 96c49048..8eb82e60 100644 --- a/src/WorkItemMigrator/JiraExport/App.config +++ b/src/WorkItemMigrator/JiraExport/App.config @@ -1,8 +1,5 @@  - - - diff --git a/src/WorkItemMigrator/JiraExport/Properties/AssemblyInfo.cs b/src/WorkItemMigrator/JiraExport/Properties/AssemblyInfo.cs index a17e7f8e..6bd1f6b6 100644 --- a/src/WorkItemMigrator/JiraExport/Properties/AssemblyInfo.cs +++ b/src/WorkItemMigrator/JiraExport/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("jira-export")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Jira Exporter")] -[assembly: AssemblyCopyright("Copyright (c) Solidify")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,5 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("600e6ed8-49fd-46f0-8498-adeadaebdf6c")] -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("0.0.1")] diff --git a/src/WorkItemMigrator/JiraExport/jira-export.csproj b/src/WorkItemMigrator/JiraExport/jira-export.csproj index 55df9b37..3e5674f9 100644 --- a/src/WorkItemMigrator/JiraExport/jira-export.csproj +++ b/src/WorkItemMigrator/JiraExport/jira-export.csproj @@ -1,19 +1,12 @@ - - - + - Debug - AnyCPU - {600E6ED8-49FD-46F0-8498-ADEADAEBDF6C} Exe JiraExport - jira-export - v4.8 - 512 + net6 true false - C:\temp\jirapublish\ + true true Disk false @@ -29,27 +22,21 @@ false true true - - + jira-export + Jira Exporter + Copyright (c) Solidify + false + 0.0.1 + 1.0.* + 1.0.* + bin\$(Configuration)\ - AnyCPU - true full - false - bin\Debug\ - TRACE;DEBUG - prompt 0 - AnyCPU pdbonly - true - bin\Release\ - TRACE - prompt - 4 JiraExport.Program @@ -73,112 +60,36 @@ Properties\app.manifest - - ..\packages\Atlassian.SDK.12.1.0\lib\net452\Atlassian.Jira.dll - - - ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll - - - ..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.9.1\lib\net45\Microsoft.AI.DependencyCollector.dll - - - ..\packages\Microsoft.ApplicationInsights.2.9.1\lib\net46\Microsoft.ApplicationInsights.dll - - - ..\packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll - - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll - - + + + + + + + + + + - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - Designer - - - False - Microsoft .NET Framework 4.6.1 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - {87df777c-d3cb-4b0b-8552-159247b1f022} - Migration.Common.Log - - - {3d3e0fd1-05fc-454b-828a-9004d3ddb296} - Migration.Common - - - {19b3af60-8be6-47fc-9911-7829455b3557} - Migration.WIContract - + + + - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj b/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj index 8cf107e8..6122493f 100644 --- a/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj +++ b/src/WorkItemMigrator/Migration.Common.Log/Migration.Common.Log.csproj @@ -1,72 +1,29 @@ - - - + - Debug - AnyCPU - {87DF777C-D3CB-4B0B-8552-159247B1F022} - Library - Properties - Migration.Common.Log - Migration.Common.Log - v4.8 - 512 - true - - - + net6 + Migration.Common.Log + Migration.Common.Log + Copyright © 2019 + bin\$(Configuration)\ - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\Microsoft.ApplicationInsights.2.9.1\lib\net46\Microsoft.ApplicationInsights.dll - - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Semver.2.0.4\lib\net452\Semver.dll - - + + + + + + + - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - - - - - - - - - - - - Designer - - \ No newline at end of file diff --git a/src/WorkItemMigrator/Migration.Common.Log/Properties/AssemblyInfo.cs b/src/WorkItemMigrator/Migration.Common.Log/Properties/AssemblyInfo.cs index d230bd45..94ed6d91 100644 --- a/src/WorkItemMigrator/Migration.Common.Log/Properties/AssemblyInfo.cs +++ b/src/WorkItemMigrator/Migration.Common.Log/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Migration.Common.Log")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Migration.Common.Log")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("87df777c-d3cb-4b0b-8552-159247b1f022")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj b/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj index 5564f4d1..56cf29b8 100644 --- a/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj +++ b/src/WorkItemMigrator/Migration.Common/Migration.Common.csproj @@ -1,99 +1,36 @@ - - - + - Debug - AnyCPU - {3D3E0FD1-05FC-454B-828A-9004D3DDB296} - Library - Properties - Migration.Common - Migration.Common - v4.8 - 512 - - - + net6 + Migration.Common + Migration.Common + Copyright (c) Solidify + false + 0.0.1 + 1.0.* + 1.0.* + bin\$(Configuration)\ - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - + + + + + - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - {87df777c-d3cb-4b0b-8552-159247b1f022} - Migration.Common.Log - - - {19b3af60-8be6-47fc-9911-7829455b3557} - Migration.WIContract - + + - \ No newline at end of file diff --git a/src/WorkItemMigrator/Migration.Common/Properties/AssemblyInfo.cs b/src/WorkItemMigrator/Migration.Common/Properties/AssemblyInfo.cs index 813ed475..f43f1049 100644 --- a/src/WorkItemMigrator/Migration.Common/Properties/AssemblyInfo.cs +++ b/src/WorkItemMigrator/Migration.Common/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Migration.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Migration.Common")] -[assembly: AssemblyCopyright("Copyright (c) Solidify")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,15 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("3d3e0fd1-05fc-454b-828a-9004d3ddb296")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("0.0.1")] diff --git a/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj b/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj index 52a77b14..19d364e7 100644 --- a/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj +++ b/src/WorkItemMigrator/Migration.WIContract/Migration.WIContract.csproj @@ -1,66 +1,30 @@ - - - + - Debug - AnyCPU - {19B3AF60-8BE6-47FC-9911-7829455B3557} - Library - Properties - Migration.WIContract - Migration.WIContract - v4.8 - 512 - + net6 + Migration.WIContract + Migration.WIContract + Copyright (c) Solidify + false + 0.0.1 + 1.0.* + 1.0.* + bin\$(Configuration)\ - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - - + + + - - - - - - - - - - - - - - - - {87df777c-d3cb-4b0b-8552-159247b1f022} - Migration.Common.Log - - + - \ No newline at end of file diff --git a/src/WorkItemMigrator/Migration.WIContract/Properties/AssemblyInfo.cs b/src/WorkItemMigrator/Migration.WIContract/Properties/AssemblyInfo.cs index bc3d3d35..0ce59c2d 100644 --- a/src/WorkItemMigrator/Migration.WIContract/Properties/AssemblyInfo.cs +++ b/src/WorkItemMigrator/Migration.WIContract/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Migration.WIContract")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Migration.WIContract")] -[assembly: AssemblyCopyright("Copyright (c) Solidify")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,15 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("19b3af60-8be6-47fc-9911-7829455b3557")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("0.0.1")] diff --git a/src/WorkItemMigrator/WorkItemImport/App.config b/src/WorkItemMigrator/WorkItemImport/App.config index 171723e0..006de8c2 100644 --- a/src/WorkItemMigrator/WorkItemImport/App.config +++ b/src/WorkItemMigrator/WorkItemImport/App.config @@ -1,40 +1,5 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WorkItemMigrator/WorkItemImport/Properties/AssemblyInfo.cs b/src/WorkItemMigrator/WorkItemImport/Properties/AssemblyInfo.cs index faf40697..6a074c95 100644 --- a/src/WorkItemMigrator/WorkItemImport/Properties/AssemblyInfo.cs +++ b/src/WorkItemMigrator/WorkItemImport/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("wi-import")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Work Item Importer")] -[assembly: AssemblyCopyright("Copyright (c) Solidify")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,5 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("fe3852ef-a2a8-45b7-8598-ca9400d7f60b")] -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("0.0.1")] diff --git a/src/WorkItemMigrator/WorkItemImport/wi-import.csproj b/src/WorkItemMigrator/WorkItemImport/wi-import.csproj index 47bddc5e..df8aa443 100644 --- a/src/WorkItemMigrator/WorkItemImport/wi-import.csproj +++ b/src/WorkItemMigrator/WorkItemImport/wi-import.csproj @@ -1,21 +1,12 @@ - - - + - Debug - AnyCPU - {FE3852EF-A2A8-45B7-8598-CA9400D7F60B} Exe WorkItemImport - wi-import - v4.8 - 512 + net6 true - - - false publish\ + true true Disk false @@ -29,168 +20,48 @@ 1.0.0.%2a false true + wi-import + Work Item Importer + Copyright (c) Solidify + false + 0.0.1 + 1.0.* + 1.0.* + bin\$(Configuration)\ - AnyCPU - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - ..\packages\Ben.Demystifier.0.1.3\lib\net45\Ben.Demystifier.dll - - - ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll - - - ..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.9.1\lib\net45\Microsoft.AI.DependencyCollector.dll - - - ..\packages\Microsoft.ApplicationInsights.2.9.1\lib\net46\Microsoft.ApplicationInsights.dll - - - ..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.3\lib\net452\Microsoft.Azure.Services.AppAuthentication.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - True - - - ..\packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll - - - ..\packages\Microsoft.IdentityModel.Abstractions.7.5.1\lib\net472\Microsoft.IdentityModel.Abstractions.dll - True - - - ..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.4.3.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - - - ..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - True - - - ..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net472\Microsoft.IdentityModel.Logging.dll - True - - - ..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net472\Microsoft.IdentityModel.Tokens.dll - True - - - ..\packages\WindowsAzure.ServiceBus.5.0.0\lib\net46\Microsoft.ServiceBus.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Build2.WebApi.dll - - - ..\packages\Microsoft.VisualStudio.Services.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Common.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Core.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Dashboards.WebApi.dll - - - ..\packages\Microsoft.TeamFoundation.DistributedTask.Common.Contracts.16.153.0\lib\net45\Microsoft.TeamFoundation.DistributedTask.Common.Contracts.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Policy.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.SourceControl.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Test.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.TestManagement.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Wiki.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.Work.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.WorkItemTracking.Process.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll - - - ..\packages\Microsoft.VisualStudio.Services.InteractiveClient.16.153.0\lib\net45\Microsoft.VisualStudio.Services.Client.Interactive.dll - - - ..\packages\Microsoft.VisualStudio.Services.Client.16.153.0\lib\net45\Microsoft.VisualStudio.Services.Common.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.VisualStudio.Services.TestManagement.TestPlanning.WebApi.dll - - - ..\packages\Microsoft.TeamFoundationServer.Client.16.153.0\lib\net45\Microsoft.VisualStudio.Services.TestResults.WebApi.dll - - - ..\packages\Microsoft.VisualStudio.Services.Client.16.153.0\lib\net45\Microsoft.VisualStudio.Services.WebApi.dll - - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - True - - - ..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll - + + + + + + + + + + + + + + + + + + + + + + - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - - ..\packages\System.IdentityModel.Tokens.Jwt.5.7.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll - True - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - True - - - ..\packages\System.Reflection.Metadata.1.5.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - True - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll @@ -210,74 +81,14 @@ - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll - - - - - - - - - - - - - - - - - - - - - - Designer - - - PreserveNewest - - - - - - {87df777c-d3cb-4b0b-8552-159247b1f022} - Migration.Common.Log - - - {3d3e0fd1-05fc-454b-828a-9004d3ddb296} - Migration.Common - - - {19b3af60-8be6-47fc-9911-7829455b3557} - Migration.WIContract - - - False - Microsoft .NET Framework 4.7.1 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - + + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file 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 4d5dd495..b3531446 100644 --- a/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj +++ b/src/WorkItemMigrator/tests/Migration.Common.Tests/Migration.Common.Tests.csproj @@ -1,30 +1,22 @@ - - - - netcoreapp3.1 - - false - - - - - true - - - - - - - true - - - - - - - - - - - - + + + net6 + false + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 5977c06c..26fdc766 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,27 +1,24 @@ - - + - netcoreapp3.1 + net6 Migration.Jira_Export.Tests - false + false - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 cf4d7169..09f43a73 100644 --- a/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj +++ b/src/WorkItemMigrator/tests/Migration.WIContract.Tests/Migration.WIContract.Tests.csproj @@ -1,23 +1,25 @@ - - + - netcoreapp3.1 - + net6 false - - - - + + + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + - - + \ No newline at end of file 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 4bca6f86..c8f54337 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,29 +1,24 @@ - - - - netcoreapp3.1 - Migration.Wi_Import.Tests - - false - - - - - - - - - - - - - - - - - - - - - - + + + net6 + Migration.Wi_Import.Tests + false + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/integration/integration-test-template.yml b/test/integration/integration-test-template.yml index 3f53ce12..2b894742 100644 --- a/test/integration/integration-test-template.yml +++ b/test/integration/integration-test-template.yml @@ -28,12 +28,14 @@ steps: - task: CopyFiles@2 displayName: 'Copy JiraExport files' inputs: - SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\JiraExport\bin\$(BuildConfiguration)' + SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\JiraExport\bin\$(BuildConfiguration)\net6' Contents: | ApplicationInsights.config Atlassian.Jira.dll jira-export.exe + jira-export.dll jira-export.exe.config + jira-export.runtimeconfig.json Microsoft.AI.Agent.Intercept.dll Microsoft.AI.DependencyCollector.dll Microsoft.ApplicationInsights.dll @@ -44,6 +46,7 @@ steps: Newtonsoft.Json.dll RestSharp.dll Semver.dll + System.Configuration.ConfigurationManager.dll System.Diagnostics.DiagnosticSource.dll TargetFolder: '$(build.artifactstagingdirectory)\WorkItemMigrator' flattenFolders: true @@ -51,7 +54,7 @@ steps: - task: CopyFiles@2 displayName: 'Copy WorkItemImport files' inputs: - SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\WorkItemImport\bin\$(BuildConfiguration)' + SourceFolder: '$(system.defaultworkingdirectory)\src\WorkItemMigrator\WorkItemImport\bin\$(BuildConfiguration)\net6' Contents: | Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll @@ -69,6 +72,8 @@ steps: System.Net.Http.Formatting.dll wi-import.exe wi-import.exe.config + wi-import.dll + wi-import.runtimeconfig.json TargetFolder: '$(build.artifactstagingdirectory)\WorkItemMigrator' flattenFolders: true