diff --git a/makefiles/Makefile.dotnet.mk b/makefiles/Makefile.dotnet.mk index ef3ababfd6..b06f18e718 100644 --- a/makefiles/Makefile.dotnet.mk +++ b/makefiles/Makefile.dotnet.mk @@ -73,7 +73,7 @@ OR_TOOLS_NATIVE_LIB := google-ortools-native OR_TOOLS_FSHARP_ASSEMBLY_NAME := $(OR_TOOLS_ASSEMBLY_NAME).FSharp OR_TOOLS_FSHARP_TESTS_ASSEMBLY_NAME := $(OR_TOOLS_ASSEMBLY_NAME).FSharp.Tests DOTNET_ORTOOLS_NUPKG := $(PACKAGE_DIR)/$(OR_TOOLS_ASSEMBLY_NAME).$(OR_TOOLS_VERSION).nupkg -DOTNET_ORTOOLS_NATIVE_NUPKG := $(PACKAGE_DIR)/$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).$(OR_TOOLS_VERSION).nupkg +DOTNET_ORTOOLS_RUNTIME_NUPKG := $(PACKAGE_DIR)/$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).$(OR_TOOLS_VERSION).nupkg DOTNET_ORTOOLS_FSHARP_NUPKG := $(PACKAGE_DIR)/$(OR_TOOLS_FSHARP_ASSEMBLY_NAME).$(OR_TOOLS_VERSION).nupkg NUGET_PACK_ARGS := -c Release DOTNET_BUILD_ARGS := -c Release /p:Platform=x64 @@ -82,7 +82,7 @@ DOTNET_BUILD_ARGS := -c Release /p:Platform=x64 ## RUNTIME CSHARP ## ###################### .PHONY: dotnet_runtime # Build C# runtime OR-Tools -dotnet_runtime: $(DOTNET_ORTOOLS_NATIVE_NUPKG) +dotnet_runtime: $(DOTNET_ORTOOLS_RUNTIME_NUPKG) ################################################################### # Protobuf: generate C# cs files from proto specification files. ## @@ -340,14 +340,14 @@ $(SRC_DIR)/ortools/dotnet/$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)/$(OR_TOOLS_RUNTIME_A $(SED) -e "s/@PROJECT_VERSION@/$(OR_TOOLS_VERSION)/" \ ortools$Sdotnet$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).csproj.in \ > ortools$Sdotnet$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).csproj - -$(DOTNET_ORTOOLS_NATIVE_NUPKG): \ $(SED) -i -e 's/@DOTNET_PACKAGES_DIR@/..\/..\/..\/packages/' \ ortools$Sdotnet$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).csproj $(SED) -i -e 's/@native@/..\/..\/..\/lib\/$(OR_TOOLS_NATIVE_LIB).$(SWIG_DOTNET_LIB_SUFFIX)/' \ ortools$Sdotnet$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).csproj $(SED) -i -e 's/@ortools@/..\/..\/..\/lib\/$(LIB_PREFIX)ortools.$L;..\/..\/..\/dependencies\/install\/lib*\/*.$L*/' \ ortools$Sdotnet$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME)$S$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME).csproj + +$(DOTNET_ORTOOLS_RUNTIME_NUPKG): \ $(LIB_DIR)/$(OR_TOOLS_NATIVE_LIB).$(SWIG_DOTNET_LIB_SUFFIX) \ $(SRC_DIR)/ortools/dotnet/Directory.Build.props \ $(SRC_DIR)/ortools/dotnet/orLogo.png \ @@ -397,7 +397,7 @@ $(SRC_DIR)/ortools/dotnet/$(OR_TOOLS_ASSEMBLY_NAME)/$(OR_TOOLS_ASSEMBLY_NAME).cs # Pack managed project nuget $(DOTNET_ORTOOLS_NUPKG): \ - $(DOTNET_ORTOOLS_NATIVE_NUPKG) \ + $(DOTNET_ORTOOLS_RUNTIME_NUPKG) \ $(SRC_DIR)/ortools/dotnet/$(OR_TOOLS_ASSEMBLY_NAME)/$(OR_TOOLS_ASSEMBLY_NAME).csproj \ | $(DOTNET_ORTOOLS_SNK) $(PACKAGE_DIR) "$(DOTNET_BIN)" build $(DOTNET_BUILD_ARGS) ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME) @@ -801,7 +801,7 @@ detect_dotnet: @echo SWIG_DOTNET_LIB_SUFFIX = $(SWIG_DOTNET_LIB_SUFFIX) @echo OR_TOOLS_NATIVE_LIB = $(OR_TOOLS_NATIVE_LIB) @echo OR_TOOLS_RUNTIME_ASSEMBLY_NAME =$(OR_TOOLS_RUNTIME_ASSEMBLY_NAME) - @echo DOTNET_ORTOOLS_NATIVE_NUPKG = $(DOTNET_ORTOOLS_NATIVE_NUPKG) + @echo DOTNET_ORTOOLS_RUNTIME_NUPKG = $(DOTNET_ORTOOLS_RUNTIME_NUPKG) @echo OR_TOOLS_ASSEMBLY_NAME = $(OR_TOOLS_ASSEMBLY_NAME) @echo DOTNET_ORTOOLS_NUPKG = $(DOTNET_ORTOOLS_NUPKG) @echo OR_TOOLS_FSHARP_ASSEMBLY_NAME = $(OR_TOOLS_FSHARP_ASSEMBLY_NAME)