Commit Graph

66 Commits

Author SHA1 Message Date
Corentin Le Molgat
e8e0cf0425 Make:dotnet: Add few more *_DIR variables 2020-03-05 15:37:41 +01:00
Corentin Le Molgat
c81dd15a15 Make:dotnet: add variable to csproj.in
Change needed since CMake build out of the source tree
i.e. path are differents
2020-03-05 15:19:55 +01:00
Corentin Le Molgat
4a2e02637b Make: Copy orLogo.png to ${SRC_DIR}/ortools/dotnet
needed for CMake since it will use ${BUILD_DIR}/dotnet
2020-03-04 14:34:33 +01:00
Corentin Le Molgat
595660d93d .Net: move snk kay to ortools/dotnet
to get relative path .. from project,
which is needed for CMake compatibility
2020-03-02 11:01:36 +01:00
Corentin Le Molgat
5bfbcd5b6c Fix F# build 2020-02-14 15:28:42 +01:00
Corentin Le Molgat
7883c52f87 .Net: keep target file only for net45
.Net core automatically copy the  runtime native files without
the help of this target file...
2020-02-04 08:58:29 +01:00
Corentin Le Molgat
592b286a92 .Net: disable symbols for runtime
There is no managed .dll BTW
2020-01-31 17:06:09 +01:00
Corentin Le Molgat
206a72b7f8 Update .Net windows runtime management 2020-01-31 16:07:42 +01:00
Corentin Le Molgat
8616733866 Fix .Net Framework 4.5.2 support on windows 2020-01-30 16:51:14 +01:00
Corentin Le Molgat
abba070522 .Net: Generate .snupkg 2020-01-28 17:34:55 +01:00
Mizux Seiha
d69c8cf041 Bump Protobuf 3.10.0 -> 3.11.2 2020-01-09 22:02:43 +01:00
Corentin Le Molgat
ca351f503c .Net: Allow RollForward for CreateSigningKey
i.e. If a user has only >netCore SDK 3.0 installed allow .netcoreapp2.0 to "fallback" to .netcoreapp3.0

ref: https://github.com/dotnet/docs/issues/12237
2020-01-08 16:28:28 +01:00
Laurent Perron
21a2219a90 remove warning in nuget packaging, use local icon instead of icon url 2019-11-19 09:54:40 -08:00
Mizux Seiha
d001017e9e .Net Fix signing issue (fix #1421) 2019-11-19 11:42:24 +01:00
Laurent Perron
d2fc853b1f fix dotnet on windows 2019-10-14 11:05:58 +02:00
Laurent Perron
e04a608039 add support for netstandard2.1 2019-10-13 05:12:43 +02:00
Laurent Perron
73450ebebe bump protobuf to 3.10.0 2019-10-11 11:39:43 +02:00
Laurent Perron
f66e52cc71 remove delay signing 2019-09-30 16:34:08 -04:00
Laurent Perron
3ea4cde63e re-incorporate proto files in the main assembly 2019-09-18 10:54:22 +02:00
Laurent Perron
f1c46101af fix nuget dependencies 2019-09-13 21:22:35 +02:00
Peter Bruch
a03f7f849e Remove runtime identifier in native dll name and rely on the runtime to find the appropriate library at runtime.
Removed lib and runtime suffix in DllImport (PInvoke).
2019-09-04 18:49:52 +02:00
Peter Bruch
f9ee91c652 Improved .net build and package.
* Produce 2 types of Nuget packages:
  1. One managed package: Google.OrTools with the managed binary for Swig C# wrapper and Protobuf C# classes.
  2. 3 unmanaged packages: Google.OrTools.runtime.{win-x64, linux-x64, osx-x64} with the native binaries for Swig C++ Wrapper and OrTools for each platform.
* Simplified/unified .net projects (csproj files).
* Added symbols (pdb) file to Nuget package for managed binaries.
* Added documentation (xml files) to Nuget package for managed binaries.
* Added target framework net452 in order to provide support for consumers using .net framework >= 4.5.2 (on windows only).
* Added build target for .net framework consumers that copies native binaries of OrTools to build output directory (in order to prevent "FileNotFoundException" for Google.OrTools.runtime.win-x64.dll).
* MakeFile: added explicit build and packaging arguments for "Release", "x64", "include-symbols".
* Removed producing of reference assembly approach.
* Removed Protobuf files (.proto) from nuget package in order to prevent copying them into Nuget consumers project.

Disable CS1591 "Missing XML comment for publicly visible type or member" (Swig doesn't generate documentation).
2019-09-04 16:18:06 +02:00
Laurent Perron
2c67e00f3a fix 2019-08-05 13:37:22 -07:00
Laurent Perron
f6b597996f tentative hack for CentOs and dotnet 2019-07-03 13:40:24 +02:00
Laurent Perron
03b04af587 bump dotnet to 2.2 in linux docker files, bump protobuf to 3.8.0 in dotnet core runtimes 2019-07-03 11:32:27 +02:00
Laurent Perron
33c8d17edc fix F# test 2019-05-15 22:58:38 +02:00
Laurent Perron
a70ed70563 remove the need for IntArrayHelper.cs; support conversion from type[][] and type[,] to std::vector<std::vector<type>> in C# 2019-05-06 12:55:30 +02:00
Corentin Le Molgat
011cce9dd1 .Net: Add .proto to Google.OrTools (Fix #1190) 2019-05-06 09:16:35 +02:00
Corentin Le Molgat
a553317bbf C#: Bump protobuf to 3.7.0 2019-05-03 16:41:26 +02:00
Corentin Le Molgat
c72cb46350 fix missing nuget properties (Fix #990) 2019-02-20 10:55:19 +01:00
Corentin Le Molgat
dbef712477 .Net: Add LinearSolverTests.cs
- remove duplicate testlp.cs and Google.OrTools.Tests
2019-01-30 16:08:36 +01:00
Laurent Perron
b5dcf54a27 fix F# after move to typed enums 2018-12-11 18:59:26 +01:00
Laurent Perron
fedf3d4ff4 revamp and simplify swig support, force typed enums for C# and Java for all except the constraint_solver/routing module; port examples; Fix SAT on very large problems 2018-12-11 17:03:03 +01:00
Corentin Le Molgat
b027e57e95 dotnet: Remove reference to dotnet release command
- Currently not implemented...

Add abseil patch

- Add patches/absl-config.cmake

Makefile: Add abseil-cpp on unix

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

Makefile: Add abseil-cpp on windows

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

CMake: Add abseil-cpp

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

port to absl: C++ Part

- Fix warning with the use of ABSL_MUST_USE_RESULT
  > The macro must appear as the very first part of a function
    declaration or definition:
    ...
    Note: past advice was to place the macro after the argument list.
  src: dependencies/sources/abseil-cpp-master/absl/base/attributes.h:418
- Rename enum after windows clash
- Remove non compact table constraints
- Change index type from int64 to int in routing library
- Fix file_nonport compilation on windows
- Fix another naming conflict with windows (NO_ERROR is a macro)
- Cleanup hash containers; work on sat internals
- Add optional_boolean sub-proto

Sync cpp examples with internal code
- reenable issue173 after reducing number of loops

port to absl: Python Part

- Add back cp_model.INT32_MIN|MAX for examples

Update Python examples

- Add random_tsp.py
- Run words_square example
- Run magic_square in python tests

port to absl: Java Part

- Fix compilation of the new routing parameters in java
- Protect some code from SWIG parsing

Update Java Examples

port to absl: .Net Part

Update .Net examples

work on sat internals; Add C++ CP-SAT CpModelBuilder API; update sample code and recipes to use the new API; sync with internal code

Remove VS 2015 in Appveyor-CI

- abseil-cpp does not support VS 2015...

improve tables

upgrade C++ sat examples to use the new API; work on sat internals

update license dates

rewrite jobshop_ft06_distance.py to use the CP-SAT solver

rename last example

revert last commit

more work on SAT internals

fix
2018-11-30 14:48:55 +01:00
Laurent Perron
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Corentin Le Molgat
96f95aebf9 dotnet: Remove reference to dotnet release command
- Currently not implemented...
2018-10-31 16:18:18 +01:00
Corentin Le Molgat
26316228e7 dotnet: Move runtime.{rid} as a suffix... (#744)
Change runtime.{rid}.Google.OrTools -> Google.OrTools.runtime.{rid}

note: nuget support team didn't want to give us runtime.{rid}.Google* reserved prefix
beside the fact they use this naming convention in the dotnetframework and give it to
"quamotion" company too
2018-10-05 16:47:41 +02:00
Corentin Le Molgat
d2031c2d48 Centos dotnet fix 2018-09-17 15:43:10 +02:00
Corentin Le Molgat
5da668b0a7 dotnet: EnableDefaultCompileItems -> EnableDefaultItems in .proj 2018-09-14 11:19:38 +02:00
Corentin Le Molgat
f7fde3bd25 dotnet: Move CreateSigningKey to ortools/dotnet (Fix #824) 2018-09-11 15:05:03 +02:00
Corentin Le Molgat
76dd91d211 dotnet: bump dependency protobuf 3.5.1 -> 3.6.1 2018-09-11 11:09:45 +02:00
Corentin Le Molgat
19b8b6d3b5 dotnet: Fix Google.OrTools.FSharp.Tests 2018-08-31 13:35:12 +02:00
Corentin Le Molgat
9d8301d3d0 dotnet: Rework Xunit Tests 2018-08-30 17:37:46 +02:00
Corentin Le Molgat
f3a58c1c84 dotnet: Improve documentation
- Add documentation on build process
2018-08-30 11:58:47 +02:00
Corentin Le Molgat
62cbe9a228 dotnet: Full Rework
- Create native project runtime.{rid}.Google.OrTools
  - follow the microsoft convention e.g.:
  https://www.nuget.org/packages/Microsoft.NETCore.App/
  https://www.nuget.org/packages/runtime.linux-x64.Microsoft.NETCore.App/
- Target `make_dotnet` targets local nupkg instead of dll.
- Use 4096 RSA key for or-tools.snk
- Clean nuget cache in `clean_dotnet` recipe

Refactor:
- Move cs files to ortools/*/csharp
- Move dotnet project to ortools/dotnet/Google.OrTools
- Move example generation to temp_dotnet
  - Avoid to mess the `BIN_DIR`
- Rework Google.OrTools.FSharp

Cleanup:
- Remove deps to netfx.props since we only support:
  netstandard2.0 TFM and netcoreapp2.1 Runtime TFM
- Remove OrTools.nuspec.in
  -> use newly added properties to .csproj format
- Remove of ortools/dotnet/OrTools project
  - replaced by ortools/dotnet/Google.OrTools
- Remove provided protobuf.dll.
  - Automatically retrieved from nuget.org

Misc:
- Add **/*.csproj to gitignore
- Add **/runtime.json to gitignore

- dotnet: Makefile windows fix
  - make.exe doesn't support `else ifeq`
2018-08-30 11:58:47 +02:00
Corentin Le Molgat
b43055c128 dotnet: Fix unused variable warnings 2018-08-29 16:56:25 +02:00
Laurent Perron
7586085328 add DecisionStrategy to sat java/C# API 2018-08-09 17:09:59 -07:00
Laurent Perron
fb309a2527 [API Change] Remove support for optional int vars in reservoir, use parallel array of boolean literals to indicate presence 2018-08-01 10:17:48 -07:00
Laurent Perron
4da6c790c8 fix crash in .NET sat layer 2018-07-30 15:45:48 -07:00
Corentin Le Molgat
e1fd0437b9 dotnet: use netcoreap2.0 when possible 2018-07-17 17:11:25 +02:00