Skip to content

Commit 50f8535

Browse files
NotOfficerNotOfficer
committed
.net 10 target & FModel. prefix
1 parent f79c303 commit 50f8535

5 files changed

Lines changed: 102 additions & 109 deletions

File tree

‎BankExtractor/BankExtractor.csproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
910

10-
<ItemGroup>
11-
<ProjectReference Include="..\Fmod5Sharp\Fmod5Sharp.csproj" />
12-
</ItemGroup>
11+
<ItemGroup>
12+
<ProjectReference Include="..\Fmod5Sharp\Fmod5Sharp.csproj" />
13+
</ItemGroup>
1314

1415
</Project>

‎Fmod5Sharp.Tests/Fmod5Sharp.Tests.csproj‎

Lines changed: 44 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,48 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
7-
<IsPackable>false</IsPackable>
8-
9-
<Configurations>Release;Debug</Configurations>
10-
11-
<Platforms>AnyCPU;x64</Platforms>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
15-
<PlatformTarget>x86</PlatformTarget>
16-
</PropertyGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
20-
<PackageReference Include="xunit" Version="2.4.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
<PrivateAssets>all</PrivateAssets>
24-
</PackageReference>
25-
<PackageReference Include="coverlet.collector" Version="3.0.2">
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
<PrivateAssets>all</PrivateAssets>
28-
</PackageReference>
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<ProjectReference Include="..\Fmod5Sharp\Fmod5Sharp.csproj" />
33-
</ItemGroup>
34-
35-
<ItemGroup>
36-
<None Remove="TestResources\short_vorbis.fsb" />
37-
<EmbeddedResource Include="TestResources\short_vorbis.fsb" />
38-
<None Remove="TestResources\long_vorbis.fsb" />
39-
<EmbeddedResource Include="TestResources\long_vorbis.fsb" />
40-
<None Remove="TestResources\pcm16.fsb" />
41-
<EmbeddedResource Include="TestResources\pcm16.fsb" />
42-
<None Remove="TestResources\gcadpcm.fsb" />
43-
<EmbeddedResource Include="TestResources\gcadpcm.fsb" />
44-
<None Remove="TestResources\imaadpcm_short.fsb" />
45-
<EmbeddedResource Include="TestResources\imaadpcm_short.fsb" />
46-
<None Remove="TestResources\imaadpcm_long.fsb" />
47-
<EmbeddedResource Include="TestResources\imaadpcm_long.fsb" />
48-
<None Remove="TestResources\broken_imaad.fsb" />
49-
<None Remove="TestResources\previously_unrecoverable_vorbis.fsb" />
50-
<EmbeddedResource Include="TestResources\previously_unrecoverable_vorbis.fsb" />
51-
<None Remove="TestResources\xbox_imaad.fsb" />
52-
<EmbeddedResource Include="TestResources\xbox_imaad.fsb" />
53-
<None Remove="TestResources\vorbis_with_blockflag_exception.fsb" />
54-
<EmbeddedResource Include="TestResources\vorbis_with_blockflag_exception.fsb" />
55-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
11+
<PackageReference Include="xunit" Version="2.9.3" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
<PrivateAssets>all</PrivateAssets>
15+
</PackageReference>
16+
<PackageReference Include="coverlet.collector" Version="6.0.4">
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
<PrivateAssets>all</PrivateAssets>
19+
</PackageReference>
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<ProjectReference Include="..\Fmod5Sharp\Fmod5Sharp.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<None Remove="TestResources\short_vorbis.fsb" />
28+
<EmbeddedResource Include="TestResources\short_vorbis.fsb" />
29+
<None Remove="TestResources\long_vorbis.fsb" />
30+
<EmbeddedResource Include="TestResources\long_vorbis.fsb" />
31+
<None Remove="TestResources\pcm16.fsb" />
32+
<EmbeddedResource Include="TestResources\pcm16.fsb" />
33+
<None Remove="TestResources\gcadpcm.fsb" />
34+
<EmbeddedResource Include="TestResources\gcadpcm.fsb" />
35+
<None Remove="TestResources\imaadpcm_short.fsb" />
36+
<EmbeddedResource Include="TestResources\imaadpcm_short.fsb" />
37+
<None Remove="TestResources\imaadpcm_long.fsb" />
38+
<EmbeddedResource Include="TestResources\imaadpcm_long.fsb" />
39+
<None Remove="TestResources\broken_imaad.fsb" />
40+
<None Remove="TestResources\previously_unrecoverable_vorbis.fsb" />
41+
<EmbeddedResource Include="TestResources\previously_unrecoverable_vorbis.fsb" />
42+
<None Remove="TestResources\xbox_imaad.fsb" />
43+
<EmbeddedResource Include="TestResources\xbox_imaad.fsb" />
44+
<None Remove="TestResources\vorbis_with_blockflag_exception.fsb" />
45+
<EmbeddedResource Include="TestResources\vorbis_with_blockflag_exception.fsb" />
46+
</ItemGroup>
5647

5748
</Project>

‎Fmod5Sharp/Fmod5Sharp.csproj‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5-
<Authors>Sam Byass (Samboy063)</Authors>
6-
<Configurations>Release;Debug</Configurations>
7-
<DebugType>embedded</DebugType>
8-
<Description>Decoder for FMOD 5 sound banks (FSB files)</Description>
9-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
10-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<IsTrimmable>true</IsTrimmable>
12-
<LangVersion>10</LangVersion>
13-
<Nullable>enable</Nullable>
14-
<PackageId>Fmod5Sharp</PackageId>
15-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16-
<PackageProjectUrl>https://github.com/SamboyCoding/Fmod5Sharp</PackageProjectUrl>
17-
<PackageTags>fmod;audio</PackageTags>
18-
<Platforms>x86;x64;AnyCPU</Platforms>
19-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20-
<RepositoryType>git</RepositoryType>
21-
<RepositoryUrl>https://github.com/SamboyCoding/Fmod5Sharp.git</RepositoryUrl>
22-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
23-
<Title>FMOD5 Sharp</Title>
24-
<Version>3.0.1</Version>
25-
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
26-
</PropertyGroup>
3+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
4+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
5+
</PropertyGroup>
276

28-
<ItemGroup>
29-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
30-
<PackageReference Include="IndexRange" Version="1.0.2"/>
31-
<PackageReference Include="NAudio.Core" Version="2.1.0"/>
32-
<PackageReference Include="OggVorbisEncoder" Version="1.2.0"/>
33-
<PackageReference Include="System.Text.Json" Version="6.0.5"/>
34-
</ItemGroup>
7+
<PropertyGroup>
8+
<TargetFrameworks>net10.0</TargetFrameworks>
9+
<LangVersion>latest</LangVersion>
10+
<Nullable>enable</Nullable>
11+
<IsTrimmable>true</IsTrimmable>
12+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
13+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
14+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
15+
<Version>3.1.0</Version>
16+
<PackageId>FModel.Fmod5Sharp</PackageId>
17+
<PackageTags>fmod;audio</PackageTags>
18+
<Title>FMOD5 Sharp</Title>
19+
<Description>Decoder for FMOD 5 sound banks (FSB files)</Description>
20+
<Copyright>Copyright © 2026 FModel</Copyright>
21+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
22+
<NeutralLanguage>en</NeutralLanguage>
23+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
24+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
25+
<IncludeSymbols>true</IncludeSymbols>
26+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27+
<PackageReadmeFile>README.md</PackageReadmeFile>
28+
</PropertyGroup>
3529

36-
<ItemGroup>
37-
<None Remove="FmodVorbis\vorbis_headers_converted.json"/>
38-
<EmbeddedResource Include="Util\vorbis_headers_converted.json"/>
39-
</ItemGroup>
30+
<ItemGroup>
31+
<None Include="..\README.md" Pack="true" Visible="false" PackagePath="\" />
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<PackageReference Include="NAudio.Core" Version="2.2.1" />
36+
<PackageReference Include="OggVorbisEncoder" Version="1.2.2" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<None Remove="FmodVorbis\vorbis_headers_converted.json" />
41+
<EmbeddedResource Include="Util\vorbis_headers_converted.json" />
42+
</ItemGroup>
4043

4144
</Project>

‎HeaderGenerator/HeaderGenerator.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
89

910
</Project>

‎README.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Fmod5Sharp
22
## Managed decoder for FMOD 5 sound banks (FSB files).
33

4-
[![NuGet](https://img.shields.io/nuget/v/Fmod5Sharp?)](https://www.nuget.org/packages/Fmod5Sharp/)
4+
[![NuGet](https://img.shields.io/nuget/v/FModel.Fmod5Sharp?)](https://www.nuget.org/packages/FModel.Fmod5Sharp/)
55

66
This library allows you to read FMOD 5 sound bank files (they start with the characters FSB5) into their contained samples,
77
and then export those samples to standard file formats (assuming the contained data format is supported).
@@ -78,6 +78,3 @@ This project uses:
7878
- [OggVorbisEncoder](https://github.com/SteveLillis/.NET-Ogg-Vorbis-Encoder) to build Ogg Vorbis output streams.
7979
- [NAudio.Core](https://github.com/naudio/NAudio) to do the same thing but for WAV files.
8080
- [BitStreams](https://github.com/rubendal/BitStream) for parsing vorbis header data.
81-
- [IndexRange](https://github.com/bgrainger/IndexRange) to make my life easier when supporting .NET Standard 2.0.
82-
83-
It also uses System.Text.Json.

0 commit comments

Comments
 (0)