diff --git a/scripts/build/build_appdeps.ps1 b/scripts/build/build_appdeps.ps1 index 55ec5172c..f7f996f2b 100644 --- a/scripts/build/build_appdeps.ps1 +++ b/scripts/build/build_appdeps.ps1 @@ -6,21 +6,14 @@ param( [Parameter(Mandatory=$true)][string]$RepoRoot, [Parameter(Mandatory=$true)][string]$OutputDir) -$intermediateDir = "$RepoRoot\artifacts\appdepssdk\packages" $appdepBinDir = "$OutputDir\bin\appdepsdk" -If (Test-Path $intermediateDir){ - rmdir -Force -Rec $intermediateDir -} -mkdir $intermediateDir -& dotnet restore --packages "$intermediateDir" "$RepoRoot\src\dotnet\commands\dotnet-compile-native\appdep\project.json" - - If (Test-Path $appdepBinDir){ rmdir -Force -Rec $appdepBinDir } + mkdir -Force "$appdepBinDir" -ls "$intermediateDir\toolchain*\*\*" | foreach { +ls "$env:NUGET_PACKAGES\toolchain.win7-x64.Microsoft.DotNet.AppDep\1.0.4-prerelease-00001\*" | foreach { copy -Rec $_ "$appdepBinDir" } \ No newline at end of file diff --git a/scripts/build/build_appdeps.sh b/scripts/build/build_appdeps.sh index af180121d..208c41211 100755 --- a/scripts/build/build_appdeps.sh +++ b/scripts/build/build_appdeps.sh @@ -16,7 +16,17 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$DIR/../common/_common.sh" -APPDEPS_PROJECT_DIR="$REPOROOT/src/dotnet/commands/dotnet-compile-native/appdep" +# Always recalculate the RID because the package always uses a specific RID, regardless of OS X version or Linux distro. +if [ "$OSNAME" == "osx" ]; then + RID=osx.10.10-x64 +elif [ "$OSNAME" == "ubuntu" ]; then + RID=ubuntu.14.04-x64 +elif [ "$OSNAME" == "centos" ]; then + RID=centos.7.1-x64 +else + echo "Unknown OS: $OSNAME" 1>&2 + exit 1 +fi # Get Absolute Output Dir pushd $1 @@ -24,10 +34,6 @@ OUTPUT_DIR="$(pwd)" popd ## App Deps ## -pushd $APPDEPS_PROJECT_DIR -dotnet restore --runtime $RID --packages $APPDEPS_PROJECT_DIR/packages $DISABLE_PARALLEL -APPDEP_SDK=$APPDEPS_PROJECT_DIR/packages/toolchain*/*/ -popd - +APPDEP_SDK=$NUGET_PACKAGES/toolchain.$RID.Microsoft.DotNet.AppDep/1.0.4-prerelease-00001/ mkdir -p $OUTPUT_DIR/appdepsdk cp -a $APPDEP_SDK/. $OUTPUT_DIR/appdepsdk diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index d522ce652..e9b419ea5 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -6,7 +6,7 @@ "description": "Types to model a .NET Project", "dependencies": { "NETStandard.Library": "1.0.0-rc2-23728", - "System.Reflection.Metadata": "1.2.0-rc2-23608", + "System.Reflection.Metadata": "1.2.0-rc2-23728", "System.Runtime.Loader": "4.0.0-rc2-23728", "System.Dynamic.Runtime": "4.0.11-rc2-23728", "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23728", @@ -14,14 +14,14 @@ "System.Xml.XDocument": "4.0.11-rc2-23728", "NuGet.Packaging": "3.4.0-beta-569", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15975", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15985", "Microsoft.Extensions.JsonParser.Sources": { "type": "build", - "version": "1.0.0-*" + "version": "1.0.0-rc2-16453" }, "Microsoft.Extensions.HashCodeCombiner.Sources": { "type": "build", - "version": "1.0.0-*" + "version": "1.0.0-rc2-16054" }, "Microsoft.Extensions.DependencyModel": { "type": "build", diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 2e7c2d187..15d037985 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -12,7 +12,7 @@ "dependencies": { "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-15935", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16010", "NETStandard.Library": "1.0.0-rc2-23728", "System.Resources.ResourceManager": "4.0.1-rc2-23728", "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23728" diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 0712973cc..42fca71f1 100644 --- a/src/dotnet/commands/dotnet-compile-native/appdep/project.json +++ b/src/dotnet/commands/dotnet-compile-native/appdep/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.0.0-rc2-23728", - "Microsoft.DotNet.AppDep":"1.0.4-*" + "Microsoft.DotNet.AppDep":"1.0.4-prerelease-00001" }, "frameworks": { "dnxcore50": { } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 216d45c0b..1559f1860 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -28,22 +28,21 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ILCompiler": "1.0.4-*", - "Microsoft.DotNet.ILCompiler.SDK": "1.0.4-*", + "Microsoft.DotNet.ILCompiler.SDK": "1.0.4-prerelease-00006", "Microsoft.Extensions.Logging": "1.0.0-rc2-16011", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16011", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16531", "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", - "version": "1.0.0-*" + "version": "1.0.0-rc2-16453" }, "Microsoft.Dnx.Runtime.CommandParsing.Sources": { - "version": "1.0.0-*", + "version": "1.0.0-rc2-16453", "type": "build" }, "Microsoft.Dnx.Runtime.Sources": { - "version": "1.0.0-*", + "version": "1.0.0-rc2-16453", "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": { diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 82ae895f7..8a704d0a6 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "NETStandard.Library": "1.0.0-rc2-23728", - "Microsoft.NETCore.TestHost" : "1.0.0-*", + "Microsoft.NETCore.TestHost" : "1.0.0-rc2-23728", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101",