Skip to content
This repository was archived by the owner on Dec 18, 2017. It is now read-only.

Commit 8d184bf

Browse files
pranavkmpranavkm
committed
Merge remote-tracking branch 'origin/dev' into release
2 parents d4fa7c5 + 47ac353 commit 8d184bf

21 files changed

+680
-235
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ nuget.exe
3636
*.*sdf
3737
*.ipch
3838
*.sln.ide
39+
40+
# Vim files
41+
*.swp
42+
*.swo

‎.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: csharp
2+
sudo: false
3+
addons:
4+
apt:
5+
packages:
6+
- zsh
7+
script:
8+
- ./build.sh verify

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Contributing
22
======
33

4-
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.
4+
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
1+
Copyright (c) .NET Foundation. All rights reserved.
22

33
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
44
these files except in compliance with the License. You may obtain a copy of the

‎NuGet.Config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetrelease/" />
5-
<add key="NuGet.org" value="https://nuget.org/api/v2/" />
4+
<clear />
5+
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetrelease/api/v2" />
6+
<add key="NuGet" value="https://nuget.org/api/v2/" />
67
</packageSources>
7-
</configuration>
8+
</configuration>

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
dnvm
22
====
3+
AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/969jbosi0qwc1awg/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/dnvm/branch/dev)
4+
5+
Travis: [![Travis](https://travis-ci.org/aspnet/dnvm.svg?branch=dev)](https://travis-ci.org/aspnet/dnvm)
36

47
`dnvm` is the .NET Version Manager, a set of command line utilities to update and configure which .NET Runtime to use.
58

‎appveyor.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
build_script:
2+
- build.cmd verify
3+
clone_depth: 1
4+
test: off
5+
deploy: off

‎src/dnvm.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set DNVM_CMD_PATH_FILE="%USERPROFILE%\.dnx\temp-set-envvars.cmd"
44

55
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';$CmdPathFile='%DNVM_CMD_PATH_FILE%';& '%~dp0dnvm.ps1' %*"
66

7-
IF EXIST "%DNVM_CMD_PATH_FILE%" (
8-
CALL "%DNVM_CMD_PATH_FILE%"
9-
DEL "%DNVM_CMD_PATH_FILE%"
7+
IF EXIST %DNVM_CMD_PATH_FILE% (
8+
CALL %DNVM_CMD_PATH_FILE%
9+
DEL %DNVM_CMD_PATH_FILE%
1010
)

0 commit comments

Comments
 (0)