Skip to content

Commit 9306fe2

Browse files
USER001 FUSER001 F
USER001 F
authored and
USER001 F
committed
UpdateRTM
NET Core 1.0 RTM
1 parent 00a2fcd commit 9306fe2

File tree

10 files changed

+33
-23
lines changed

10 files changed

+33
-23
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@
4848
*.fsproj text=auto
4949
*.dbproj text=auto
5050
*.sln text=auto eol=crlf
51+
52+
*.sh eol=lf

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
[Bb]in/
33
TestResults/
44
.nuget/
5+
.build/
6+
.testPublish/
57
*.sln.ide/
68
_ReSharper.*/
79
packages/
@@ -35,3 +37,5 @@ nuget.exe
3537
node_modules
3638
**/[Cc]ompiler/[Rr]esources/**/*.js
3739
*.log
40+
*launchSettings.json
41+
*.orig

‎.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ addons:
1212
- libssl-dev
1313
- libunwind8
1414
- zlib1g
15+
before_install:
16+
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; brew install openssl; brew link --force openssl; fi
1517
mono:
1618
- 4.0.5
1719
os:
1820
- linux
1921
- osx
2022
osx_image: xcode7.1
2123
script:
22-
- ./build.sh verify
24+
- ./build.sh --quiet verify
25+
env:
26+
- KOREBUILD_TEST_SKIPMONO=1

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:latest
1+
FROM microsoft/dotnet:1.0.0-preview2-sdk
22

33
MAINTAINER f799 <[email protected]>
44

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="AspNetCI" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
4+
<add key="AspNetCI" value="https://www.myget.org/f/aspnetmaster/api/v3/index.json" />
55
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
66
</packageSources>
7-
</configuration>
7+
</configuration>

‎build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP

‎build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-preview1-002702"
4+
"version": "1.0.0-preview2-003121"
55
}
66
}

‎src/LearningCSharp.Service/project.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.App": {
4-
"version": "1.0.0-rc2-3002702",
4+
"version": "1.0.0",
55
"type": "platform"
66
},
7-
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
8-
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
9-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
10-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
11-
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
12-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
13-
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
14-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
15-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final"
7+
"Microsoft.AspNetCore.Mvc": "1.0.0",
8+
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
9+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
10+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
11+
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
12+
"Microsoft.Extensions.Configuration.Json": "1.0.0",
13+
"Microsoft.Extensions.Logging": "1.0.0",
14+
"Microsoft.Extensions.Logging.Console": "1.0.0",
15+
"Microsoft.Extensions.Logging.Debug": "1.0.0"
1616
},
1717

1818
"tools": {
1919
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
20-
"version": "1.0.0-preview1-final",
21-
"imports": "portable-net45+win8+dnxcore50"
20+
"version": "1.0.0-preview2-final",
21+
"imports": "portable-net45+win8"
2222
}
2323
},
2424

2525
"frameworks": {
2626
"netcoreapp1.0": {
2727
"imports": [
2828
"dotnet5.6",
29-
"dnxcore50",
3029
"portable-net45+win8"
3130
]
3231
}

‎test/LearningCSharp.Test/project.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
"warningsAsErrors": true
44
},
55
"dependencies": {
6-
"dotnet-test-xunit": "1.0.0-rc2-build10015",
6+
"dotnet-test-xunit": "1.0.0-rc2-build10025",
77
"xunit": "2.1.0"
88
},
99
"testRunner": "xunit",
1010
"frameworks": {
1111
"netcoreapp1.0": {
1212
"imports": [
13+
"dotnet5.6",
1314
"dnxcore50",
1415
"portable-net451+win8"
1516
],
1617
"dependencies": {
1718
"Microsoft.NETCore.App": {
18-
"version": "1.0.0-*",
19+
"version": "1.0.0",
1920
"type": "platform"
2021
},
21-
"System.Diagnostics.Process": "4.1.0-*"
22+
"System.Diagnostics.Process": "4.1.0"
2223
}
2324
}
2425
}

0 commit comments

Comments
 (0)