Skip to content

Commit c5746e1

Browse files
damienboddamienbod
committed
Merge branch 'aspnetcore_2_0_0'
# Conflicts: # .gitignore
2 parents c4567ce + 4c3e7b3 commit c5746e1

File tree

8 files changed

+51
-51
lines changed

8 files changed

+51
-51
lines changed

‎.gitignore‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,4 @@ src/Angular2WebpackVisualStudio/wwwroot/assets
322322
src/Angular2WebpackVisualStudio/wwwroot/dist
323323
src/AngularWebpackVisualStudio/wwwroot/dist/
324324
src/AngularWebpackVisualStudio/wwwroot/index.html
325-
src/AngularWebpackVisualStudio/wwwroot/assets/damienbod.jpg
326-
src/AngularWebpackVisualStudio/wwwroot/assets/fabianGosebrink.jpg
327-
src/AngularWebpackVisualStudio/wwwroot/assets/glyphicons-halflings-regular-448c34.woff2
328-
src/AngularWebpackVisualStudio/wwwroot/assets/glyphicons-halflings-regular-898896.svg
329-
src/AngularWebpackVisualStudio/wwwroot/assets/glyphicons-halflings-regular-e18bbf.ttf
330-
src/AngularWebpackVisualStudio/wwwroot/assets/glyphicons-halflings-regular-f4769f.eot
331-
src/AngularWebpackVisualStudio/wwwroot/assets/glyphicons-halflings-regular-fa2772.woff
332-
src/AngularWebpackVisualStudio/wwwroot/assets/RobertoSimonetti.jpg
325+
src/AngularWebpackVisualStudio/wwwroot/

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ For a fresh start, consider running these commands
55

66
<a href="https://github.com/damienbod/Angular2WebpackVisualStudio/blob/master/README.md">Readme</a>
77

8+
<a name="2017-08-18"></a>
9+
# 2017-08-15
10+
* Update ASP.NET Core 2.0
11+
812
<a name="2017-07-20"></a>
913
# 2017-07-20
1014
* Release 1.0.0: Angular 4.3.1, typescript 2.4.2, webpack 3.3.0

‎src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
1-
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp1.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<Folder Include="wwwroot\" />
6+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
10-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
16-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
21-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
9+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
10+
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
11+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
2212
</ItemGroup>
2313
</Project>

‎src/AngularWebpackVisualStudio/Program.cs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Threading.Tasks;
1+
using Microsoft.AspNetCore;
62
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.AspNetCore.Builder;
83

94
namespace Angular2WebpackVisualStudio
105
{
116
public class Program
127
{
138
public static void Main(string[] args)
149
{
15-
var host = new WebHostBuilder()
16-
.UseKestrel()
17-
.UseContentRoot(Directory.GetCurrentDirectory())
18-
.UseIISIntegration()
10+
BuildWebHost(args).Run();
11+
}
12+
13+
public static IWebHost BuildWebHost(string[] args) =>
14+
WebHost.CreateDefaultBuilder(args)
1915
.UseStartup<Startup>()
2016
.Build();
21-
22-
host.Run();
23-
}
2417
}
25-
}
18+
}

‎src/AngularWebpackVisualStudio/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-webpack-visualstudio",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"description": "An Angular VS template",
55
"main": "wwwroot/index.html",
66
"author": "",

‎src/AngularWebpackVisualStudio/runtimeconfig.template.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎tests/AngularWebpackVisualStudio_Tests/AngularWebpackVisualStudio_Tests.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.0</TargetFramework>
54
</PropertyGroup>
65

76
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.2" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
7+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
1110
<PackageReference Include="xunit.runner.console" Version="2.2.0" />
1211
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1312
<PackageReference Include="xunit" Version="2.2.0" />
1413
<PackageReference Include="xunit.runners" Version="2.0.0" />
15-
1614
</ItemGroup>
1715

1816
<ItemGroup>

‎tests/AngularWebpackVisualStudio_Tests/Properties/launchSettings.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"iisSettings": {
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
5+
"iisExpress": {
6+
"applicationUrl": "http://localhost:18364/",
7+
"sslPort": 0
8+
}
9+
},
10+
"profiles": {
11+
"IIS Express": {
12+
"commandName": "IISExpress",
13+
"launchBrowser": true,
14+
"environmentVariables": {
15+
"ASPNETCORE_ENVIRONMENT": "Development"
16+
}
17+
},
18+
"AngularWebpackVisualStudio_Tests": {
19+
"commandName": "Project",
20+
"launchBrowser": true,
21+
"environmentVariables": {
22+
"ASPNETCORE_ENVIRONMENT": "Development"
23+
},
24+
"applicationUrl": "http://localhost:18365/"
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)