From 001367407184ae54e84c72c5393023145363dc57 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Mon, 4 Apr 2016 15:25:24 -0700 Subject: [PATCH 1/3] Remove the need for packages.config for Cake --- scripts/cake-bootstrap.ps1 | 10 +--------- scripts/cake-bootstrap.sh | 12 +----------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/scripts/cake-bootstrap.ps1 b/scripts/cake-bootstrap.ps1 index 6e0aa023b6..4656e051f7 100644 --- a/scripts/cake-bootstrap.ps1 +++ b/scripts/cake-bootstrap.ps1 @@ -77,14 +77,6 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { New-Item -Path $TOOLS_DIR -Type directory | out-null } -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch { - Throw "Could not download packages.config." - } -} - # Try download NuGet.exe if not exists if (!(Test-Path $NUGET_EXE)) { Write-Verbose -Message "Downloading NuGet.exe..." @@ -106,7 +98,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) Set-Location $TOOLS_DIR Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" + $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install Cake -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" Write-Verbose -Message ($NuGetOutput | out-string) Pop-Location diff --git a/scripts/cake-bootstrap.sh b/scripts/cake-bootstrap.sh index e594523e97..a712051bcb 100644 --- a/scripts/cake-bootstrap.sh +++ b/scripts/cake-bootstrap.sh @@ -35,16 +35,6 @@ if [ ! -d "$TOOLS_DIR" ]; then mkdir "$TOOLS_DIR" fi -# Make sure that packages.config exist. -if [ ! -f "$TOOLS_DIR/packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." - exit 1 - fi -fi - # Download NuGet if it does not exist. if [ ! -f "$NUGET_EXE" ]; then echo "Downloading NuGet..." @@ -57,7 +47,7 @@ fi # Restore tools from NuGet. pushd "$TOOLS_DIR" >/dev/null -mono "$NUGET_EXE" install -ExcludeVersion +mono "$NUGET_EXE" install Cake -ExcludeVersion if [ $? -ne 0 ]; then echo "Could not restore NuGet packages." exit 1 From 177c42b86051e774b6cdaa82492fa5848b3bf480 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Mon, 4 Apr 2016 15:31:53 -0700 Subject: [PATCH 2/3] Dependency upgrade 20448->20449 --- src/OmniSharp.Abstractions/project.json | 12 ++++++------ src/OmniSharp.Bootstrap/project.json | 2 +- src/OmniSharp.DotNet/project.json | 2 +- src/OmniSharp.Host/project.json | 18 +++++++++--------- src/OmniSharp.MSBuild/project.json | 2 +- src/OmniSharp.Roslyn/project.json | 2 +- src/OmniSharp.Stdio/project.json | 4 ++-- tests/OmniSharp.Bootstrap.Tests/project.json | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/OmniSharp.Abstractions/project.json b/src/OmniSharp.Abstractions/project.json index f1e1edb2ae..91f2c01e8a 100644 --- a/src/OmniSharp.Abstractions/project.json +++ b/src/OmniSharp.Abstractions/project.json @@ -8,12 +8,12 @@ "Newtonsoft.Json": "8.0.3", "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", "Microsoft.Composition": "1.0.30", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448", - "Microsoft.Extensions.Configuration": "1.0.0-rc2-20448", - "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20448", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20449", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-20449", + "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20449", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20449", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449", "System.Reflection.Metadata": "1.3.0-rc2-23931" }, "frameworks": { diff --git a/src/OmniSharp.Bootstrap/project.json b/src/OmniSharp.Bootstrap/project.json index bf35eae34e..2743045cc0 100644 --- a/src/OmniSharp.Bootstrap/project.json +++ b/src/OmniSharp.Bootstrap/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "Microsoft.Composition": "1.0.30", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449", "Newtonsoft.Json": "8.0.3" }, "commands": { diff --git a/src/OmniSharp.DotNet/project.json b/src/OmniSharp.DotNet/project.json index 9b532e7d48..4fe31d02e6 100644 --- a/src/OmniSharp.DotNet/project.json +++ b/src/OmniSharp.DotNet/project.json @@ -9,7 +9,7 @@ "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", "Microsoft.CodeAnalysis.Common": "1.3.0-beta1-20160321-04", "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449" }, "frameworks": { "net451": { diff --git a/src/OmniSharp.Host/project.json b/src/OmniSharp.Host/project.json index 750c95c62c..eddcd44b83 100644 --- a/src/OmniSharp.Host/project.json +++ b/src/OmniSharp.Host/project.json @@ -10,18 +10,18 @@ "OmniSharp.Stdio": "1.0.0-*", "OmniSharp.Plugins": "1.0.0-*", "OmniSharp.Roslyn": "1.0.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20448", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20448", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20449", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20449", "Microsoft.Composition": "1.0.30", "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20448", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20449", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20449", "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20448", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448", - "Microsoft.Extensions.Options": "1.0.0-rc2-20448", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20448" + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20449", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20449", + "Microsoft.Extensions.Options": "1.0.0-rc2-20449", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20449" }, "frameworks": { "net451": { diff --git a/src/OmniSharp.MSBuild/project.json b/src/OmniSharp.MSBuild/project.json index 3c16189c6e..9ae9d55dc9 100644 --- a/src/OmniSharp.MSBuild/project.json +++ b/src/OmniSharp.MSBuild/project.json @@ -7,7 +7,7 @@ "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", "OmniSharp.Roslyn.CSharp": "1.0.0-*", - "Microsoft.Extensions.Options": "1.0.0-rc2-20448" + "Microsoft.Extensions.Options": "1.0.0-rc2-20449" }, "frameworks": { "net451": { diff --git a/src/OmniSharp.Roslyn/project.json b/src/OmniSharp.Roslyn/project.json index 6c1d824cf7..41952654b1 100644 --- a/src/OmniSharp.Roslyn/project.json +++ b/src/OmniSharp.Roslyn/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449", "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04" }, "frameworks": { diff --git a/src/OmniSharp.Stdio/project.json b/src/OmniSharp.Stdio/project.json index c6dc37cf56..e56454f8d6 100644 --- a/src/OmniSharp.Stdio/project.json +++ b/src/OmniSharp.Stdio/project.json @@ -7,8 +7,8 @@ }, "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", - "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20448", - "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20448", + "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20449", + "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20449", "Newtonsoft.Json": "8.0.3" }, "frameworks": { diff --git a/tests/OmniSharp.Bootstrap.Tests/project.json b/tests/OmniSharp.Bootstrap.Tests/project.json index ef3581f3b3..a0537bcb4c 100644 --- a/tests/OmniSharp.Bootstrap.Tests/project.json +++ b/tests/OmniSharp.Bootstrap.Tests/project.json @@ -20,8 +20,8 @@ "NETStandard.Library": "1.5.0-rc2-23931", "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-002202", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20448", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20449", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449", "NuGet.Packaging": "3.5.0-beta-1123", "System.Diagnostics.Process": "4.1.0-rc2-23931", "System.IO.Compression": "4.1.0-rc2-23931", From 9a9a3607db79ad2804420a566739016f5ef364d0 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Mon, 4 Apr 2016 15:41:41 -0700 Subject: [PATCH 3/3] Pin dotnet cli to 1.0.0-beta-002202 --- build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.json b/build.json index eff2167500..b3d5b8115d 100644 --- a/build.json +++ b/build.json @@ -3,7 +3,7 @@ "DotNetFolder": ".dotnet", "DotNetInstallScriptURL": "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain", "DotNetChannel": "beta", - "DotNetVersion": "Latest", + "DotNetVersion": "1.0.0-beta-002202", "BuildToolsFolder": ".tools", "ArtifactsFolder": "artifacts", "TestProjects": {