Skip to content

Commit

Permalink
Merge branch 'main' into ENGINE-7190-funding-sources-wallet-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristianCasado authored Jan 8, 2025
2 parents 24f6117 + 3c0020e commit c28026b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 8 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,16 @@ Fixed handling of No Content responses

### Added

- Added funding_source and parcelguard to insurance provider enumeration
- Added funding_source and parcelguard to insurance provider enumeration

## 2.3.3

### Changed

- update System.Text.Json to latest version 8.0.5

## 2.3.4

### Added

- Added error code MultipackageNotSupported
6 changes: 6 additions & 0 deletions ShipEngineSDK/Enums/ErrorCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -273,5 +273,11 @@ public enum ErrorCode
/// </summary>
[EnumMember(Value = "funding_source_error")]
FundingSourceError,

/// <summary>
/// The attempted operation does not support multiple packages.
/// </summary>
[EnumMember(Value = "multipackage_not_supported")]
MultipackageNotSupported,

Check warning on line 281 in ShipEngineSDK/Enums/ErrorCode.cs

View workflow job for this annotation

GitHub Actions / .Net 8.0 on windows-latest

Symbol 'MultipackageNotSupported' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)
}
}
3 changes: 2 additions & 1 deletion ShipEngineSDK/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ ShipEngineSDK.ErrorCode.InvalidStatus = 20 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.InvalidStringLength = 21 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.LabelImagesNotSupported = 22 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.MeterFailure = 23 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.MultipackageNotSupported = 39 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.NoRatesReturned = 25 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.NotFound = 24 -> ShipEngineSDK.ErrorCode
ShipEngineSDK.ErrorCode.RateLimitExceeded = 26 -> ShipEngineSDK.ErrorCode
Expand Down Expand Up @@ -1594,4 +1595,4 @@ virtual ShipEngineSDK.ShipEngineMock.VoidLabelWithLabelId(string! labelId, ShipE
~ShipEngineSDK.ValidateAddresses.Result.NormalizedAddress.get -> ShipEngineSDK.Common.Address
~ShipEngineSDK.ValidateAddresses.Result.NormalizedAddress.set -> void
~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.get -> ShipEngineSDK.Common.Address
~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.set -> void
~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.set -> void
4 changes: 2 additions & 2 deletions ShipEngineSDK/ShipEngineSDK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageId>ShipEngine</PackageId>
<PackageTags>sdk;rest;api;shipping;rates;label;tracking;cost;address;validation;normalization;fedex;ups;usps;</PackageTags>

<Version>2.3.2</Version>
<Version>2.3.4</Version>
<Authors>ShipEngine</Authors>
<Company>ShipEngine</Company>
<Summary>The official ShipEngine C# SDK for .NET</Summary>
Expand Down Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion openapitools.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"packageName": "ShipEngineSDK",
"ignoreFileOverride": "./.openapi-generator-ignore",
"additionalProperties": {
"packageVersion": "2.2.0",
"packageVersion": "2.3.4",
"targetFramework": "netstandard2.0",
"validatable": false,
"sourceFolder": "",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "shipengine-dotnet",
"version": "2.3.2",
"version": "2.3.3",
"description": "Package primarily used to generate the API and models from OpenApi spec\"",
"main": "index.js",
"directories": {
Expand Down

0 comments on commit c28026b

Please sign in to comment.