Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #14

Open
wants to merge 4 commits into
base: Dev
Choose a base branch
from
Open

Master #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e200cf5
Upgrade to MsBuild Project files, and the C++ project to 2107
Mar 9, 2017
b98c447
delete backup
yoyofx Mar 9, 2017
8f5cb77
修改命名空间
yoyofx Mar 12, 2017
8bf8129
other runtime
yoyofx Mar 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,000 changes: 0 additions & 1,000 deletions .vs/config/applicationhost.config
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions .vs/restore.dg
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions AspNetCore/YOYO.AspNetCore.Builder/OwinApplicationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using YOYO.Mvc.Route;
using YOYO.Mvc;
using YOYO.Mvc.Session;
using YOYO.Owin;
using YOYO.Mvc.Owin;
using YOYO.Mvc.ActionRuntime;
using YOYO.AspNetCore.Mvc.Route;
using YOYO.AspNetCore.Mvc;
using YOYO.AspNetCore.Mvc.Session;
using YOYO.AspNetCore.Owin;
using YOYO.AspNetCore.Mvc.Owin;
using YOYO.AspNetCore.Mvc.ActionRuntime;
using Microsoft.Extensions.DependencyInjection;
using YOYO.Extensions.DI;

Expand Down
31 changes: 31 additions & 0 deletions AspNetCore/YOYO.AspNetCore.Builder/YOYO.AspNetCore.Builder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.1.3</VersionPrefix>
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
<DebugType>portable</DebugType>
<AssemblyName>YOYO.AspNetCore.Builder</AssemblyName>
<PackageId>YOYO.AspNetCore.Builder</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\YOYO.AspNetCore.Mvc\YOYO.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\YOYO.AspNetCore.Owin\YOYO.AspNetCore.Owin.csproj" />
<ProjectReference Include="..\YOYO.Extensions.DI\YOYO.Extensions.DI.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="Owin" Version="1.0.0" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions AspNetCore/YOYO.AspNetCore.Builder/YOYO.AspNetCore.Builder.xproj
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions AspNetCore/YOYO.AspNetCore.Builder/YOYO.AspNetCore.Builder.xproj.user
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions AspNetCore/YOYO.AspNetCore.Builder/project.json
View file
Open in desktop

This file was deleted.

Loading