Skip to content

Commit

Permalink
Merge pull request #773 from alpacahq/develop
Browse files Browse the repository at this point in the history
Merge the `develop` branch into the `master` branch
  • Loading branch information
OlegRa authored Jan 19, 2025
2 parents 40750af + de5a975 commit 36d558d
Show file tree
Hide file tree
Showing 72 changed files with 2,480 additions and 2,030 deletions.
157 changes: 155 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/10700224?v=4",
"profile": "https://github.com/rudeGit",
"contributions": [
"bug"
"bug",
"question"
]
},
{
Expand Down Expand Up @@ -848,7 +849,8 @@
"profile": "https://github.com/Slacquer",
"contributions": [
"bug",
"question"
"question",
"ideas"
]
},
{
Expand Down Expand Up @@ -888,6 +890,157 @@
"bug",
"userTesting"
]
},
{
"login": "AntoineDubois",
"name": "Antoine Dubois",
"avatar_url": "https://avatars.githubusercontent.com/u/77892842?v=4",
"profile": "https://github.com/AntoineDubois",
"contributions": [
"bug",
"userTesting"
]
},
{
"login": "hiohiohio",
"name": "hiohiohio",
"avatar_url": "https://avatars.githubusercontent.com/u/2696532?v=4",
"profile": "https://github.com/hiohiohio",
"contributions": [
"bug",
"code"
]
},
{
"login": "bobrot",
"name": "bobrot",
"avatar_url": "https://avatars.githubusercontent.com/u/1851767?v=4",
"profile": "http://thedevprocess.com",
"contributions": [
"question"
]
},
{
"login": "Chacoon3",
"name": "Chaconn3",
"avatar_url": "https://avatars.githubusercontent.com/u/92221220?v=4",
"profile": "https://github.com/Chacoon3",
"contributions": [
"question",
"bug",
"code"
]
},
{
"login": "homer14",
"name": "homer14",
"avatar_url": "https://avatars.githubusercontent.com/u/146207223?v=4",
"profile": "https://github.com/homer14",
"contributions": [
"bug"
]
},
{
"login": "IvoTops",
"name": "Ivo Tops",
"avatar_url": "https://avatars.githubusercontent.com/u/3900366?v=4",
"profile": "https://github.com/IvoTops",
"contributions": [
"bug"
]
},
{
"login": "artemiusgreat",
"name": "Anonymous",
"avatar_url": "https://avatars.githubusercontent.com/u/5140879?v=4",
"profile": "http://indemos.com",
"contributions": [
"bug"
]
},
{
"login": "cdeMonkey",
"name": "Abdi Ahmed",
"avatar_url": "https://avatars.githubusercontent.com/u/29919316?v=4",
"profile": "http://aabdiahmed.com",
"contributions": [
"question"
]
},
{
"login": "ushahx",
"name": "ushahx",
"avatar_url": "https://avatars.githubusercontent.com/u/13063345?v=4",
"profile": "https://github.com/ushahx",
"contributions": [
"bug",
"question"
]
},
{
"login": "myrabyte",
"name": "myrabyte",
"avatar_url": "https://avatars.githubusercontent.com/u/44659656?v=4",
"profile": "https://github.com/myrabyte",
"contributions": [
"bug"
]
},
{
"login": "sunilvarghese",
"name": "sunilvarghese",
"avatar_url": "https://avatars.githubusercontent.com/u/38252112?v=4",
"profile": "https://github.com/sunilvarghese",
"contributions": [
"bug"
]
},
{
"login": "hoangvu07s",
"name": "hoangvu07s",
"avatar_url": "https://avatars.githubusercontent.com/u/12878060?v=4",
"profile": "https://github.com/hoangvu07s",
"contributions": [
"bug"
]
},
{
"login": "rshahrabani",
"name": "rshahrabani",
"avatar_url": "https://avatars.githubusercontent.com/u/37419900?v=4",
"profile": "https://github.com/rshahrabani",
"contributions": [
"bug"
]
},
{
"login": "leveltensoftware",
"name": "leveltensoftware",
"avatar_url": "https://avatars.githubusercontent.com/u/108337260?v=4",
"profile": "https://github.com/leveltensoftware",
"contributions": [
"bug"
]
},
{
"login": "uranio-235",
"name": "Lázaro Armando",
"avatar_url": "https://avatars.githubusercontent.com/u/2146818?v=4",
"profile": "https://github.com/uranio-235",
"contributions": [
"bug",
"code"
]
},
{
"login": "michaelnero",
"name": "Michael Nero",
"avatar_url": "https://avatars.githubusercontent.com/u/1127408?v=4",
"profile": "https://github.com/michaelnero",
"contributions": [
"bug",
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 0 additions & 3 deletions Alpaca.Markets.Extensions.Tests/AlpacaTradingClientTest.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System.Diagnostics.CodeAnalysis;

namespace Alpaca.Markets.Extensions.Tests;

[Collection("MockEnvironment")]
[SuppressMessage("Usage", "xUnit1047:Avoid using TheoryDataRow arguments that might not be serializable")]
public sealed class AlpacaTradingClientTest(
MockClientsFactoryFixture mockClientsFactory)
{
Expand Down
22 changes: 14 additions & 8 deletions Alpaca.Markets.Extensions/Alpaca.Markets.Extensions.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0</TargetFrameworks>
<AssemblyOriginatorKeyFile>..\Alpaca.Markets.snk</AssemblyOriginatorKeyFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -12,14 +12,14 @@
</PropertyGroup>

<PropertyGroup>
<AssemblyVersion>7.2.0.1</AssemblyVersion>
<FileVersion>7.2.0.1</FileVersion>
<Version>7.2.0</Version>
<AssemblyVersion>8.0.0.0</AssemblyVersion>
<FileVersion>8.0.0.0</FileVersion>
<Version>8.0.0-alpha1</Version>
</PropertyGroup>

<PropertyGroup>
<PackageReleaseNotes>
- The `AlpacaDataClientExtensions.ListCorporateActionsAsAsyncEnumerable` helper method was added to simplify corporate actions pagination handling.
- Obsolete members cleanup - remove fully obsolete and convert warnings into errors.
</PackageReleaseNotes>
<Description>C# SDK for Alpaca Trade API https://docs.alpaca.markets/</Description>
<RepositoryUrl>https://github.com/alpacahq/alpaca-trade-api-csharp</RepositoryUrl>
Expand Down Expand Up @@ -49,12 +49,15 @@
<PropertyGroup>
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
<!--<GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>-->
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>7.2.0</PackageValidationBaselineVersion>
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<EnablePackageValidation>true</EnablePackageValidation>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
</PropertyGroup>

<PropertyGroup Condition="($(TargetFramework.StartsWith('net8')))">
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>
Expand All @@ -78,6 +81,10 @@
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Alpaca.Markets\Alpaca.Markets.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="IsExternalInit" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -99,14 +106,13 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" PrivateAssets="compile;contentfiles;build;analyzers" />
<PackageReference Include="System.Threading.Channels" Version="9.0.0" PrivateAssets="compile;contentfiles;build;analyzers" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" PrivateAssets="compile;contentfiles;build;analyzers" />
<PackageReference Include="Alpaca.Markets" Version="7.2.0" PrivateAssets="compile;contentfiles;build;analyzers;" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="!($(TargetFramework.StartsWith('net6')))">
<ItemGroup Condition="!($(TargetFramework.StartsWith('net8')))">
<PackageReference Include="Portable.System.DateTimeOnly" Version="9.0.0" PrivateAssets="compile;contentfiles;build;analyzers" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 36d558d

Please sign in to comment.