Skip to content

Commit 9252061

Browse files
yukozhyukozh
committed
Fixed #1035, #1048, #1034. Add rc1 samples, update dockerfile
Remove web listener Simple the command line of kestrel Add IISPlatformHandler Up the latest to date Created rc1 folder Update docker files rc1 -> rc1-final
1 parent 98355aa commit 9252061

37 files changed

+364
-45
lines changed

‎samples/1.0.0-beta8/ConsoleApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dnx451": { },
1010
"dnxcore50": {
1111
"dependencies": {
12-
"System.Console": "4.0.0-beta-beta8"
12+
"System.Console": "4.0.0-beta-23409"
1313
}
1414
}
1515
}

‎samples/1.0.0-beta8/HelloMvc/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM microsoft/aspnet:1.0.0-beta8
22

3-
COPY project.json /app/
3+
COPY . /app./
44
WORKDIR /app
55
RUN ["dnu", "restore"]
6-
COPY . /app
76

87
EXPOSE 5004
98
ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"]

‎samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@
77
"ASPNET_ENV": "Development"
88
}
99
},
10-
"kestrel": {
11-
"commandName": "kestrel",
12-
"launchBrowser": true,
13-
"launchUrl": "http://localhost:5004"
14-
},
1510
"web": {
1611
"commandName": "web",
1712
"launchBrowser": true,
18-
"launchUrl": "http://localhost:5001"
13+
"launchUrl": "http://localhost:5004"
1914
}
2015
}
2116
}

‎samples/1.0.0-beta8/HelloMvc/Startup.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
1515
{
1616
loggerFactory.AddConsole();
1717

18+
app.UseIISPlatformHandler();
19+
1820
app.UseDeveloperExceptionPage();
1921

2022
app.UseMvcWithDefaultRoute();

‎samples/1.0.0-beta8/HelloMvc/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
],
1212
"dependencies": {
1313
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
14+
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8",
1415
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8",
1516
"Microsoft.AspNet.Mvc": "6.0.0-beta8",
1617
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta8",
1718
"Microsoft.Framework.Logging.Console": "1.0.0-beta8"
1819
},
1920
"commands": {
20-
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",
21-
"kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004"
21+
"web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004"
2222
},
2323
"frameworks": {
2424
"dnx451": { },

‎samples/1.0.0-beta8/HelloWeb/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM microsoft/aspnet:1.0.0-beta8
22

3-
COPY project.json /app/
3+
COPY . /app./
44
WORKDIR /app
55
RUN ["dnu", "restore"]
6-
COPY . /app
76

87
EXPOSE 5004
98
ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"]

‎samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@
77
"ASPNET_ENV": "Development"
88
}
99
},
10-
"kestrel": {
11-
"commandName": "kestrel",
12-
"launchBrowser": true,
13-
"launchUrl": "http://localhost:5004"
14-
},
1510
"web": {
1611
"commandName": "web",
1712
"launchBrowser": true,
18-
"launchUrl": "http://localhost:5001"
13+
"launchUrl": "http://localhost:5004"
1914
}
2015
}
2116
}

‎samples/1.0.0-beta8/HelloWeb/Startup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class Startup
88
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
99
{
1010
loggerFactory.AddConsole();
11+
app.UseIISPlatformHandler();
1112
app.UseStaticFiles();
1213
app.UseWelcomePage();
1314
}

‎samples/1.0.0-beta8/HelloWeb/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
],
1212
"dependencies": {
1313
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
14+
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8",
1415
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8",
1516
"Microsoft.AspNet.Hosting": "1.0.0-beta8",
1617
"Microsoft.AspNet.StaticFiles": "1.0.0-beta8",
1718
"Microsoft.Framework.Logging.Console": "1.0.0-beta8"
1819
},
1920
"commands": {
20-
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",
21-
"kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004"
21+
"web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004"
2222
},
2323
"frameworks": {
2424
"dnx451": { },

‎samples/1.0.0-rc1/ConsoleApp/ConsoleApp.xproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>d4f684c8-b6a4-45f0-aca0-0d95632ff946</ProjectGuid>
10+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
11+
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<SchemaVersion>2.0</SchemaVersion>
15+
</PropertyGroup>
16+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
17+
</Project>

0 commit comments

Comments
 (0)