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

Fix the update-dependencies project so it builds and runs again.

Browse source
This commit is contained in:
Eric Erhardt 2016-05-16 19:10:04 -05:00
parent b90f5081c9
commit da41168a12
6 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
global.json
View file

@ -1,3 +1,3 @@
{ {
"projects": [ "src", "test", "tools" ] "projects": [ "src", "test", "tools", "build_projects" ]
} }

3
scripts/global.json
View file

@ -1,3 +0,0 @@
{
"projects": [ "." ]
}

2
scripts/update-dependencies.ps1
View file

@ -41,7 +41,7 @@ popd
# Publish the app # Publish the app
Write-Host "Compiling App $appPath..." Write-Host "Compiling App $appPath..."
dotnet publish "$appPath" -o "$appPath\bin" --framework netstandardapp1.5 dotnet publish "$appPath" -o "$appPath\bin" --framework netcoreapp1.0
if($LASTEXITCODE -ne 0) { throw "Failed to compile build scripts" } if($LASTEXITCODE -ne 0) { throw "Failed to compile build scripts" }
# Run the app # Run the app

4
scripts/update-dependencies/Config.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Scripts
/// ///
/// The following Environment Variables can optionally be specified: /// The following Environment Variables can optionally be specified:
/// ///
/// COREFX_VERSION_URL - The Url to get the current CoreFx version. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/dotnet/corefx/release/1.0.0-rc2/LKG.txt") /// COREFX_VERSION_URL - The Url to get the current CoreFx version. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/master/Latest.txt")
/// GITHUB_ORIGIN_OWNER - The owner of the GitHub fork to push the commit and create the PR from. (ex. "dotnet-bot") /// GITHUB_ORIGIN_OWNER - The owner of the GitHub fork to push the commit and create the PR from. (ex. "dotnet-bot")
/// GITHUB_UPSTREAM_OWNER - The owner of the GitHub base repo to create the PR to. (ex. "dotnet") /// GITHUB_UPSTREAM_OWNER - The owner of the GitHub base repo to create the PR to. (ex. "dotnet")
/// GITHUB_PROJECT - The repo name under the ORIGIN and UPSTREAM owners. (ex. "cli") /// GITHUB_PROJECT - The repo name under the ORIGIN and UPSTREAM owners. (ex. "cli")
@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Scripts
private Lazy<string> _email = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_EMAIL")); private Lazy<string> _email = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_EMAIL"));
private Lazy<string> _password = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PASSWORD")); private Lazy<string> _password = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PASSWORD"));
private Lazy<string> _coreFxVersionUrl = new Lazy<string>(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/dotnet/corefx/release/1.0.0-rc2/LKG.txt")); private Lazy<string> _coreFxVersionUrl = new Lazy<string>(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/master/Latest.txt"));
private Lazy<string> _gitHubOriginOwner; private Lazy<string> _gitHubOriginOwner;
private Lazy<string> _gitHubUpstreamOwner = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet")); private Lazy<string> _gitHubUpstreamOwner = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet"));
private Lazy<string> _gitHubProject = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PROJECT", "cli")); private Lazy<string> _gitHubProject = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PROJECT", "cli"));

2
scripts/update-dependencies/UpdateFilesTargets.cs
View file

@ -190,7 +190,7 @@ namespace Microsoft.DotNet.Scripts
[Target] [Target]
public static BuildTargetResult ReplaceCrossGen(BuildTargetContext c) public static BuildTargetResult ReplaceCrossGen(BuildTargetContext c)
{ {
ReplaceFileContents(@"scripts\dotnet-cli-build\CompileTargets.cs", compileTargetsContent => ReplaceFileContents(@"build_projects\dotnet-cli-build\CompileTargets.cs", compileTargetsContent =>
{ {
DependencyInfo coreFXInfo = c.GetCoreFXDependency(); DependencyInfo coreFXInfo = c.GetCoreFXDependency();
Regex regex = new Regex(@"CoreCLRVersion = ""(?<version>\d.\d.\d)-(?<release>.*)"";"); Regex regex = new Regex(@"CoreCLRVersion = ""(?<version>\d.\d.\d)-(?<release>.*)"";");

8
scripts/update-dependencies/project.json
View file

@ -1,21 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Updates the repos dependencies", "description": "Updates the repos dependencies",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027", "NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027", "Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},
"NuGet.Versioning": "3.5.0-rc-1285", "NuGet.Versioning": "3.5.0-rc-1285",
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Octokit": "0.18.0", "Octokit": "0.18.0",
"Microsoft.Net.Http": "2.2.29" "Microsoft.Net.Http": "2.2.29"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
"portable-net45+win" "portable-net45+win"