diff --git a/buildpipeline/DotNet-CoreRT-Publish.json b/buildpipeline/DotNet-CoreRT-Publish.json
index c0b3486bc16..ed451610e6d 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\\Microsoft.TargetingPack.Private.CoreRT\\$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\\Windows_NT.x64.$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\\Microsoft.TargetingPack.Private.CoreRT\\$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\\Windows_NT.x64.$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\\Microsoft.TargetingPack.Private.CoreRT\\$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\\Windows_NT.x64.$env:Configuration\\$env:AzureContainerPackageGlob",
"workingFolder": "",
"failOnStandardError": "true"
}
diff --git a/dir.props b/dir.props
index 028d688d044..00fa26eb7a5 100644
--- a/dir.props
+++ b/dir.props
@@ -135,7 +135,7 @@
$(DotnetCliPath)
- $(PackageOutputRoot)$(OSPlatformConfig)/$(MSBuildProjectName)/
+ $(PackageOutputRoot)$(OSPlatformConfig)/
$(PackageOutputPath)symbols/
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
new file mode 100644
index 00000000000..841203881cb
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds
@@ -0,0 +1,12 @@
+
+
+
+
+
+ Windows_NT
+ Linux
+ Mac
+
+
+
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
index 03098cb7c56..b437e405c86 100644
--- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj
@@ -1,37 +1,49 @@
-
-
-
-
true
false
x64;
true
true
+ true
+
+
-
-
-
-
-
-
-
-
-
- 1.0.13-prerelease-00001
-
-
- 1.2.0-beta-24815-03
-
-
- 1.2.0
-
-
+
+ build
+
+
+ targets
+
+
+ tools
+
+
+ sdk
+
+
+ framework
+
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
+
+ sdk
+
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
new file mode 100644
index 00000000000..28e6f9aa7c1
--- /dev/null
+++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.targets
@@ -0,0 +1,7 @@
+
+
+ <_ILCompilerRootDir>$(MSBuildThisFileDirectory)../
+ $(_ILCompilerRootDir)targets/
+
+
+
diff --git a/pkg/packageIndex.json b/pkg/packageIndex.json
index 1b47ad46889..f1839ab6646 100644
--- a/pkg/packageIndex.json
+++ b/pkg/packageIndex.json
@@ -4,6 +4,10 @@
"StableVersions": [],
"BaselineVersion": "1.0.0",
},
+ "Microsoft.DotNet.ILCompiler" : {
+ "StableVersions": [],
+ "BaselineVersion": "1.0.0",
+ },
"Microsoft.TargetingPack.Private.CoreRT" : {
"StableVersions": [],
"BaselineVersion": "1.0.0",
diff --git a/pkg/packages.proj b/pkg/packages.proj
index 80f05e92fb9..83764c693b7 100644
--- a/pkg/packages.proj
+++ b/pkg/packages.proj
@@ -1,18 +1,20 @@
-
+
$(BinDir)pkg/reports/
false
-
-
+
+
+ AnyOS
+
+
AnyOS
-
-
+
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index 5489fbbc572..20065cdc8b7 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -22,7 +22,10 @@ See the LICENSE file in the project root for more information.
true
OSX
+
+
$(OS)
+ $(MSBuildThisFileDirectory)/..