From 47152b339203fe87070b45ee6f1b465ac2dc4f21 Mon Sep 17 00:00:00 2001
From: Joel Hendrix <jhendrix@microsoft.com>
Date: Tue, 4 Aug 2015 14:54:40 -0700
Subject: Title:

   Binplace xplat binaries during official builds

Change Description:

   This is the initial implementation of having our official devdiv razzle builds binplace non-Windows xplat binaries.

   For now xplat binaries are binplaced only during official builds; this can be overridden by specifying /p:GetAllXPlatBinaries=true.  Binplacing is limited to CoreClr builds on amd64 as that's all we build for xplat.
   xplat binaries are pulled directly from Azure; if this becomes problematic we can look at having an internal cache.
   Binaries are pulled from Azure using a checked in copy of azcopy.exe.  For now I have embedded the source key; this will be removed in the future in favor of using a shared access signature.
   At present the build number for the xplat bits is fixed; this will be removed in a future change.
   The binaries are in zip format.  Once downloaded the contents are extracted in a directory under %_nttree% named after the platform; this puts them with the other xplat bits we build on Windows.

[tfs-changeset: 1510395]
---
 dirs.proj     | 5 ++++-
 src/dirs.proj | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dirs.proj b/dirs.proj
index 51df66a3fa..a59584335b 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -4,7 +4,7 @@
 
   <ItemDefinitionGroup>
     <ProjectFile>
-      <ProductGroups>VS;FX</ProductGroups>
+      <ProductGroups>FX;PK</ProductGroups>
     </ProjectFile>
   </ItemDefinitionGroup>
 
@@ -13,11 +13,14 @@
     <BuildInPhase1>true</BuildInPhase1>
     <BuildInPhase2>true</BuildInPhase2>
     <BuildSysBinaries>true</BuildSysBinaries>
+    <!-- for now only binplace the xplat bits during official builds -->
+    <GetAllXPlatBinaries Condition="'$(GetAllXPlatBinaries)' == '' and '$(OfficialBuild)' != ''">true</GetAllXPlatBinaries>
   </PropertyGroup>
 
   <!-- Build in all phases -->
   <ItemGroup>
     <ProjectFile Include="src\dirs.proj" Condition="'$(BuildSysBuildOnlyForARM64)' == 'true'" />
+    <ProjectFile Include="xplat\GetAllXPlatBinaries.proj" Condition="'$(GetAllXPlatBinaries)' == 'true' and '$(FeatureCoreclr)' == 'true' and '$(TargetArch)' == 'amd64'" />
   </ItemGroup>
 
   <!--Import the targets-->
diff --git a/src/dirs.proj b/src/dirs.proj
index ded6fb4267..91952252b0 100644
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -4,7 +4,7 @@
 
   <ItemDefinitionGroup>
     <ProjectFile>
-      <ProductGroups>FX</ProductGroups>
+      <ProductGroups>FX;PK</ProductGroups>
     </ProjectFile>
   </ItemDefinitionGroup>
 
@@ -31,7 +31,7 @@
         <ProjectFile Include="md\dirs.proj" />
         <ProjectFile Include="classlibnative\dirs.proj" />
         <ProjectFile Include="strongname\dirs.proj" >
-            <ProductGroups>VS;FX</ProductGroups>
+            <ProductGroups>FX</ProductGroups>
         </ProjectFile>
         <ProjectFile Include="zap\dirs.proj" />
         <ProjectFile Include="gcdump\lib\gcdump.nativeproj" />
@@ -53,7 +53,7 @@
 
         <ProjectFile Include="tools\dirs.proj" />
         <ProjectFile Include="toolbox\dirs.proj" >
-            <ProductGroups>VS;FX</ProductGroups>
+            <ProductGroups>FX</ProductGroups>
         </ProjectFile>
         <ProjectFile Include="misc\misc.proj" />
     </ItemGroup>
@@ -70,7 +70,7 @@
         <ProjectFile Include="bcl\mscorlib.csproj" />
         <ProjectFile Include="managedlibraries\dirs.proj" />
         <ProjectFile Include="config\config.nativeproj" >
-            <ProductGroups>VS;FX</ProductGroups>
+            <ProductGroups>FX</ProductGroups>
         </ProjectFile>
         <ProjectFile Include="usagelog\usagelog.nativeproj" />
         <ProjectFile Include="lhdwshim\dirs.proj" />
-- 
cgit v1.2.3


From 8be07672ed28ab632bf9a525f93f0b9f75b5c969 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Tue, 4 Aug 2015 20:15:08 -0700
Subject: Pick up security cookie definition from CRT headers

[tfs-changeset: 1510564]
---
 src/vm/ceemain.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp
index 4055635e65..07c037fa41 100644
--- a/src/vm/ceemain.cpp
+++ b/src/vm/ceemain.cpp
@@ -256,6 +256,11 @@
 #include "perfmap.h"
 #endif
 
+#ifndef FEATURE_PAL
+// Included for referencing __security_cookie
+#include "process.h"
+#endif // !FEATURE_PAL
+
 #ifdef FEATURE_IPCMAN
 static HRESULT InitializeIPCManager(void);
 static void PublishIPCManager(void);
@@ -683,15 +688,6 @@ DWORD __stdcall BBSweepStartFunction(LPVOID lpArgs)
 
 //-----------------------------------------------------------------------------
 
-#ifndef FEATURE_PAL
-// Defined by CRT
-extern "C"
-{
-    extern DWORD_PTR __security_cookie;
-    extern void __fastcall __security_check_cookie(DWORD_PTR cookie);
-}
-#endif // !FEATURE_PAL
-
 void InitGSCookie()
 {
     CONTRACTL
@@ -717,7 +713,7 @@ void InitGSCookie()
                               PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOMBINE)) == 0));
 
     // Forces VC cookie to be initialized.
-    void (__fastcall *pf)(DWORD_PTR cookie) = &__security_check_cookie;
+    void * pf = &__security_check_cookie;
     pf = NULL;
 
     GSCookie val = (GSCookie)(__security_cookie ^ GetTickCount());
-- 
cgit v1.2.3


From 00453a1e5707e8e56d595ede07a43f2cc6012dec Mon Sep 17 00:00:00 2001
From: Joel Hendrix <jhendrix@microsoft.com>
Date: Wed, 5 Aug 2015 09:19:01 -0700
Subject: Fix for build issue #764084, remove PK product group (it shouldn't
 have been added to begin with).

[tfs-changeset: 1510862]
---
 src/dirs.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dirs.proj b/src/dirs.proj
index 91952252b0..1572fccf96 100644
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -4,7 +4,7 @@
 
   <ItemDefinitionGroup>
     <ProjectFile>
-      <ProductGroups>FX;PK</ProductGroups>
+      <ProductGroups>FX</ProductGroups>
     </ProjectFile>
   </ItemDefinitionGroup>
 
-- 
cgit v1.2.3