Merge pull request #4219 from marek-safar/corert-bump
authorMarek Safar <marek.safar@gmail.com>
Wed, 11 Jan 2017 13:32:31 +0000 (14:32 +0100)
committerGitHub <noreply@github.com>
Wed, 11 Jan 2017 13:32:31 +0000 (14:32 +0100)
Update ValueTuple implementation

1  2 
mcs/class/corlib/Makefile

index e466678a17f65294bab12f26c131e732dc731aba,d1bcd6a9f533af2b2531c98ec987ea1637d35251..a261d0356b6ac0fc8a6217dc81971f53d5ad38f3
@@@ -20,12 -20,10 +20,14 @@@ $(error Unknown framework version
  endif
  endif
  
 +ifeq ($(PROFILE),build)
 +CSC_RUNTIME_FLAGS=--profile=aot:output=$(topdir)/class/lib/build/csc.aotprofile
 +endif
 +
  RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
- RESX_RESOURCE_STRING = ../../../external/corefx/src/System.ValueTuple/src/Resources/Strings.resx
+ RESX_RESOURCE_STRING = \
+       ../../../external/corert/src/System.Private.CoreLib/src/Resources/Strings.resx
  
  LIBRARY_COMPILE = $(BOOT_COMPILE)
  LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)