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 @@
$(DotnetCliPath)
- $(PackageOutputRoot)$(OSPlatformConfig)/
+ $(PackageOutputRoot)$(BinDirConfiguration)/
$(PackageOutputPath)symbols/
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..70aebe043af
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.Common.props
@@ -0,0 +1,47 @@
+
+
+
+
+
+ true
+ false
+ x64;
+ true
+ true
+ true
+
+
+
+
+ targets
+
+
+ tools
+
+
+ sdk
+
+
+ framework
+
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
+
+
+
+
\ No newline at end of file
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 @@
+
+ OSX
+
+
+ $(OS)
+ win
+ linux
+ osx
+
+
+
+
- Windows_NT
- Linux
- Mac
+ AnyOS
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index a94ce651b38..e933a5b3f99 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -5,44 +5,35 @@
false
x64;
true
+ true
true
true
-
+
+ true
+
+
+
+
+
+
+
+
-
+
+
build
-
- targets
-
-
+
+
+
tools
-
- sdk
-
-
- framework
-
-
-
- sdk
-
-
- sdk
-
-
- sdk
-
-
- sdk
-
-
- sdk
+
+ targets
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
index 28e6f9aa7c1..2832fe6b7cf 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
@@ -1,7 +1,204 @@
-
+
- <_ILCompilerRootDir>$(MSBuildThisFileDirectory)../
- $(_ILCompilerRootDir)targets/
+ false
+ <_ILCompilerPackageRootDir>$(MSBuildThisFileDirectory)../
+ $(_ILCompilerPackageRootDir)targets/
+
+
+ OSX
+
+
+ $(OS)
+
+ win-x64
+ linux-x64
+ osx-x64
+
+ <_RuntimeILCompilerPackageName Condition="'$(TargetRuntimeIdentifier)' != ''">runtime.$(TargetRuntimeIdentifier).Microsoft.DotNet.ILCompiler
+ $(IlCompilerTargetsDir)$(_RuntimeILCompilerPackageName).targets
-
+
+
+
+ $(IntermediateOutputPath)native\
+ $(OutputPath)native\
+ true
+
+
+
+ .obj
+ .o
+ .bc
+ .lib
+ .a
+ $(NativeObjectExt)
+ .cpp
+ .bc
+ .exe
+
+ .dll
+ .dylib
+ .so
+ .lib
+ .a
+ .html
+ $(NativeIntermediateOutputPath)$(TargetName)$(NativeObjectExt)
+ $(NativeOutputPath)$(TargetName)$(NativeBinaryExt)
+ $(NativeObject)
+ $(NativeIntermediateOutputPath)$(TargetName).cpp
+ IlcCompile
+ CppCompile
+ IlcCompile
+ $(NativeOutputPath)
+ $(NativeIntermediateOutputPath)
+ $(FrameworkLibPath)\Framework$(LibFileExt)
+ $(FrameworkLibPath)\libframework$(LibFileExt)
+
+
+
+ Compile;ComputeIlcCompileInputs
+ $(IlcCompileDependsOn);BuildFrameworkLib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(RuntimePackagePath)
+ $(RuntimePackagePath)\tools\ILCompiler.Build.Tasks.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IntermediateOutputPath=$(IntermediateOutputPath); FrameworkLibPath=$(FrameworkLibPath); FrameworkObjPath=$(FrameworkObjPath); RuntimePackagePath=$(RuntimePackagePath)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+ linux-x64
+
+
+
+
+
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 @@
+
+
+
+
+
+ osx-x64
+
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/targets/BuildFrameworkNativeObjects.proj b/pkg/Microsoft.DotNet.ILCompiler/targets/BuildFrameworkNativeObjects.proj
new file mode 100644
index 00000000000..6f6c82b12f0
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/targets/BuildFrameworkNativeObjects.proj
@@ -0,0 +1,44 @@
+
+
+
+ ComputeIlcCompileInputs;BuildOneFrameworkLibrary
+ BuildAllFrameworkLibrariesAsSingleLib
+ true
+ $(FrameworkObjPath)\
+ true
+
+
+
+
+
+
+
+
+ LibraryToCompile=%(DefaultFrameworkAssemblies.Identity)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/targets/BuildIntegration.proj b/pkg/Microsoft.DotNet.ILCompiler/targets/BuildIntegration.proj
new file mode 100644
index 00000000000..5340405aa8a
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/targets/BuildIntegration.proj
@@ -0,0 +1,18 @@
+
+
+
+ $(BaseOutputPath)$(OSPlatformConfig)/build
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Publish.targets b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Publish.targets
new file mode 100644
index 00000000000..21c72dd97ad
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Publish.targets
@@ -0,0 +1,66 @@
+
+
+
+ $(MSBuildThisFileDirectory)..\tools\ILCompiler.Build.Tasks.dll
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_NativeIntermediateAssembly Include="@(IntermediateAssembly->'$(NativeOutputPath)%(Filename)$(NativeBinaryExt)')" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Unix.props b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Unix.props
new file mode 100644
index 00000000000..903282f11b8
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Unix.props
@@ -0,0 +1,68 @@
+
+
+
+
+
+ clang
+ clang-3.9
+ $(CppCompilerAndLinker)
+ $(CppCompilerAndLinker)
+ ar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Windows.props b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Windows.props
new file mode 100644
index 00000000000..f5b1622ee41
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/targets/Microsoft.NETCore.Native.Windows.props
@@ -0,0 +1,80 @@
+
+
+
+
+
+ cl
+ link
+ lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+ win-x64
+
+
+
+
+
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index 41b0227a604..4387068c1ba 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -75,5 +75,5 @@ See the LICENSE file in the project root for more information.
-
+