Skip to content

Commit

Permalink
Upgrade to RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
justdmitry committed May 17, 2016
1 parent 9e1396f commit 0b41df3
Show file tree
Hide file tree
Showing 19 changed files with 13,215 additions and 21,742 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,3 +1,5 @@
/.vs
/artifacts
*.user
bin
obj
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -62,13 +62,19 @@ And viola! Your task will run every 5 minutes (second param when calling :base c

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

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

### Dependencies

* Microsoft.Extensions.Logging.Abstractions
* Microsoft.Extensions.DependencyInjection.Abstractions
* System.Threading

## Version history

* 2.1.0 (May 17, 2016)
* Target framework changed to `netstandard1.3` (`System.Threading` v4.0.11 is new dependency)
* Other dependencies upgraded to RC2
* 2.0.0 (Feb 5, 2016)
* Class/method/property names changed. Incompatible update - major version bump.
* New overridable methods `OnBeforeRun`, `OnAfterRunSuccess`, `OnAfterRunFail`
Expand Down
3 changes: 2 additions & 1 deletion RecurrentTasks.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{79344640-D2E5-4A31-880B-C6A9B0CC5F78}"
EndProject
Expand Down Expand Up @@ -39,6 +39,7 @@ Global
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.Build.0 = Release|Any CPU
{00D3BBCA-6803-4BBC-BF81-41F8EAED2EE9}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion global.json
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-rc1-update1"
"version": "1.0.0-preview1-002702"
}
}
2 changes: 1 addition & 1 deletion sample/RecurrentTasks.Sample/Controllers/HomeController.cs
@@ -1,7 +1,7 @@
namespace RecurrentTasks.Sample.Controllers
{
using System;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNetCore.Mvc;

public class HomeController : Controller
{
Expand Down
8 changes: 4 additions & 4 deletions sample/RecurrentTasks.Sample/Properties/launchSettings.json
Expand Up @@ -12,15 +12,15 @@
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"RecurrentTasks.Sample": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:5000",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions sample/RecurrentTasks.Sample/RecurrentTasks.Sample.xproj
Expand Up @@ -5,12 +5,12 @@
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>

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

<PropertyGroup>
Expand All @@ -21,5 +21,5 @@
<DnxInvisibleContent Include=".bowerrc" />
<DnxInvisibleContent Include="package.json" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
22 changes: 15 additions & 7 deletions sample/RecurrentTasks.Sample/Startup.cs
@@ -1,13 +1,26 @@
namespace RecurrentTasks.Sample
{
using System;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;

public class Startup
{
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();

host.Run();
}

public void ConfigureServices(IServiceCollection services)
{
services.AddSingleton<SampleTask>();
Expand All @@ -17,16 +30,11 @@ public void ConfigureServices(IServiceCollection services)

public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
{
loggerFactory.MinimumLevel = LogLevel.Debug;
loggerFactory.AddConsole(LogLevel.Debug);

app.UseIISPlatformHandler();

app.UseMvcWithDefaultRoute();

app.ApplicationServices.GetRequiredService<SampleTask>().Start();
}

public static void Main(string[] args) => WebApplication.Run<Startup>(args);
}
}
70 changes: 49 additions & 21 deletions sample/RecurrentTasks.Sample/project.json
@@ -1,34 +1,62 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},

"dependencies": {
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
"Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"RecurrentTasks": ""
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-preview1-final",
"type": "build"
},
"Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
"RecurrentTasks": "*"
},

"commands": {
"web": "Microsoft.AspNet.Server.Kestrel"
"tools": {
"Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-preview1-final",
"imports": "portable-net45+win8+dnxcore50"
},
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-preview1-final",
"imports": "portable-net45+win8+dnxcore50"
}
},

"frameworks": {
"dnx451": { },
"dnxcore50": { }
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"dnxcore50",
"portable-net45+win8"
]
}
},
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},

"exclude": [
"wwwroot"
],
"runtimeOptions": {
"gcServer": true
},

"publishOptions": {
"include": [
"wwwroot",
"Views",
"web.config"
]
},

"publishExclude": [
"**.user",
"**.vspscc"
]
"scripts": {
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
}
}

0 comments on commit 0b41df3

Please sign in to comment.