Skip to content

Commit 0b41df3

Browse files
justdmitryjustdmitry
committed
Upgrade to RC2
1 parent 9e1396f commit 0b41df3

File tree

19 files changed

+13215
-21742
lines changed

19 files changed

+13215
-21742
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/.vs
22
/artifacts
33
*.user
4+
bin
5+
obj

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,19 @@ And viola! Your task will run every 5 minutes (second param when calling :base c
6262

6363
Use NuGet package [RecurrentTasks](https://www.nuget.org/packages/RecurrentTasks/)
6464

65+
Target [framework/platform moniker](https://github.com/dotnet/corefx/blob/master/Documentation/architecture/net-platform-standard.md): **`netstandard1.3`**
66+
6567
### Dependencies
6668

6769
* Microsoft.Extensions.Logging.Abstractions
6870
* Microsoft.Extensions.DependencyInjection.Abstractions
71+
* System.Threading
6972

7073
## Version history
7174

75+
* 2.1.0 (May 17, 2016)
76+
* Target framework changed to `netstandard1.3` (`System.Threading` v4.0.11 is new dependency)
77+
* Other dependencies upgraded to RC2
7278
* 2.0.0 (Feb 5, 2016)
7379
* Class/method/property names changed. Incompatible update - major version bump.
7480
* New overridable methods `OnBeforeRun`, `OnAfterRunSuccess`, `OnAfterRunFail`

‎RecurrentTasks.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{79344640-D2E5-4A31-880B-C6A9B0CC5F78}"
77
EndProject
@@ -39,6 +39,7 @@ Global
3939
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
4040
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
4141
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.Deploy.0 = Release|Any CPU
4243
EndGlobalSection
4344
GlobalSection(SolutionProperties) = preSolution
4445
HideSolutionNode = FALSE

‎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-rc1-update1"
4+
"version": "1.0.0-preview1-002702"
55
}
66
}

‎sample/RecurrentTasks.Sample/Controllers/HomeController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace RecurrentTasks.Sample.Controllers
22
{
33
using System;
4-
using Microsoft.AspNet.Mvc;
4+
using Microsoft.AspNetCore.Mvc;
55

66
public class HomeController : Controller
77
{

‎sample/RecurrentTasks.Sample/Properties/launchSettings.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"commandName": "IISExpress",
1313
"launchBrowser": true,
1414
"environmentVariables": {
15-
"Hosting:Environment": "Development"
15+
"ASPNETCORE_ENVIRONMENT": "Development"
1616
}
1717
},
18-
"web": {
19-
"commandName": "web",
18+
"RecurrentTasks.Sample": {
19+
"commandName": "Project",
2020
"launchBrowser": true,
2121
"launchUrl": "http://localhost:5000",
2222
"environmentVariables": {
23-
"Hosting:Environment": "Development"
23+
"ASPNETCORE_ENVIRONMENT": "Development"
2424
}
2525
}
2626
}

‎sample/RecurrentTasks.Sample/RecurrentTasks.Sample.xproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
77

8-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
99
<PropertyGroup Label="Globals">
1010
<ProjectGuid>00d3bbca-6803-4bbc-bf81-41f8eaed2ee9</ProjectGuid>
1111
<RootNamespace>RecurrentTasks.Sample</RootNamespace>
12-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
13-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
@@ -21,5 +21,5 @@
2121
<DnxInvisibleContent Include=".bowerrc" />
2222
<DnxInvisibleContent Include="package.json" />
2323
</ItemGroup>
24-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
24+
<Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
2525
</Project>

‎sample/RecurrentTasks.Sample/Startup.cs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
namespace RecurrentTasks.Sample
22
{
33
using System;
4-
using Microsoft.AspNet.Builder;
5-
using Microsoft.AspNet.Hosting;
4+
using System.IO;
5+
using Microsoft.AspNetCore.Builder;
6+
using Microsoft.AspNetCore.Hosting;
67
using Microsoft.Extensions.DependencyInjection;
78
using Microsoft.Extensions.Logging;
89

910
public class Startup
1011
{
12+
public static void Main(string[] args)
13+
{
14+
var host = new WebHostBuilder()
15+
.UseKestrel()
16+
.UseContentRoot(Directory.GetCurrentDirectory())
17+
.UseIISIntegration()
18+
.UseStartup<Startup>()
19+
.Build();
20+
21+
host.Run();
22+
}
23+
1124
public void ConfigureServices(IServiceCollection services)
1225
{
1326
services.AddSingleton<SampleTask>();
@@ -17,16 +30,11 @@ public void ConfigureServices(IServiceCollection services)
1730

1831
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
1932
{
20-
loggerFactory.MinimumLevel = LogLevel.Debug;
2133
loggerFactory.AddConsole(LogLevel.Debug);
2234

23-
app.UseIISPlatformHandler();
24-
2535
app.UseMvcWithDefaultRoute();
2636

2737
app.ApplicationServices.GetRequiredService<SampleTask>().Start();
2838
}
29-
30-
public static void Main(string[] args) => WebApplication.Run<Startup>(args);
3139
}
3240
}

‎sample/RecurrentTasks.Sample/project.json‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,62 @@
11
{
22
"version": "1.0.0-*",
3-
"compilationOptions": {
4-
"emitEntryPoint": true
5-
},
63

74
"dependencies": {
8-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
9-
"Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
10-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
11-
"Microsoft.Extensions.Configuration": "1.0.0-rc1-final",
12-
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
13-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
14-
"RecurrentTasks": ""
5+
"Microsoft.NETCore.App": {
6+
"version": "1.0.0-rc2-3002702",
7+
"type": "platform"
8+
},
9+
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
10+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
11+
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
12+
"Microsoft.AspNetCore.Razor.Tools": {
13+
"version": "1.0.0-preview1-final",
14+
"type": "build"
15+
},
16+
"Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
17+
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
18+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
19+
"RecurrentTasks": "*"
1520
},
1621

17-
"commands": {
18-
"web": "Microsoft.AspNet.Server.Kestrel"
22+
"tools": {
23+
"Microsoft.AspNetCore.Razor.Tools": {
24+
"version": "1.0.0-preview1-final",
25+
"imports": "portable-net45+win8+dnxcore50"
26+
},
27+
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
28+
"version": "1.0.0-preview1-final",
29+
"imports": "portable-net45+win8+dnxcore50"
30+
}
1931
},
2032

2133
"frameworks": {
22-
"dnx451": { },
23-
"dnxcore50": { }
34+
"netcoreapp1.0": {
35+
"imports": [
36+
"dotnet5.6",
37+
"dnxcore50",
38+
"portable-net45+win8"
39+
]
40+
}
41+
},
42+
"buildOptions": {
43+
"emitEntryPoint": true,
44+
"preserveCompilationContext": true
2445
},
2546

26-
"exclude": [
27-
"wwwroot"
28-
],
47+
"runtimeOptions": {
48+
"gcServer": true
49+
},
50+
51+
"publishOptions": {
52+
"include": [
53+
"wwwroot",
54+
"Views",
55+
"web.config"
56+
]
57+
},
2958

30-
"publishExclude": [
31-
"**.user",
32-
"**.vspscc"
33-
]
59+
"scripts": {
60+
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
61+
}
3462
}

0 commit comments

Comments
 (0)