Skip to content

Update aspnet50/aspnetcore50 => dnx50/dnxcore50. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NTaylorMullen merged 2 commits into from
Mar 9, 2015
Merged

Update aspnet50/aspnetcore50 => dnx50/dnxcore50. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e478466
Update aspnet50/aspnetcore50 => dnx451/dnxcore50.
Mar 8, 2015
74c1187
Update build.sh to use dnvm correctly.
Mar 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash

if test `uname` = Darwin; then
cachedir=~/Library/Caches/KBuild
Expand Down Expand Up @@ -27,7 +27,7 @@ if test ! -d packages/KoreBuild; then
mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
fi

if ! type k > /dev/null 2>&1; then
if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh
fi

Expand All @@ -36,3 +36,4 @@ if ! type k > /dev/null 2>&1; then
fi

mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"

6 changes: 3 additions & 3 deletions src/Microsoft.Framework.BufferEntryCollection.Internal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"shared": "*.cs",
"dependencies": {
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.20-*",
"System.Collections": "4.0.10-*",
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Framework.CopyOnWriteDictionary.Internal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"shared": "*.cs",
"dependencies": {
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.20-*"
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Framework.NotNullAttribute.Internal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"shared": "*.cs",
"dependencies": {
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.20-*"
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Framework.PropertyActivator.Internal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"shared": "*.cs",
"dependencies": {
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.20-*"
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Framework.PropertyHelper.Internal/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"shared": "*.cs",
"dependencies": {
},
"frameworks": {
"net45": { },
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.20-*"
}
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.Framework.Internal.Test/CopyOnWriteDictionaryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;
using System.Collections.Generic;
#if !ASPNETCORE50
#if !DNXCORE50
using Moq;
#endif
using Xunit;
Expand All @@ -12,7 +12,7 @@ namespace Microsoft.Framework.Internal
{
public class CopyOnWriteDictionaryTest
{
#if !ASPNETCORE50
#if !DNXCORE50
[Fact]
public void ReadOperation_DelegatesToSourceDictionary_IfNoMutationsArePerformed()
{
Expand Down Expand Up @@ -103,4 +103,4 @@ public void ReadOperation_DoesNotDelegateToSourceDictionary_OnceDictionaryIsModi
Assert.Equal("value3", copyOnWriteDictionary["key3"]);
}
}
}
}
4 changes: 2 additions & 2 deletions test/Microsoft.Framework.Internal.Test/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"dependencies": {
"Moq": "4.2.1312.1622"
}
},
"aspnetcore50": { }
"dnxcore50": { }
}
}