THRIFT-4350: enable dotnet-2.0.0-sdk in ubuntu xenial, update netcore
projects, get them running with make cross
Client: netcore
This closes #1379
diff --git a/test/netcore/Makefile.am b/test/netcore/Makefile.am
index 21a6e7d..e84a57a 100644
--- a/test/netcore/Makefile.am
+++ b/test/netcore/Makefile.am
@@ -23,13 +23,6 @@
GENDIR = ThriftTest/gen-netcore
-# Due to a known issue with "dotnet restore" the Thrift.dll dependency cannot be resolved from cmdline.
-# The problem does NOT affect Visual Studio builds, only cmdline.
-# - For details see https://github.com/dotnet/cli/issues/3199 and related tickets.
-# - Workaround is to temporarily copy the Thrift project into the solution
-COPYCMD = cp -u -p -r
-
-
THRIFTCODE = \
ThriftTest/TestClient.cs \
ThriftTest/TestServer.cs \
@@ -37,32 +30,29 @@
ThriftTest/Program.cs
all-local: \
- ThriftTest.exe
+ ThriftTest/stage/ThriftTest.dll
-ThriftTest.exe: $(THRIFTCODE)
+ThriftTest/stage/ThriftTest.dll: $(THRIFTCODE)
$(MKDIR_P) $(GENDIR)
$(THRIFT) -gen netcore:wcf -r -out $(GENDIR) $(top_srcdir)/test/ThriftTest.thrift
- $(MKDIR_P) ./Thrift
- $(COPYCMD) $(top_srcdir)/lib/netcore/Thrift/* ./Thrift
$(DOTNETCORE) --info
$(DOTNETCORE) restore
- $(DOTNETCORE) build **/*/project.json -r win10-x64
- $(DOTNETCORE) build **/*/project.json -r osx.10.11-x64
- $(DOTNETCORE) build **/*/project.json -r ubuntu.16.04-x64
+ $(DOTNETCORE) build
+
+precross: \
+ ThriftTest/stage/ThriftTest.dll
clean-local:
$(RM) ThriftTest.exe
$(RM) -r $(GENDIR)
$(RM) -r ThriftTest/bin
$(RM) -r ThriftTest/obj
- $(RM) -r Thrift
EXTRA_DIST = \
$(THRIFTCODE) \
- global.json \
- ThriftTest/project.json \
- ThriftTest/ThriftTest.sln \
- ThriftTest/ThriftTest.xproj \
+ ThriftTest.sln \
+ ThriftTest/ThriftTest.csproj \
build.cmd \
- build.sh
+ build.sh \
+ README.md