Skip to content

Commit 5b5bb00

Browse files
Corey-MCorey-M
committed
Bind to NAudio 2.1.0, update other package references. Bump version, docs and package.
1 parent e4658ce commit 5b5bb00

File tree

10 files changed

+74
-51
lines changed

10 files changed

+74
-51
lines changed

‎Lame.Test.Core/Lame.Test.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<RootNamespace>Lame.Test</RootNamespace>
99

10-
<Version>2.0.1</Version>
10+
<Version>2.1.0</Version>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
@@ -39,14 +39,14 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
43-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
44-
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
45-
<PackageReference Include="coverlet.collector" Version="3.0.2">
42+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
43+
<PackageReference Include="MSTest.TestAdapter" Version="3.0.3" />
44+
<PackageReference Include="MSTest.TestFramework" Version="3.0.3" />
45+
<PackageReference Include="coverlet.collector" Version="6.0.0">
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4848
</PackageReference>
49-
<PackageReference Include="NAudio" Version="2.0.0" />
49+
<PackageReference Include="NAudio" Version="2.1.0" />
5050
</ItemGroup>
5151

5252
<ItemGroup>

‎Lame.Test.Framework/Lame.Test.Framework.csproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
3+
<Import Project="..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,42 +41,42 @@
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
44+
<HintPath>..\packages\MSTest.TestFramework.3.0.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
47+
<HintPath>..\packages\MSTest.TestFramework.3.0.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5050
<HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
5151
</Reference>
52-
<Reference Include="NAudio, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
53-
<HintPath>..\packages\NAudio.2.0.0\lib\netstandard2.0\NAudio.dll</HintPath>
52+
<Reference Include="NAudio, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
53+
<HintPath>..\packages\NAudio.2.1.0\lib\net472\NAudio.dll</HintPath>
5454
</Reference>
55-
<Reference Include="NAudio.Asio, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
56-
<HintPath>..\packages\NAudio.Asio.2.0.0\lib\netstandard2.0\NAudio.Asio.dll</HintPath>
55+
<Reference Include="NAudio.Asio, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
56+
<HintPath>..\packages\NAudio.Asio.2.1.0\lib\netstandard2.0\NAudio.Asio.dll</HintPath>
5757
</Reference>
58-
<Reference Include="NAudio.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
59-
<HintPath>..\packages\NAudio.Core.2.0.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
58+
<Reference Include="NAudio.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
59+
<HintPath>..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
6060
</Reference>
6161
<Reference Include="NAudio.Lame">
6262
<HintPath>..\NAudio.Lame\bin\Debug\netstandard2.0\NAudio.Lame.dll</HintPath>
6363
</Reference>
64-
<Reference Include="NAudio.Midi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
65-
<HintPath>..\packages\NAudio.Midi.2.0.0\lib\netstandard2.0\NAudio.Midi.dll</HintPath>
64+
<Reference Include="NAudio.Midi, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
65+
<HintPath>..\packages\NAudio.Midi.2.1.0\lib\netstandard2.0\NAudio.Midi.dll</HintPath>
6666
</Reference>
67-
<Reference Include="NAudio.Wasapi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
68-
<HintPath>..\packages\NAudio.Wasapi.2.0.0\lib\netstandard2.0\NAudio.Wasapi.dll</HintPath>
67+
<Reference Include="NAudio.Wasapi, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
68+
<HintPath>..\packages\NAudio.Wasapi.2.1.0\lib\netstandard2.0\NAudio.Wasapi.dll</HintPath>
6969
</Reference>
70-
<Reference Include="NAudio.WinForms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
71-
<HintPath>..\packages\NAudio.WinForms.2.0.0\lib\net472\NAudio.WinForms.dll</HintPath>
70+
<Reference Include="NAudio.WinForms, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
71+
<HintPath>..\packages\NAudio.WinForms.2.1.0\lib\net472\NAudio.WinForms.dll</HintPath>
7272
</Reference>
73-
<Reference Include="NAudio.WinMM, Version=2.0.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
74-
<HintPath>..\packages\NAudio.WinMM.2.0.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
73+
<Reference Include="NAudio.WinMM, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
74+
<HintPath>..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
7575
</Reference>
7676
<Reference Include="System" />
7777
<Reference Include="System.Core" />
78-
<Reference Include="System.Security.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79-
<HintPath>..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
78+
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79+
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8282
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
@@ -135,8 +135,8 @@
135135
<PropertyGroup>
136136
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
137137
</PropertyGroup>
138-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
139-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
138+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.props'))" />
139+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.targets'))" />
140140
</Target>
141-
<Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
141+
<Import Project="..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.3.0.3\build\net462\MSTest.TestAdapter.targets')" />
142142
</Project>

‎Lame.Test.Framework/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
[assembly: Guid("df68a50e-1072-4c6b-89f7-6b7ccdb7ae5d")]
1717

1818
// [assembly: AssemblyVersion("1.0.*")]
19-
[assembly: AssemblyVersion("2.0.1")]
20-
[assembly: AssemblyFileVersion("2.0.1")]
19+
[assembly: AssemblyVersion("2.1.0")]
20+
[assembly: AssemblyFileVersion("2.1.0")]

‎Lame.Test.Framework/app.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
<assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="NAudio.Core" publicKeyToken="e279aa5131008a41" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="NAudio.WinMM" publicKeyToken="e279aa5131008a41" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="NAudio.Wasapi" publicKeyToken="e279aa5131008a41" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
20+
</dependentAssembly>
921
</assemblyBinding>
1022
</runtime>
1123
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

‎Lame.Test.Framework/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net472" />
4-
<package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net472" />
5-
<package id="MSTest.TestFramework" version="2.1.2" targetFramework="net472" />
6-
<package id="NAudio" version="2.0.0" targetFramework="net48" />
7-
<package id="NAudio.Asio" version="2.0.0" targetFramework="net48" />
8-
<package id="NAudio.Core" version="2.0.0" targetFramework="net48" />
9-
<package id="NAudio.Midi" version="2.0.0" targetFramework="net48" />
10-
<package id="NAudio.Wasapi" version="2.0.0" targetFramework="net48" />
11-
<package id="NAudio.WinForms" version="2.0.0" targetFramework="net48" />
12-
<package id="NAudio.WinMM" version="2.0.0" targetFramework="net48" />
13-
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net472" />
4+
<package id="MSTest.TestAdapter" version="3.0.3" targetFramework="net48" />
5+
<package id="MSTest.TestFramework" version="3.0.3" targetFramework="net48" />
6+
<package id="NAudio" version="2.1.0" targetFramework="net48" />
7+
<package id="NAudio.Asio" version="2.1.0" targetFramework="net48" />
8+
<package id="NAudio.Core" version="2.1.0" targetFramework="net48" />
9+
<package id="NAudio.Midi" version="2.1.0" targetFramework="net48" />
10+
<package id="NAudio.Wasapi" version="2.1.0" targetFramework="net48" />
11+
<package id="NAudio.WinForms" version="2.1.0" targetFramework="net48" />
12+
<package id="NAudio.WinMM" version="2.1.0" targetFramework="net48" />
13+
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
1414
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
1515
</packages>

‎LameDLLWrap/LameDLLWrap.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<Platforms>x86;x64</Platforms>
5-
<AssemblyVersion>2.0.1</AssemblyVersion>
6-
<FileVersion>2.0.1</FileVersion>
7-
<Version>2.0.1</Version>
5+
<AssemblyVersion></AssemblyVersion>
6+
<FileVersion></FileVersion>
7+
<Version>2.1.0</Version>
88
</PropertyGroup>
99

1010
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -16,6 +16,6 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="NAudio.Core" Version="2.0.0" />
19+
<PackageReference Include="NAudio.Core" Version="2.1.0" />
2020
</ItemGroup>
2121
</Project>

NAudio.Lame.2.0.1.nuspec renamed to NAudio.Lame.2.1.0.nuspec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>NAudio.Lame</id>
5-
<version>2.0.1</version>
5+
<version>2.1.0</version>
66
<authors>Corey Murtagh</authors>
77
<owners>Corey Murtagh</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="file">LICENSE.txt</license>
1010
<projectUrl>https://github.com/Corey-M/NAudio.Lame</projectUrl>
1111
<description>Uses libmp3lame.dll from the Lame project to provide MP3 encoding support to NAudio 2.0. Both 64-bit and 32-bit versions of libmp3lame.dll are provided, with platform detection to determine which to use.</description>
1212
<summary>Implements MP3 writing for NAudio using libmp3lame.</summary>
13-
<releaseNotes>v2.0.1 Fix exception when NAudio.Lame loaded as memory assembly.
13+
<releaseNotes>v2.1.0 Improve ID3v2 handling of unicode strings, updated to NAudio v2.1.
14+
15+
v2.0.1 Fix exception when NAudio.Lame loaded as memory assembly.
1416

1517
v2.0.0 Binding to NAudio 2.0.0, version alignment with NAudio. No feature updates.
1618

@@ -32,7 +34,7 @@ v1.1.0 Changed all projects to .NET STandard 2.0, rebuilt testing using .NET Cor
3234
<tags>C# NAudio MP3 Lame Windows</tags>
3335
<repository type="git" url="https://github.com/Corey-M/NAudio.Lame" />
3436
<dependencies>
35-
<dependency id="NAudio.Core" version="2.0.0" />
37+
<dependency id="NAudio.Core" version="2.1.0" />
3638
</dependencies>
3739
</metadata>
3840
<files>

‎NAudio.Lame.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LameDLLWrap", "LameDLLWrap\
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{4CB3247B-DBD1-4E84-A6F5-DF88D39E7764}"
1414
ProjectSection(SolutionItems) = preProject
15-
NAudio.Lame.2.0.1.nuspec = NAudio.Lame.2.0.1.nuspec
1615
NAudio.Lame.targets = NAudio.Lame.targets
16+
NAudio.Lame.2.1.0.nuspec = NAudio.Lame.2.1.0.nuspec
1717
EndProjectSection
1818
EndProject
1919
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{1D6D2A07-C056-4D03-BCAA-DE3B954A361A}"

‎NAudio.Lame/NAudio.Lame.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Platforms>AnyCPU</Platforms>
6-
<Version>2.0.1</Version>
6+
<Version>2.1.0</Version>
77
<Authors>Corey Murtagh</Authors>
8-
<Copyright>Copyright © 2013-2022 Corey Murtagh</Copyright>
8+
<Copyright>Copyright © 2013-2023 Corey Murtagh</Copyright>
99
<Description>Uses libmp3lame.dll from the Lame project to provide MP3 encoding support to NAudio. Both 64-bit and 32-bit versions of libmp3lame.dll are provided, with platform detection to determine which to use.</Description>
1010
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1111
</PropertyGroup>
@@ -37,7 +37,7 @@
3737
<PackageReference Include="ModuleInit.Fody" Version="2.1.1">
3838
<PrivateAssets>all</PrivateAssets>
3939
</PackageReference>
40-
<PackageReference Include="NAudio.Core" Version="2.0.0" />
40+
<PackageReference Include="NAudio.Core" Version="2.1.0" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,15 @@ While there are many more settings available I don't have a clear picture of who
171171

172172
## Relase Notes
173173

174+
### Version 2.1.0
175+
176+
Released to NuGet 30-May-2023
177+
178+
Changes:
179+
180+
* Improved handling of unicode characters in ID3v2 tags.
181+
* Binding to NAudio 2.1.0
182+
174183
### Version 2.0.1
175184

176185
Released to NuGet 18-Jan-2022

0 commit comments

Comments
 (0)