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 "$<" "$@"

View File

@ -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:

View File

@ -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:

View File

@ -1 +1 @@
573c53e6293cd2939965dca9b67122cfc812637e
d4bf30694cd360d7152e64c43a9e4838e71f2c0c

View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.6.0.243/dea2155"
#define FULL_VERSION "Stable 4.6.0.245/746756c"

Binary file not shown.

View File

@ -1 +1 @@
31076442ea3698ce3dd1e125cd282082aded321b
56ea4b55d1668de5427cf107eaeb0953c60c28cc

Binary file not shown.

View File

@ -1 +1 @@
44c1885888fd7975851a38137e1f2359ae94fca4
31991cd52568f4081252056455dbb066afbf7ccf

Binary file not shown.

View File

@ -1 +1 @@
dc37607d81f1efd35350e3cc40a041fbfe84ad90
c749ad09d3c1fca63a6d5f2a9d489b4e75f219e8

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mono 4.6.0\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2016-09-09 07:01+0000\n"
"POT-Creation-Date: 2016-09-14 09:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
b3da446b8368a85d94c695fbb8aca0d2fa9f19a1
9098f30cedafc6c19c09061033e3210b47cd21ec