From 6c9c008ed7ae6be96ee1973f6b0b48027a6a2f92 Mon Sep 17 00:00:00 2001 From: James Hockey Date: Tue, 30 Mar 2021 12:08:42 +0100 Subject: [PATCH] Removed the old CA nuget packages Upgraded to .net SDK 5 Forced the CA warnings to be errors Enforced code style in the build --- .editorconfig | 4 ++-- .github/workflows/ci-build.yml | 2 +- nuget.config | 3 +-- ...ntegrationMigration.BizTalk.Analyze.csproj | 10 ++------- ...ntegrationMigration.BizTalk.Convert.csproj | 10 ++------- ...tegrationMigration.BizTalk.Discover.csproj | 10 ++------- ...eIntegrationMigration.BizTalk.Parse.csproj | 10 ++------- ...IntegrationMigration.BizTalk.Report.csproj | 10 ++------- ...ationMigration.BizTalk.StageRunners.csproj | 10 ++------- ...eIntegrationMigration.BizTalk.Types.csproj | 6 ++---- ...tionMigration.BizTalk.Analyze.Tests.csproj | 10 ++------- ...egrationMigration.BizTalk.Cli.Tests.csproj | 10 ++------- ...tionMigration.BizTalk.Convert.Tests.csproj | 21 ++----------------- ...ionMigration.BizTalk.Discover.Tests.csproj | 21 ++----------------- ...rationMigration.BizTalk.Parse.Tests.csproj | 10 ++------- ...ationMigration.BizTalk.Report.Tests.csproj | 10 ++------- ...rationMigration.BizTalk.Types.Tests.csproj | 10 ++------- 17 files changed, 32 insertions(+), 135 deletions(-) diff --git a/.editorconfig b/.editorconfig index 63e3e29..4af539b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -139,8 +139,8 @@ dotnet_naming_symbols.all_members.applicable_kinds = * dotnet_naming_style.pascal_case_style.capitalization = pascal_case # IDE0073: File header -# dotnet_diagnostic.IDE0073.severity = warning -# file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information. +dotnet_diagnostic.IDE0073.severity = warning +file_header_template = Copyright (c) Microsoft Corporation.\n Licensed under the MIT license. # CSharp code style settings: diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d9e56b4..dff946a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,7 +17,7 @@ on: env: BUILD_TYPE: 'Release' - DOTNET_VERSION: '3.1.200' + DOTNET_VERSION: '5.0.x' CHOCO_BIZTALK_MIGRATOR_PACKAGE: '..\..\build\chocolatey\biztalkmigrator\biztalkmigrator.nuspec' CHOCO_CONFIG_DIR: 'build/chocolatey' CHOCO_PACKAGE_OUTPUT_DIR: 'choco-package' diff --git a/nuget.config b/nuget.config index 0779cb7..26a0269 100644 --- a/nuget.config +++ b/nuget.config @@ -4,7 +4,6 @@ - - + diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj index dfd15c7..6d1206c 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -35,14 +37,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj index 68b04d2..c206da0 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -34,14 +36,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj index 490f62e..0b4bf48 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -37,14 +39,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj index 500abfe..378d6a0 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -26,14 +28,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj index 9817ea1..146871b 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -27,14 +29,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj index 50c462c..6c84ff8 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj @@ -14,6 +14,8 @@ https://github.com/azure/aimbiztalk 0.0.1-alpha NU5105 + true + true @@ -28,14 +30,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj index 87dfde9..eaa8e8e 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj @@ -13,6 +13,8 @@ https://github.com/azure/aimbiztalk 0.0.4-alpha NU5105 + true + true @@ -26,10 +28,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj index 65bf45f..7a08e1f 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj @@ -12,6 +12,8 @@ $(MSBuildThisFileDirectory)\..\..\dist\packages Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests 0.0.4-alpha + true + true @@ -34,14 +36,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj index 48e69fd..df48f92 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj @@ -3,18 +3,12 @@ Exe netcoreapp3.1 + true + true - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj index fdf51e4..a6ce2c8 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj @@ -3,6 +3,8 @@ netcoreapp3.1 false + true + true @@ -17,14 +19,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -48,17 +42,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj index a93fd8b..05a36f9 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj @@ -3,6 +3,8 @@ netcoreapp3.1 false + true + true @@ -17,14 +19,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -48,17 +42,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj index 2f608f6..e02a4b2 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj @@ -12,6 +12,8 @@ $(MSBuildThisFileDirectory)\..\..\dist\packages Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests 0.0.4-alpha + true + true @@ -25,14 +27,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj index 9af53d0..4bbe59b 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj @@ -12,6 +12,8 @@ $(MSBuildThisFileDirectory)\..\..\dist\packages Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests 0.0.4-alpha + true + true @@ -26,14 +28,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj index 49658c0..0500525 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj @@ -12,6 +12,8 @@ $(MSBuildThisFileDirectory)\..\..\dist\packages Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests 0.0.4-alpha + true + true @@ -25,14 +27,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive -