Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit e91c97c

Browse files
SwimburgerSwimburger
committed
Undo undesired changes/fix solution
1 parent a422b94 commit e91c97c

25 files changed

+355
-297
lines changed

‎.fernignore‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,47 @@ LICENSE
55
assemblyai.png
66
icon.png
77
.gitignore
8+
.github/workflows/ci.yml
89
.github/workflows/publish-reference.yml
910
src/AssemblyAI.sln
11+
src/AssemblyAI/AssemblyAI.Custom.props
12+
src/AssemblyAI/AssemblyAIClient.cs
13+
src/AssemblyAI/UserAgent.cs
14+
src/AssemblyAI/Event.cs
15+
src/AssemblyAI/DependencyInjectionExtensions.cs
16+
src/AssemblyAI/EnumConverter.cs
17+
src/AssemblyAI/Types/Error.cs
18+
src/AssemblyAI/Core/EnumSerializer.cs
19+
src/AssemblyAI/Core/JsonConfiguration.cs
1020
src/AssemblyAI/Core/Public/ExtendedRequestOptions.cs
11-
src/AssemblyAI/Core/Public/ExtendedClientOptions.cs
1221
src/AssemblyAI/Core/Public/AssemblyAIClientEnvironment.cs
1322
src/AssemblyAI/Core/Public/ClientOptions.cs
23+
src/AssemblyAI/Core/Public/ExtendedClientOptions.cs
1424
src/AssemblyAI/Core/Public/ApiException.cs
1525
src/AssemblyAI/Core/Public/AssemblyAIException.cs
16-
src/AssemblyAI/UserAgent.cs
17-
src/AssemblyAI/Event.cs
18-
src/AssemblyAI/DependencyInjectionExtensions.cs
1926
src/AssemblyAI/Files/ExtendedFilesClient.cs
2027
src/AssemblyAI/Transcripts/ExtendedTranscriptsClient.cs
28+
src/AssemblyAI/Transcripts/TranscriptNotCompletedStatusException.cs
2129
src/AssemblyAI/Transcripts/Types/TranscriptExtensions.cs
2230
src/AssemblyAI/Transcripts/Types/TranscriptParamsMapper.cs
2331
src/AssemblyAI/Transcripts/Types/TranscriptParamsCloner.cs
24-
src/AssemblyAI/Transcripts/TranscriptNotCompletedStatusException.cs
32+
src/AssemblyAI/Transcripts/Types/ContentSafetyLabelsResult.cs
33+
src/AssemblyAI/Transcripts/Types/TopicDetectionModelResult.cs
2534
src/AssemblyAI/Lemur/ExtendedLemurClient.cs
35+
src/AssemblyAI/Lemur/Types/LemurResponse.cs
36+
src/AssemblyAI/Lemur/Types/LemurModel.cs
2637
src/AssemblyAI/Realtime/RealtimeTranscriber.cs
2738
src/AssemblyAI/Realtime/WebsocketClient
2839
src/AssemblyAI/Realtime/ExtendedRealtimeClient.cs
2940
src/AssemblyAI/Realtime/RealtimeTranscriberOptions.cs
41+
src/AssemblyAI/Realtime/Types/RealtimeTranscript.cs
42+
src/AssemblyAI/Realtime/Types/TerminateSession.cs
43+
src/AssemblyAI/Realtime/Types/ForceEndUtterance.cs
44+
src/AssemblyAI/Realtime/Types/Realtime.cs
45+
src/AssemblyAI.Test/TestClient.cs
46+
src/AssemblyAI.Test/Core/RawClientTests.cs
3047
src/AssemblyAI.UnitTests
48+
3149
src/AssemblyAI.IntegrationTests
3250
docfx
3351

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ on: [push]
44

55
jobs:
66
compile:
7+
name: Compile
78
runs-on: ubuntu-latest
8-
9+
env:
10+
DOTNET_NOLOGO: true
911
steps:
1012
- name: Checkout repo
11-
uses: actions/checkout@v3
12-
13-
- uses: actions/checkout@master
13+
uses: actions/checkout@v4
1414

1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v1
16+
uses: actions/setup-dotnet@v4
1717
with:
1818
dotnet-version: 8.x
1919

@@ -24,40 +24,54 @@ jobs:
2424
- name: Build Release
2525
run: dotnet build src -c Release /p:ContinuousIntegrationBuild=true
2626

27-
unit-tests:
27+
tests:
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
framework: [net462, net6.0]
32+
os: [ubuntu-latest, windows-latest]
33+
exclude:
34+
- os: ubuntu-latest
35+
framework: net462
36+
name: Run Tests on ${{ matrix.os }} with ${{ matrix.framework }}
2837
runs-on: ubuntu-latest
29-
3038
steps:
3139
- name: Checkout repo
32-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
3341

3442
- uses: actions/checkout@master
3543

3644
- name: Setup .NET
37-
uses: actions/setup-dotnet@v1
45+
uses: actions/setup-dotnet@v4
3846
with:
39-
dotnet-version: 8.x
47+
dotnet-version: |
48+
8.x
49+
6.x
4050
4151
- name: Install tools
4252
run: |
4353
dotnet tool restore
4454
4555
- name: Run Tests
4656
run: |
47-
dotnet test src
48-
57+
dotnet test src --framework ${{ matrix.framework }}
58+
env:
59+
ASSEMBLYAI_API_KEY: ${{ secrets.ASSEMBLYAI_API_KEY }}
60+
TEST_TRANSCRIPT_ID: ${{ secrets.TEST_TRANSCRIPT_ID }}
61+
TEST_TRANSCRIPT_IDS: ${{ secrets.TEST_TRANSCRIPT_IDS }}
4962

5063
publish:
64+
name: Publish to NuGet
5165
needs: [compile]
5266
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
5367
runs-on: ubuntu-latest
5468

5569
steps:
5670
- name: Checkout repo
57-
uses: actions/checkout@v3
71+
uses: actions/checkout@v4
5872

5973
- name: Setup .NET
60-
uses: actions/setup-dotnet@v1
74+
uses: actions/setup-dotnet@v4
6175
with:
6276
dotnet-version: 8.x
6377

‎src/AssemblyAI.Test/Core/EnumSerializerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace AssemblyAI.Test.Core
99
{
1010
[TestFixture]
11-
public class StringEnumSerializerTests
11+
public class EnumSerializerTests
1212
{
1313
private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true };
1414

‎src/AssemblyAI.Test/Core/RawClientTests.cs‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎src/AssemblyAI.Test/TestClient.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/AssemblyAI.UnitTests/AssemblyAI.UnitTests.csproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\AssemblyAI\AssemblyAI.csproj" />
29+
<ProjectReference Include="..\AssemblyAI\AssemblyAI.csproj" />
30+
<Compile Include="..\AssemblyAI.Test\**\*.cs" Exclude="**\obj\**;**\bin\**">
31+
<Link>FernGenerated\%(RecursiveDir)%(Filename)%(Extension)</Link>
32+
</Compile>
3033
</ItemGroup>
3134

3235

@@ -36,4 +39,9 @@
3639
<PrivateAssets>all</PrivateAssets>
3740
</PackageReference>
3841
</ItemGroup>
42+
43+
44+
<ItemGroup>
45+
<Folder Include="FernGenerated\" />
46+
</ItemGroup>
3947
</Project>

‎src/AssemblyAI.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyAI", "AssemblyAI\As
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyAI.IntegrationTests", "AssemblyAI.IntegrationTests\AssemblyAI.IntegrationTests.csproj", "{311AB518-6FCF-453B-A4B7-12E444C9479E}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyAI.UnitTests", "AssemblyAI.UnitTests\AssemblyAI.UnitTests.csproj", "{F432A09F-C463-438F-AF0D-EB7951F0DBB9}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyAI.UnitTests", "AssemblyAI.UnitTests\AssemblyAI.UnitTests.csproj", "{547C3456-F649-4E68-A591-0538486F7DE3}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,9 +26,9 @@ Global
2626
{311AB518-6FCF-453B-A4B7-12E444C9479E}.Debug|Any CPU.Build.0 = Debug|Any CPU
2727
{311AB518-6FCF-453B-A4B7-12E444C9479E}.Release|Any CPU.ActiveCfg = Release|Any CPU
2828
{311AB518-6FCF-453B-A4B7-12E444C9479E}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{F432A09F-C463-438F-AF0D-EB7951F0DBB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{F432A09F-C463-438F-AF0D-EB7951F0DBB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{F432A09F-C463-438F-AF0D-EB7951F0DBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{F432A09F-C463-438F-AF0D-EB7951F0DBB9}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{547C3456-F649-4E68-A591-0538486F7DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{547C3456-F649-4E68-A591-0538486F7DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{547C3456-F649-4E68-A591-0538486F7DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{547C3456-F649-4E68-A591-0538486F7DE3}.Release|Any CPU.Build.0 = Release|Any CPU
3333
EndGlobalSection
3434
EndGlobal

‎src/AssemblyAI/AssemblyAI.Custom.props‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,57 @@ Configure additional MSBuild properties for your project in this file:
44
- Step 2: Modify this file to your liking.
55
-->
66
<Project>
7-
<!--
87
<PropertyGroup>
9-
<Title>Contoso SDK</Title>
10-
<Authors>Contoso</Authors>
11-
<Company>Contoso</Company>
12-
<AssemblyName>Contoso.Sdk</AssemblyName>
13-
<AssemblyTitle>Contoso SDK</AssemblyTitle>
8+
<TargetFrameworks>net462;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
9+
<ImplicitUsings>enable</ImplicitUsings>
10+
<LangVersion>12</LangVersion>
11+
<Nullable>enable</Nullable>
12+
<RootNamespace>AssemblyAI</RootNamespace>
13+
<AssemblyName>AssemblyAI</AssemblyName>
14+
<PackageId>AssemblyAI</PackageId>
15+
<PackageVersion>$(Version)</PackageVersion>
16+
<Title>AssemblyAI C# .NET SDK</Title>
17+
<Authors>AssemblyAI</Authors>
18+
<Description>The AssemblyAI C# .NET SDK provides an easy-to-use interface for interacting with the AssemblyAI API, which supports async and real-time transcription, audio intelligence models, as well as the latest LeMUR models.</Description>
19+
<Copyright>Copyright 2024 (c) AssemblyAI, Inc. All rights reserved.</Copyright>
20+
<PackageTags>ASR;Speech-To-Text;STT;Speech;AI;AssemblyAI</PackageTags>
21+
<Company>AssemblyAI</Company>
22+
<Product>AssemblyAI</Product>
23+
<OutputType>Library</OutputType>
24+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
25+
<RepositoryUrl>https://github.com/AssemblyAI/assemblyai-csharp-sdk.git</RepositoryUrl>
26+
<PackageIconUrl>https://www.assemblyai.com/favicon.png</PackageIconUrl>
1427
<PackageIcon>icon.png</PackageIcon>
28+
<PackageReadmeFile>README.md</PackageReadmeFile>
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
31+
<IncludeSymbols>true</IncludeSymbols>
32+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
33+
<RepositoryType>git</RepositoryType>
1534
</PropertyGroup>
35+
<PropertyGroup Condition="'$(CI)' == 'true'">
36+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<None Include="..\..\icon.png" Pack="true" PackagePath="\" />
40+
<None Remove="..\..\README.md" Pack="true" PackagePath="\" />
41+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
45+
<PackageReference Include="Riok.Mapperly" Version="3.6.0" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
47+
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
48+
</ItemGroup>
49+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.0'">
50+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
51+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
53+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
54+
</ItemGroup>
1655
<ItemGroup>
17-
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
56+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
57+
<_Parameter1>AssemblyAI.UnitTests</_Parameter1>
58+
</AssemblyAttribute>
1859
</ItemGroup>
19-
-->
2060
</Project>

‎src/AssemblyAI/AssemblyAI.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<Project Sdk="Microsoft.NET.Sdk">
32

43
<PropertyGroup>

0 commit comments

Comments
 (0)