Skip to content

Commit a379b1a

Browse files
committed
Merge pull request #25 from HtmlUnit/feature/travis-build
Working Travis build
2 parents e4ad4da + 3a9677f commit a379b1a

73 files changed

Lines changed: 1537 additions & 1418 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.nuget/NuGet.Config

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

.nuget/NuGet.exe

-1.59 MB
Binary file not shown.

.nuget/NuGet.targets

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

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
language: csharp
2+
solution: NHtmlUnit.sln
3+
sudo: false
4+
install:
5+
- nuget restore NHtmlUnit.sln
6+
- nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./packages
7+
- find .
8+
script:
9+
- mkdir -p ./app/NHtmlUnit/obj/Release/ # http://www.johankarlsson.net/2014/12/fileswrittenabsolutetxt.html
10+
- xbuild NHtmlUnit.sln /property:Configuration="Release" /verbosity:detailed
11+
- mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe ./tests/IntegrationTests/bin/Release/IntegrationTests.dll

NHtmlUnit.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<references />
2121
</metadata>
2222
<files>
23-
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net35" />
24-
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net35" />
23+
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net45" />
24+
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net45" />
2525
</files>
2626
</package>

NHtmlUnit.sln

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30110.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.25123.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "tests\IntegrationTests\IntegrationTests.csproj", "{63131319-E7FF-4DC2-A55E-213327E701D1}"
66
EndProject
@@ -14,28 +14,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHtmlUnit.Generator", "app\
1414
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "tests\ConsoleTest\ConsoleTest.csproj", "{DCEE9766-27F8-4E05-ACCE-9AD9CD55AE11}"
1616
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{48CA8BC7-E132-40EC-A8AE-5A62B644431A}"
18-
ProjectSection(SolutionItems) = preProject
19-
.nuget\NuGet.Config = .nuget\NuGet.Config
20-
.nuget\NuGet.exe = .nuget\NuGet.exe
21-
.nuget\NuGet.targets = .nuget\NuGet.targets
22-
EndProjectSection
23-
EndProject
24-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".docs", ".docs", "{5B152A0C-87B8-4920-80AE-77F60A184ABF}"
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8273FDB1-A8CD-4450-A25D-74BAA56DFC94}"
2518
ProjectSection(SolutionItems) = preProject
19+
.gitignore = .gitignore
20+
.travis.yml = .travis.yml
2621
clean.cmd = clean.cmd
2722
LICENSE-HtmlUnit.txt = LICENSE-HtmlUnit.txt
2823
LICENSE.txt = LICENSE.txt
29-
lib\HtmlUnit\Make.cmd = lib\HtmlUnit\Make.cmd
3024
NHtmlUnit.nuspec = NHtmlUnit.nuspec
31-
nuget-pack.cmd = nuget-pack.cmd
25+
nuget.cmd = nuget.cmd
3226
README.md = README.md
3327
EndProjectSection
3428
EndProject
3529
Global
36-
GlobalSection(CodealikeProperties) = postSolution
37-
SolutionGuid = b6764003-5843-4527-bc66-bb40ba5617bc
38-
EndGlobalSection
3930
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4031
Debug|Any CPU = Debug|Any CPU
4132
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -91,8 +82,8 @@ Global
9182
EndGlobalSection
9283
GlobalSection(NestedProjects) = preSolution
9384
{63131319-E7FF-4DC2-A55E-213327E701D1} = {63B6ADAD-20F5-47F6-9354-AFD18F28177B}
94-
{DCEE9766-27F8-4E05-ACCE-9AD9CD55AE11} = {63B6ADAD-20F5-47F6-9354-AFD18F28177B}
9585
{8E71417D-9EEE-4FCD-B738-9D4939D1F20C} = {B9019988-D169-4DE8-AB0E-16D0EBEB24FD}
9686
{15D5F20A-A36D-48CF-9CE3-F79BDB18B7C9} = {B9019988-D169-4DE8-AB0E-16D0EBEB24FD}
87+
{DCEE9766-27F8-4E05-ACCE-9AD9CD55AE11} = {63B6ADAD-20F5-47F6-9354-AFD18F28177B}
9788
EndGlobalSection
9889
EndGlobal

app/GlobalAssemblyInfo.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
// --------------------------------------------------
4-
// Copyright © 2003-2015 OKB. All Rights Reserved.
4+
// Copyright © 2003-2016 OKB. All Rights Reserved.
55
//
66
// This software is proprietary information of OKB.
77
// USE IS SUBJECT TO LICENSE TERMS.
@@ -14,8 +14,6 @@
1414

1515
[assembly : AssemblyCompany("OKB AS")]
1616
[assembly : AssemblyProduct("NHtmlUnit")]
17-
[assembly : AssemblyCopyright("Copyright © OKB AS 2015")]
18-
[assembly : AssemblyTrademark("OKB AS 2015")]
19-
[assembly : ComVisible(false)]
20-
[assembly : AssemblyVersion("2.19.0.0")]
21-
[assembly : AssemblyFileVersion("2.19.0.0")]
17+
[assembly : AssemblyCopyright("Copyright © OKB AS 2016")]
18+
[assembly : AssemblyTrademark("OKB AS 2016")]
19+
[assembly : ComVisible(false)]

0 commit comments

Comments
 (0)