Skip to content

Commit 6844c26

Browse files
Justintime50Justintime50
authored
Merge pull request #635 from EasyPost/v7.4.0
chore: prep v7.4.0 for release
2 parents 5b3e4e7 + 0f5afaf commit 6844c26

File tree

19 files changed

+362
-186
lines changed

19 files changed

+362
-186
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 63 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88

99
jobs:
1010
lint:
11-
runs-on: windows-2022
11+
runs-on: windows-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Install .NET SDK
16-
uses: actions/setup-dotnet@v4
16+
uses: actions/setup-dotnet@v5
1717
with:
18-
dotnet-version: 9.x.x
18+
dotnet-version: 10.x.x
1919

2020
- name: Set up dotnet tools
2121
run: make install install-styleguide
@@ -26,12 +26,12 @@ jobs:
2626
Roslyn_Static_Analysis:
2727
runs-on: windows-latest
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030

3131
- name: Install .NET SDK
32-
uses: actions/setup-dotnet@v4
32+
uses: actions/setup-dotnet@v5
3333
with:
34-
dotnet-version: 9.x.x
34+
dotnet-version: 10.x.x
3535

3636
- name: Set up dotnet tools
3737
run: make install install-styleguide
@@ -46,14 +46,14 @@ jobs:
4646
Security_Code_Scan:
4747
runs-on: windows-latest
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050

5151
- name: Install .NET SDK
52-
uses: actions/setup-dotnet@v4
52+
uses: actions/setup-dotnet@v5
5353
with:
5454
# v6 is needed for the tool to run
5555
dotnet-version: |
56-
9.x.x
56+
10.x.x
5757
6.x.x
5858
5959
- name: Set up dotnet tools and dependencies
@@ -65,12 +65,12 @@ jobs:
6565
Coverage_Requirements:
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969

7070
- name: Install .NET SDK
71-
uses: actions/setup-dotnet@v4
71+
uses: actions/setup-dotnet@v5
7272
with:
73-
dotnet-version: 9.x.x
73+
dotnet-version: 10.x.x
7474

7575
- name: Set up dotnet tools and dependencies
7676
run: make install
@@ -82,12 +82,12 @@ jobs:
8282
if: github.ref == 'refs/heads/master'
8383
runs-on: ubuntu-latest
8484
steps:
85-
- uses: actions/checkout@v4
85+
- uses: actions/checkout@v5
8686

8787
- name: Install .NET SDK
88-
uses: actions/setup-dotnet@v4
88+
uses: actions/setup-dotnet@v5
8989
with:
90-
dotnet-version: 9.x.x
90+
dotnet-version: 10.x.x
9191

9292
- name: Set up dotnet tools and dependencies
9393
run: make install
@@ -105,12 +105,12 @@ jobs:
105105
if: github.ref == 'refs/heads/master'
106106
runs-on: ubuntu-latest
107107
steps:
108-
- uses: actions/checkout@v4
108+
- uses: actions/checkout@v5
109109

110110
- name: Install .NET SDK
111-
uses: actions/setup-dotnet@v4
111+
uses: actions/setup-dotnet@v5
112112
with:
113-
dotnet-version: 9.x.x
113+
dotnet-version: 10.x.x
114114

115115
- name: Install docfx
116116
run: make install-tools
@@ -132,7 +132,7 @@ jobs:
132132
EASYPOST_PROD_API_KEY: "123"
133133
strategy:
134134
matrix:
135-
name: ["Net60", "Net70", "Net80", "Net90"]
135+
name: ["Net60", "Net70", "Net80", "Net90", "Net100"]
136136
include:
137137
- name: Net60
138138
framework: net6.0
@@ -146,15 +146,24 @@ jobs:
146146
- name: Net90
147147
framework: net9.0
148148
dotnet-version: 9.x.x
149+
- name: Net100
150+
framework: net10.0
151+
dotnet-version: 10.x.x
149152
steps:
150-
- uses: actions/checkout@v4
153+
- uses: actions/checkout@v5
151154
with:
152155
submodules: true
153156

154157
- name: Install .NET SDK
155-
uses: actions/setup-dotnet@v4
158+
uses: actions/setup-dotnet@v5
156159
with:
157-
dotnet-version: ${{ matrix.dotnet-version }}
160+
dotnet-version: |
161+
10.x.x
162+
${{ matrix.dotnet-version }}
163+
164+
- name: Specify .NET SDK version to use since GitHub runners have multiple installed
165+
run: |
166+
echo '{"sdk":{"version": "${{ matrix.dotnet-version }}"}}' > ./global.json
158167
159168
- name: Setup MSBuild
160169
uses: microsoft/setup-msbuild@v2
@@ -184,14 +193,14 @@ jobs:
184193
Integration_Tests:
185194
runs-on: windows-latest
186195
steps:
187-
- uses: actions/checkout@v4
196+
- uses: actions/checkout@v5
188197
with:
189198
submodules: true
190199

191200
- name: Install .NET SDK
192-
uses: actions/setup-dotnet@v4
201+
uses: actions/setup-dotnet@v5
193202
with:
194-
dotnet-version: 9.x.x
203+
dotnet-version: 10.x.x
195204

196205
- name: Setup MSBuild
197206
uses: microsoft/setup-msbuild@v2
@@ -223,12 +232,23 @@ jobs:
223232
# - By extension, this is ensuring we are testing that the `EasyPost` source code can run in a .NET Framework environment
224233

225234
NetStandard_Compatibility_Tests:
235+
# Need windows-2022 for .NET Framework 4.7.2 support
226236
runs-on: windows-2022
227237
steps:
228-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
229239
with:
230240
submodules: true
231241

242+
- name: Install .NET SDK
243+
uses: actions/setup-dotnet@v5
244+
id: setupid
245+
with:
246+
dotnet-version: 10.x.x
247+
248+
- name: Specify .NET SDK version to use since GitHub runners have multiple installed
249+
run: |
250+
echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json
251+
232252
- name: Setup MSBuild
233253
uses: microsoft/setup-msbuild@v2
234254

@@ -252,14 +272,19 @@ jobs:
252272
FSharp_Compatibility_Tests:
253273
runs-on: windows-latest
254274
steps:
255-
- uses: actions/checkout@v4
275+
- uses: actions/checkout@v5
256276
with:
257277
submodules: true
258278

259279
- name: Install .NET SDK
260-
uses: actions/setup-dotnet@v4
280+
uses: actions/setup-dotnet@v5
281+
id: setupid
261282
with:
262-
dotnet-version: 9.x.x
283+
dotnet-version: 10.x.x
284+
285+
- name: Specify .NET SDK version to use since GitHub runners have multiple installed
286+
run: |
287+
echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json
263288
264289
- name: Setup MSBuild
265290
uses: microsoft/setup-msbuild@v2
@@ -284,14 +309,19 @@ jobs:
284309
Visual_Basic_Compatibility_Test:
285310
runs-on: windows-latest
286311
steps:
287-
- uses: actions/checkout@v4
312+
- uses: actions/checkout@v5
288313
with:
289314
submodules: true
290315

291316
- name: Install .NET SDK
292-
uses: actions/setup-dotnet@v4
317+
uses: actions/setup-dotnet@v5
318+
id: setupid
293319
with:
294-
dotnet-version: 9.x.x
320+
dotnet-version: 10.x.x
321+
322+
- name: Specify .NET SDK version to use since GitHub runners have multiple installed
323+
run: |
324+
echo '{"sdk":{"version": "${{ steps.setupid.outputs.dotnet-version }}"}}' > ./global.json
295325
296326
- name: Setup MSBuild
297327
uses: microsoft/setup-msbuild@v2

‎.github/workflows/manual_release_prep.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: windows-latest
1010
steps:
1111
- name: Checkout repository
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313

1414
- name: Install .NET SDK
15-
uses: actions/setup-dotnet@v4
15+
uses: actions/setup-dotnet@v5
1616
with:
1717
dotnet-version: |
1818
5.x.x

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: windows-latest
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Install .NET SDK
16-
uses: actions/setup-dotnet@v4
16+
uses: actions/setup-dotnet@v5
1717
with:
1818
dotnet-version: |
1919
5.x.x

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
# CHANGELOG
22

3-
## Next Release
3+
## v7.4.0 (2025-11-24)
44

5+
- Adds .NET 10 support
56
- Adds the following functions:
67
- `CustomerPortal.CreateAccountLink`
78
- `Embeddable.CreateSession`
9+
- Corrects the definition of `Tracker.RetrieveBatch` to use parameter sets
810

911
## v7.3.0 (2025-11-10)
1012

13+
NOTE: This version was not released to Nuget
14+
1115
- Adds support for `UspsShipAccount`
1216
- Adds `Tracker.RetrieveBatch` function
1317
- Adds `VerifyCarrier` address param

‎EasyPost.Compatibility.FSharp/EasyPost.Compatibility.FSharp.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
66
<RootNamespace>EasyPost.Compatibility.FSharp</RootNamespace>
77
</PropertyGroup>

‎EasyPost.Compatibility.FSharp/packages.lock.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net9.0": {
4+
"net10.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[3.1.2, 4.0.0)",
@@ -65,8 +65,7 @@
6565
"resolved": "17.3.0",
6666
"contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==",
6767
"dependencies": {
68-
"NuGet.Frameworks": "5.11.0",
69-
"System.Reflection.Metadata": "1.6.0"
68+
"NuGet.Frameworks": "5.11.0"
7069
}
7170
},
7271
"Microsoft.TestPlatform.TestHost": {
@@ -88,11 +87,6 @@
8887
"resolved": "5.11.0",
8988
"contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
9089
},
91-
"System.Reflection.Metadata": {
92-
"type": "Transitive",
93-
"resolved": "1.6.0",
94-
"contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
95-
},
9690
"xunit.abstractions": {
9791
"type": "Transitive",
9892
"resolved": "2.0.3",

‎EasyPost.Compatibility.VB/EasyPost.Compatibility.VB.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>EasyPost.Compatibility.VB</RootNamespace>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
77
</PropertyGroup>
88

‎EasyPost.Compatibility.VB/packages.lock.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net9.0": {
4+
"net10.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[3.1.2, 4.0.0)",
@@ -59,8 +59,7 @@
5959
"resolved": "17.3.0",
6060
"contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==",
6161
"dependencies": {
62-
"NuGet.Frameworks": "5.11.0",
63-
"System.Reflection.Metadata": "1.6.0"
62+
"NuGet.Frameworks": "5.11.0"
6463
}
6564
},
6665
"Microsoft.TestPlatform.TestHost": {
@@ -82,11 +81,6 @@
8281
"resolved": "5.11.0",
8382
"contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
8483
},
85-
"System.Reflection.Metadata": {
86-
"type": "Transitive",
87-
"resolved": "1.6.0",
88-
"contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
89-
},
9084
"xunit.abstractions": {
9185
"type": "Transitive",
9286
"resolved": "2.0.3",

‎EasyPost.Integration/EasyPost.Integration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

‎EasyPost.Tests/EasyPost.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
<Configurations>Release;Debug</Configurations>
66
<Platforms>AnyCPU</Platforms>

0 commit comments

Comments
 (0)