You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/05/09 23:13:07 UTC
[1/2] lucenenet git commit: SWEEP: Removed hard dependency on
Microsoft.NETCore.App version 1.0.1 (which doesn't work if another version is
on the system)
Repository: lucenenet
Updated Branches:
refs/heads/master 0ff95608b -> 41c6191fd
SWEEP: Removed hard dependency on Microsoft.NETCore.App version 1.0.1 (which doesn't work if another version is on the system)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c2bf370f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c2bf370f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c2bf370f
Branch: refs/heads/master
Commit: c2bf370f21dcc34256bce9000dacbfdadcef4765
Parents: 0ff9560
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed May 10 05:40:08 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed May 10 05:40:08 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Tests.Analysis.Common/project.json | 8 +-------
src/Lucene.Net.Tests.Analysis.Stempel/project.json | 6 ------
src/Lucene.Net.Tests.Classification/project.json | 6 ------
src/Lucene.Net.Tests.Codecs/project.json | 6 ------
src/Lucene.Net.Tests.Expressions/project.json | 6 ------
src/Lucene.Net.Tests.Facet/project.json | 6 ------
src/Lucene.Net.Tests.Grouping/project.json | 6 ------
src/Lucene.Net.Tests.Highlighter/project.json | 4 ----
src/Lucene.Net.Tests.ICU/project.json | 4 ----
src/Lucene.Net.Tests.Join/project.json | 6 ------
src/Lucene.Net.Tests.Memory/project.json | 6 ------
src/Lucene.Net.Tests.Misc/project.json | 6 ------
src/Lucene.Net.Tests.Queries/project.json | 6 ------
src/Lucene.Net.Tests.QueryParser/project.json | 6 ------
src/Lucene.Net.Tests.Sandbox/project.json | 6 ------
src/Lucene.Net.Tests.Spatial/project.json | 6 ------
src/Lucene.Net.Tests.Suggest/project.json | 6 ------
src/Lucene.Net.Tests/project.json | 6 ------
18 files changed, 1 insertion(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Analysis.Common/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/project.json b/src/Lucene.Net.Tests.Analysis.Common/project.json
index cd4f619..0ad7006 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Common/project.json
@@ -1,4 +1,4 @@
-{
+{
"version": "4.8.0",
"title": "Lucene.Net.Tests.Analysis.Common",
"buildOptions": {
@@ -109,12 +109,6 @@
]
}
},
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
- },
"imports": "dnxcore50"
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Analysis.Stempel/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/project.json b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
index 3c59e56..d2bcbff 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
@@ -29,12 +29,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Classification/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/project.json b/src/Lucene.Net.Tests.Classification/project.json
index f70eb57..b804729 100644
--- a/src/Lucene.Net.Tests.Classification/project.json
+++ b/src/Lucene.Net.Tests.Classification/project.json
@@ -24,12 +24,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Codecs/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/project.json b/src/Lucene.Net.Tests.Codecs/project.json
index 6be65e9..1eb7aa1 100644
--- a/src/Lucene.Net.Tests.Codecs/project.json
+++ b/src/Lucene.Net.Tests.Codecs/project.json
@@ -25,12 +25,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Expressions/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/project.json b/src/Lucene.Net.Tests.Expressions/project.json
index 021f138..1fbfb5c 100644
--- a/src/Lucene.Net.Tests.Expressions/project.json
+++ b/src/Lucene.Net.Tests.Expressions/project.json
@@ -24,12 +24,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Facet/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/project.json b/src/Lucene.Net.Tests.Facet/project.json
index 6423d53..88a2645 100644
--- a/src/Lucene.Net.Tests.Facet/project.json
+++ b/src/Lucene.Net.Tests.Facet/project.json
@@ -25,12 +25,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Grouping/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/project.json b/src/Lucene.Net.Tests.Grouping/project.json
index 62dfaef..1354ce9 100644
--- a/src/Lucene.Net.Tests.Grouping/project.json
+++ b/src/Lucene.Net.Tests.Grouping/project.json
@@ -25,12 +25,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Highlighter/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/project.json b/src/Lucene.Net.Tests.Highlighter/project.json
index 4f338ab..44720d3 100644
--- a/src/Lucene.Net.Tests.Highlighter/project.json
+++ b/src/Lucene.Net.Tests.Highlighter/project.json
@@ -32,10 +32,6 @@
}
},
"dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- },
"System.Xml.XmlDocument": "4.0.1"
}
},
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.ICU/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.ICU/project.json b/src/Lucene.Net.Tests.ICU/project.json
index 17a2db6..0dc780d 100644
--- a/src/Lucene.Net.Tests.ICU/project.json
+++ b/src/Lucene.Net.Tests.ICU/project.json
@@ -61,10 +61,6 @@
}
},
"dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- },
"System.Xml.XmlDocument": "4.0.1"
}
},
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Join/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/project.json b/src/Lucene.Net.Tests.Join/project.json
index d642013..65a4484 100644
--- a/src/Lucene.Net.Tests.Join/project.json
+++ b/src/Lucene.Net.Tests.Join/project.json
@@ -24,12 +24,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Memory/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/project.json b/src/Lucene.Net.Tests.Memory/project.json
index c2cf17f..be62899 100644
--- a/src/Lucene.Net.Tests.Memory/project.json
+++ b/src/Lucene.Net.Tests.Memory/project.json
@@ -30,12 +30,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Misc/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/project.json b/src/Lucene.Net.Tests.Misc/project.json
index 1586276..9737338 100644
--- a/src/Lucene.Net.Tests.Misc/project.json
+++ b/src/Lucene.Net.Tests.Misc/project.json
@@ -23,12 +23,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Queries/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/project.json b/src/Lucene.Net.Tests.Queries/project.json
index 128b9a2..5de2e88 100644
--- a/src/Lucene.Net.Tests.Queries/project.json
+++ b/src/Lucene.Net.Tests.Queries/project.json
@@ -23,12 +23,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.QueryParser/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/project.json b/src/Lucene.Net.Tests.QueryParser/project.json
index 331539b..afb802d 100644
--- a/src/Lucene.Net.Tests.QueryParser/project.json
+++ b/src/Lucene.Net.Tests.QueryParser/project.json
@@ -55,12 +55,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Sandbox/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/project.json b/src/Lucene.Net.Tests.Sandbox/project.json
index 9d65892..5b56757 100644
--- a/src/Lucene.Net.Tests.Sandbox/project.json
+++ b/src/Lucene.Net.Tests.Sandbox/project.json
@@ -29,12 +29,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Spatial/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/project.json b/src/Lucene.Net.Tests.Spatial/project.json
index 39971e2..69963f5 100644
--- a/src/Lucene.Net.Tests.Spatial/project.json
+++ b/src/Lucene.Net.Tests.Spatial/project.json
@@ -42,12 +42,6 @@
"Support/TestApiConsistency.cs"
]
}
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
}
},
"net451": {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests.Suggest/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/project.json b/src/Lucene.Net.Tests.Suggest/project.json
index eaaf8f2..98e8c2b 100644
--- a/src/Lucene.Net.Tests.Suggest/project.json
+++ b/src/Lucene.Net.Tests.Suggest/project.json
@@ -23,12 +23,6 @@
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50",
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
- },
"buildOptions": {
"debugType": "portable",
"define": [ "NETSTANDARD" ],
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c2bf370f/src/Lucene.Net.Tests/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json
index ccdeed7..c8b25ae 100644
--- a/src/Lucene.Net.Tests/project.json
+++ b/src/Lucene.Net.Tests/project.json
@@ -76,12 +76,6 @@
]
}
},
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
- },
"imports": "dnxcore50"
},
"net451": {
[2/2] lucenenet git commit: build\build.ps1: Added tasks for
InstallSDK and Restore to ensure dependencies are available during testing on
TeamCity. Reversed order of tests so .NET Core runs first (since it is most
likely to fail).
Posted by ni...@apache.org.
build\build.ps1: Added tasks for InstallSDK and Restore to ensure dependencies are available during testing on TeamCity. Reversed order of tests so .NET Core runs first (since it is most likely to fail).
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/41c6191f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/41c6191f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/41c6191f
Branch: refs/heads/master
Commit: 41c6191fdf9bb21f1c241ae757bee57d4b92fab3
Parents: c2bf370
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed May 10 06:10:54 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed May 10 06:10:54 2017 +0700
----------------------------------------------------------------------
build/build.ps1 | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/41c6191f/build/build.ps1
----------------------------------------------------------------------
diff --git a/build/build.ps1 b/build/build.ps1
index 0db9bc1..d0cd4e1 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -43,7 +43,7 @@ properties {
[string]$product_name = "Lucene.Net"
#test paramters
- [string]$frameworks_to_test = "net451,netcoreapp1.0"
+ [string]$frameworks_to_test = "netcoreapp1.0,net451"
[string]$where = ""
}
@@ -56,7 +56,7 @@ task Clean -description "This task cleans up the build directory" {
Get-ChildItem $base_directory -Include *.bak -Recurse | foreach ($_) {Remove-Item $_.FullName}
}
-task Init -description "This task makes sure the build environment is correctly setup" {
+task InstallSDK -description "This task makes sure the correct SDK version is installed" {
& where.exe dotnet.exe
$sdkVersion = ""
@@ -77,7 +77,9 @@ task Init -description "This task makes sure the build environment is correctly
if ($LASTEXITCODE -ne 0) {
throw "Could not find dotnet CLI in PATH. Please install the .NET Core 1.1 SDK version 1.0.0-preview2-1-003177."
}
+}
+task Init -depends InstallSDK -description "This task makes sure the build environment is correctly setup" {
#Update TeamCity or MyGet with packageVersion
Write-Output "##teamcity[buildNumber '$packageVersion']"
Write-Output "##myget[buildNumber '$packageVersion']"
@@ -98,6 +100,12 @@ task Init -description "This task makes sure the build environment is correctly
Ensure-Directory-Exists "$release_directory"
}
+task Restore -description "This task restores the dependencies" {
+ Exec {
+ & dotnet.exe restore $base_directory
+ }
+}
+
task Compile -depends Clean, Init -description "This task compiles the solution" {
try {
pushd $base_directory
@@ -109,9 +117,7 @@ task Compile -depends Clean, Init -description "This task compiles the solution"
Prepare-For-Build $projects
}
- Exec {
- & dotnet.exe restore $base_directory
- }
+ Invoke-Task Restore
Build-Assemblies $projects
@@ -139,7 +145,7 @@ task Pack -depends Compile -description "This task creates the NuGet packages" {
}
}
-task Test -description "This task runs the tests" {
+task Test -depends InstallSDK, Restore -description "This task runs the tests" {
Write-Host "Running tests..." -ForegroundColor DarkCyan
pushd $base_directory