Skip to content

Commit c853d26

Browse files
committed
Inital bump to net6.0
1 parent a14709d commit c853d26

File tree

6 files changed

+10
-22
lines changed

6 files changed

+10
-22
lines changed

.github/workflows/mac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 3.1.421
21+
dotnet-version: 6.0.302
2222
- name: Build with dotnet
2323
run: dotnet build --configuration Release
2424
- name: Run unit tests

.github/workflows/ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 3.1.421
21+
dotnet-version: 6.0.302
2222
- name: Build with dotnet
2323
run: dotnet build --configuration Release
2424
- name: Run unit tests

.github/workflows/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 3.1.421
21+
dotnet-version: 6.0.302
2222

2323
- name: Clean
2424
run: dotnet clean --configuration Release && dotnet nuget locals all --clear

Directory.Build.props

+2-15
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,9 @@
66
<RepositoryType>git</RepositoryType>
77

88
<!-- Make sure to update Directory.Build.targets too! -->
9-
<ExeTargetFrameworks>net462;netcoreapp3.1</ExeTargetFrameworks>
10-
<LibTargetFrameworks>net462;netstandard2.0</LibTargetFrameworks>
9+
<ExeTargetFrameworks>net6.0;net472</ExeTargetFrameworks>
10+
<LibTargetFrameworks>net6.0;netstandard2.0</LibTargetFrameworks>
1111
<LangVersion>latest</LangVersion>
1212
</PropertyGroup>
1313

14-
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
15-
<DebugType>full</DebugType>
16-
</PropertyGroup>
17-
18-
<!-- Allow building net framework using mono -->
19-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">
20-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23-
</PackageReference>
24-
</ItemGroup>
25-
26-
2714
</Project>

src/TaglibSharp.Tests/Collections/ByteVectorTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void CommentsFrameError ()
152152

153153
static string MD5Hash (byte[] bytes)
154154
{
155-
var md5 = new MD5CryptoServiceProvider ();
155+
var md5 = MD5.Create ();
156156
byte[] hash_bytes = md5.ComputeHash (bytes);
157157
string hash_string = string.Empty;
158158

src/TaglibSharp/Matroska/File.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,11 @@ void ReadWrite (ReadStyle propertiesStyle)
338338
EBMLreader element;
339339
try {
340340
element = new EBMLreader (this, offset);
341-
} catch (Exception ex) {
341+
} catch (Exception) {
342342
// Sometimes, the file has zero padding at the end
343-
if (hasSegment) break; // Avoid crash
344-
throw ex;
343+
if (hasSegment)
344+
break; // Avoid crash
345+
throw;
345346
}
346347

347348
EBMLID ebml_id = (EBMLID)element.ID;

0 commit comments

Comments
 (0)