From e4d5001206fde605a255669079c50b89e5f32324 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Fri, 29 Jul 2016 10:43:49 -0700 Subject: [PATCH 1/5] Port fixes for CoreCLR #5837, 6016 and 6460 --- src/jit/ee_il_dll.cpp | 31 +++++++++++++++++++++++++++---- src/pal/src/exception/signal.cpp | 6 +++--- src/pal/src/include/pal/context.h | 2 +- src/vm/appdomain.cpp | 4 ++++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/jit/ee_il_dll.cpp b/src/jit/ee_il_dll.cpp index b97c10cca47e..e9b64fbda763 100755 --- a/src/jit/ee_il_dll.cpp +++ b/src/jit/ee_il_dll.cpp @@ -72,10 +72,33 @@ void __stdcall jitStartup(ICorJitHost* jitHost) #else if (jitstdout == nullptr) { - int jitstdoutFd = _dup(_fileno(procstdout())); - _setmode(jitstdoutFd, _O_TEXT); - jitstdout = _fdopen(jitstdoutFd, "w"); - assert(jitstdout != nullptr); + int stdoutFd = _fileno(procstdout()); + // Check fileno error output(s) -1 may overlap with errno result + // but is included for completness. + // We want to detect the case where the initial handle is null + // or bogus and avoid making further calls. + if ((stdoutFd != -1) && (stdoutFd != -2) && (errno != EINVAL)) + { + int jitstdoutFd = _dup(_fileno(procstdout())); + // Check the error status returned by dup. + if (jitstdoutFd != -1) + { + _setmode(jitstdoutFd, _O_TEXT); + jitstdout = _fdopen(jitstdoutFd, "w"); + assert(jitstdout != nullptr); + + // Prevent the FILE* from buffering its output in order to avoid calls to + // `fflush()` throughout the code. + setvbuf(jitstdout, nullptr, _IONBF, 0); + } + } + } + + // If jitstdout is still null, fallback to whatever procstdout() was + // initially set to. + if (jitstdout == nullptr) + { + jitstdout = procstdout(); } #endif diff --git a/src/pal/src/exception/signal.cpp b/src/pal/src/exception/signal.cpp index dc26ee4baca0..649d4e2a6f0e 100644 --- a/src/pal/src/exception/signal.cpp +++ b/src/pal/src/exception/signal.cpp @@ -464,10 +464,10 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE)) { g_activationFunction(&winContext); - } - // Activation function may have modified the context, so update it. - CONTEXTToNativeContext(&winContext, ucontext); + // Activation function may have modified the context, so update it. + CONTEXTToNativeContext(&winContext, ucontext); + } } else if (g_previous_activation.sa_sigaction != NULL) { diff --git a/src/pal/src/include/pal/context.h b/src/pal/src/include/pal/context.h index 7591703369ed..6f1b3fe7341e 100644 --- a/src/pal/src/include/pal/context.h +++ b/src/pal/src/include/pal/context.h @@ -111,7 +111,7 @@ typedef ucontext_t native_context_t; #define MCREG_Rax(mc) ((mc).gregs[REG_RAX]) #define MCREG_Rip(mc) ((mc).gregs[REG_RIP]) #define MCREG_Rsp(mc) ((mc).gregs[REG_RSP]) -#define MCREG_SegCs(mc) ((mc).gregs[REG_CSGSFS]) +#define MCREG_SegCs(mc) (*(WORD*)&((mc).gregs[REG_CSGSFS])) #define MCREG_R8(mc) ((mc).gregs[REG_R8]) #define MCREG_R9(mc) ((mc).gregs[REG_R9]) #define MCREG_R10(mc) ((mc).gregs[REG_R10]) diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 53c68776d383..1222a813ea6c 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -14322,6 +14322,10 @@ HRESULT RuntimeInvokeHostAssemblyResolver(INT_PTR pManagedAssemblyLoadContextToB // Make the call _gcRefs.oRefLoadedAssembly = (ASSEMBLYREF) methLoadAssembly.Call_RetOBJECTREF(args); + if (_gcRefs.oRefLoadedAssembly != NULL) + { + fResolvedAssembly = true; + } } if (fResolvedAssembly && !fResolvedAssemblyViaTPALoadContext) From ead23e5fcdebfef5d42870e58338c07779437ae4 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Thu, 4 Aug 2016 12:26:28 -0700 Subject: [PATCH 2/5] Update Patch versions for CoreCLR and JIT packages to 1.0.3 --- src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj | 2 +- .../Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj | 2 +- .../fedora/23/Microsoft.NETCore.Jit.pkgproj | 2 +- .../opensuse/13.2/Microsoft.NETCore.Jit.pkgproj | 2 +- .../Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj | 2 +- .../Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj | 2 +- .../ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj | 2 +- .../ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj | 2 +- .../Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj | 2 +- .../Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- .../win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index 3317626000be..3df74f58b342 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true true x64;x86;arm diff --git a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj index 8e38632fba8d..bc14c37a2da7 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true debian.8-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj index 18d9dffbac43..2d9eb0cefa5d 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true fedora.23-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj index dfc3ba13bdb3..915a0e4e6477 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true opensuse.13.2-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj index c395aafba766..a0a20ba837c4 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true osx.10.10-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj index e67ae361feca..89cd92586af9 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true rhel.7-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj index 1035fde4e501..7f06724286f7 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.14.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj index d3d36bf99eaf..38633c6b69e5 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.16.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj index 449df7639131..aebaea8bf373 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true win7 win8 diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 310f7f160005..c198c5353e5b 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true true x64;x86;arm diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 2b52dc6433eb..ad2d72330b67 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true debian.8-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index c56905aa9c03..5cc197df60d9 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true fedora.23-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 227639d46f12..a380ad209ef0 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true opensuse.13.2-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index fd1f09bcfcd0..6a76b2a65974 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true osx.10.10-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 1628349ca4c1..0be890d6dd07 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true rhel.7-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 006223c88fa5..eff193ef56ec 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.14.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 71674b2f4ba3..667b5a15e1dc 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.16.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index ecbb80d96e51..2f2f1af39d7d 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true win7 win8 From 7378b3d7d0b128582d52bdbc4501634009e2fe4f Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Thu, 4 Aug 2016 12:54:22 -0700 Subject: [PATCH 3/5] Update ILAsm and ILDasm package version to 1.0.3 since they depend upon CoreCLR package --- .../Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../debian/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../fedora/23/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../rhel/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../debian/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../fedora/23/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../osx/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../rhel/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../win/Microsoft.NETCore.ILDAsm.pkgproj | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index 92ea9933cd07..a18f7ac63df4 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true true x64;x86;arm diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj index eb19dd18f4a3..7914ae7dae02 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true debian.8-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj index df59a839d5fc..02727b73f3f8 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true fedora.23-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj index dd38e0852329..7a4834920414 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true opensuse.13.2-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj index 9fdbc204da73..b3ade2638096 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true osx.10.10-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj index 5061870288b0..2490154aeccd 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true rhel.7-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj index 41bbacd9d4bb..1919ba6cbe25 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.14.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj index b06cb2dcff5f..524999384273 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.16.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj index a882bf6748e4..700346b6d195 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true win7 win8 diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 4dc69dc4bb7a..cf564dfbee8a 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true true x64;x86;arm diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj index afe28338d058..8458534498ce 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true debian.8-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj index 49bd4488e884..bd7ea38b3cc4 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true fedora.23-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj index bc04cc1f9b20..b95a2836cbc2 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true opensuse.13.2-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj index db2f1abb740d..d394d7465d5b 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true osx.10.10-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj index dce97c8235fd..2aa8bbd4b037 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true rhel.7-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj index d9b21796f59e..505d61d59990 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.14.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj index 038b26f2fa71..8a692e9550ac 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true ubuntu.16.04-$(PackagePlatform) diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj index 200723e01e69..e575ecf38ae4 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,7 @@ - 1.0.2 + 1.0.3 true win7 win8 From f1ca50544449b5d84d5af756626e3627020d2477 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Fri, 5 Aug 2016 13:22:28 -0700 Subject: [PATCH 4/5] Switch pre-release label to servicing --- dir.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.props b/dir.props index 955f96b62fd7..bc625b16a108 100644 --- a/dir.props +++ b/dir.props @@ -138,7 +138,7 @@ - rc3 + servicing $(SourceDir).nuget/descriptions.json $(SourceDir).nuget/dotnet_library_license.txt $(SourceDir).nuget/ThirdPartyNotices.txt From 97ad48a4f5c370c2dc016b5456917d16d3be28f8 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Sun, 7 Aug 2016 08:20:45 -0700 Subject: [PATCH 5/5] Port CoreCLR PR 6052 as part of fix for #6460 --- src/jit/ee_il_dll.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jit/ee_il_dll.cpp b/src/jit/ee_il_dll.cpp index e9b64fbda763..947b090d05d1 100755 --- a/src/jit/ee_il_dll.cpp +++ b/src/jit/ee_il_dll.cpp @@ -23,6 +23,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX #if !defined(PLATFORM_UNIX) #include // For _dup, _setmode #include // For _O_TEXT +#include // For EINVAL #endif /*****************************************************************************/