Imported Upstream version 4.6.0.245

Former-commit-id: 1985000beed41a2cae92ee274f902a9c593e6c11
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-14 09:26:12 +00:00
parent 3cc9601fd9
commit a306c5803a
14 changed files with 19 additions and 12 deletions

View File

@@ -14,8 +14,6 @@ LIBRARY_INSTALL_DIR = $(NUGET_BUILDTASKS_TARGETS_DIR)
KEY_FILE = $(NUGET_BUILDTASKS_REPO_DIR)/build/PublicKey.snk
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE)
RESOURCE_DEFS = Microsoft.NuGet.Build.Tasks.Strings,$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx
LIB_REFS = $(PARENT_PROFILE)System \
$(PARENT_PROFILE)System.Core \
$(PARENT_PROFILE)System.Data \
@@ -27,9 +25,18 @@ LIB_REFS = $(PARENT_PROFILE)System \
LIB_MCS_FLAGS = \
-nowarn:3021 \
$(SIGN_FLAGS)
$(SIGN_FLAGS) \
-resource:Microsoft.NuGet.Build.Tasks.Strings.resources
CLEAN_FILES = Microsoft.NuGet.Build.Tasks.Strings.resources
EXTRA_DISTFILES = \
$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx \
$(NUGET_BUILDTASKS_REPO_DIR)/build/PublicKey.snk
include ../../build/library.make
$(build_lib): Microsoft.NuGet.Build.Tasks.Strings.resources
Microsoft.NuGet.Build.Tasks.Strings.resources: $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx
MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_4_x/resgen.exe "$<" "$@"