mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #798 from piotrpMSFT/piotrpMSFT/issue797/emptyNuget

Browse source 
Fix empty NuGets
This commit is contained in:
Piotr Puszkiewicz 2016-01-13 00:32:02 -08:00
commit 1e423d4f1b
6 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/nuget/package.ps1
View file

@ -23,21 +23,16 @@ New-Item -ItemType Directory -Force -Path $IntermediatePackagesDir
$Projects = @( $Projects = @(
"Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.ProjectModel", "Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.DotNet.Runtime",
"Microsoft.Extensions.Testing.Abstractions",
"Microsoft.DotNet.ProjectModel.Loader", "Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.Extensions.DependencyModel" "Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions"
) )
foreach ($ProjectName in $Projects) { foreach ($ProjectName in $Projects) {
$ProjectFile = "$RepoRoot\src\$ProjectName\project.json" $ProjectFile = "$RepoRoot\src\$ProjectName\project.json"
& $toolsDir\dotnet restore "$ProjectFile"
if (!$?) { & $toolsDir\dotnet pack "$ProjectFile" --basepath "$Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
Write-Host "$toolsDir\dotnet restore failed for: $ProjectFile"
Exit 1
}
& $toolsDir\dotnet pack "$ProjectFile" --basepath "Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
if (!$?) { if (!$?) {
Write-Host "$toolsDir\dotnet pack failed for: $ProjectFile" Write-Host "$toolsDir\dotnet pack failed for: $ProjectFile"
Exit 1 Exit 1

6
scripts/compile/compile-stage.ps1
View file

@ -13,6 +13,8 @@ param(
$Projects = @( $Projects = @(
"Microsoft.DotNet.Cli", "Microsoft.DotNet.Cli",
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Server", "Microsoft.DotNet.ProjectModel.Server",
"Microsoft.DotNet.Tools.Builder", "Microsoft.DotNet.Tools.Builder",
"Microsoft.DotNet.Tools.Compiler", "Microsoft.DotNet.Tools.Compiler",
@ -27,7 +29,9 @@ $Projects = @(
"Microsoft.DotNet.Tools.Repl.Csi", "Microsoft.DotNet.Tools.Repl.Csi",
"Microsoft.DotNet.Tools.Resgen", "Microsoft.DotNet.Tools.Resgen",
"Microsoft.DotNet.Tools.Run", "Microsoft.DotNet.Tools.Run",
"Microsoft.DotNet.Tools.Test" "Microsoft.DotNet.Tools.Test",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions"
) )
$BinariesForCoreHost = @( $BinariesForCoreHost = @(

2
src/Microsoft.DotNet.Tools.Compiler/project.json
View file

@ -10,7 +10,7 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530",
"Microsoft.Extensions.CommandLineUtils.Sources": { "Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build", "type": "build",

2
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -14,7 +14,7 @@
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": { },
"dotnet5.4": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23616", "System.IO.FileSystem": "4.0.1-rc2-23616",
"System.Linq": "4.0.1-rc2-23616", "System.Linq": "4.0.1-rc2-23616",

1
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -12,7 +12,6 @@
"dependencies": { "dependencies": {
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"System.Runtime.Serialization.Primitives": "4.0.11-rc2-23616" "System.Runtime.Serialization.Primitives": "4.0.11-rc2-23616"
}, },

2
test/LoadContextTest/project.json
View file

@ -13,7 +13,7 @@
"System.Linq": "4.0.1-beta-23516", "System.Linq": "4.0.1-beta-23516",
"System.Threading": "4.0.11-beta-23516", "System.Threading": "4.0.11-beta-23516",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530",
"Microsoft.DotNet.ProjectModel.Loader": { "target": "project" } "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" }
}, },