Skip to content

Commit a95568d

Browse files
authored
Merge pull request #30 from degrim/Update104
Update for .NET Core SDK 1.0.4
2 parents cb0c4ea + 1a0d8ed commit a95568d

File tree

5 files changed

+12
-36
lines changed

5 files changed

+12
-36
lines changed

global.json

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

manifest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
applications:
33
- name: sample-aspnetcore-helloworld
44
random-route: true
5-
memory: 256M
5+
memory: 512M
66
env:
77
DOTNET_CLI_TELEMETRY_OPTOUT: 1
8+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

src/WebApplication/Program.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.Extensions.Configuration;
32
using Microsoft.AspNetCore.Hosting;
43

54
namespace WebApplication
@@ -8,13 +7,8 @@ public class Program
87
{
98
public static void Main(string[] args)
109
{
11-
var config = new ConfigurationBuilder()
12-
.AddCommandLine(args)
13-
.Build();
14-
1510
var host = new WebHostBuilder()
1611
.UseKestrel()
17-
.UseConfiguration(config)
1812
.UseStartup<Startup>()
1913
.Build();
2014
host.Run();

src/WebApplication/WebApplication.csproj

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<VersionPrefix>1.0.3</VersionPrefix>
4+
<VersionPrefix>1.0.5</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
6-
<RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
76
<DebugType>portable</DebugType>
87
<PreserveCompilationContext>true</PreserveCompilationContext>
98
<AssemblyName>WebApplication</AssemblyName>
109
<OutputType>Exe</OutputType>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<Content Update="**\*.cshtml;appsettings.json;web.config">
15-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
17-
</Content>
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
22-
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />
23-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.2" />
24-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.0.1" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.1" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" />
30-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.0.1" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
13+
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.*" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.*" />
15+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.*" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.*" />
17+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.0.*" />
3518
</ItemGroup>
3619

3720
<Target Name="AddWwwRoot" BeforeTargets="AssignTargetPaths" DependsOnTargets="BeforeBuild;BeforePublish">
@@ -42,6 +25,10 @@
4225
</ItemGroup>
4326
</Target>
4427

28+
<ItemGroup>
29+
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.*" />
30+
</ItemGroup>
31+
4532
<Target Name="PrecompileScript" BeforeTargets="BeforeBuild;BeforePublish;">
4633
<Exec Command="dotnet bundle" />
4734
</Target>

src/WebApplication/wwwroot/css/site.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)