From 333273c4996229439724cf87f7c121dbe5fbcc89 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 30 Aug 2018 22:53:15 +0200 Subject: [PATCH] Add Travis CI build (#69) --- .travis.yml | 11 +++++++++++ Packaging.Targets.Tests/ArchiveBuilderTests.cs | 9 +++++---- Packaging.Targets/Packaging.Targets.csproj | 9 ++++----- dotnet-deb/dotnet-deb.csproj | 3 +-- dotnet-rpm/dotnet-rpm.csproj | 3 +-- dotnet-tarball/dotnet-tarball.csproj | 3 +-- dotnet-zip/dotnet-zip.csproj | 3 +-- 7 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..051df87 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: csharp +mono: none +dotnet: 2.1.400 + +git: + depth: false + +script: + - dotnet restore dotnet-packaging.sln + - dotnet pack dotnet-packaging.sln -c Release + - dotnet test Packaging.Targets.Tests/Packaging.Targets.Tests.csproj \ No newline at end of file diff --git a/Packaging.Targets.Tests/ArchiveBuilderTests.cs b/Packaging.Targets.Tests/ArchiveBuilderTests.cs index 152e586..05c5695 100644 --- a/Packaging.Targets.Tests/ArchiveBuilderTests.cs +++ b/Packaging.Targets.Tests/ArchiveBuilderTests.cs @@ -3,6 +3,7 @@ using Microsoft.Build.Utilities; using Packaging.Targets.IO; using System; using System.Collections.Generic; +using System.IO; using Xunit; namespace Packaging.Targets.Tests @@ -31,7 +32,7 @@ namespace Packaging.Targets.Tests Assert.Equal(LinuxFileMode.S_IROTH | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IRUSR | LinuxFileMode.S_IFREG, readme.Mode); Assert.Equal("root", readme.Owner); Assert.False(readme.RemoveOnUninstall); - Assert.Equal("archive\\README.md", readme.SourceFilename); + Assert.Equal(Path.Combine("archive", "README.md"), readme.SourceFilename); Assert.Equal("/opt/demo/README.md", readme.TargetPath); Assert.Equal("/opt/demo/README.md", readme.TargetPathWithFinalSlash); Assert.Equal(ArchiveEntryType.None, readme.Type); @@ -44,7 +45,7 @@ namespace Packaging.Targets.Tests Assert.Equal(LinuxFileMode.S_IROTH | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IRUSR | LinuxFileMode.S_IFREG, script.Mode); Assert.Equal("root", script.Owner); Assert.False(script.RemoveOnUninstall); - Assert.Equal("archive\\script.sh", script.SourceFilename); + Assert.Equal(Path.Combine("archive", "script.sh"), script.SourceFilename); Assert.Equal("/opt/demo/script.sh", script.TargetPath); Assert.Equal("/opt/demo/script.sh", script.TargetPathWithFinalSlash); Assert.Equal(ArchiveEntryType.None, script.Type); @@ -79,7 +80,7 @@ namespace Packaging.Targets.Tests Assert.Equal(LinuxFileMode.S_IROTH | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IRUSR | LinuxFileMode.S_IFREG, readme.Mode); Assert.Equal("root", readme.Owner); Assert.False(readme.RemoveOnUninstall); - Assert.Equal("archive\\README.md", readme.SourceFilename); + Assert.Equal(Path.Combine("archive", "README.md"), readme.SourceFilename); Assert.Equal("/opt/demo/README.md", readme.TargetPath); Assert.Equal("/opt/demo/README.md", readme.TargetPathWithFinalSlash); Assert.Equal(ArchiveEntryType.None, readme.Type); @@ -94,7 +95,7 @@ namespace Packaging.Targets.Tests Assert.Equal(LinuxFileMode.S_IXOTH | LinuxFileMode.S_IROTH | LinuxFileMode.S_IXGRP | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IXUSR | LinuxFileMode.S_IWUSR | LinuxFileMode.S_IRUSR, script.Mode); Assert.Equal("root", script.Owner); Assert.False(script.RemoveOnUninstall); - Assert.Equal("archive\\script.sh", script.SourceFilename); + Assert.Equal(Path.Combine("archive", "script.sh"), script.SourceFilename); Assert.Equal("/bin/script.sh", script.TargetPath); Assert.Equal("/bin/script.sh", script.TargetPathWithFinalSlash); Assert.Equal(ArchiveEntryType.None, script.Type); diff --git a/Packaging.Targets/Packaging.Targets.csproj b/Packaging.Targets/Packaging.Targets.csproj index ed2d44e..ff93a86 100644 --- a/Packaging.Targets/Packaging.Targets.csproj +++ b/Packaging.Targets/Packaging.Targets.csproj @@ -2,7 +2,6 @@ netstandard1.5;netstandard2.0 0.1.1 - $(USERPROFILE)\.nuget\packages Frederik Carlier Quamotion Packaging Tools for .NET CLI @@ -65,21 +64,21 @@ - + true tools\netstandard1.5\ - + true tools\netstandard2.0\ - + true tools\netstandard1.5\ - + true tools\netstandard2.0\ diff --git a/dotnet-deb/dotnet-deb.csproj b/dotnet-deb/dotnet-deb.csproj index 55f3593..adc0d48 100644 --- a/dotnet-deb/dotnet-deb.csproj +++ b/dotnet-deb/dotnet-deb.csproj @@ -17,7 +17,6 @@ Once you've installed this package as a .NET CLI tool, run dotnet deb to generat See https://github.com/qmfrederik/dotnet-packaging/ for more information on how to use dotnet deb. Packaging Tools for .NET CLI - $(USERPROFILE)\.nuget\packages @@ -28,7 +27,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + true lib\$(TargetFramework)\ diff --git a/dotnet-rpm/dotnet-rpm.csproj b/dotnet-rpm/dotnet-rpm.csproj index a93463d..bc55e0b 100644 --- a/dotnet-rpm/dotnet-rpm.csproj +++ b/dotnet-rpm/dotnet-rpm.csproj @@ -17,7 +17,6 @@ Once you've installed this package as a .NET CLI tool, run dotnet rpm to generat See https://github.com/qmfrederik/dotnet-packaging/ for more information on how to use dotnet rpm. Packaging Tools for .NET CLI - $(USERPROFILE)\.nuget\packages @@ -28,7 +27,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + true lib\$(TargetFramework)\ diff --git a/dotnet-tarball/dotnet-tarball.csproj b/dotnet-tarball/dotnet-tarball.csproj index 0511fc5..263557f 100644 --- a/dotnet-tarball/dotnet-tarball.csproj +++ b/dotnet-tarball/dotnet-tarball.csproj @@ -17,7 +17,6 @@ Once you've installed this package as a .NET CLI tool, run dotnet tar to generat See https://github.com/qmfrederik/dotnet-packaging/ for more information on how to use dotnet tarball. Packaging Tools for .NET CLI - $(USERPROFILE)\.nuget\packages @@ -28,7 +27,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + true lib\$(TargetFramework)\ diff --git a/dotnet-zip/dotnet-zip.csproj b/dotnet-zip/dotnet-zip.csproj index d4319bf..2968d4a 100644 --- a/dotnet-zip/dotnet-zip.csproj +++ b/dotnet-zip/dotnet-zip.csproj @@ -17,7 +17,6 @@ Once you've installed this package as a .NET CLI tool, run dotnet zip to generat See https://github.com/qmfrederik/dotnet-packaging/ for more information on how to use dotnet tarball. Packaging Tools for .NET CLI - $(USERPROFILE)\.nuget\packages @@ -28,7 +27,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + true lib\$(TargetFramework)\