Bump to net462, netstandard2.0, netcoreapp3.1

decriptor · decriptor · commit 8eb9957dd7cf · 2020-04-26T14:00:04.000-06:00
net462 seems reasonable, it also brings in support for paths longer than 260 characters. (Among other things) https://en.wikipedia.org/wiki/.NET_Framework_version_history#.NET_Framework_4.6.2 netcoreapp3.1 is the current LTS release https://dotnet.microsoft.com/platform/support/policy/dotnet-core Version: .NET Core 3.1 Original Release Date: December 3, 2019 Latest Patch Version: 3.1.3 Patch Release Date: March 24, 2020 Support Level: LTS End of Support: December 3, 2022
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -1,4 +1,4 @@
-name: MacNetCore
+name: macOS
 
 on:
   push:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,4 +1,4 @@
-name: UbuntuNetCore
+name: Ubuntu
 
 on:
   push:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: WindowsNetCore
+name: Windows
 
 on:
   push:
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,27 @@
 <Project>
+
   <PropertyGroup>
     <ReleaseVersion>2.3.0.0</ReleaseVersion>
     <RepositoryUrl>https://github.com/mono/taglib-sharp</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <TaglibSharpTargetFramework>netstandard2.0</TaglibSharpTargetFramework>
+
+    <!-- Make sure to update Directory.Build.targets too! -->
+    <ExeTargetFrameworks>net462;netcoreapp3.1</ExeTargetFrameworks>
+    <LibTargetFrameworks>net462;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/examples/ReadFromUri/ReadFromUri.csproj b/examples/ReadFromUri/ReadFromUri.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(ExeTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,8 +22,4 @@
     <Compile Include="ReadFromUri.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/examples/SetPictures/SetPictures.csproj b/examples/SetPictures/SetPictures.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(ExeTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,8 +22,4 @@
     <ProjectReference Include="..\..\src\TaglibSharp\TaglibSharp.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Debug/Debug.csproj b/src/Debug/Debug.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(ExeTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
@@ -13,8 +13,4 @@
     <ProjectReference Include="..\TaglibSharp\TaglibSharp.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/TaglibSharp.Tests/TaglibSharp.Tests.csproj b/src/TaglibSharp.Tests/TaglibSharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(ExeTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -22,7 +22,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TaglibSharp/TaglibSharp.csproj b/src/TaglibSharp/TaglibSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TaglibSharpTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(LibTargetFrameworks)</TargetFrameworks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\TaglibSharp.xml</DocumentationFile>
     <AssemblyName>TagLibSharp</AssemblyName>
     <RootNamespace>TagLib</RootNamespace>
@@ -32,8 +32,4 @@ January 21, 2019
 * Lots and lots of updates including net45 and .netstandard 2.0</PackageReleaseNotes>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: MacNetCore`
	`1`	`+name: macOS`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: UbuntuNetCore`
	`1`	`+name: Ubuntu`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: WindowsNetCore`
	`1`	`+name: Windows`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`