Skip to content

Commit 034a6fc

Browse files
glenncglennc
committed
Merge pull request #864 from aspnet/glennc/beta7
Set beta7 version numbers.
2 parents a2a1c63 + 3854909 commit 034a6fc

File tree

22 files changed

+340
-1
lines changed

22 files changed

+340
-1
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In order to be able to get new builds of the DNX, and switch between them, you n
1414

1515
The easiest way to get started on Windows is to grab the latest preview of Visual Studio 2015, which can be found [here](http://go.microsoft.com/fwlink/?LinkId=521794).
1616

17-
Visual Studio will install DNVM for you, so if you open a command prompt and type `dnvm` you should get some help text.
17+
Visual Studio will install DNVM for you, so if you open a developer command prompt and type `dnvm` you should get some help text.
1818

1919
### Upgrading DNVM or running without Visual Studio
2020

‎samples/1.0.0-beta7/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>

‎samples/1.0.0-beta7/ConsoleApp/Program.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System;
2+
3+
public class Program
4+
{
5+
public static void Main()
6+
{
7+
Console.WriteLine("Hello World");
8+
}
9+
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"dependencies": {
3+
4+
},
5+
"commands": {
6+
"ConsoleApp": "ConsoleApp"
7+
},
8+
"frameworks": {
9+
"dnx451": { },
10+
"dnxcore50": {
11+
"dependencies": {
12+
"System.Console": "4.0.0-beta-23220"
13+
}
14+
}
15+
}
16+
}

‎samples/1.0.0-beta7/HelloMvc/Controllers/HomeController.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using Microsoft.AspNet.Mvc;
2+
using MvcSample.Web.Models;
3+
4+
namespace MvcSample.Web
5+
{
6+
public class HomeController : Controller
7+
{
8+
public IActionResult Index()
9+
{
10+
return View(CreateUser());
11+
}
12+
13+
public User CreateUser()
14+
{
15+
User user = new User()
16+
{
17+
Name = "My name",
18+
Address = "My address"
19+
};
20+
21+
return user;
22+
}
23+
}
24+
}

‎samples/1.0.0-beta7/HelloMvc/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM microsoft/aspnet
2+
3+
COPY project.json /app/
4+
WORKDIR /app
5+
RUN ["dnu", "restore"]
6+
COPY . /app
7+
8+
EXPOSE 5004
9+
ENTRYPOINT ["dnx", "project.json", "kestrel"]

‎samples/1.0.0-beta7/HelloMvc/HelloMvc.xproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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>78627bb3-851e-4c1a-91c0-629fc7c15f8f</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+
<DevelopmentServerPort>26425</DevelopmentServerPort>
16+
</PropertyGroup>
17+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
18+
</Project>

‎samples/1.0.0-beta7/HelloMvc/Models/User.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using System.ComponentModel.DataAnnotations;
2+
3+
namespace MvcSample.Web.Models
4+
{
5+
public class User
6+
{
7+
[Required]
8+
[MinLength(4)]
9+
public string Name { get; set; }
10+
public string Address { get; set; }
11+
public int Age { get; set; }
12+
}
13+
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"profiles": {
3+
"IIS Express": {
4+
"commandName": "IISExpress",
5+
"launchBrowser": true,
6+
"environmentVariables": {
7+
"ASPNET_ENV": "Development"
8+
}
9+
},
10+
"kestrel": {
11+
"commandName": "kestrel",
12+
"launchBrowser": true,
13+
"launchUrl": "http://localhost:5004"
14+
},
15+
"web": {
16+
"commandName": "web",
17+
"launchBrowser": true,
18+
"launchUrl": "http://localhost:5001"
19+
}
20+
}
21+
}

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using Microsoft.AspNet.Builder;
2+
using Microsoft.Framework.DependencyInjection;
3+
using Microsoft.Framework.Logging;
4+
5+
namespace HelloMvc
6+
{
7+
public class Startup
8+
{
9+
public void ConfigureServices(IServiceCollection services)
10+
{
11+
services.AddMvc();
12+
}
13+
14+
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
15+
{
16+
loggerFactory.AddConsole();
17+
18+
app.UseErrorPage();
19+
20+
app.UseMvcWithDefaultRoute();
21+
22+
app.UseWelcomePage();
23+
}
24+
}
25+
}

0 commit comments

Comments
 (0)