Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 63 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@

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

- name: Check style with dotnet-format
run: make lint

Roslyn_Static_Analysis:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
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
Expand All @@ -46,14 +46,14 @@
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
Expand All @@ -65,12 +65,12 @@
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
Expand All @@ -82,12 +82,12 @@
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
Expand All @@ -105,12 +105,12 @@
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
Expand All @@ -132,7 +132,7 @@
EASYPOST_PROD_API_KEY: "123"
strategy:
matrix:
name: ["Net60", "Net70", "Net80", "Net90"]
name: ["Net60", "Net70", "Net80", "Net90", "Net100"]
include:
- name: Net60
framework: net6.0
Expand All @@ -146,15 +146,24 @@
- 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
Expand Down Expand Up @@ -184,14 +193,14 @@
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
Expand Down Expand Up @@ -223,12 +232,23 @@
# - 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

Expand All @@ -252,14 +272,19 @@
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
Expand All @@ -284,14 +309,19 @@
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual_release_prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RootNamespace>EasyPost.Compatibility.FSharp</RootNamespace>
</PropertyGroup>
Expand Down
10 changes: 2 additions & 8 deletions EasyPost.Compatibility.FSharp/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net9.0": {
"net10.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[3.1.2, 4.0.0)",
Expand Down Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>EasyPost.Compatibility.VB</RootNamespace>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>

Expand Down
10 changes: 2 additions & 8 deletions EasyPost.Compatibility.VB/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net9.0": {
"net10.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[3.1.2, 4.0.0)",
Expand Down Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion EasyPost.Integration/EasyPost.Integration.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion EasyPost.Tests/EasyPost.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Configurations>Release;Debug</Configurations>
<Platforms>AnyCPU</Platforms>
Expand Down
Loading
Loading