From a306c5803aff32304b11436bda1c7630adb4cd18 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 14 Sep 2016 09:26:12 +0000 Subject: [PATCH] Imported Upstream version 4.6.0.245 Former-commit-id: 1985000beed41a2cae92ee274f902a9c593e6c11 --- .../Microsoft.NuGet.Build.Tasks/Makefile | 13 ++++++++++--- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 14 files changed, 19 insertions(+), 12 deletions(-) diff --git a/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile b/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile index e3561d4fb4..ceac5cfb33 100644 --- a/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile +++ b/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile @@ -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 "$<" "$@" diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index ebba9e0bc1..cddc2dfbe6 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.0.243/dea2155\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.0.245/746756c\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index ebba9e0bc1..cddc2dfbe6 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.0.243/dea2155\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.0.245/746756c\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 4c88e3aeeb..24b9d6a55a 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -573c53e6293cd2939965dca9b67122cfc812637e \ No newline at end of file +d4bf30694cd360d7152e64c43a9e4838e71f2c0c \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 8e54e10ae6..a0c31789a6 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.6.0.243/dea2155" +#define FULL_VERSION "Stable 4.6.0.245/746756c" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 0315e42c9106568936f10cec1c896eac933bc6aa..c36f8cf8bb1c22f74774add046534815f76adc34 100644 GIT binary patch delta 21 ccmbQIHBW296D|%z69ofHD?`i8Z@7%O08m{9t^fc4 delta 21 ccmbQIHBW296D|$|O9caSD+9yLZ@7%O08m2)rvLx| diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index b7e5d7dd73..f29ee6565a 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -31076442ea3698ce3dd1e125cd282082aded321b \ No newline at end of file +56ea4b55d1668de5427cf107eaeb0953c60c28cc \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 9dd2548249585c2aaedbd8a7f7e8d0a882f26eaf..c4210ff5026ad5a8118962871e3c953ff25f32d9 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et_iGqQpm7(QkQ^hHA09V}x\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 96a19722da26cdeeca36ba55eed0415ee735106f..1426ae9b4e7d07d36e9ccc0e6676aef056389fe5 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AI1Eh`3@oh-EjKGpThR^xZ7K+( delta 23 fcmX@Po8{zgmJO2AI1DTm49u+z3^yxIThR^xZ4d~Y diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index b50cd445c1..7bdabd08d9 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -b3da446b8368a85d94c695fbb8aca0d2fa9f19a1 \ No newline at end of file +9098f30cedafc6c19c09061033e3210b47cd21ec \ No newline at end of file