Inital bump to net6.0

mono · Jul 30, 2022 · c853d26 · c853d26
1 parent a14709d
commit c853d26
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.421
+        dotnet-version: 6.0.302
     - name: Build with dotnet
       run: dotnet build --configuration Release
     - name: Run unit tests

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.421
+        dotnet-version: 6.0.302
     - name: Build with dotnet
       run: dotnet build --configuration Release
     - name: Run unit tests

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.421
+        dotnet-version: 6.0.302
 
     - name: Clean
       run: dotnet clean --configuration Release && dotnet nuget locals all --clear

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,22 +6,9 @@
     <RepositoryType>git</RepositoryType>
 
     <!-- Make sure to update Directory.Build.targets too! -->
-    <ExeTargetFrameworks>net462;netcoreapp3.1</ExeTargetFrameworks>
-    <LibTargetFrameworks>net462;netstandard2.0</LibTargetFrameworks>
+    <ExeTargetFrameworks>net6.0;net472</ExeTargetFrameworks>
+    <LibTargetFrameworks>net6.0;netstandard2.0</LibTargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-
-  <!-- Allow building net framework using mono -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-
 </Project>
diff --git a/src/TaglibSharp.Tests/Collections/ByteVectorTest.cs b/src/TaglibSharp.Tests/Collections/ByteVectorTest.cs
@@ -152,7 +152,7 @@ public void CommentsFrameError ()
 
 		static string MD5Hash (byte[] bytes)
 		{
-			var md5 = new MD5CryptoServiceProvider ();
+			var md5 = MD5.Create ();
 			byte[] hash_bytes = md5.ComputeHash (bytes);
 			string hash_string = string.Empty;
 

diff --git a/src/TaglibSharp/Matroska/File.cs b/src/TaglibSharp/Matroska/File.cs
@@ -338,10 +338,11 @@ void ReadWrite (ReadStyle propertiesStyle)
 				EBMLreader element;
 				try {
 					element = new EBMLreader (this, offset);
-				} catch (Exception ex) {
+				} catch (Exception) {
 					// Sometimes, the file has zero padding at the end
-					if (hasSegment) break; // Avoid crash 
-					throw ex;
+					if (hasSegment)
+						break; // Avoid crash 
+					throw;
 				}
 
 				EBMLID ebml_id = (EBMLID)element.ID;