From 9d57862ed76484c10ff9287d9f79158de3efa4c2 Mon Sep 17 00:00:00 2001 From: Duncan Angus Wilkie Date: Wed, 29 Apr 2015 22:07:20 +0100 Subject: [PATCH 01/18] Update README.md To show bash profile step for osx --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 8271355f6c..a176b91e04 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,13 @@ brew tap aspnet/dnx brew update brew install dnvm ``` + +Add dnvm to your bash profile (./bash_profile) +```bash +source dnvm +``` + + Note that on Windows the .NET Framework is already installed, whereas on OS X the brew formula uses a particular version of [Mono](http://www.mono-project.com/) that we know works with ASP.NET 5. ## Linux From 8e7d4a957b47848e669c2eeb512d64cff8617c86 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Mon, 4 May 2015 08:57:51 -0700 Subject: [PATCH 02/18] Remove link to old repo list --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fbf86224bd..6ba593c310 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ Please log a new issue in the appropriate GitHub repo. Here are some of the most * [MVC](https://github.com/aspnet/Mvc) * [SignalR-Server](https://github.com/aspnet/SignalR-Server) -A description of all the repos is [here](https://github.com/aspnet/Home/wiki/Repo-List). +Or browse the full list of repos in the [aspnet](https://github.com/aspnet/) organization. ## Other discussions From 4505f7333d3c4eca59d0d04cec36d957dddd2471 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Tue, 5 May 2015 17:33:45 -0700 Subject: [PATCH 03/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@c10520f43c189b7ccd63d6ecb4e38bd4d19f8e4f --- dnvm.ps1 | 17 ++++++++++------- dnvm.sh | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index a0d955063d..a0937cc342 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta5-10374" +$BuildVersion="beta5-10375" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -1148,12 +1148,15 @@ function dnvm-install { Write-Progress -Activity "Installing runtime" "Unpacking runtime" -Id 1 Unpack-Package $DownloadFile $UnpackFolder - New-Item -Type Directory $RuntimeFolder -Force | Out-Null - _WriteOut "Installing to $RuntimeFolder" - _WriteDebug "Moving package contents to $RuntimeFolder" - Move-Item "$UnpackFolder\*" $RuntimeFolder - _WriteDebug "Cleaning temporary directory $UnpackFolder" - Remove-Item $UnpackFolder -Force | Out-Null + if(Test-Path $RuntimeFolder) { + # Ensure the runtime hasn't been installed in the time it took to download the package. + _WriteOut "'$runtimeFullName' is already installed." + } + else { + _WriteOut "Installing to $RuntimeFolder" + _WriteDebug "Moving package contents to $RuntimeFolder" + Move-Item $UnpackFolder $RuntimeFolder + } dnvm-use $PackageVersion -Architecture:$Architecture -Runtime:$Runtime -Persistent:$Persistent diff --git a/dnvm.sh b/dnvm.sh index 09ec229923..cc5a5cd3fc 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta5-10374" +_DNVM_BUILDNUMBER="beta5-10375" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From 69ad72371dd1be4e5fc773ec2f79e1b6f79ae7e7 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 7 May 2015 20:38:02 -0700 Subject: [PATCH 04/18] Update CLA info --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ba593c310..d696812098 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), ## Contributing code and content -You will need to sign a [Contributor License Agreement](https://cla.msopentech.com) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the form and then electronically sign the Contributor License Agreement when you receive the email containing the link to the document. This needs to only be done once for any Microsoft Open Technologies OSS project. +You will need to sign a [Contributor License Agreement](https://cla2.dotnetfoundation.org/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the form and then electronically sign the Contributor License Agreement when you receive the email containing the link to the document. This needs to only be done once for any .NET Foundation OSS project. Make sure you can build the code. Familiarize yourself with the project workflow and our coding conventions. If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. From 2d97024dbe27545014d40d43df21d6912623ee12 Mon Sep 17 00:00:00 2001 From: Van Kichline Date: Fri, 8 May 2015 09:24:11 -0700 Subject: [PATCH 05/18] Update README.md There was a single lingering reference to "K command." This will become less intelligible as time goes by, so best to correct it. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8271355f6c..f6cfd1f9ff 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ You should also be able to run `dnx` and see the help text of the `dnx` command. 2. Change directory to the folder of the sample you want to run 3. Run ```dnu restore``` to restore the packages required by that sample. 4. You should see a bunch of output as all the dependencies of the app are downloaded from MyGet. -5. Run the sample using the appropriate K command: +5. Run the sample using the appropriate DNX command: - For the console app run `dnx . run`. - For the web apps run `dnx . web` on Windows or `dnx . kestrel` on OS X/Linux. 6. You should see the output of the console app or a message that says the site is now started. From 2bb2d1484d541c8fb391d79dcdfda1ba5aa10ef6 Mon Sep 17 00:00:00 2001 From: Glen Date: Mon, 11 May 2015 10:32:45 +0200 Subject: [PATCH 06/18] Fix variable names in dnvminstall.ps1 --- dnvminstall.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dnvminstall.ps1 b/dnvminstall.ps1 index 9f68f27bab..765cde2e58 100644 --- a/dnvminstall.ps1 +++ b/dnvminstall.ps1 @@ -1,6 +1,6 @@ $tempPath = Join-Path $env:TEMP "dnvminstall" -$kvmPs1Path = Join-Path $tempPath "dnvm.ps1" -$kvmCmdPath = Join-Path $tempPath "dnvm.cmd" +$dnvmPs1Path = Join-Path $tempPath "dnvm.ps1" +$dnvmCmdPath = Join-Path $tempPath "dnvm.cmd" Write-Host "Using temporary directory: $tempPath" if (!(Test-Path $tempPath)) { md $tempPath | Out-Null } @@ -8,8 +8,8 @@ if (!(Test-Path $tempPath)) { md $tempPath | Out-Null } $webClient = New-Object System.Net.WebClient Write-Host "Downloading DNVM.ps1 to $dnvmPs1Path" -$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.ps1', $kvmPs1Path) +$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.ps1', $dnvmPs1Path) Write-Host "Downloading DNVM.cmd to $dnvmCmdPath" -$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.cmd', $kvmCmdPath) +$webClient.DownloadFile('https://raw.githubusercontent.com/aspnet/Home/dev/dnvm.cmd', $dnvmCmdPath) Write-Host "Installing DNVM" -& $kvmCmdPath setup \ No newline at end of file +& $dnvmCmdPath setup From 27376a7bb8cdfed48271b9541bc57a0902517aa6 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 11 May 2015 20:56:19 -0700 Subject: [PATCH 07/18] Add global.json with an sdk version for beta4 samples --- samples/1.0.0-beta4/global.json | 5 +++++ samples/latest/global.json | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 samples/1.0.0-beta4/global.json create mode 100644 samples/latest/global.json diff --git a/samples/1.0.0-beta4/global.json b/samples/1.0.0-beta4/global.json new file mode 100644 index 0000000000..a86c5572d6 --- /dev/null +++ b/samples/1.0.0-beta4/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "1.0.0-beta4" + } +} \ No newline at end of file diff --git a/samples/latest/global.json b/samples/latest/global.json new file mode 100644 index 0000000000..4eb7c3f983 --- /dev/null +++ b/samples/latest/global.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file From 239906e943b576d4ffd80bdaf855376aef737c63 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 11 May 2015 21:03:28 -0700 Subject: [PATCH 08/18] No tabs --- samples/1.0.0-beta4/global.json | 6 +++--- samples/latest/global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/1.0.0-beta4/global.json b/samples/1.0.0-beta4/global.json index a86c5572d6..19827f2622 100644 --- a/samples/1.0.0-beta4/global.json +++ b/samples/1.0.0-beta4/global.json @@ -1,5 +1,5 @@ { - "sdk": { - "version": "1.0.0-beta4" - } + "sdk": { + "version": "1.0.0-beta4" + } } \ No newline at end of file diff --git a/samples/latest/global.json b/samples/latest/global.json index 4eb7c3f983..0e0dcd235c 100644 --- a/samples/latest/global.json +++ b/samples/latest/global.json @@ -1,3 +1,3 @@ { - + } \ No newline at end of file From 8653b9ca5e7fcec202e8d63c9f9a8187fc5dd1b4 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Tue, 12 May 2015 12:46:53 -0700 Subject: [PATCH 09/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@73a4914c1f1b268bc93afea770fc90e80d680a8e --- dnvm.ps1 | 2 +- dnvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index a0937cc342..9549c2a44d 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta5-10375" +$BuildVersion="beta5-10376" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... diff --git a/dnvm.sh b/dnvm.sh index cc5a5cd3fc..634da3189e 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta5-10375" +_DNVM_BUILDNUMBER="beta5-10376" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From 3a15ea1d91bdcf8058735a3d7c2cdf5f05bef89c Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 14 May 2015 09:17:40 -0700 Subject: [PATCH 10/18] Update contributing link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6cfd1f9ff..631f754dfe 100644 --- a/README.md +++ b/README.md @@ -110,5 +110,5 @@ A description of all the repos is [here](https://github.com/aspnet/Home/wiki/Rep # Feedback -Check out the [contributing](https://github.com/aspnet/Home/blob/release/CONTRIBUTING.md) page to see the best places to log issues and start discussions. +Check out the [contributing](CONTRIBUTING.md) page to see the best places to log issues and start discussions. From 598e0fd37789cb4b410ccf4824712d7c5f013bee Mon Sep 17 00:00:00 2001 From: thekane Date: Sun, 17 May 2015 14:50:56 -0600 Subject: [PATCH 11/18] lowercase mono-complete package name --- GettingStartedDeb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GettingStartedDeb.md b/GettingStartedDeb.md index 065fb7497b..2b1c8ff306 100644 --- a/GettingStartedDeb.md +++ b/GettingStartedDeb.md @@ -25,7 +25,7 @@ To get these builds you need to run: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list sudo apt-get update -sudo apt-get install Mono-Complete +sudo apt-get install mono-complete ``` ### Get libuv From ef07010f41396368d6f75f179b297914190b1ee0 Mon Sep 17 00:00:00 2001 From: Marcus Hammarberg Date: Tue, 19 May 2015 13:41:18 +0700 Subject: [PATCH 12/18] Added instructions on how to source dnvm.sh on OsX --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 631f754dfe..1d9b2fe782 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,12 @@ brew install dnvm ``` Note that on Windows the .NET Framework is already installed, whereas on OS X the brew formula uses a particular version of [Mono](http://www.mono-project.com/) that we know works with ASP.NET 5. +To verify that everything works run the `dnvm` command. + +Should that fail, for example with `-bash: dnvm: command not found`, run the command `source dnvm.sh`. This means that `dnvm` will be available in this session. + +To make sure `dnvm` is available for *every* session, add the command to your `~/.bashrc` with the following command `echo "source dnvm.sh" >> ~/.bashrc`. + ## Linux * [Debian, Ubuntu and derivatives see here](GettingStartedDeb.md) From 85164e724b331bc173f278048d4658a5e66f3037 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Mon, 25 May 2015 16:00:17 -0700 Subject: [PATCH 13/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@73a4914c1f1b268bc93afea770fc90e80d680a8e --- dnvm.ps1 | 2 +- dnvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index 9549c2a44d..eb6e225db1 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta5-10376" +$BuildVersion="beta5-10377" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... diff --git a/dnvm.sh b/dnvm.sh index 634da3189e..7b899144fc 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta5-10376" +_DNVM_BUILDNUMBER="beta5-10377" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From d7215043a23733fc717c04b6c3385c59eaa59639 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Tue, 26 May 2015 11:19:00 -0700 Subject: [PATCH 14/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@47ac353e36d6d10a3f02e5b9f25e2e8614e0831c --- dnvm.ps1 | 4 ++-- dnvm.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index eb6e225db1..2a5d39ef3b 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta5-10377" +$BuildVersion="beta5-10378" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -86,7 +86,7 @@ Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k") Set-Variable -Option Constant "RuntimePackageName" "dnx" Set-Variable -Option Constant "DefaultFeed" "https://www.nuget.org/api/v2" Set-Variable -Option Constant "DefaultUnstableFeed" "https://www.myget.org/F/aspnetvnext/api/v2" -Set-Variable -Option Constant "CrossGenCommand" "k-crossgen" +Set-Variable -Option Constant "CrossGenCommand" "dnx-crossgen" Set-Variable -Option Constant "CommandPrefix" "dnvm-" Set-Variable -Option Constant "DefaultArchitecture" "x86" Set-Variable -Option Constant "DefaultRuntime" "clr" diff --git a/dnvm.sh b/dnvm.sh index 7b899144fc..712ca5d008 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta5-10377" +_DNVM_BUILDNUMBER="beta5-10378" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From 0bd310cc732cad7f4708f31331bb76ec9ec91094 Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Wed, 27 May 2015 16:56:49 -0700 Subject: [PATCH 15/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@c4da6df0a3c194f2c1638688b701e630942c3560 --- dnvm.ps1 | 2 +- dnvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index 2a5d39ef3b..619af85399 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta5-10378" +$BuildVersion="beta6-10380" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... diff --git a/dnvm.sh b/dnvm.sh index 712ca5d008..227525e90c 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta5-10378" +_DNVM_BUILDNUMBER="beta6-10380" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From 338c09434e5591c1fb953fb4e230d15a0f165ccd Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Thu, 28 May 2015 21:43:14 -0700 Subject: [PATCH 16/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@07bff51bfe8f3f4c09c84ab9ff66300371503e91 --- dnvm.ps1 | 6 +++--- dnvm.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index 619af85399..b05270b43e 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta6-10380" +$BuildVersion="beta6-10381" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -751,7 +751,7 @@ function dnvm-help { $Script:ExitCodes = $ExitCodes.UnknownCommand return } - $help = Get-Help "dnvm-$Command" + $help = Get-Help "dnvm-$Command" -ShowWindow:$false if($PassThru) { $help } else { @@ -833,7 +833,7 @@ function dnvm-help { _WriteOut -ForegroundColor $ColorScheme.Help_Header "commands: " Get-Command "$CommandPrefix*" | ForEach-Object { - $h = Get-Help $_.Name + $h = Get-Help $_.Name -ShowWindow:$false $name = $_.Name.Substring($CommandPrefix.Length) if($DeprecatedCommands -notcontains $name) { _WriteOut -NoNewLine " " diff --git a/dnvm.sh b/dnvm.sh index 227525e90c..a622eb73fa 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta6-10380" +_DNVM_BUILDNUMBER="beta6-10381" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" From edf4e91d0c3a9c06d7016293939008491691f6d0 Mon Sep 17 00:00:00 2001 From: Glen Date: Sat, 30 May 2015 19:23:25 +0200 Subject: [PATCH 17/18] Update CONTRIBUTING.md (vNext -> 5) --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d696812098..8e83ec74f0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,8 +23,8 @@ Or browse the full list of repos in the [aspnet](https://github.com/aspnet/) org ## Other discussions Our team members also monitor several other discussion forums: -* [ASP.NET vNext forum](http://forums.asp.net/1255.aspx/1?ASP+NET+vNext) -* [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-vnext) with the `asp.net-vnext` or `entity-framework-7` tag +* [ASP.NET 5 forum](http://forums.asp.net/1255.aspx/1?ASP+NET+5) +* [StackOverflow](http://stackoverflow.com/questions/tagged/asp.net-5) with the `asp.net-5` or `entity-framework-7` tag * [JabbR chat room](https://jabbr.net/#/rooms/aspnetvnext) for real-time discussions with the community and the people who work on the project From 25733b644c5e498d55dadc3d3d5f682123d8f86c Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Tue, 2 Jun 2015 11:39:41 -0700 Subject: [PATCH 18/18] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: AspNet/kvm@3a4ee552917ebbe7144b72b1ee66a929d045cc26 --- dnvm.ps1 | 40 ++++++++++++++++++++++------------------ dnvm.sh | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index b05270b43e..41ef8444e7 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -1,4 +1,4 @@ -#Requires -Version 3 +#Requires -Version 2 if (Test-Path env:WEBSITE_SITE_NAME) { @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta6-10381" +$BuildVersion="beta6-10383" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -252,7 +252,7 @@ function Safe-Filecopy { } function GetArch($Architecture, $FallBackArch = $DefaultArchitecture) { - if(![String]::IsNullOrWhiteSpace($Architecture)) { + if(![String]::IsNullOrEmpty($Architecture)) { $Architecture } elseif($CompatArch) { $CompatArch @@ -262,7 +262,7 @@ function GetArch($Architecture, $FallBackArch = $DefaultArchitecture) { } function GetRuntime($Runtime) { - if(![String]::IsNullOrWhiteSpace($Runtime)) { + if(![String]::IsNullOrEmpty($Runtime)) { $Runtime } else { $DefaultRuntime @@ -560,7 +560,7 @@ function Download-Package( } } - Write-Progress -Activity ("Downloading $RuntimeShortFriendlyName from $url") -Id 2 -ParentId 1 -Completed + Write-Progress -Status "Done" -Activity ("Downloading $RuntimeShortFriendlyName from $url") -Id 2 -ParentId 1 -Completed } finally { Remove-Variable downloadData -Scope "Global" @@ -632,10 +632,10 @@ function Change-Path() { $newPath = $prependPath foreach($portion in $existingPaths.Split(';')) { - if(![string]::IsNullOrWhiteSpace($portion)) { + if(![string]::IsNullOrEmpty($portion)) { $skip = $portion -eq "" foreach($removePath in $removePaths) { - if(![string]::IsNullOrWhiteSpace($removePath)) { + if(![string]::IsNullOrEmpty($removePath)) { $removePrefix = if($removePath.EndsWith("\")) { $removePath } else { "$removePath\" } if ($removePath -and (($portion -eq $removePath) -or ($portion.StartsWith($removePrefix)))) { @@ -645,7 +645,7 @@ function Change-Path() { } } if (!$skip) { - if(![String]::IsNullOrWhiteSpace($newPath)) { + if(![String]::IsNullOrEmpty($newPath)) { $newPath += ";" } $newPath += $portion @@ -752,7 +752,7 @@ function dnvm-help { return } $help = Get-Help "dnvm-$Command" -ShowWindow:$false - if($PassThru) { + if($PassThru -Or $Host.Version.Major -lt 3) { $help } else { _WriteOut -ForegroundColor $ColorScheme.Help_Header "$CommandName $Command" @@ -1084,7 +1084,7 @@ function dnvm-install { } if ($VersionNuPkgOrAlias -eq "latest") { - Write-Progress -Activity "Installing runtime" "Determining latest runtime" -Id 1 + Write-Progress -Status "Determining Latest Runtime" -Activity "Installing runtime" -Id 1 $VersionNuPkgOrAlias = Find-Latest $Runtime $Architecture -Feed:$selectedFeed } @@ -1094,7 +1094,7 @@ function dnvm-install { if(!(Test-Path $VersionNuPkgOrAlias)) { throw "Unable to locate package file: '$VersionNuPkgOrAlias'" } - Write-Progress -Activity "Installing runtime" "Parsing package file name" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Parsing package file name" -Id 1 $runtimeFullName = [System.IO.Path]::GetFileNameWithoutExtension($VersionNuPkgOrAlias) $Architecture = Get-PackageArch $runtimeFullName $Runtime = Get-PackageRuntime $runtimeFullName @@ -1134,18 +1134,18 @@ function dnvm-install { New-Item -Type Directory $UnpackFolder | Out-Null if($IsNuPkg) { - Write-Progress -Activity "Installing runtime" "Copying package" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Copying package" -Id 1 _WriteDebug "Copying local nupkg $VersionNuPkgOrAlias to $DownloadFile" Copy-Item $VersionNuPkgOrAlias $DownloadFile } else { # Download the package - Write-Progress -Activity "Installing runtime" "Downloading runtime" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Downloading runtime" -Id 1 _WriteDebug "Downloading version $VersionNuPkgOrAlias to $DownloadFile" Download-Package $PackageVersion $Architecture $Runtime $DownloadFile -Proxy:$Proxy -Feed:$selectedFeed } - Write-Progress -Activity "Installing runtime" "Unpacking runtime" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Unpacking runtime" -Id 1 Unpack-Package $DownloadFile $UnpackFolder if(Test-Path $RuntimeFolder) { @@ -1164,7 +1164,7 @@ function dnvm-install { if (-not $NoNative) { if ((Is-Elevated) -or $Ngen) { $runtimeBin = Get-RuntimePath $runtimeFullName - Write-Progress -Activity "Installing runtime" "Generating runtime native images" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Generating runtime native images" -Id 1 Ngen-Library $runtimeBin $Architecture } else { @@ -1178,7 +1178,7 @@ function dnvm-install { } else { _WriteOut "Compiling native images for $runtimeFullName to improve startup performance..." - Write-Progress -Activity "Installing runtime" "Generating runtime native images" -Id 1 + Write-Progress -Activity "Installing runtime" -Status "Generating runtime native images" -Id 1 if ($DebugPreference -eq 'SilentlyContinue') { Start-Process $CrossGenCommand -Wait -WindowStyle Hidden } @@ -1198,7 +1198,7 @@ function dnvm-install { dnvm-alias $Alias $PackageVersion -Architecture:$Architecture -Runtime:$Runtime } - Write-Progress -Activity "Install complete" -Id 1 -Complete + Write-Progress -Status "Done" -Activity "Install complete" -Id 1 -Complete } @@ -1431,7 +1431,11 @@ if(!$cmd) { try { if(Get-Command -Name "$CommandPrefix$cmd" -ErrorAction SilentlyContinue) { _WriteDebug "& dnvm-$cmd $cmdargs" - & "dnvm-$cmd" @cmdargs + if($host.Version.Major -lt 3) { + Invoke-Command ([ScriptBlock]::Create("dnvm-$cmd $cmdargs")) + } else { + & "dnvm-$cmd" @cmdargs + } } else { _WriteOut "Unknown command: '$cmd'" diff --git a/dnvm.sh b/dnvm.sh index a622eb73fa..3d06adeeef 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="beta6-10381" +_DNVM_BUILDNUMBER="beta6-10383" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"