From efe6eb40f450d419c19ddfe98792dded0b0f5029 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Wed, 6 Dec 2017 16:39:56 -0800
Subject: [PATCH 1/8] ILCompiler Package Multi-Runtime Package Support

---
 buildpipeline/DotNet-CoreRT-Publish.json      |   6 +-
 dir.props                                     |   2 +-
 .../Microsoft.DotNet.ILCompiler.Common.props  |  47 ++++++++
 .../Microsoft.DotNet.ILCompiler.builds        |  20 +++-
 .../Microsoft.DotNet.ILCompiler.pkgproj       |  41 +++----
 .../Microsoft.DotNet.ILCompiler.targets       |  46 ++++++-
 .../linux/Microsoft.DotNet.ILCompiler.pkgproj |  12 ++
 .../osx/Microsoft.DotNet.ILCompiler.pkgproj   |  12 ++
 .../win/Microsoft.DotNet.ILCompiler.pkgproj   |  12 ++
 .../BuildFrameworkNativeObjects.proj          |   4 +-
 .../Microsoft.NETCore.Native.Publish.targets  |   5 +-
 .../Microsoft.NETCore.Native.Unix.props       |  84 +++++++------
 .../Microsoft.NETCore.Native.Windows.props    | 112 +++++++++---------
 .../Microsoft.NETCore.Native.targets          |  56 +++++++--
 tests/src/Simple/PInvoke/PInvokeNative.exp    | Bin 0 -> 6273 bytes
 15 files changed, 316 insertions(+), 143 deletions(-)
 create mode 100644 pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
 create mode 100644 pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
 create mode 100644 pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj
 create mode 100644 pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj
 create mode 100644 tests/src/Simple/PInvoke/PInvokeNative.exp

diff --git a/buildpipeline/DotNet-CoreRT-Publish.json b/buildpipeline/DotNet-CoreRT-Publish.json
index ed451610e6d..3589bf04e90 100644
--- a/buildpipeline/DotNet-CoreRT-Publish.json
+++ b/buildpipeline/DotNet-CoreRT-Publish.json
@@ -94,7 +94,7 @@
         "scriptType": "inlineScript",
         "scriptName": "",
         "arguments": "",
-        "inlineScript": "if ($env:Configuration -ne \"Release\") { exit }\n\n& $env:Build_SourcesDirectory\\scripts\\DotNet-Trusted-Publish\\Embed-Index.ps1 `\n  $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\Windows_NT.x64.$env:Configuration\\$env:AzureContainerSymbolPackageGlob `\n  $env:Build_StagingDirectory\\IndexedSymbolPackages",
+        "inlineScript": "if ($env:Configuration -ne \"Release\") { exit }\n\n& $env:Build_SourcesDirectory\\scripts\\DotNet-Trusted-Publish\\Embed-Index.ps1 `\n  $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\$env:Configuration\\$env:AzureContainerSymbolPackageGlob `\n  $env:Build_StagingDirectory\\IndexedSymbolPackages",
         "workingFolder": "",
         "failOnStandardError": "true"
       }
@@ -152,7 +152,7 @@
         "scriptType": "inlineScript",
         "scriptName": "",
         "arguments": "$(MyGetApiKey)",
-        "inlineScript": "param($ApiKey)\nif ($env:Configuration -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\Windows_NT.x64.$env:Configuration\\$env:AzureContainerPackageGlob $ApiKey -Source $env:MyGetFeedUrl -Timeout 3600",
+        "inlineScript": "param($ApiKey)\nif ($env:Configuration -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\$env:Configuration\\$env:AzureContainerPackageGlob $ApiKey -Source $env:MyGetFeedUrl -Timeout 3600",
         "workingFolder": "",
         "failOnStandardError": "true"
       }
@@ -192,7 +192,7 @@
         "scriptType": "inlineScript",
         "scriptName": "",
         "arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory)",
-        "inlineScript": "param($gitHubAuthToken, $root)\nif ($env:Configuration -ne \"Release\") { exit }\ncd $root\n. $root\\buildscripts\\UpdatePublishedVersions.ps1 `\n  -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n  -gitHubAuthToken $gitHubAuthToken `\n  -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo $env:VersionsRepo `\n  -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n  -nupkgPath $root\\packages\\AzureTransfer\\Windows_NT.x64.$env:Configuration\\$env:AzureContainerPackageGlob",
+        "inlineScript": "param($gitHubAuthToken, $root)\nif ($env:Configuration -ne \"Release\") { exit }\ncd $root\n. $root\\buildscripts\\UpdatePublishedVersions.ps1 `\n  -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n  -gitHubAuthToken $gitHubAuthToken `\n  -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo $env:VersionsRepo `\n  -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n  -nupkgPath $root\\packages\\AzureTransfer\\$env:Configuration\\$env:AzureContainerPackageGlob",
         "workingFolder": "",
         "failOnStandardError": "true"
       }
diff --git a/dir.props b/dir.props
index 5c78f0c1e3d..6e9f1a4f732 100644
--- a/dir.props
+++ b/dir.props
@@ -135,7 +135,7 @@
     <!-- Use the shared tools host and runtime for testing -->
     <TestHostRootPath Condition="'$(TestHostRootPath)' == ''">$(DotnetCliPath)</TestHostRootPath>
 
-    <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(OSPlatformConfig)/</PackageOutputPath>
+    <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(BinDirConfiguration)/</PackageOutputPath>
     <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(PackageOutputPath)symbols/</SymbolPackageOutputPath>
 
     <!-- Folder where we will drop the Nuget package for the toolchain -->
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
new file mode 100644
index 00000000000..84364490584
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" 
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <!-- This target defines files and properties that need to be included in the package regardless of platform -->
+    <PropertyGroup>
+    <SkipPackageFileCheck>true</SkipPackageFileCheck>
+    <BaseLinePackageDependencies>false</BaseLinePackageDependencies>
+    <PackagePlatforms>x64;</PackagePlatforms>
+    <PreventImplementationReference>true</PreventImplementationReference>
+    <SkipValidatePackage>true</SkipValidatePackage>
+    <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
+      <TargetPath>targets</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
+      <TargetPath>tools</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\framework\*">
+      <TargetPath>framework</TargetPath>
+    </File>
+    <!-- Workaround to avoid linker warnings on Windows - include all pdb files for static native libraries -->
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+  </ItemGroup>
+  <Target Name="GetPackageDependencies"/>
+
+</Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
index 841203881cb..e814a633bcf 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
+    <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
+    <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->    
+    <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
+    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'Windows_NT'">win</TargetRuntimePackageLocation>
+    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'Unix'">linux</TargetRuntimePackageLocation>
+    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'OSX'">osx</TargetRuntimePackageLocation>
+  </PropertyGroup>
+  
+  
+
   <ItemGroup>
     <Project Include="Microsoft.DotNet.ILCompiler.pkgproj" >
-      <OSGroup>Windows_NT</OSGroup>
-      <OSGroup>Linux</OSGroup>
-      <OSGroup>Mac</OSGroup>
+      <OSGroup>AnyOS</OSGroup>
     </Project>
+
+    <!-- Include platform-specific package definitions-->
+    <Project Include="$(TargetRuntimePackageLocation)\Microsoft.DotNet.ILCompiler.pkgproj" />
+
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index a94ce651b38..ffe824f1e7c 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -5,44 +5,37 @@
     <BaseLinePackageDependencies>false</BaseLinePackageDependencies>
     <PackagePlatforms>x64;</PackagePlatforms>
     <PreventImplementationReference>true</PreventImplementationReference>
+    <RestorePackages>true</RestorePackages>
     <SkipValidatePackage>true</SkipValidatePackage>
     <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
-
+    <!-- Mark this package as a lineup (meta-) package -->
+    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
     <!-- Override this property so that the package name won't look like runtime.[RID].[TFM].[ID] -->
     <PackageTargetRuntime></PackageTargetRuntime>
   </PropertyGroup>
+
   <ItemGroup>
-    <File Include="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets" >
+    <ProjectReference Include="win\Microsoft.DotNet.ILCompiler.pkgproj" />
+    <ProjectReference Include="linux\Microsoft.DotNet.ILCompiler.pkgproj" />
+    <ProjectReference Include="osx\Microsoft.DotNet.ILCompiler.pkgproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <File Include="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets">
       <TargetPath>build</TargetPath>
     </File>
+    
     <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
       <TargetPath>targets</TargetPath>
     </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
+
+    <!-- This assembly is needed so the build tasks can be resolved and run from the metapackage -->
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\\ILCompiler.Build.Tasks.dll" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
       <TargetPath>tools</TargetPath>
     </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\framework\*.dll">
-      <TargetPath>framework</TargetPath>
-    </File>
 
-    <!-- Workaround to avoid linker warnings on Windows - include all pdb files for static native libraries -->    
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb">
-      <TargetPath>sdk</TargetPath>
+    <File Include="$(MSBuildThisFileDirectory)\targets\*">
+      <TargetPath>targets</TargetPath>
     </File>
   </ItemGroup>
 
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
index 28e6f9aa7c1..051c9a8346c 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
@@ -1,7 +1,45 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project 
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_ILCompilerRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerRootDir>
-    <IlCompilerTargetsDir>$(_ILCompilerRootDir)targets/</IlCompilerTargetsDir>
+    <DeployAppHost>false</DeployAppHost>
+    <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerPackageRootDir>
+    <BuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)targets/</BuildIntegrationTargetsDir>
+   
+    <!-- Workaround for lack of current host OS detection - https://github.com/Microsoft/msbuild/issues/539 -->
+    <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
+    <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
+    <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->
+    <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
+    
+    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</TargetRuntimeIdentifier>
+    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Unix'">linux-x64</TargetRuntimeIdentifier>
+    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'OSX'">osx-x64</TargetRuntimeIdentifier>
+
+    <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+    <!-- Define the name of the runtime specific compiler package to import -->
+    <_RuntimeILCompilerPackageName Condition="'$(TargetRuntimeIdentifier)' != ''">runtime.$(TargetRuntimeIdentifier).Microsoft.DotNet.ILCompiler</_RuntimeILCompilerPackageName>
+    <RuntimeILCompilerBuildTargetPath>$(BuildIntegrationTargetsDir)$(_RuntimeILCompilerPackageName).targets</RuntimeILCompilerBuildTargetPath>
+    <CalledViaPackage>true</CalledViaPackage>
+   
+    <!-- If CoreRT is being consumed via its package, runtime-specific properties must be set before compilation can proceed -->
+    <ImportRuntimeILCompilerPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeILCompilerPackageTargetDependsOn>
+    <SetupPropertiesDependsOn>ImportRuntimeILCompilerPackageTarget</SetupPropertiesDependsOn>
+    <DynamicBuildPropertyDependencies>SetupProperties</DynamicBuildPropertyDependencies>
+    
   </PropertyGroup>
-  <Import Project="$(IlCompilerTargetsDir)/Microsoft.NETCore.Native.targets"/>
+
+  <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+  <!-- Locate the runtime package according to the current target runtime -->
+  <Target Name="ImportRuntimeILCompilerPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(CalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeILCompilerPackageTargetDependsOn)" BeforeTargets="Publish">
+    <!-- CoreRT SDK and Framework Assemblies need to be defined to avoid CoreCLR implementations being set as compiler inputs -->
+    <Error Condition="'@(PackageDefinitions)' == ''" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeILCompilerPackageTarget" />
+    <ItemGroup>
+      <RuntimePackage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)' == '$(_RuntimeILCompilerPackageName)'" />
+    </ItemGroup>
+    <CreateProperty Value="%(RuntimePackage.ResolvedPath)">
+      <Output TaskParameter="Value" PropertyName="RuntimePackagePath"/>
+    </CreateProperty>
+  </Target>
+
+  <Import Project="$(MSBuildThisFileDirectory)\..\targets\Microsoft.NETCore.Native.targets" />  
 </Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
new file mode 100644
index 00000000000..ee248648040
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
@@ -0,0 +1,12 @@
+<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
+  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  
+  <PropertyGroup>
+    <PackageTargetRuntime>linux-x64</PackageTargetRuntime>
+  </PropertyGroup>
+  
+  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
+</Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj
new file mode 100644
index 00000000000..da5cafaf13a
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj
@@ -0,0 +1,12 @@
+<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
+  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  
+  <PropertyGroup>
+    <PackageTargetRuntime>osx-x64</PackageTargetRuntime>
+  </PropertyGroup>
+  
+  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
+</Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj
new file mode 100644
index 00000000000..433dc4652a6
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj
@@ -0,0 +1,12 @@
+<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
+  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
+  <PropertyGroup>
+    <PackageTargetRuntime>win-x64</PackageTargetRuntime>
+  </PropertyGroup>
+
+  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />  
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
+</Project>
diff --git a/src/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
index 806b087f4cd..7c00d75614c 100644
--- a/src/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -8,7 +8,9 @@
     <BuildingFrameworkLibrary>true</BuildingFrameworkLibrary>
   </PropertyGroup>
   
-  <Import Project="Microsoft.NETCore.Native.targets" />
+  <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.DotNet.ILCompiler.targets" Condition="'$(CalledViaPackage)' == 'true'"/>
+  <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(CalledViaPackage)' == ''"/>
 
   <Target Name="BuildAllFrameworkLibraries"
     Inputs="@(DefaultFrameworkAssemblies)"
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
index a7a6d4ac60a..1da2ebd32c6 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
@@ -11,7 +11,8 @@
   </PropertyGroup>
 
   <Target Name="_ComputeIlcCompileInputs"
-          BeforeTargets="ComputeIlcCompileInputs">
+          BeforeTargets="ComputeIlcCompileInputs"
+          DependsOnTargets="$(DynamicBuildPropertyDependencies)">
     <ItemGroup>
       <IlcReference Include="@(_ManagedResolvedAssembliesToPublish)" />
     </ItemGroup>
@@ -47,7 +48,7 @@
     until we get a proper AOT NetCore app package.
   -->
   <UsingTask TaskName="ComputeManagedAssemblies" AssemblyFile="$(BuildTasksPath)" />
-  <Target Name="_ComputeAssembliesToCompileToNative">
+  <Target Name="_ComputeAssembliesToCompileToNative" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
 
     <!-- CoreRT SDK and Framework Assemblies need to be defined to avoid CoreCLR implementations being set as compiler inputs -->  
     <Error Condition="'@(PrivateSdkAssemblies)' == ''" Text="The PrivateSdkAssemblies ItemGroup is required for _ComputeAssembliesToCompileToNative" />
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
index 76c280d9045..73b5dc44882 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
@@ -21,44 +21,56 @@ See the LICENSE file in the project root for more information.
     <CppLinker>$(CppCompilerAndLinker)</CppLinker>
     <CppLibCreator>ar</CppLibCreator>
   </PropertyGroup>
+  
+  <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+  <!-- Ensure that runtime-specific paths have already been set -->
+  <PropertyGroup>
+    <CppCompilerAndLinker Condition="'$(CppCompilerAndLinker)' == '' and '$(TargetOS)' == 'OSX'">clang</CppCompilerAndLinker>
+    <CppCompilerAndLinker Condition="'$(CppCompilerAndLinker)' == ''">clang-3.9</CppCompilerAndLinker>
+    <CppCompiler>$(CppCompilerAndLinker)</CppCompiler>
+    <CppLinker>$(CppCompilerAndLinker)</CppLinker>
+    <CppLibCreator>ar</CppLibCreator>
+  </PropertyGroup>
+  <Target Name="SetupUnixProps" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
 
-  <ItemGroup>
-    <CppCompilerAndLinkerArg Include="-I $(IlcPath)/inc" />
-    <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="-g -O0" />
-    <CppCompilerAndLinkerArg Condition="'$(Configuration)' != 'Debug'" Include="-O2" />
-    <CppCompilerAndLinkerArg Include="-c -Wno-invalid-offsetof" />
-    <CppCompilerAndLinkerArg Include="$(AdditionalCppCompilerFlags)" />
-  </ItemGroup>
+    <ItemGroup>
+      <CppCompilerAndLinkerArg Include="-I $(IlcPath)/inc" />
+      <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="-g -O0" />
+      <CppCompilerAndLinkerArg Condition="'$(Configuration)' != 'Debug'" Include="-O2" />
+      <CppCompilerAndLinkerArg Include="-c -Wno-invalid-offsetof" />
+      <CppCompilerAndLinkerArg Include="$(AdditionalCppCompilerFlags)" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <NativeLibrary Condition="'$(IlcMultiModule)' == 'true' and $(NativeCodeGen) == ''" Include="$(SharedLibrary)" />
-    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)/sdk/libbootstrapper.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)/sdk/libbootstrapperdll.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)/sdk/libRuntime.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libPortableRuntime.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libPortableRuntime.a" />
-  </ItemGroup>
+    <ItemGroup>
+      <NativeLibrary Condition="'$(IlcMultiModule)' == 'true' and $(NativeCodeGen) == ''" Include="$(SharedLibrary)" />
+      <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)/sdk/libbootstrapper.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)/sdk/libbootstrapperdll.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)/sdk/libRuntime.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)/sdk/libPortableRuntime.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libbootstrappercpp.a" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)/sdk/libPortableRuntime.a" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <AdditionalNativeLibrary Include="$(IlcPath)/sdk/libSystem.Private.CoreLib.Native.a" />
-    <AdditionalNativeLibrary Include="$(IlcPath)/framework/System.Native.a" />
-    <AdditionalNativeLibrary Include="$(IlcPath)/framework/libSystem.Globalization.Native.a" />
-  </ItemGroup>
+    <ItemGroup>
+      <AdditionalNativeLibrary Include="$(IlcPath)/sdk/libSystem.Private.CoreLib.Native.a" />
+      <AdditionalNativeLibrary Include="$(IlcPath)/framework/System.Native.a" />
+      <AdditionalNativeLibrary Include="$(IlcPath)/framework/libSystem.Globalization.Native.a" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <LinkerArg Include="@(NativeLibrary)" />
-    <LinkerArg Include="@(AdditionalNativeLibrary)" />
-    <LinkerArg Include="-g" />
-    <LinkerArg Include="-Wl,-rpath,'$ORIGIN'" />
-    <LinkerArg Include="-pthread" />
-    <LinkerArg Include="-lstdc++" />
-    <LinkerArg Include="-ldl" />
-    <LinkerArg Include="-lm" />
-    <LinkerArg Include="-luuid" Condition="'$(TargetOS)' != 'OSX'" />
-    <LinkerArg Include="-lrt" Condition="'$(TargetOS)' != 'OSX'" />
-    <LinkerArg Include="-licucore" Condition="'$(TargetOS)' == 'OSX'" />
-    <LinkerArg Include="-shared" Condition="'$(NativeLib)' == 'Shared'" />
-  </ItemGroup>
+    <ItemGroup>
+      <LinkerArg Include="@(NativeLibrary)" />
+      <LinkerArg Include="@(AdditionalNativeLibrary)" />
+      <LinkerArg Include="-g" />
+      <LinkerArg Include="-Wl,-rpath,'$ORIGIN'" />
+      <LinkerArg Include="-pthread" />
+      <LinkerArg Include="-lstdc++" />
+      <LinkerArg Include="-ldl" />
+      <LinkerArg Include="-lm" />
+      <LinkerArg Include="-luuid" Condition="'$(TargetOS)' != 'OSX'" />
+      <LinkerArg Include="-lrt" Condition="'$(TargetOS)' != 'OSX'" />
+      <LinkerArg Include="-licucore" Condition="'$(TargetOS)' == 'OSX'" />
+      <LinkerArg Include="-shared" Condition="'$(NativeLib)' == 'Shared'" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index 41b0227a604..98d064a1362 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -14,66 +14,66 @@ See the LICENSE file in the project root for more information.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <!-- Ensure that runtime-specific paths have already been set -->
   <PropertyGroup>
     <CppCompiler>cl</CppCompiler>
     <CppLinker>link</CppLinker>
     <CppLibCreator>lib</CppLibCreator>
   </PropertyGroup>
+  <Target Name="SetupWindowsProps" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+    <ItemGroup>
+      <CppCompilerAndLinkerArg Include="/I$(IlcPath)\inc" />
+      <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="/Od" />
+      <CppCompilerAndLinkerArg Condition="'$(Configuration)' != 'Debug'" Include="/O2" />
+      <CppCompilerAndLinkerArg Include="/c /nologo /W3 /GS /DCPPCODEGEN /EHs /Zi /bigobj" />
+      <CppCompilerAndLinkerArg Condition="'$(UseDebugCrt)' == 'true'" Include="/MTd" />
+      <CppCompilerAndLinkerArg Condition="'$(UseDebugCrt)' != 'true'" Include="/MT" />
+      <CppCompilerAndLinkerArg Include="$(AdditionalCppCompilerFlags)" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <CppCompilerAndLinkerArg Include="/I$(IlcPath)\inc" />
-    <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="/Od" />
-    <CppCompilerAndLinkerArg Condition="'$(Configuration)' != 'Debug'" Include="/O2" />
-    <CppCompilerAndLinkerArg Include="/c /nologo /W3 /GS /DCPPCODEGEN /EHs /Zi /bigobj" />
-    <CppCompilerAndLinkerArg Condition="'$(UseDebugCrt)' == 'true'" Include="/MTd" />
-    <CppCompilerAndLinkerArg Condition="'$(UseDebugCrt)' != 'true'" Include="/MT" />
-    <CppCompilerAndLinkerArg Include="$(AdditionalCppCompilerFlags)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)\sdk\bootstrapperdll.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\Runtime.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\PortableRuntime.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" />
-    <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)\sdk\PortableRuntime.lib" />
-    <NativeLibrary Condition="'$(IlcMultiModule)' == 'true' and $(NativeCodeGen) == ''" Include="$(SharedLibrary)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AdditionalNativeLibrary Include="kernel32.lib" />
-    <AdditionalNativeLibrary Include="user32.lib" />
-    <AdditionalNativeLibrary Include="gdi32.lib" />
-    <AdditionalNativeLibrary Include="winspool.lib" />
-    <AdditionalNativeLibrary Include="comdlg32.lib" />
-    <AdditionalNativeLibrary Include="advapi32.lib" />
-    <AdditionalNativeLibrary Include="shell32.lib" />
-    <AdditionalNativeLibrary Include="ole32.lib" />
-    <AdditionalNativeLibrary Include="oleaut32.lib" />
-    <AdditionalNativeLibrary Include="uuid.lib" />
-    <AdditionalNativeLibrary Include="bcrypt.lib" />
-    <AdditionalNativeLibrary Include="normaliz.lib" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <LinkerArg Condition="$(NativeLib) == 'Shared'" Include="/DLL" />
-    <LinkerArg Condition="$(DefFile) != ''" Include="/DEF:$(DefFile)" />
-    <LinkerArg Include="@(NativeLibrary)" />
-    <LinkerArg Include="@(AdditionalNativeLibrary)" />
-    <LinkerArg Include="/NOLOGO /DEBUG /MANIFEST:NO" />
-    <!-- The runtime is not compatible with jump stubs inserted by incremental linking. -->
-    <LinkerArg Include="/INCREMENTAL:NO" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- TODO <LinkerArg Include="/MACHINE:X64" /> -->
-  </ItemGroup>
- 
-  <ItemGroup Condition="'$(Configuration)' != 'Debug'">
-    <LinkerArg Include="/OPT:REF" />
-    <LinkerArg Include="/OPT:ICF" />
-  </ItemGroup>
-
+    <ItemGroup>
+      <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)\sdk\bootstrapperdll.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\Runtime.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\PortableRuntime.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" />
+      <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)\sdk\PortableRuntime.lib" />
+      <NativeLibrary Condition="'$(IlcMultiModule)' == 'true' and $(NativeCodeGen) == ''" Include="$(SharedLibrary)" />
+    </ItemGroup>
+  
+    <ItemGroup>
+      <AdditionalNativeLibrary Include="kernel32.lib" />
+      <AdditionalNativeLibrary Include="user32.lib" />
+      <AdditionalNativeLibrary Include="gdi32.lib" />
+      <AdditionalNativeLibrary Include="winspool.lib" />
+      <AdditionalNativeLibrary Include="comdlg32.lib" />
+      <AdditionalNativeLibrary Include="advapi32.lib" />
+      <AdditionalNativeLibrary Include="shell32.lib" />
+      <AdditionalNativeLibrary Include="ole32.lib" />
+      <AdditionalNativeLibrary Include="oleaut32.lib" />
+      <AdditionalNativeLibrary Include="uuid.lib" />
+      <AdditionalNativeLibrary Include="bcrypt.lib" />
+      <AdditionalNativeLibrary Include="normaliz.lib" />
+    </ItemGroup>
+    
+    <ItemGroup>
+      <LinkerArg Condition="$(NativeLib) == 'Shared'" Include="/DLL" />
+      <LinkerArg Condition="$(DefFile) != ''" Include="/DEF:$(DefFile)" />
+      <LinkerArg Include="@(NativeLibrary)" />
+      <LinkerArg Include="@(AdditionalNativeLibrary)" />
+      <LinkerArg Include="/NOLOGO /DEBUG /MANIFEST:NO" />
+      <!-- The runtime is not compatible with jump stubs inserted by incremental linking. -->
+      <LinkerArg Include="/INCREMENTAL:NO" />
+    </ItemGroup>
+  
+    <ItemGroup>
+      <!-- TODO <LinkerArg Include="/MACHINE:X64" /> -->
+    </ItemGroup>
+   
+    <ItemGroup Condition="'$(Configuration)' != 'Debug'">
+      <LinkerArg Include="/OPT:REF" />
+      <LinkerArg Include="/OPT:ICF" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index ce276c89910..1cb97e3ceae 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -25,7 +25,10 @@ See the LICENSE file in the project root for more information.
     <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
     <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->    
     <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
-    <IlcPath Condition="'$(IlcPath)' == ''">$(MSBuildThisFileDirectory)/..</IlcPath>
+    
+    <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+    <!-- This value is only changed if running from a package -->
+    <BuildIntegrationTargetsDir Condition="'$(BuildIntegrationTargetsDir)' == '' ">$(MSBuildThisFileDirectory)</BuildIntegrationTargetsDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -64,11 +67,14 @@ See the LICENSE file in the project root for more information.
 
     <SharedLibrary Condition="'$(OS)' == 'Windows_NT'">$(FrameworkLibPath)\Framework$(LibFileExt)</SharedLibrary>
     <SharedLibrary Condition="'$(OS)' != 'Windows_NT'">$(FrameworkLibPath)\libframework$(LibFileExt)</SharedLibrary>
+    <DynamicBuildPropertyDependencies Condition="'$(CalledViaPackage)' == 'true'">SetupProperties</DynamicBuildPropertyDependencies>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IlcCompileDependsOn)'=='' and '$(NativeCompilationDuringPublish)' != 'false'">
     <IlcCompileDependsOn Condition="'$(BuildingFrameworkLibrary)' != 'true'">Compile;ComputeIlcCompileInputs</IlcCompileDependsOn>
     <IlcCompileDependsOn Condition="'$(IlcMultiModule)' == 'true' and '$(BuildingFrameworkLibrary)' != 'true'">$(IlcCompileDependsOn);BuildFrameworkLib</IlcCompileDependsOn>
+    <IlcCompileDependsOn Condition="'$(TargetOS)' == 'Windows_NT'">$(IlcCompileDependsOn);SetupWindowsProps</IlcCompileDependsOn>  
+    <IlcCompileDependsOn Condition="'$(TargetOS)' != 'Windows_NT'">$(IlcCompileDependsOn);SetupUnixProps</IlcCompileDependsOn>  
   </PropertyGroup>
 
   <ItemGroup>
@@ -83,7 +89,31 @@ See the LICENSE file in the project root for more information.
     <DefaultFrameworkAssemblies Include="@(PrivateSdkAssemblies)" />
   </ItemGroup>
 
-  <Target Name="ComputeIlcCompileInputs">
+  <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+  <!-- The properties below need to be defined only after we've found the correct runtime package reference -->
+  <Target Name="SetupProperties" DependsOnTargets="$(SetupPropertiesDependsOn)" BeforeTargets="Publish">
+    <PropertyGroup>
+      <!-- Define paths used in build targets to point to the runtime-specific ILCompiler implementation -->
+      <IlcPath Condition="'$(IlcPath)' == ''">$(RuntimePackagePath)</IlcPath>
+      <BuildTasksPath>$(RuntimePackagePath)\tools\ILCompiler.Build.Tasks.dll</BuildTasksPath>
+      <!-- Set defaults for unspecified properties -->
+    </PropertyGroup>
+    
+    <!-- If running from a package these values need to be set again with the resolved IlcPath -->
+    <ItemGroup>
+      <PrivateSdkAssemblies Include="$(IlcPath)\sdk\*.dll" />
+    </ItemGroup>
+    <ItemGroup>
+      <FrameworkAssemblies Include="$(IlcPath)\framework\*.dll" />
+    </ItemGroup>
+    
+    <ItemGroup>
+      <DefaultFrameworkAssemblies Include="@(FrameworkAssemblies)" />
+      <DefaultFrameworkAssemblies Include="@(PrivateSdkAssemblies)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="ComputeIlcCompileInputs" DependsOnTargets="$(DynamicBuildPropertyDependencies)" BeforeTargets="Publish">
     <ItemGroup>
       <ManagedBinary Condition="$(BuildingFrameworkLibrary) != 'true'" Include="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
       <IlcCompileInput Include="@(ManagedBinary)" />
@@ -95,13 +125,15 @@ See the LICENSE file in the project root for more information.
     BuildFrameworkLib is invoked before IlcCompile in multi-module builds to 
     produce the shared framework library on demand
   -->
-  <Target Name="BuildFrameworkLib" Condition="'$(DisableFrameworkLibGeneration)' != 'true'">
+  <Target Name="BuildFrameworkLib" Condition="'$(DisableFrameworkLibGeneration)' != 'true'" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
     <ItemGroup>
-      <ProjectToBuild Include="$(MSBuildThisFileDirectory)\BuildFrameworkNativeObjects.proj">
-        <AdditionalProperties>
+     <!-- This builds the project with the ILC implementation in the identified runtime package to avoid resolving it again  -->
+      <ProjectToBuild Include="$(BuildIntegrationTargetsDir)BuildFrameworkNativeObjects.proj">
+          <AdditionalProperties>
           IntermediateOutputPath=$(IntermediateOutputPath);
           FrameworkLibPath=$(FrameworkLibPath);
-          FrameworkObjPath=$(FrameworkObjPath)
+          FrameworkObjPath=$(FrameworkObjPath);
+          RuntimePackagePath=$(RuntimePackagePath)
         </AdditionalProperties>
       </ProjectToBuild>
     </ItemGroup>
@@ -136,8 +168,8 @@ See the LICENSE file in the project root for more information.
     <Exec Command="&quot;$(IlcPath)\tools\ilc&quot; @&quot;$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).ilc.rsp&quot;" />
   </Target>
 
-  <Import Project="Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
-  <Import Project="Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
+  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
+  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
   
   <Target Name="CppCompile"
       Inputs="$(IlcCompileOutput)"
@@ -193,23 +225,21 @@ See the LICENSE file in the project root for more information.
   <Target Name="CreateLib"
     Inputs="@(LibInputs)"
     Outputs="$(SharedLibrary)"
-    DependsOnTargets="$(CreateLibDependsOn)">
+    DependsOnTargets="$(CreateLibDependsOn);$(DynamicBuildPropertyDependencies)"
+    >
 
     <ItemGroup>
       <CustomLibArg Include="/out:$(SharedLibrary)" Condition="'$(OS)' == 'Windows_NT'" />
       <CustomLibArg Include="-crs $(SharedLibrary)" Condition="'$(OS)' != 'Windows_NT'" />
       <CustomLibArg Include="@(LibInputs->'%(Identity)')" />
     </ItemGroup>
-
     <MakeDir Directories="$(NativeIntermediateOutputPath)" />
     <WriteLinesToFile File="$(NativeIntermediateOutputPath)lib.rsp" Lines="@(CustomLibArg)" Overwrite="true" Condition="'$(OS)' == 'Windows_NT'" />
-
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(SharedLibrary)))" />
-
     <Exec Command="$(CppLibCreator) @&quot;$(NativeIntermediateOutputPath)lib.rsp&quot;" Condition="'$(OS)' == 'Windows_NT'" />
     <Exec Command="$(CppLibCreator) @(CustomLibArg, ' ')" Condition="'$(OS)' != 'Windows_NT'" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
+  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
 
 </Project>
diff --git a/tests/src/Simple/PInvoke/PInvokeNative.exp b/tests/src/Simple/PInvoke/PInvokeNative.exp
new file mode 100644
index 0000000000000000000000000000000000000000..16de11cc63eaa2aad1433a9da6248db930197bbd
GIT binary patch
literal 6273
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
GLH9rM2EtPS

literal 0
HcmV?d00001


From 48e309feb50198129b89306cde9d207621187ec2 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 11:10:34 -0800
Subject: [PATCH 2/8] Remove extra binary

---
 tests/src/Simple/PInvoke/PInvokeNative.exp | Bin 6273 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/src/Simple/PInvoke/PInvokeNative.exp

diff --git a/tests/src/Simple/PInvoke/PInvokeNative.exp b/tests/src/Simple/PInvoke/PInvokeNative.exp
deleted file mode 100644
index 16de11cc63eaa2aad1433a9da6248db930197bbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6273
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
GLH9rM2EtPS


From 6fb901f024a8cd9674601fea996b65cd6c10efd8 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 11:54:18 -0800
Subject: [PATCH 3/8] Change OS-Detection and remove ProjectReferences from
 meta-package definition

---
 .../Microsoft.DotNet.ILCompiler.builds                 | 10 +++-------
 .../Microsoft.DotNet.ILCompiler.pkgproj                |  8 +-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
index e814a633bcf..035fba9a026 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
@@ -2,13 +2,9 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
-    <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
-    <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->    
-    <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
-    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'Windows_NT'">win</TargetRuntimePackageLocation>
-    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'Unix'">linux</TargetRuntimePackageLocation>
-    <TargetRuntimePackageLocation Condition="'$(TargetOS)' == 'OSX'">osx</TargetRuntimePackageLocation>
+    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'Windows_NT'">win</TargetRuntimePackageLocation>
+    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'Unix'">linux</TargetRuntimePackageLocation>
+    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'OSX'">osx</TargetRuntimePackageLocation>
   </PropertyGroup>
   
   
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index ffe824f1e7c..edf447ae19c 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -13,13 +13,7 @@
     <!-- Override this property so that the package name won't look like runtime.[RID].[TFM].[ID] -->
     <PackageTargetRuntime></PackageTargetRuntime>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="win\Microsoft.DotNet.ILCompiler.pkgproj" />
-    <ProjectReference Include="linux\Microsoft.DotNet.ILCompiler.pkgproj" />
-    <ProjectReference Include="osx\Microsoft.DotNet.ILCompiler.pkgproj" />
-  </ItemGroup>
-
+  
   <ItemGroup>
     <File Include="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets">
       <TargetPath>build</TargetPath>

From 4113bc63032740abb1d56d789f37fd67acc8a158 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 15:25:01 -0800
Subject: [PATCH 4/8] Adding Formatting and Naming changes for clarity

---
 .../Microsoft.DotNet.ILCompiler.pkgproj       |  4 +--
 .../BuildFrameworkNativeObjects.proj          |  4 +--
 .../Microsoft.DotNet.ILCompiler.targets       | 21 ++++++++--------
 .../Microsoft.NETCore.Native.Publish.targets  |  8 +++---
 .../Microsoft.NETCore.Native.Unix.props       |  2 +-
 .../Microsoft.NETCore.Native.Windows.props    |  2 +-
 .../Microsoft.NETCore.Native.targets          | 25 +++++++++----------
 7 files changed, 32 insertions(+), 34 deletions(-)
 rename {pkg/Microsoft.DotNet.ILCompiler => src/BuildIntegration}/Microsoft.DotNet.ILCompiler.targets (64%)

diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index edf447ae19c..a8b7a44b758 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -15,11 +15,11 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <File Include="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets">
+    <File Include="$(PackageSourceDirectory)\BuildIntegration\Microsoft.DotNet.ILCompiler.targets">
       <TargetPath>build</TargetPath>
     </File>
     
-    <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
+    <File Include="$(PackageSourceDirectory)\BuildIntegration\*" Exclude="$(PackageSourceDirectory)\BuildIntegration\Microsoft.DotNet.ILCompiler.targets">
       <TargetPath>targets</TargetPath>
     </File>
 
diff --git a/src/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
index 7c00d75614c..8570bc9a5b4 100644
--- a/src/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -9,8 +9,8 @@
   </PropertyGroup>
   
   <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.DotNet.ILCompiler.targets" Condition="'$(CalledViaPackage)' == 'true'"/>
-  <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(CalledViaPackage)' == ''"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.DotNet.ILCompiler.targets" Condition="'$(IlcCalledViaPackage)' == 'true'"/>
+  <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(IlcCalledViaPackage)' == ''"/>
 
   <Target Name="BuildAllFrameworkLibraries"
     Inputs="@(DefaultFrameworkAssemblies)"
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
similarity index 64%
rename from pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
rename to src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 051c9a8346c..0cf728a3daf 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
+++ b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DeployAppHost>false</DeployAppHost>
     <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerPackageRootDir>
-    <BuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)targets/</BuildIntegrationTargetsDir>
+    <IlcBuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)targets/</IlcBuildIntegrationTargetsDir>
    
     <!-- Workaround for lack of current host OS detection - https://github.com/Microsoft/msbuild/issues/539 -->
     <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
@@ -11,30 +11,29 @@
     <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->
     <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
     
-    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</TargetRuntimeIdentifier>
-    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Unix'">linux-x64</TargetRuntimeIdentifier>
-    <TargetRuntimeIdentifier Condition="'$(TargetOS)' == 'OSX'">osx-x64</TargetRuntimeIdentifier>
+    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</IlcTargetRuntimeIdentifier>
+    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Unix'">linux-x64</IlcTargetRuntimeIdentifier>
+    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'OSX'">osx-x64</IlcTargetRuntimeIdentifier>
 
     <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
     <!-- Define the name of the runtime specific compiler package to import -->
-    <_RuntimeILCompilerPackageName Condition="'$(TargetRuntimeIdentifier)' != ''">runtime.$(TargetRuntimeIdentifier).Microsoft.DotNet.ILCompiler</_RuntimeILCompilerPackageName>
-    <RuntimeILCompilerBuildTargetPath>$(BuildIntegrationTargetsDir)$(_RuntimeILCompilerPackageName).targets</RuntimeILCompilerBuildTargetPath>
-    <CalledViaPackage>true</CalledViaPackage>
+    <RuntimeIlcPackageName Condition="'$(IlcTargetRuntimeIdentifier)' != ''">runtime.$(IlcTargetRuntimeIdentifier).Microsoft.DotNet.ILCompiler</RuntimeIlcPackageName>
+    <IlcCalledViaPackage>true</IlcCalledViaPackage>
    
     <!-- If CoreRT is being consumed via its package, runtime-specific properties must be set before compilation can proceed -->
     <ImportRuntimeILCompilerPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeILCompilerPackageTargetDependsOn>
-    <SetupPropertiesDependsOn>ImportRuntimeILCompilerPackageTarget</SetupPropertiesDependsOn>
-    <DynamicBuildPropertyDependencies>SetupProperties</DynamicBuildPropertyDependencies>
+    <IlcSetupPropertiesDependsOn>ImportRuntimeILCompilerPackageTarget</IlcSetupPropertiesDependsOn>
+    <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
     
   </PropertyGroup>
 
   <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
   <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeILCompilerPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(CalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeILCompilerPackageTargetDependsOn)" BeforeTargets="Publish">
+  <Target Name="ImportRuntimeILCompilerPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeILCompilerPackageTargetDependsOn)" BeforeTargets="Publish">
     <!-- CoreRT SDK and Framework Assemblies need to be defined to avoid CoreCLR implementations being set as compiler inputs -->
     <Error Condition="'@(PackageDefinitions)' == ''" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeILCompilerPackageTarget" />
     <ItemGroup>
-      <RuntimePackage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)' == '$(_RuntimeILCompilerPackageName)'" />
+      <RuntimePackage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)' == '$(RuntimeIlcPackageName)'" />
     </ItemGroup>
     <CreateProperty Value="%(RuntimePackage.ResolvedPath)">
       <Output TaskParameter="Value" PropertyName="RuntimePackagePath"/>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
index 1da2ebd32c6..12743b911b9 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <BuildTasksPath Condition="'$(BuildTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\ILCompiler.Build.Tasks.dll</BuildTasksPath>
+    <IlcBuildTasksPath Condition="'$(IlcBuildTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
     
     <!--
       Prevent dotnet CLI from deploying the CoreCLR shim executable since we produce
@@ -12,7 +12,7 @@
 
   <Target Name="_ComputeIlcCompileInputs"
           BeforeTargets="ComputeIlcCompileInputs"
-          DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+          DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
     <ItemGroup>
       <IlcReference Include="@(_ManagedResolvedAssembliesToPublish)" />
     </ItemGroup>
@@ -47,8 +47,8 @@
     pipeline we don't want to see in the output (native images, CoreCLR artifacts)
     until we get a proper AOT NetCore app package.
   -->
-  <UsingTask TaskName="ComputeManagedAssemblies" AssemblyFile="$(BuildTasksPath)" />
-  <Target Name="_ComputeAssembliesToCompileToNative" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+  <UsingTask TaskName="ComputeManagedAssemblies" AssemblyFile="$(IlcBuildTasksPath)" />
+  <Target Name="_ComputeAssembliesToCompileToNative" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
 
     <!-- CoreRT SDK and Framework Assemblies need to be defined to avoid CoreCLR implementations being set as compiler inputs -->  
     <Error Condition="'@(PrivateSdkAssemblies)' == ''" Text="The PrivateSdkAssemblies ItemGroup is required for _ComputeAssembliesToCompileToNative" />
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
index 73b5dc44882..5ed981fedd4 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Unix.props
@@ -31,7 +31,7 @@ See the LICENSE file in the project root for more information.
     <CppLinker>$(CppCompilerAndLinker)</CppLinker>
     <CppLibCreator>ar</CppLibCreator>
   </PropertyGroup>
-  <Target Name="SetupUnixProps" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+  <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
 
     <ItemGroup>
       <CppCompilerAndLinkerArg Include="-I $(IlcPath)/inc" />
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index 98d064a1362..2d943a99de2 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -20,7 +20,7 @@ See the LICENSE file in the project root for more information.
     <CppLinker>link</CppLinker>
     <CppLibCreator>lib</CppLibCreator>
   </PropertyGroup>
-  <Target Name="SetupWindowsProps" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+  <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
     <ItemGroup>
       <CppCompilerAndLinkerArg Include="/I$(IlcPath)\inc" />
       <CppCompilerAndLinkerArg Condition="'$(Configuration)' == 'Debug'" Include="/Od" />
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index 1cb97e3ceae..cad1db18e53 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -28,7 +28,7 @@ See the LICENSE file in the project root for more information.
     
     <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
     <!-- This value is only changed if running from a package -->
-    <BuildIntegrationTargetsDir Condition="'$(BuildIntegrationTargetsDir)' == '' ">$(MSBuildThisFileDirectory)</BuildIntegrationTargetsDir>
+    <IlcBuildIntegrationTargetsDir Condition="'$(IlcBuildIntegrationTargetsDir)' == '' ">$(MSBuildThisFileDirectory)</IlcBuildIntegrationTargetsDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -67,14 +67,13 @@ See the LICENSE file in the project root for more information.
 
     <SharedLibrary Condition="'$(OS)' == 'Windows_NT'">$(FrameworkLibPath)\Framework$(LibFileExt)</SharedLibrary>
     <SharedLibrary Condition="'$(OS)' != 'Windows_NT'">$(FrameworkLibPath)\libframework$(LibFileExt)</SharedLibrary>
-    <DynamicBuildPropertyDependencies Condition="'$(CalledViaPackage)' == 'true'">SetupProperties</DynamicBuildPropertyDependencies>
+    <IlcDynamicBuildPropertyDependencies Condition="'$(IlcCalledViaPackage)' == 'true'">SetupProperties</IlcDynamicBuildPropertyDependencies>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IlcCompileDependsOn)'=='' and '$(NativeCompilationDuringPublish)' != 'false'">
     <IlcCompileDependsOn Condition="'$(BuildingFrameworkLibrary)' != 'true'">Compile;ComputeIlcCompileInputs</IlcCompileDependsOn>
     <IlcCompileDependsOn Condition="'$(IlcMultiModule)' == 'true' and '$(BuildingFrameworkLibrary)' != 'true'">$(IlcCompileDependsOn);BuildFrameworkLib</IlcCompileDependsOn>
-    <IlcCompileDependsOn Condition="'$(TargetOS)' == 'Windows_NT'">$(IlcCompileDependsOn);SetupWindowsProps</IlcCompileDependsOn>  
-    <IlcCompileDependsOn Condition="'$(TargetOS)' != 'Windows_NT'">$(IlcCompileDependsOn);SetupUnixProps</IlcCompileDependsOn>  
+    <IlcCompileDependsOn Condition="'$(TargetOS)' == 'Windows_NT'">$(IlcCompileDependsOn);SetupOSSpecificProps</IlcCompileDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -91,11 +90,11 @@ See the LICENSE file in the project root for more information.
 
   <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
   <!-- The properties below need to be defined only after we've found the correct runtime package reference -->
-  <Target Name="SetupProperties" DependsOnTargets="$(SetupPropertiesDependsOn)" BeforeTargets="Publish">
+  <Target Name="SetupProperties" DependsOnTargets="$(IlcSetupPropertiesDependsOn)" BeforeTargets="Publish">
     <PropertyGroup>
       <!-- Define paths used in build targets to point to the runtime-specific ILCompiler implementation -->
       <IlcPath Condition="'$(IlcPath)' == ''">$(RuntimePackagePath)</IlcPath>
-      <BuildTasksPath>$(RuntimePackagePath)\tools\ILCompiler.Build.Tasks.dll</BuildTasksPath>
+      <IlcBuildTasksPath>$(RuntimePackagePath)\tools\ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
       <!-- Set defaults for unspecified properties -->
     </PropertyGroup>
     
@@ -113,7 +112,7 @@ See the LICENSE file in the project root for more information.
     </ItemGroup>
   </Target>
 
-  <Target Name="ComputeIlcCompileInputs" DependsOnTargets="$(DynamicBuildPropertyDependencies)" BeforeTargets="Publish">
+  <Target Name="ComputeIlcCompileInputs" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)" BeforeTargets="Publish">
     <ItemGroup>
       <ManagedBinary Condition="$(BuildingFrameworkLibrary) != 'true'" Include="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
       <IlcCompileInput Include="@(ManagedBinary)" />
@@ -125,10 +124,10 @@ See the LICENSE file in the project root for more information.
     BuildFrameworkLib is invoked before IlcCompile in multi-module builds to 
     produce the shared framework library on demand
   -->
-  <Target Name="BuildFrameworkLib" Condition="'$(DisableFrameworkLibGeneration)' != 'true'" DependsOnTargets="$(DynamicBuildPropertyDependencies)">
+  <Target Name="BuildFrameworkLib" Condition="'$(DisableFrameworkLibGeneration)' != 'true'" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
     <ItemGroup>
      <!-- This builds the project with the ILC implementation in the identified runtime package to avoid resolving it again  -->
-      <ProjectToBuild Include="$(BuildIntegrationTargetsDir)BuildFrameworkNativeObjects.proj">
+      <ProjectToBuild Include="$(IlcBuildIntegrationTargetsDir)BuildFrameworkNativeObjects.proj">
           <AdditionalProperties>
           IntermediateOutputPath=$(IntermediateOutputPath);
           FrameworkLibPath=$(FrameworkLibPath);
@@ -168,8 +167,8 @@ See the LICENSE file in the project root for more information.
     <Exec Command="&quot;$(IlcPath)\tools\ilc&quot; @&quot;$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).ilc.rsp&quot;" />
   </Target>
 
-  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
-  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
+  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
+  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
   
   <Target Name="CppCompile"
       Inputs="$(IlcCompileOutput)"
@@ -225,7 +224,7 @@ See the LICENSE file in the project root for more information.
   <Target Name="CreateLib"
     Inputs="@(LibInputs)"
     Outputs="$(SharedLibrary)"
-    DependsOnTargets="$(CreateLibDependsOn);$(DynamicBuildPropertyDependencies)"
+    DependsOnTargets="$(CreateLibDependsOn);$(IlcDynamicBuildPropertyDependencies)"
     >
 
     <ItemGroup>
@@ -240,6 +239,6 @@ See the LICENSE file in the project root for more information.
     <Exec Command="$(CppLibCreator) @(CustomLibArg, ' ')" Condition="'$(OS)' != 'Windows_NT'" />
   </Target>
 
-  <Import Project="$(BuildIntegrationTargetsDir)Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
+  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
 
 </Project>

From f9802d875074a5c8cb26821ff67fe54f488ce0c0 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 15:50:23 -0800
Subject: [PATCH 5/8] Unify runtime-specific packages and move package build
 targets

---
 .../Microsoft.DotNet.ILCompiler.builds               |  2 +-
 .../Microsoft.DotNet.ILCompiler.pkgproj              | 10 +---------
 .../Microsoft.DotNet.ILCompiler.pkgproj              |  4 +++-
 .../linux/Microsoft.DotNet.ILCompiler.pkgproj        | 12 ------------
 .../osx/Microsoft.DotNet.ILCompiler.pkgproj          | 12 ------------
 .../Microsoft.DotNet.ILCompiler.targets              |  4 ++--
 .../Microsoft.NETCore.Native.targets                 |  2 +-
 7 files changed, 8 insertions(+), 38 deletions(-)
 rename pkg/Microsoft.DotNet.ILCompiler/{win => TargetSpecific}/Microsoft.DotNet.ILCompiler.pkgproj (72%)
 delete mode 100644 pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
 delete mode 100644 pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj

diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
index 035fba9a026..c259278aa64 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
@@ -15,7 +15,7 @@
     </Project>
 
     <!-- Include platform-specific package definitions-->
-    <Project Include="$(TargetRuntimePackageLocation)\Microsoft.DotNet.ILCompiler.pkgproj" />
+    <Project Include="$(MSBuildThisFileDirectory)\TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj" />
 
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index a8b7a44b758..ac7f6c2b1f4 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -15,22 +15,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <File Include="$(PackageSourceDirectory)\BuildIntegration\Microsoft.DotNet.ILCompiler.targets">
+    <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
       <TargetPath>build</TargetPath>
     </File>
-    
-    <File Include="$(PackageSourceDirectory)\BuildIntegration\*" Exclude="$(PackageSourceDirectory)\BuildIntegration\Microsoft.DotNet.ILCompiler.targets">
-      <TargetPath>targets</TargetPath>
-    </File>
 
     <!-- This assembly is needed so the build tasks can be resolved and run from the metapackage -->
     <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\\ILCompiler.Build.Tasks.dll" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
       <TargetPath>tools</TargetPath>
     </File>
-
-    <File Include="$(MSBuildThisFileDirectory)\targets\*">
-      <TargetPath>targets</TargetPath>
-    </File>
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
diff --git a/pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
similarity index 72%
rename from pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj
rename to pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
index 433dc4652a6..380a672dc79 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/win/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
@@ -4,7 +4,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <PackageTargetRuntime>win-x64</PackageTargetRuntime>
+    <PackageTargetRuntime Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</PackageTargetRuntime>
+    <PackageTargetRuntime Condition="'$(OSGroup)' == 'Linux'">linux-x64</PackageTargetRuntime>
+    <PackageTargetRuntime Condition="'$(OSGroup)' == 'OSX'">osx-x64</PackageTargetRuntime>
   </PropertyGroup>
 
   <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />  
diff --git a/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
deleted file mode 100644
index ee248648040..00000000000
--- a/pkg/Microsoft.DotNet.ILCompiler/linux/Microsoft.DotNet.ILCompiler.pkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
-  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  
-  <PropertyGroup>
-    <PackageTargetRuntime>linux-x64</PackageTargetRuntime>
-  </PropertyGroup>
-  
-  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
-</Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj
deleted file mode 100644
index da5cafaf13a..00000000000
--- a/pkg/Microsoft.DotNet.ILCompiler/osx/Microsoft.DotNet.ILCompiler.pkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
-  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  
-  <PropertyGroup>
-    <PackageTargetRuntime>osx-x64</PackageTargetRuntime>
-  </PropertyGroup>
-  
-  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
-</Project>
diff --git a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 0cf728a3daf..740cb42c50c 100644
--- a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DeployAppHost>false</DeployAppHost>
     <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerPackageRootDir>
-    <IlcBuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)targets/</IlcBuildIntegrationTargetsDir>
+    <IlcBuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)build/</IlcBuildIntegrationTargetsDir>
    
     <!-- Workaround for lack of current host OS detection - https://github.com/Microsoft/msbuild/issues/539 -->
     <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
@@ -40,5 +40,5 @@
     </CreateProperty>
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)\..\targets\Microsoft.NETCore.Native.targets" />  
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Native.targets" />  
 </Project>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index cad1db18e53..a2cba426ac9 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -73,7 +73,7 @@ See the LICENSE file in the project root for more information.
   <PropertyGroup Condition="'$(IlcCompileDependsOn)'=='' and '$(NativeCompilationDuringPublish)' != 'false'">
     <IlcCompileDependsOn Condition="'$(BuildingFrameworkLibrary)' != 'true'">Compile;ComputeIlcCompileInputs</IlcCompileDependsOn>
     <IlcCompileDependsOn Condition="'$(IlcMultiModule)' == 'true' and '$(BuildingFrameworkLibrary)' != 'true'">$(IlcCompileDependsOn);BuildFrameworkLib</IlcCompileDependsOn>
-    <IlcCompileDependsOn Condition="'$(TargetOS)' == 'Windows_NT'">$(IlcCompileDependsOn);SetupOSSpecificProps</IlcCompileDependsOn>
+    <IlcCompileDependsOn>$(IlcCompileDependsOn);SetupOSSpecificProps</IlcCompileDependsOn>
   </PropertyGroup>
 
   <ItemGroup>

From 17d1c0cb340c5b6335e7cca8b26e7e3af1f22a36 Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 16:49:17 -0800
Subject: [PATCH 6/8] Use command-line arg RID and remove unnecessary files

---
 .../Microsoft.DotNet.ILCompiler.Common.props  | 47 -------------------
 .../Microsoft.DotNet.ILCompiler.builds        |  9 +---
 .../Microsoft.DotNet.ILCompiler.pkgproj       | 45 ++++++++++++++++--
 .../Microsoft.DotNet.ILCompiler.targets       | 12 +----
 4 files changed, 44 insertions(+), 69 deletions(-)
 delete mode 100644 pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props

diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
deleted file mode 100644
index 84364490584..00000000000
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" 
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <!-- This target defines files and properties that need to be included in the package regardless of platform -->
-    <PropertyGroup>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <BaseLinePackageDependencies>false</BaseLinePackageDependencies>
-    <PackagePlatforms>x64;</PackagePlatforms>
-    <PreventImplementationReference>true</PreventImplementationReference>
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
-      <TargetPath>targets</TargetPath>
-    </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
-      <TargetPath>tools</TargetPath>
-    </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\framework\*">
-      <TargetPath>framework</TargetPath>
-    </File>
-    <!-- Workaround to avoid linker warnings on Windows - include all pdb files for static native libraries -->
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb">
-      <TargetPath>sdk</TargetPath>
-    </File>
-  </ItemGroup>
-  <Target Name="GetPackageDependencies"/>
-
-</Project>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
index c259278aa64..3c6ea9fc8ca 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'Windows_NT'">win</TargetRuntimePackageLocation>
-    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'Unix'">linux</TargetRuntimePackageLocation>
-    <TargetRuntimePackageLocation Condition="'$(OSGroup)' == 'OSX'">osx</TargetRuntimePackageLocation>
-  </PropertyGroup>
-  
-  
 
   <ItemGroup>
     <Project Include="Microsoft.DotNet.ILCompiler.pkgproj" >
       <OSGroup>AnyOS</OSGroup>
     </Project>
 
-    <!-- Include platform-specific package definitions-->
+    <!-- Include this to force a build of platform-specific packages-->
     <Project Include="$(MSBuildThisFileDirectory)\TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj" />
 
   </ItemGroup>
diff --git a/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
index 380a672dc79..df63fb391a6 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/TargetSpecific/Microsoft.DotNet.ILCompiler.pkgproj
@@ -1,5 +1,3 @@
-<!-- The ILCompiler package is produced by including built binaries and executables from the OS-Specific builds.
-  These contents are defined in Microsoft.Dotnet.ILCompiler.Common.props - the purpose of this file is to force the build process to produce runtime-specific packages. -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
@@ -9,6 +7,47 @@
     <PackageTargetRuntime Condition="'$(OSGroup)' == 'OSX'">osx-x64</PackageTargetRuntime>
   </PropertyGroup>
 
-  <Import Project="..\Microsoft.DotNet.ILCompiler.Common.props" />  
+  <!-- This target defines files and properties that need to be included in the package regardless of platform -->
+    <PropertyGroup>
+    <SkipPackageFileCheck>true</SkipPackageFileCheck>
+    <BaseLinePackageDependencies>false</BaseLinePackageDependencies>
+    <PackagePlatforms>x64;</PackagePlatforms>
+    <PreventImplementationReference>true</PreventImplementationReference>
+    <SkipValidatePackage>true</SkipValidatePackage>
+    <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <File Include="$(PackageSourceDirectory)\BuildIntegration\*">
+      <TargetPath>targets</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\tools\*.pdb">
+      <TargetPath>tools</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*" Exclude="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\*.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Include="$(BaseOutputPath)\$(OSPlatformConfig)\framework\*">
+      <TargetPath>framework</TargetPath>
+    </File>
+    <!-- Workaround to avoid linker warnings on Windows - include all pdb files for static native libraries -->
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapper.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrappercpp.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\bootstrapperdll.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\Runtime.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+    <File Condition="Exists('$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb')" Include="$(BaseOutputPath)\$(OSPlatformConfig)\sdk\PortableRuntime.pdb">
+      <TargetPath>sdk</TargetPath>
+    </File>
+  </ItemGroup>
+  <Target Name="GetPackageDependencies"/>
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\src\dir.targets" />
 </Project>
diff --git a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 740cb42c50c..635f40e9845 100644
--- a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -4,20 +4,10 @@
     <DeployAppHost>false</DeployAppHost>
     <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerPackageRootDir>
     <IlcBuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)build/</IlcBuildIntegrationTargetsDir>
-   
-    <!-- Workaround for lack of current host OS detection - https://github.com/Microsoft/msbuild/issues/539 -->
-    <TargetOS Condition="'$(TargetOS)' == '' and '$(OS)' == 'Unix' and Exists('/Applications')">OSX</TargetOS>
-    <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
-    <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->
-    <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
     
-    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</IlcTargetRuntimeIdentifier>
-    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'Unix'">linux-x64</IlcTargetRuntimeIdentifier>
-    <IlcTargetRuntimeIdentifier Condition="'$(TargetOS)' == 'OSX'">osx-x64</IlcTargetRuntimeIdentifier>
-
     <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
     <!-- Define the name of the runtime specific compiler package to import -->
-    <RuntimeIlcPackageName Condition="'$(IlcTargetRuntimeIdentifier)' != ''">runtime.$(IlcTargetRuntimeIdentifier).Microsoft.DotNet.ILCompiler</RuntimeIlcPackageName>
+    <RuntimeIlcPackageName Condition="'$(RuntimeIdentifier)' != ''">runtime.$(RuntimeIdentifier).Microsoft.DotNet.ILCompiler</RuntimeIlcPackageName>
     <IlcCalledViaPackage>true</IlcCalledViaPackage>
    
     <!-- If CoreRT is being consumed via its package, runtime-specific properties must be set before compilation can proceed -->

From 7c36fb08b00cb51948f3033d52842c4a39ffb11e Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 17:17:21 -0800
Subject: [PATCH 7/8] Respond to PR feedback

---
 .../BuildFrameworkNativeObjects.proj                 |  2 +-
 .../Microsoft.DotNet.ILCompiler.targets              |  4 +---
 .../Microsoft.NETCore.Native.targets                 | 12 ++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
index 8570bc9a5b4..6affd6d3ef5 100644
--- a/src/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   
   <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.DotNet.ILCompiler.targets" Condition="'$(IlcCalledViaPackage)' == 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.DotNet.ILCompiler.targets" Condition="'$(IlcCalledViaPackage)' == 'true'"/>
   <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(IlcCalledViaPackage)' == ''"/>
 
   <Target Name="BuildAllFrameworkLibraries"
diff --git a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 635f40e9845..748e02e421f 100644
--- a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -2,9 +2,7 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DeployAppHost>false</DeployAppHost>
-    <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../</_ILCompilerPackageRootDir>
-    <IlcBuildIntegrationTargetsDir>$(_ILCompilerPackageRootDir)build/</IlcBuildIntegrationTargetsDir>
-    
+
     <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
     <!-- Define the name of the runtime specific compiler package to import -->
     <RuntimeIlcPackageName Condition="'$(RuntimeIdentifier)' != ''">runtime.$(RuntimeIdentifier).Microsoft.DotNet.ILCompiler</RuntimeIlcPackageName>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index a2cba426ac9..96bd5d50927 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -25,10 +25,6 @@ See the LICENSE file in the project root for more information.
     <!-- The correct OS detection code. Uncomment once CI machines are upgraded to the latest version of MSBuild -->
     <!-- <TargetOS Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</TargetOS>  -->    
     <TargetOS Condition="'$(TargetOS)' == ''">$(OS)</TargetOS>
-    
-    <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
-    <!-- This value is only changed if running from a package -->
-    <IlcBuildIntegrationTargetsDir Condition="'$(IlcBuildIntegrationTargetsDir)' == '' ">$(MSBuildThisFileDirectory)</IlcBuildIntegrationTargetsDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -127,7 +123,7 @@ See the LICENSE file in the project root for more information.
   <Target Name="BuildFrameworkLib" Condition="'$(DisableFrameworkLibGeneration)' != 'true'" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
     <ItemGroup>
      <!-- This builds the project with the ILC implementation in the identified runtime package to avoid resolving it again  -->
-      <ProjectToBuild Include="$(IlcBuildIntegrationTargetsDir)BuildFrameworkNativeObjects.proj">
+      <ProjectToBuild Include="$(MSBuildThisFileDirectory)BuildFrameworkNativeObjects.proj">
           <AdditionalProperties>
           IntermediateOutputPath=$(IntermediateOutputPath);
           FrameworkLibPath=$(FrameworkLibPath);
@@ -167,8 +163,8 @@ See the LICENSE file in the project root for more information.
     <Exec Command="&quot;$(IlcPath)\tools\ilc&quot; @&quot;$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).ilc.rsp&quot;" />
   </Target>
 
-  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
-  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Unix.props" Condition="'$(TargetOS)' != 'Windows_NT'" />
   
   <Target Name="CppCompile"
       Inputs="$(IlcCompileOutput)"
@@ -239,6 +235,6 @@ See the LICENSE file in the project root for more information.
     <Exec Command="$(CppLibCreator) @(CustomLibArg, ' ')" Condition="'$(OS)' != 'Windows_NT'" />
   </Target>
 
-  <Import Project="$(IlcBuildIntegrationTargetsDir)Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NETCore.Native.Publish.targets" Condition="'$(NativeCompilationDuringPublish)' != 'false'" />
 
 </Project>

From c65eb32f357572982dbccdc9397f85b9d8cb2fdf Mon Sep 17 00:00:00 2001
From: Andon Andonov <andon.andonov@microsoft.com>
Date: Fri, 15 Dec 2017 17:23:41 -0800
Subject: [PATCH 8/8] Rename + add comments

---
 src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets  | 8 ++++----
 .../Microsoft.NETCore.Native.Windows.props                | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
index 748e02e421f..0009363a3e9 100644
--- a/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
+++ b/src/BuildIntegration/Microsoft.DotNet.ILCompiler.targets
@@ -9,17 +9,17 @@
     <IlcCalledViaPackage>true</IlcCalledViaPackage>
    
     <!-- If CoreRT is being consumed via its package, runtime-specific properties must be set before compilation can proceed -->
-    <ImportRuntimeILCompilerPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeILCompilerPackageTargetDependsOn>
-    <IlcSetupPropertiesDependsOn>ImportRuntimeILCompilerPackageTarget</IlcSetupPropertiesDependsOn>
+    <ImportRuntimeIlcPackageTargetDependsOn>RunResolvePackageDependencies</ImportRuntimeIlcPackageTargetDependsOn>
+    <IlcSetupPropertiesDependsOn>ImportRuntimeIlcPackageTarget</IlcSetupPropertiesDependsOn>
     <IlcDynamicBuildPropertyDependencies>SetupProperties</IlcDynamicBuildPropertyDependencies>
     
   </PropertyGroup>
 
   <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
   <!-- Locate the runtime package according to the current target runtime -->
-  <Target Name="ImportRuntimeILCompilerPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeILCompilerPackageTargetDependsOn)" BeforeTargets="Publish">
+  <Target Name="ImportRuntimeIlcPackageTarget" Condition="'$(BuildingFrameworkLibrary)' != 'true' AND $(IlcCalledViaPackage) == 'true'" DependsOnTargets="$(ImportRuntimeIlcPackageTargetDependsOn)" BeforeTargets="Publish">
     <!-- CoreRT SDK and Framework Assemblies need to be defined to avoid CoreCLR implementations being set as compiler inputs -->
-    <Error Condition="'@(PackageDefinitions)' == ''" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeILCompilerPackageTarget" />
+    <Error Condition="'@(PackageDefinitions)' == ''" Text="The PackageDefinitions ItemGroup is required for target ImportRuntimeIlcPackageTarget" />
     <ItemGroup>
       <RuntimePackage Include="@(PackageDefinitions)" Condition="'%(PackageDefinitions.Name)' == '$(RuntimeIlcPackageName)'" />
     </ItemGroup>
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index 2d943a99de2..2214b342372 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -14,12 +14,14 @@ See the LICENSE file in the project root for more information.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Ensure that runtime-specific paths have already been set -->
   <PropertyGroup>
     <CppCompiler>cl</CppCompiler>
     <CppLinker>link</CppLinker>
     <CppLibCreator>lib</CppLibCreator>
   </PropertyGroup>
+    
+  <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 -->
+  <!-- Ensure that runtime-specific paths have already been set -->  
   <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
     <ItemGroup>
       <CppCompilerAndLinkerArg Include="/I$(IlcPath)\inc" />