Compare commits

..
Author SHA1 Message Date
Mikayla Hutchinson 746756c301 Merge pull request #3533 from mhutch/buildtasks-resources
Revert "[xbuild] Use RESOURCE_DEFS to compile resx"
2016-09-08 01:19:08 -04:00
Mikayla Hutchinson 97ebf484bc Revert "[xbuild] Use RESOURCE_DEFS to compile resx"
Mono.4.6.x doesn't support RESOURCE_DEFS

This reverts commit 4a6176c71e.
2016-09-07 21:45:13 -04:00
+10 -3
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 "$<" "$@"