Skip to content

Commit 1e3b477

Browse files
authored
Remove autotools and update build scripts (#169)
Pulled in some changes from lidarr/taglib-sharp
1 parent 21d46df commit 1e3b477

22 files changed

+64
-993
lines changed

.travis.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo: required
2-
dist: trusty
2+
dist: bionic
33
language: csharp
44
solution: TaglibSharp.sln
55
mono: latest
@@ -13,16 +13,9 @@ before_install:
1313
install:
1414
- sudo apt-get update -qq > /dev/null
1515
# - mono .nuget/nuget.exe restore TaglibSharp.sln -Verbosity detailed
16-
- mono .nuget/nuget.exe install NUnit.Runners -Version 3.9.0 -OutputDirectory packages
16+
- mono .nuget/nuget.exe install NUnit.Runners -Version 3.10.0 -OutputDirectory packages
1717

1818
script:
19-
- ./autogen.sh
20-
- make
21-
- make dist # Let's make sure we don't break make dist
19+
- msbuild /restore TaglibSharp.sln
2220
- cd src/TaglibSharp.Tests/bin/Debug
23-
- mono ../../../../packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe --labels=All net45/TaglibSharp.Tests.dll
24-
# This errors out for some reason:
25-
# System.IO.FileNotFoundException: Unable to find tests for C:\code\taglib-sharp\src\TaglibSharp.Tests\bin\Debug\netstandard2.0\TaglibSharp.Tests.dll.
26-
# Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk" and framework version settings are appropriate.
27-
# Rerun with /diag option to diagnose further.
28-
# - mono ../../../../packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe --labels=All netstandard2.0/TaglibSharp.Tests.dll
21+
- mono ../../../../packages/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe --labels=All net461/TaglibSharp.Tests.dll

Directory.Build.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
2-
<PropertyGroup>
3-
<ReleaseVersion>2.2.0.0-beta</ReleaseVersion>
4-
<RepositoryUrl>https://github.com/mono/taglib-sharp</RepositoryUrl>
5-
<RepositoryType>git</RepositoryType>
6-
<TaglibSharpTargetFramework>net45;netstandard2.0</TaglibSharpTargetFramework>
7-
<LangVersion>latest</LangVersion>
8-
</PropertyGroup>
2+
<PropertyGroup>
3+
<ReleaseVersion>2.2.0.0</ReleaseVersion>
4+
<RepositoryUrl>https://github.com/mono/taglib-sharp</RepositoryUrl>
5+
<RepositoryType>git</RepositoryType>
6+
<TaglibSharpTargetFramework>net45;netstandard2.0</TaglibSharpTargetFramework>
7+
<LangVersion>latest</LangVersion>
8+
</PropertyGroup>
99
</Project>

Makefile.am

Lines changed: 0 additions & 53 deletions
This file was deleted.

TaglibSharp.sln

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReadFromUri", "examples\Rea
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetPictures", "examples\SetPictures\SetPictures.csproj", "{812A0494-6BFA-477E-B9F7-1A1F679091BA}"
1717
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DBAF85DD-F405-4903-AF22-91FE886EF7DA}"
19+
ProjectSection(SolutionItems) = preProject
20+
.travis.yml = .travis.yml
21+
appveyor.yml = appveyor.yml
22+
azure-pipelines.yml = azure-pipelines.yml
23+
Directory.Build.props = Directory.Build.props
24+
Directory.Build.targets = Directory.Build.targets
25+
EndProjectSection
26+
EndProject
1827
Global
1928
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2029
Debug|Any CPU = Debug|Any CPU

autogen.sh

Lines changed: 0 additions & 136 deletions
This file was deleted.

build/msbuild.include

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)