diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78b49526..a9b25d2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,14 +8,14 @@ on: jobs: lint: - runs-on: windows-2022 + runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Set up dotnet tools run: make install install-styleguide @@ -26,12 +26,12 @@ jobs: Roslyn_Static_Analysis: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Set up dotnet tools run: make install install-styleguide @@ -46,14 +46,14 @@ jobs: Security_Code_Scan: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: # v6 is needed for the tool to run dotnet-version: | - 9.x.x + 10.x.x 6.x.x - name: Set up dotnet tools and dependencies @@ -65,12 +65,12 @@ jobs: Coverage_Requirements: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Set up dotnet tools and dependencies run: make install @@ -82,12 +82,12 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Set up dotnet tools and dependencies run: make install @@ -105,12 +105,12 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Install docfx run: make install-tools @@ -132,7 +132,7 @@ jobs: EASYPOST_PROD_API_KEY: "123" strategy: matrix: - name: ["Net60", "Net70", "Net80", "Net90"] + name: ["Net60", "Net70", "Net80", "Net90", "Net100"] include: - name: Net60 framework: net6.0 @@ -146,15 +146,24 @@ jobs: - name: Net90 framework: net9.0 dotnet-version: 9.x.x + - name: Net100 + framework: net10.0 + dotnet-version: 10.x.x steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: | + 10.x.x + ${{ matrix.dotnet-version }} + + - name: Specify .NET SDK version to use since GitHub runners have multiple installed + run: | + echo '{"sdk":{"version": "${{ matrix.dotnet-version }}"}}' > ./global.json - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 @@ -184,14 +193,14 @@ jobs: Integration_Tests: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 @@ -223,12 +232,23 @@ jobs: # - By extension, this is ensuring we are testing that the `EasyPost` source code can run in a .NET Framework environment NetStandard_Compatibility_Tests: + # Need windows-2022 for .NET Framework 4.7.2 support runs-on: windows-2022 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true + - name: Install .NET SDK + uses: actions/setup-dotnet@v5 + id: setupid + with: + dotnet-version: 10.x.x + + - name: Specify .NET SDK version to use since GitHub runners have multiple installed + run: | + echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json + - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 @@ -252,14 +272,19 @@ jobs: FSharp_Compatibility_Tests: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 + id: setupid with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x + + - name: Specify .NET SDK version to use since GitHub runners have multiple installed + run: | + echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 @@ -284,14 +309,19 @@ jobs: Visual_Basic_Compatibility_Test: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 + id: setupid with: - dotnet-version: 9.x.x + dotnet-version: 10.x.x + + - name: Specify .NET SDK version to use since GitHub runners have multiple installed + run: | + echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 diff --git a/.github/workflows/manual_release_prep.yml b/.github/workflows/manual_release_prep.yml index 17b1cc53..a6402824 100644 --- a/.github/workflows/manual_release_prep.yml +++ b/.github/workflows/manual_release_prep.yml @@ -9,10 +9,10 @@ jobs: runs-on: windows-latest steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 5.x.x diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index abe4991d..03788000 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: runs-on: windows-latest steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 5.x.x diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c397829..bbc1982f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ # CHANGELOG -## Next Release +## v7.4.0 (2025-11-24) +- Adds .NET 10 support - Adds the following functions: - `CustomerPortal.CreateAccountLink` - `Embeddable.CreateSession` +- Corrects the definition of `Tracker.RetrieveBatch` to use parameter sets ## v7.3.0 (2025-11-10) +NOTE: This version was not released to Nuget + - Adds support for `UspsShipAccount` - Adds `Tracker.RetrieveBatch` function - Adds `VerifyCarrier` address param diff --git a/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj b/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj index 3137bec1..158bc413 100644 --- a/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj +++ b/EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true EasyPost.Compatibility.FSharp diff --git a/EasyPost.Compatibility.FSharp/packages.lock.json b/EasyPost.Compatibility.FSharp/packages.lock.json index 6ad734d9..de3d23aa 100644 --- a/EasyPost.Compatibility.FSharp/packages.lock.json +++ b/EasyPost.Compatibility.FSharp/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net9.0": { + "net10.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, 4.0.0)", @@ -65,8 +65,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -88,11 +87,6 @@ "resolved": "5.11.0", "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", diff --git a/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj b/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj index 1b4731ec..8a71bc69 100644 --- a/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj +++ b/EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj @@ -2,7 +2,7 @@ EasyPost.Compatibility.VB - net9.0 + net10.0 true diff --git a/EasyPost.Compatibility.VB/packages.lock.json b/EasyPost.Compatibility.VB/packages.lock.json index eb3a353c..bdded6e4 100644 --- a/EasyPost.Compatibility.VB/packages.lock.json +++ b/EasyPost.Compatibility.VB/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net9.0": { + "net10.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, 4.0.0)", @@ -59,8 +59,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -82,11 +81,6 @@ "resolved": "5.11.0", "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", diff --git a/EasyPost.Integration/EasyPost.Integration.csproj b/EasyPost.Integration/EasyPost.Integration.csproj index fc0e3541..fe413966 100644 --- a/EasyPost.Integration/EasyPost.Integration.csproj +++ b/EasyPost.Integration/EasyPost.Integration.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 latest enable enable diff --git a/EasyPost.Tests/EasyPost.Tests.csproj b/EasyPost.Tests/EasyPost.Tests.csproj index 5cf33676..1594c1ab 100644 --- a/EasyPost.Tests/EasyPost.Tests.csproj +++ b/EasyPost.Tests/EasyPost.Tests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 false Release;Debug AnyCPU diff --git a/EasyPost.Tests/packages.lock.json b/EasyPost.Tests/packages.lock.json index 316af337..da5d5637 100644 --- a/EasyPost.Tests/packages.lock.json +++ b/EasyPost.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net10.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, 4.0.0)", @@ -88,8 +88,7 @@ "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": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -105,8 +104,7 @@ "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.Options": "6.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { @@ -126,10 +124,7 @@ "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -141,8 +136,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -159,23 +153,209 @@ "resolved": "5.11.0", "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, - "System.Diagnostics.DiagnosticSource": { + "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", + "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" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "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.Reflection.Metadata": { + "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" }, - "System.Runtime.CompilerServices.Unsafe": { + "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "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==" + }, + "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" + } + }, + "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==" }, "xunit.abstractions": { "type": "Transitive", @@ -316,8 +496,7 @@ "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": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -333,8 +512,7 @@ "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.Options": "6.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { @@ -354,10 +532,7 @@ "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -369,8 +544,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -387,24 +561,6 @@ "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", @@ -544,8 +700,7 @@ "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": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -561,8 +716,7 @@ "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.Options": "6.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { @@ -582,10 +736,7 @@ "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -597,8 +748,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -615,24 +765,6 @@ "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", @@ -772,8 +904,7 @@ "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": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -789,8 +920,7 @@ "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.Options": "6.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { @@ -810,10 +940,7 @@ "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -825,8 +952,7 @@ "resolved": "17.3.0", "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" + "NuGet.Frameworks": "5.11.0" } }, "Microsoft.TestPlatform.TestHost": { @@ -843,24 +969,6 @@ "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", diff --git a/EasyPost.nuspec b/EasyPost.nuspec index c81f5ad6..6a5b5a1d 100644 --- a/EasyPost.nuspec +++ b/EasyPost.nuspec @@ -3,7 +3,7 @@ EasyPost-Official EasyPost (Official) - 7.3.0 + 7.4.0 EasyPost EasyPost https://www.easypost.com @@ -30,6 +30,9 @@ + + + @@ -43,6 +46,8 @@ + + diff --git a/EasyPost/EasyPost.csproj b/EasyPost/EasyPost.csproj index d35ee207..29ad060a 100644 --- a/EasyPost/EasyPost.csproj +++ b/EasyPost/EasyPost.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0;net7.0;net8.0;net9.0 + netstandard2.0;net6.0;net7.0;net8.0;net9.0;net10.0 enable enable Library diff --git a/EasyPost/Properties/VersionInfo.cs b/EasyPost/Properties/VersionInfo.cs index 0032fe5b..0b69e10c 100644 --- a/EasyPost/Properties/VersionInfo.cs +++ b/EasyPost/Properties/VersionInfo.cs @@ -2,6 +2,6 @@ // Version information for an assembly must follow semantic versioning // When releasing a release candidate, append a 4th digit being the number of the release candidate -[assembly: AssemblyVersion("7.3.0")] -[assembly: AssemblyFileVersion("7.3.0")] -[assembly: AssemblyInformationalVersion("7.3.0")] +[assembly: AssemblyVersion("7.4.0")] +[assembly: AssemblyFileVersion("7.4.0")] +[assembly: AssemblyInformationalVersion("7.4.0")] diff --git a/EasyPost/packages.lock.json b/EasyPost/packages.lock.json index 726b07d7..aed22790 100644 --- a/EasyPost/packages.lock.json +++ b/EasyPost/packages.lock.json @@ -1,26 +1,66 @@ { "version": 1, "dependencies": { - "net9.0": { + ".NETStandard,Version=v2.0": { + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "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==" }, - "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": { + "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.2.0.435", - "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + } + }, + "net10.0": { + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + } + }, + "net6.0": { + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + } + }, + "net7.0": { + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + } + }, + "net8.0": { + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, 14.0.0)", + "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==" } } } diff --git a/Makefile b/Makefile index 9feecdbc..a9499f5a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -FW ?= net9.0 +FW ?= net10.0 ## help - Display help about make targets for this Makefile help: diff --git a/README.md b/README.md index d736d9ab..dbf6b786 100644 --- a/README.md +++ b/README.md @@ -334,6 +334,7 @@ unit tests in one framework at a time with, e.g `make unit-test fw=net9.0`. Vali - `net7.0` (.NET 7.0) - `net8.0` (.NET 8.0) - `net9.0` (.NET 9.0) +- `net10.0` (.NET 10.0) #### Test Coverage diff --git a/scripts/unix/check_coverage.sh b/scripts/unix/check_coverage.sh index 8501d702..c6c1b9d7 100755 --- a/scripts/unix/check_coverage.sh +++ b/scripts/unix/check_coverage.sh @@ -1,6 +1,6 @@ #!/bin/sh -FRAMEWORK="net9.0" +FRAMEWORK="net10.0" THRESHOLD=$1 THRESHOLD_TYPE=line diff --git a/scripts/unix/generate_test_reports.sh b/scripts/unix/generate_test_reports.sh index bdc07257..720f89a7 100755 --- a/scripts/unix/generate_test_reports.sh +++ b/scripts/unix/generate_test_reports.sh @@ -1,6 +1,6 @@ #!/bin/sh -FRAMEWORK="net9.0" +FRAMEWORK="net10.0" # Navigate to the test folder TEST_FOLDER="EasyPost.Tests" @@ -21,10 +21,10 @@ dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.4.4 | # check reportgenerator is available set -- dotnet reportgenerator for req in "$@"; do - if ! command -v "$req" >/dev/null 2>&1; then - echo "$req could not be found" - exit - fi + if ! command -v "$req" >/dev/null 2>&1; then + echo "$req could not be found" + exit + fi done COVERAGE_REPORT_FOLDER="../coveragereport"