From cb598a377d84939be7016acbf9a5c25c6e970d0e Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Fri, 15 Nov 2024 16:23:10 -0700 Subject: [PATCH 01/11] - Account for enum comparison during inter-dependency checks on Parameter sets --- EasyPost/Utilities/Internal/Enum.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/EasyPost/Utilities/Internal/Enum.cs b/EasyPost/Utilities/Internal/Enum.cs index 4aff4556..c5ccb235 100644 --- a/EasyPost/Utilities/Internal/Enum.cs +++ b/EasyPost/Utilities/Internal/Enum.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; From ad78d8ec3ad1f0c2029a3e8b479bd7f8d876168f Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 12:33:33 -0700 Subject: [PATCH 02/11] - Linting --- EasyPost/Utilities/Internal/Enum.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/EasyPost/Utilities/Internal/Enum.cs b/EasyPost/Utilities/Internal/Enum.cs index c5ccb235..4aff4556 100644 --- a/EasyPost/Utilities/Internal/Enum.cs +++ b/EasyPost/Utilities/Internal/Enum.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; From 61cfea75b26c34208f5ce526cd58f959d4427b36 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Fri, 16 Aug 2024 11:43:12 -0600 Subject: [PATCH 03/11] - Drop .NET 5.0 support --- .../EasyPost.Integration.csproj | 2 +- EasyPost.Tests/EasyPost.Tests.csproj | 2 +- EasyPost.Tests/packages.lock.json | 242 ------------------ EasyPost.nuspec | 5 - EasyPost/EasyPost.csproj | 2 +- EasyPost/packages.lock.json | 78 ------ README.md | 1 - scripts/unix/setup.sh | 2 +- scripts/win/setup.bat | 2 +- 9 files changed, 5 insertions(+), 331 deletions(-) diff --git a/EasyPost.Integration/EasyPost.Integration.csproj b/EasyPost.Integration/EasyPost.Integration.csproj index 316dc78c..8caa9de7 100644 --- a/EasyPost.Integration/EasyPost.Integration.csproj +++ b/EasyPost.Integration/EasyPost.Integration.csproj @@ -1,7 +1,7 @@ - net462;net5.0;net6.0;net7.0;net8.0 + net462;net6.0;net7.0;net8.0 latest enable enable diff --git a/EasyPost.Tests/EasyPost.Tests.csproj b/EasyPost.Tests/EasyPost.Tests.csproj index e7e84048..7bca41d5 100644 --- a/EasyPost.Tests/EasyPost.Tests.csproj +++ b/EasyPost.Tests/EasyPost.Tests.csproj @@ -1,6 +1,6 @@ - net462;net5.0;net6.0;net7.0;net8.0 + net462;net6.0;net7.0;net8.0 false diff --git a/EasyPost.Tests/packages.lock.json b/EasyPost.Tests/packages.lock.json index 725b00ac..75d20633 100644 --- a/EasyPost.Tests/packages.lock.json +++ b/EasyPost.Tests/packages.lock.json @@ -264,248 +264,6 @@ } } }, - ".NETCoreApp,Version=v5.0": { - "coverlet.collector": { - "type": "Direct", - "requested": "[3.1.2, 4.0.0)", - "resolved": "3.1.2", - "contentHash": "wuLDIDKD5XMt0A7lE31JPenT7QQwZPFkP5rRpdJeblyXZ9MGLI8rYjvm5fvAKln+2/X+4IxxQDxBtwdrqKNLZw==" - }, - "coverlet.msbuild": { - "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "lu/eJJpqJb4qy3BGPtDD/LI5RSOwXYYyRErTyaG0OTP69llzVK3FEe74hBQx0JtLUTLEVBfERV4uGYcE1Br2sg==" - }, - "EasyVCR": { - "type": "Direct", - "requested": "[0.5.1, )", - "resolved": "0.5.1", - "contentHash": "rvNLrrOKVdWC3f95anMJIkhdkPO7CZpt7nC+83jVYH8pCEfdfi3QG0Nx+4+oS1OOaWue6P5tn9DDI3GCaQdbNw==", - "dependencies": { - "Microsoft.Extensions.Logging": "6.0.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.3.0, 18.0.0)", - "resolved": "17.3.0", - "contentHash": "ch4JCT7AZdBzvCAKD36t6fDsl7NEzzunwW7MwXUG2uFPoWcMd8B8KYg5fiwxnpdXJHodJk6yIBdSwMpN3Ikt9w==", - "dependencies": { - "Microsoft.CodeCoverage": "17.3.0", - "Microsoft.TestPlatform.TestHost": "17.3.0" - } - }, - "Microsoft.VisualStudio.TestPlatform.ObjectModel": { - "type": "Direct", - "requested": "[14.0.0, 15.0.0)", - "resolved": "14.0.0", - "contentHash": "PlQ38dL950pnyptA3CcnYIqAKpqlP7xpoz8n5ZfS1QgxFiZrh2x1lw05V3VNmq0ZZ9Xy3SHB5tOyvFjmjNR1HQ==" - }, - "NETStandard.Library": { - "type": "Direct", - "requested": "[2.0.3, 3.0.0)", - "resolved": "2.0.3", - "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json": { - "type": "Direct", - "requested": "[13.0.1, 14.0.0)", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "SecurityCodeScan.VS2019": { - "type": "Direct", - "requested": "[5.6.6, 6.0.0)", - "resolved": "5.6.6", - "contentHash": "1BEkaTw2iZ5QccesAYfRcab9ttQvg6xyIItazCWLJEt5aKf3cDXvGtX+Z4p11a1QwYmf3WaNxpiZXfzXK/0VIw==" - }, - "xunit": { - "type": "Direct", - "requested": "[2.4.2, 3.0.0)", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", - "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" - } - }, - "xunit.runner.visualstudio": { - "type": "Direct", - "requested": "[2.4.5, 3.0.0)", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "/xxz+e29F2V5pePtInjbLffoqWVTm60KCX87vSj2laNboeWq65WFJ634fGtBcMZO3VEfOmh9/XcoWEfLlWWG+g==" - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" - }, - "Microsoft.Extensions.Logging": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.TestPlatform.ObjectModel": { - "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", - "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" - } - }, - "Microsoft.TestPlatform.TestHost": { - "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "uOJALDWtKXZkISKuNI7kOlRi/lk2CqXZtLkNS0Ei+RXqRUjUpCsjAPYSP+DJ/a4QwJ5cI9CVF52vtajnGOaEpw==", - "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.3.0", - "Newtonsoft.Json": "9.0.1" - } - }, - "NuGet.Frameworks": { - "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "xunit.abstractions": { - "type": "Transitive", - "resolved": "2.0.3", - "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg==" - }, - "xunit.analyzers": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" - }, - "xunit.assert": { - "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", - "dependencies": { - "NETStandard.Library": "1.6.1" - } - }, - "xunit.core": { - "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", - "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" - } - }, - "xunit.extensibility.core": { - "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", - "dependencies": { - "NETStandard.Library": "1.6.1", - "xunit.abstractions": "2.0.3" - } - }, - "xunit.extensibility.execution": { - "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", - "dependencies": { - "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" - } - }, - "easypost": { - "type": "Project", - "dependencies": { - "Newtonsoft.Json": "[13.0.1, 14.0.0)" - } - } - }, "net6.0": { "coverlet.collector": { "type": "Direct", diff --git a/EasyPost.nuspec b/EasyPost.nuspec index 74d95008..1ae2ff57 100644 --- a/EasyPost.nuspec +++ b/EasyPost.nuspec @@ -18,9 +18,6 @@ - - - @@ -35,8 +32,6 @@ - - diff --git a/EasyPost/EasyPost.csproj b/EasyPost/EasyPost.csproj index 9c979fbb..ba5b90c6 100644 --- a/EasyPost/EasyPost.csproj +++ b/EasyPost/EasyPost.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net5.0;net6.0;net7.0;net8.0 + netstandard2.0;net6.0;net7.0;net8.0 enable enable Library diff --git a/EasyPost/packages.lock.json b/EasyPost/packages.lock.json index 770e1509..88ae9c6e 100644 --- a/EasyPost/packages.lock.json +++ b/EasyPost/packages.lock.json @@ -17,46 +17,10 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "StyleCop.Analyzers": { - "type": "Direct", - "requested": "[1.2.0-beta.435, )", - "resolved": "1.2.0-beta.435", - "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", - "dependencies": { - "StyleCop.Analyzers.Unstable": "1.2.0.435" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "StyleCop.Analyzers.Unstable": { - "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" - } - }, - ".NETCoreApp,Version=v5.0": { - "Newtonsoft.Json": { - "type": "Direct", - "requested": "[13.0.1, 14.0.0)", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "StyleCop.Analyzers": { - "type": "Direct", - "requested": "[1.2.0-beta.435, )", - "resolved": "1.2.0-beta.435", - "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", - "dependencies": { - "StyleCop.Analyzers.Unstable": "1.2.0.435" - } - }, - "StyleCop.Analyzers.Unstable": { - "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" } }, "net6.0": { @@ -65,20 +29,6 @@ "requested": "[13.0.1, 14.0.0)", "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "StyleCop.Analyzers": { - "type": "Direct", - "requested": "[1.2.0-beta.435, )", - "resolved": "1.2.0-beta.435", - "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", - "dependencies": { - "StyleCop.Analyzers.Unstable": "1.2.0.435" - } - }, - "StyleCop.Analyzers.Unstable": { - "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" } }, "net7.0": { @@ -87,20 +37,6 @@ "requested": "[13.0.1, 14.0.0)", "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "StyleCop.Analyzers": { - "type": "Direct", - "requested": "[1.2.0-beta.435, )", - "resolved": "1.2.0-beta.435", - "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", - "dependencies": { - "StyleCop.Analyzers.Unstable": "1.2.0.435" - } - }, - "StyleCop.Analyzers.Unstable": { - "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" } }, "net8.0": { @@ -109,20 +45,6 @@ "requested": "[13.0.1, 14.0.0)", "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "StyleCop.Analyzers": { - "type": "Direct", - "requested": "[1.2.0-beta.435, )", - "resolved": "1.2.0-beta.435", - "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", - "dependencies": { - "StyleCop.Analyzers.Unstable": "1.2.0.435" - } - }, - "StyleCop.Analyzers.Unstable": { - "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" } } } diff --git a/README.md b/README.md index 0a74a992..78031d9d 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,6 @@ referrals. We have attempted to call out these functions in their respective doc unit tests in one framework at a time with, e.g `make unit-test fw=net8.0`. Valid frameworks: - `net462` (.NET Framework 4.6.2, the oldest non-EOL version of .NET Framework; will not run on Apple Silicon) -- `net5.0` (.NET 5.0) - `net6.0` (.NET 6.0) - `net7.0` (.NET 7.0) - `net8.0` (.NET 8.0) diff --git a/scripts/unix/setup.sh b/scripts/unix/setup.sh index cb1dcec7..a3dd7cdf 100644 --- a/scripts/unix/setup.sh +++ b/scripts/unix/setup.sh @@ -10,7 +10,7 @@ if [[ $(sysctl -n machdep.cpu.brand_string) =~ "Apple" ]]; then fi # .NET versions we want to install -declare -a NetVersions=("8.0" "7.0" "6.0" "5.0") +declare -a NetVersions=("8.0" "7.0" "6.0") # Download dotnet-install.sh echo "Downloading dotnet-install.sh script..." diff --git a/scripts/win/setup.bat b/scripts/win/setup.bat index 34bdbe25..04b33600 100644 --- a/scripts/win/setup.bat +++ b/scripts/win/setup.bat @@ -10,7 +10,7 @@ @ECHO OFF :: .NET Versions we want to install and destination -SET NetVersions=Current 8.0 7.0 6.0 5.0 +SET NetVersions=Current 8.0 7.0 6.0 SET InstallPath=C:\dotnet :: Dependency file From 7486396c413795fae4a9aa99fcf578d336995b52 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Fri, 16 Aug 2024 11:51:04 -0600 Subject: [PATCH 04/11] - Remove .NET 5.0 from CI --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dee241d..2d6eb429 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,15 +124,13 @@ jobs: EASYPOST_PROD_API_KEY: "123" strategy: matrix: - name: [ 'NetStandard20', 'Net50', 'Net60', 'Net70', 'Net80' ] + name: [ 'NetStandard20', 'Net60', 'Net70', 'Net80' ] include: - name: NetStandard20 # can't run tests on .NET Standard, it's just a bridge between .NET Framework and .NET. # So we'll target .NET Framework 4.6.2 # More notes at the bottom of this file framework: net462 - - name: Net50 - framework: net5.0 - name: Net60 framework: net6.0 - name: Net70 @@ -147,9 +145,9 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - # .NET 5.0 is deprecated and removed from GitHub Actions, we need to manually install it dotnet-version: | - 5.x.x + 6.x.x + 7.x.x 8.x.x - name: Setup MSBuild From d7d0078d69c2151dbdb76e56cc1a16eb516a5e51 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 13:24:31 -0700 Subject: [PATCH 05/11] - Add .NET 9.0 support --- .../EasyPost.Compatibility.FSharp.fsproj | 2 +- .../EasyPost.Compatibility.VB.vbproj | 2 +- EasyPost.Integration/EasyPost.Integration.csproj | 2 +- EasyPost.Tests/EasyPost.Tests.csproj | 2 +- EasyPost/EasyPost.csproj | 2 +- EasyPost/packages.lock.json | 8 ++++++++ README.md | 3 ++- scripts/unix/setup.sh | 2 +- scripts/win/setup.bat | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj b/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj index 028edf68..bf58593e 100644 --- a/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj +++ b/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 true true EasyPost.Compatibility.FSharp diff --git a/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj b/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj index 51bf2832..d78a4cc2 100644 --- a/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj +++ b/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj @@ -2,7 +2,7 @@ EasyPost.Compatibility.VB - net8.0 + net9.0 true diff --git a/EasyPost.Integration/EasyPost.Integration.csproj b/EasyPost.Integration/EasyPost.Integration.csproj index 8caa9de7..e48ec9aa 100644 --- a/EasyPost.Integration/EasyPost.Integration.csproj +++ b/EasyPost.Integration/EasyPost.Integration.csproj @@ -1,7 +1,7 @@ - net462;net6.0;net7.0;net8.0 + net462;net6.0;net7.0;net8.0;net9.0 latest enable enable diff --git a/EasyPost.Tests/EasyPost.Tests.csproj b/EasyPost.Tests/EasyPost.Tests.csproj index 7bca41d5..6abad3ff 100644 --- a/EasyPost.Tests/EasyPost.Tests.csproj +++ b/EasyPost.Tests/EasyPost.Tests.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0;net8.0 + net462;net6.0;net7.0;net8.0;net9.0 false diff --git a/EasyPost/EasyPost.csproj b/EasyPost/EasyPost.csproj index ba5b90c6..d35ee207 100644 --- a/EasyPost/EasyPost.csproj +++ b/EasyPost/EasyPost.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0;net7.0;net8.0 + netstandard2.0;net6.0;net7.0;net8.0;net9.0 enable enable Library diff --git a/EasyPost/packages.lock.json b/EasyPost/packages.lock.json index 88ae9c6e..0e840452 100644 --- a/EasyPost/packages.lock.json +++ b/EasyPost/packages.lock.json @@ -46,6 +46,14 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" } + }, + "net9.0": { + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + } } } } \ No newline at end of file diff --git a/README.md b/README.md index 78031d9d..4fd13895 100644 --- a/README.md +++ b/README.md @@ -327,12 +327,13 @@ Some tests may require a user with a particular set of enabled features such as referrals. We have attempted to call out these functions in their respective docstrings. **NOTE** .NET Framework/.NET Standard unit tests cannot currently be run on Apple Silicon (M1, M2, etc.). Instead, run -unit tests in one framework at a time with, e.g `make unit-test fw=net8.0`. Valid frameworks: +unit tests in one framework at a time with, e.g `make unit-test fw=net9.0`. Valid frameworks: - `net462` (.NET Framework 4.6.2, the oldest non-EOL version of .NET Framework; will not run on Apple Silicon) - `net6.0` (.NET 6.0) - `net7.0` (.NET 7.0) - `net8.0` (.NET 8.0) +- `net9.0` (.NET 9.0) #### Test Coverage diff --git a/scripts/unix/setup.sh b/scripts/unix/setup.sh index a3dd7cdf..93228055 100644 --- a/scripts/unix/setup.sh +++ b/scripts/unix/setup.sh @@ -10,7 +10,7 @@ if [[ $(sysctl -n machdep.cpu.brand_string) =~ "Apple" ]]; then fi # .NET versions we want to install -declare -a NetVersions=("8.0" "7.0" "6.0") +declare -a NetVersions=("9.0" "8.0" "7.0" "6.0") # Download dotnet-install.sh echo "Downloading dotnet-install.sh script..." diff --git a/scripts/win/setup.bat b/scripts/win/setup.bat index 04b33600..6cc7de42 100644 --- a/scripts/win/setup.bat +++ b/scripts/win/setup.bat @@ -10,7 +10,7 @@ @ECHO OFF :: .NET Versions we want to install and destination -SET NetVersions=Current 8.0 7.0 6.0 +SET NetVersions=Current 9.0 8.0 7.0 6.0 SET InstallPath=C:\dotnet :: Dependency file From 9ced6a9747061fd178a90053eb5b3171bdae6e0f Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 13:24:58 -0700 Subject: [PATCH 06/11] - Bump examples submodule --- examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples b/examples index 0492e408..bcfb3b90 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 0492e408e1b37b2ec18bcb4a4d228ab0f458f59d +Subproject commit bcfb3b900550b99e9e4ded9acf4fbd35f1df349f From 9edbd299bc39314cdcfa553ee37c9722dc6a0bae Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 14:02:43 -0700 Subject: [PATCH 07/11] - Use .NET 9.0 in CI --- .github/workflows/ci.yml | 27 ++- .../packages.lock.json | 2 +- EasyPost.Compatibility.VB/packages.lock.json | 2 +- EasyPost.Tests/packages.lock.json | 228 ++++++++++++++++++ 4 files changed, 245 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d6eb429..2f2ad861 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Set up dotnet tools run: make install install-styleguide @@ -31,7 +31,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Set up dotnet tools run: make install install-styleguide @@ -51,7 +51,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Set up dotnet tools and dependencies run: make install @@ -67,7 +67,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Set up dotnet tools and dependencies run: make install @@ -102,7 +102,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Install docfx run: make install-tools @@ -124,7 +124,7 @@ jobs: EASYPOST_PROD_API_KEY: "123" strategy: matrix: - name: [ 'NetStandard20', 'Net60', 'Net70', 'Net80' ] + name: [ 'NetStandard20', 'Net60', 'Net70', 'Net80', 'Net90' ] include: - name: NetStandard20 # can't run tests on .NET Standard, it's just a bridge between .NET Framework and .NET. @@ -137,6 +137,8 @@ jobs: framework: net7.0 - name: Net80 framework: net8.0 + - name: Net90 + framework: net9.0 steps: - uses: actions/checkout@v4 with: @@ -149,6 +151,7 @@ jobs: 6.x.x 7.x.x 8.x.x + 9.x.x - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1.2 @@ -185,7 +188,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1.2 @@ -205,7 +208,7 @@ jobs: # Run the integration tests - name: Run Tests - run: make integration-test fw=net7.0 # Always run integration tests on the latest framework + run: make integration-test fw=net9.0 # Always run integration tests on the latest framework FSharp_Compatibility_Tests: runs-on: windows-2022 @@ -217,7 +220,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1.2 @@ -237,7 +240,7 @@ jobs: # Run the compatibility tests - name: Run Tests - run: make fs-compat-test fw=net7.0 # Always run compatibility tests on the latest framework + run: make fs-compat-test fw=net9.0 # Always run compatibility tests on the latest framework Visual_Basic_Compatibility_Test: runs-on: windows-2022 @@ -250,7 +253,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.x.x + dotnet-version: 9.x.x - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1.2 @@ -270,7 +273,7 @@ jobs: # Run the compatibility tests - name: Run Tests - run: make vb-compat-test fw=net7.0 # Always run compatibility tests on the latest framework + run: make vb-compat-test fw=net9.0 # Always run compatibility tests on the latest framework # .NET Standard notes: diff --git a/EasyPost.Compatibility.FSharp/packages.lock.json b/EasyPost.Compatibility.FSharp/packages.lock.json index bec50d61..7fd53266 100644 --- a/EasyPost.Compatibility.FSharp/packages.lock.json +++ b/EasyPost.Compatibility.FSharp/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net8.0": { + "net9.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, 4.0.0)", diff --git a/EasyPost.Compatibility.VB/packages.lock.json b/EasyPost.Compatibility.VB/packages.lock.json index b480aa81..c86ff612 100644 --- a/EasyPost.Compatibility.VB/packages.lock.json +++ b/EasyPost.Compatibility.VB/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net8.0": { + "net9.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, 4.0.0)", diff --git a/EasyPost.Tests/packages.lock.json b/EasyPost.Tests/packages.lock.json index 75d20633..b95299cd 100644 --- a/EasyPost.Tests/packages.lock.json +++ b/EasyPost.Tests/packages.lock.json @@ -947,6 +947,234 @@ "Newtonsoft.Json": "[13.0.1, 14.0.0)" } } + }, + "net9.0": { + "coverlet.collector": { + "type": "Direct", + "requested": "[3.1.2, 4.0.0)", + "resolved": "3.1.2", + "contentHash": "wuLDIDKD5XMt0A7lE31JPenT7QQwZPFkP5rRpdJeblyXZ9MGLI8rYjvm5fvAKln+2/X+4IxxQDxBtwdrqKNLZw==" + }, + "coverlet.msbuild": { + "type": "Direct", + "requested": "[3.2.0, )", + "resolved": "3.2.0", + "contentHash": "lu/eJJpqJb4qy3BGPtDD/LI5RSOwXYYyRErTyaG0OTP69llzVK3FEe74hBQx0JtLUTLEVBfERV4uGYcE1Br2sg==" + }, + "EasyVCR": { + "type": "Direct", + "requested": "[0.5.1, )", + "resolved": "0.5.1", + "contentHash": "rvNLrrOKVdWC3f95anMJIkhdkPO7CZpt7nC+83jVYH8pCEfdfi3QG0Nx+4+oS1OOaWue6P5tn9DDI3GCaQdbNw==", + "dependencies": { + "Microsoft.Extensions.Logging": "6.0.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.3.0, 18.0.0)", + "resolved": "17.3.0", + "contentHash": "ch4JCT7AZdBzvCAKD36t6fDsl7NEzzunwW7MwXUG2uFPoWcMd8B8KYg5fiwxnpdXJHodJk6yIBdSwMpN3Ikt9w==", + "dependencies": { + "Microsoft.CodeCoverage": "17.3.0", + "Microsoft.TestPlatform.TestHost": "17.3.0" + } + }, + "Microsoft.VisualStudio.TestPlatform.ObjectModel": { + "type": "Direct", + "requested": "[14.0.0, 15.0.0)", + "resolved": "14.0.0", + "contentHash": "PlQ38dL950pnyptA3CcnYIqAKpqlP7xpoz8n5ZfS1QgxFiZrh2x1lw05V3VNmq0ZZ9Xy3SHB5tOyvFjmjNR1HQ==" + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, 3.0.0)", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "SecurityCodeScan.VS2019": { + "type": "Direct", + "requested": "[5.6.6, 6.0.0)", + "resolved": "5.6.6", + "contentHash": "1BEkaTw2iZ5QccesAYfRcab9ttQvg6xyIItazCWLJEt5aKf3cDXvGtX+Z4p11a1QwYmf3WaNxpiZXfzXK/0VIw==" + }, + "xunit": { + "type": "Direct", + "requested": "[2.4.2, 3.0.0)", + "resolved": "2.4.2", + "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "dependencies": { + "xunit.analyzers": "1.0.0", + "xunit.assert": "2.4.2", + "xunit.core": "[2.4.2]" + } + }, + "xunit.runner.visualstudio": { + "type": "Direct", + "requested": "[2.4.5, 3.0.0)", + "resolved": "2.4.5", + "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.3.0", + "contentHash": "/xxz+e29F2V5pePtInjbLffoqWVTm60KCX87vSj2laNboeWq65WFJ634fGtBcMZO3VEfOmh9/XcoWEfLlWWG+g==" + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "17.3.0", + "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", + "dependencies": { + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "17.3.0", + "contentHash": "uOJALDWtKXZkISKuNI7kOlRi/lk2CqXZtLkNS0Ei+RXqRUjUpCsjAPYSP+DJ/a4QwJ5cI9CVF52vtajnGOaEpw==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "17.3.0", + "Newtonsoft.Json": "9.0.1" + } + }, + "NuGet.Frameworks": { + "type": "Transitive", + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "xunit.abstractions": { + "type": "Transitive", + "resolved": "2.0.3", + "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg==" + }, + "xunit.analyzers": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + }, + "xunit.assert": { + "type": "Transitive", + "resolved": "2.4.2", + "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "dependencies": { + "NETStandard.Library": "1.6.1" + } + }, + "xunit.core": { + "type": "Transitive", + "resolved": "2.4.2", + "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "dependencies": { + "xunit.extensibility.core": "[2.4.2]", + "xunit.extensibility.execution": "[2.4.2]" + } + }, + "xunit.extensibility.core": { + "type": "Transitive", + "resolved": "2.4.2", + "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "dependencies": { + "NETStandard.Library": "1.6.1", + "xunit.abstractions": "2.0.3" + } + }, + "xunit.extensibility.execution": { + "type": "Transitive", + "resolved": "2.4.2", + "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "dependencies": { + "NETStandard.Library": "1.6.1", + "xunit.extensibility.core": "[2.4.2]" + } + }, + "easypost": { + "type": "Project", + "dependencies": { + "Newtonsoft.Json": "[13.0.1, 14.0.0)" + } + } } } } \ No newline at end of file From 3d2fbbe48e131fbb43aa7255ce28a8e50de62e79 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 14:12:10 -0700 Subject: [PATCH 08/11] - Add .NET 9.0 to nuspec - Update nuspec tags, docs link --- EasyPost.nuspec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/EasyPost.nuspec b/EasyPost.nuspec index 1ae2ff57..a1e07b28 100644 --- a/EasyPost.nuspec +++ b/EasyPost.nuspec @@ -9,8 +9,8 @@ https://www.easypost.com MIT false - EasyPost Shipping API Client Library for .NET https://easypost.com/docs - EasyPost ShippingAPI USPS UPS FedEx + EasyPost Shipping API Client Library for .NET https://docs.easypost.com + EasyPost shipping API USPS UPS FedEx DHL CanadaPost RoyalMail mail package logistics rate insurance docs\README.md See Release Notes at https://github.com/EasyPost/easypost-csharp/releases images\icon.png @@ -27,6 +27,9 @@ + + + @@ -38,6 +41,8 @@ + + From ed7f112def8e0d7c3d79ddad20f2df2e2808efb2 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 14:26:07 -0700 Subject: [PATCH 09/11] - Clean up bad docstrings --- EasyPost/Parameters/Tracker/CreateList.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EasyPost/Parameters/Tracker/CreateList.cs b/EasyPost/Parameters/Tracker/CreateList.cs index 0179bac6..62559b23 100644 --- a/EasyPost/Parameters/Tracker/CreateList.cs +++ b/EasyPost/Parameters/Tracker/CreateList.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; @@ -6,9 +7,10 @@ namespace EasyPost.Parameters.Tracker { /// - /// Parameters for API calls. + /// This parameter set is no longer used. /// [ExcludeFromCodeCoverage] + [Obsolete("This parameter set is no longer used.")] public class CreateList : BaseParameters, ITrackerParameter { #region Request Parameters @@ -67,8 +69,9 @@ public override Dictionary ToDictionary() } /// - /// Internal class used to construct a parameter set. + /// This class is no longer used. /// + [Obsolete("This class is no longer used.")] internal sealed class CreateListTracker { /// From 2b84eeb6bc8a691ccc8680870fa42d36db6b8cdf Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 14:35:16 -0700 Subject: [PATCH 10/11] Revert "- Bump examples submodule" This reverts commit fde4ba8b3de0a7145e1d10eb2347c78bf1dfc6bc. --- examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples b/examples index bcfb3b90..0492e408 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit bcfb3b900550b99e9e4ded9acf4fbd35f1df349f +Subproject commit 0492e408e1b37b2ec18bcb4a4d228ab0f458f59d From bf884a9bcd2ddc5427ad4e9f2430eae0624094d1 Mon Sep 17 00:00:00 2001 From: Nate Harris Date: Mon, 18 Nov 2024 14:35:32 -0700 Subject: [PATCH 11/11] - Linting --- EasyPost.Tests/ExceptionsTests/ExceptionsTest.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EasyPost.Tests/ExceptionsTests/ExceptionsTest.cs b/EasyPost.Tests/ExceptionsTests/ExceptionsTest.cs index 5ba92689..4fb58127 100644 --- a/EasyPost.Tests/ExceptionsTests/ExceptionsTest.cs +++ b/EasyPost.Tests/ExceptionsTests/ExceptionsTest.cs @@ -15,6 +15,7 @@ namespace EasyPost.Tests.ExceptionsTests { +#pragma warning disable CA2263 public class ExceptionsTests : UnitTest { public ExceptionsTests() : base("exceptions") @@ -31,6 +32,7 @@ public async Task TestApiExceptionPrettyPrint() // Generate a dummy HttpResponseMessage with the given status code to parse HttpStatusCode httpStatusCode = (HttpStatusCode)Enum.Parse(typeof(HttpStatusCode), statusCode.ToString(CultureInfo.InvariantCulture)); + HttpResponseMessage response = new() { StatusCode = httpStatusCode }; ApiError generatedError = await ApiError.FromErrorResponse(response); @@ -480,4 +482,5 @@ public async Task TestHTTPTimeoutFriendlyException() #endregion } +#pragma warning restore CA2263 }