Skip to content

feature/netcore (WIP) #34

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

Open
jrgcubano wants to merge 12 commits into
base: master
Choose a base branch
from
Open

feature/netcore (WIP) #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd513b0
refactor libraries to sdk project with net461/netstandard
jrgcubano Mar 10, 2019
5b2ec9d
refactor benchmark to sdk project and update dependencies
jrgcubano Mar 10, 2019
047e994
refactor mvc5 api server to sdk project with minor username fix
jrgcubano Mar 10, 2019
83b3ea5
refactor tests to sdk project and update libraries
jrgcubano Mar 10, 2019
a952782
fix tests with valid format for key paths, changed backslash for slash
jrgcubano Mar 10, 2019
87386d6
add first version of netcore server for gitdb
jrgcubano Mar 10, 2019
ac1400d
refactor test project to allow multiple frameworks and testservers
jrgcubano Mar 10, 2019
bdf4abb
rebase latest paged feature with key fix and add feature to netcore
jrgcubano Mar 10, 2019
6172eaf
update readme with netcore project and contribute section
jrgcubano Mar 10, 2019
4517d4b
remove explicit configuration (already checked in CreateDefaultBuilde…
jrgcubano Mar 10, 2019
37cd485
refactor startup with extensions
jrgcubano Apr 1, 2019
cd7ceea
refactor build process without a host project and update readme
jrgcubano Apr 1, 2019
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
Prev Previous commit
Next Next commit
refactor mvc5 api server to sdk project with minor username fix
  • Loading branch information
@jrgcubano
jrgcubano committed Mar 10, 2019
commit 047e99402b8cdda8b99ebf4aa2399602c55f69e9
2 changes: 1 addition & 1 deletion Appy.GitDb.Server/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<appSettings>
<add key="server.url" value="http://+:9500" />
<add key="git.repository.path" value="d:\test" />
<add key="git.repository.path" value="c:\test" />
<add key="remote.url" value="" />
<add key="remote.user.name" value="" />
<add key="remote.user.email" value="" />
Expand Down
175 changes: 44 additions & 131 deletions Appy.GitDb.Server/Appy.GitDb.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,155 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A9FAB943-9F28-49F8-82FB-0380A22FD683}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Appy.GitDb.Server</RootNamespace>
<AssemblyName>Appy.GitDb.Server</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>net461</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />

<ItemGroup>
<Reference Include="Autofac, Version=4.1.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.4.1.1\lib\net45\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Integration.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Integration.WebApi, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.WebApi2.4.0.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Integration.WebApi.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.WebApi2.Owin.4.0.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core, Version=4.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\FSharp.Core.4.1.17\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin.Hosting, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin.Security, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin.Compression, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.Compression.1.0.15\lib\net45\Owin.Compression.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="Thinktecture.IdentityModel.Owin.BasicAuthentication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Thinktecture.IdentityModel.Owin.BasicAuthentication.1.0.1\lib\net45\Thinktecture.IdentityModel.Owin.BasicAuthentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="YamlDotNet, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\YamlDotNet.4.0.0\lib\net35\YamlDotNet.dll</HintPath>
<Private>True</Private>
</Reference>
<PackageReference Include="Autofac" Version="$(AutofacPackageVersion)" />
<PackageReference Include="Autofac.Owin" Version="$(AutofacOwinPackageVersion)" />
<PackageReference Include="Autofac.WebApi2" Version="$(AutofacOwinPackageVersion)" />
<PackageReference Include="Autofac.WebApi2.Owin" Version="$(AutofacWebApi2OwinPackageVersion)" />
<PackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
<PackageReference Include="Invoke-Build" Version="$(InvokeBuildPackageVersion)">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiPackageVersion)" />
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="$(MicrosoftAspNetWebApiPackageVersion)" />
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="$(MicrosoftAspNetWebApiPackageVersion)" />
<PackageReference Include="Microsoft.Owin" Version="$(MicrosoftOwinPackageVersion)" />
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="$(MicrosoftOwinHostPackageVersion)" />
<PackageReference Include="Microsoft.Owin.Hosting" Version="$(MicrosoftOwinHostPackageVersion)" />
<PackageReference Include="Microsoft.Owin.Security" Version="$(MicrosoftOwinSecurityPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
<PackageReference Include="NLog" Version="$(NLogPackageVersion)" />
<PackageReference Include="NLog.Config" Version="$(NLogPackageVersion)" />
<PackageReference Include="NLog.Schema" Version="$(NLogPackageVersion)" />
<PackageReference Include="OctopusTools" Version="$(OctopusToolsPackageVersion)">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Owin" Version="$(OwinPackageVersion)" />
<PackageReference Include="Owin.Compression" Version="$(OwinCompressionPackageVersion)" />
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
<PackageReference Include="Thinktecture.IdentityModel.Owin.BasicAuthentication" Version="$(IdentityModelOwinBasicAuthenticationPackageVersion)" />
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetPackageVersion)" />
</ItemGroup>

<ItemGroup>
<Compile Include="Auth\Authentication.cs" />
<Compile Include="GitProtocol.cs" />
<Compile Include="Logging\CorrelationIdRenderer.cs" />
<Compile Include="Logging\ExceptionLogger.cs" />
<Compile Include="GitApi.cs" />
<Compile Include="Logging\LogContext.cs" />
<Compile Include="Logging\LoggingMiddleWare.cs" />
<Compile Include="Logging\ExceptionLayoutRenderer.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="App.cs" />
<Reference Include="System.Configuration" />
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<None Include="App.config" />
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Appy.GitDb.Core\Appy.GitDb.Core.csproj">
<Project>{72ae8930-98ef-446d-8167-7dd251bcf4e6}</Project>
<Name>Appy.GitDb.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Appy.GitDb.Local\Appy.GitDb.Local.csproj">
<Project>{37d87fb6-e7d6-4217-b021-38cea7233e6f}</Project>
<Name>Appy.GitDb.Local</Name>
</ProjectReference>
<ProjectReference Include="..\Appy.GitDb.Core\Appy.GitDb.Core.csproj" />
<ProjectReference Include="..\Appy.GitDb.Local\Appy.GitDb.Local.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
2 changes: 1 addition & 1 deletion Appy.GitDb.Server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static void Main(string[] args)
var app = App.Create(url, new LocalGitDb(gitRepoPath, remoteUrl, userName, userEmail, password, transactionTimeout), new List<User>
{
new User{ UserName = "GitAdmin", Password = ConfigurationManager.AppSettings["GitAdmin"], Roles = new [] { "admin","read","write" }},
new User{ UserName = "GitReader",Password = ConfigurationManager.AppSettings["GitAdmin"],Roles = new [] { "read" }},
new User{ UserName = "GitReader",Password = ConfigurationManager.AppSettings["GitReader"],Roles = new [] { "read" }},
new User{ UserName = "GitWriter", Password = ConfigurationManager.AppSettings["GitWriter"] ,Roles = new [] { "write" }}
});
using (app.Start())
Expand Down
12 changes: 0 additions & 12 deletions Appy.GitDb.Server/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("Appy.GitDb.Server")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AppyParking")]
[assembly: AssemblyProduct("Appy.GitDb.Server")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]

[assembly: Guid("a9fab943-9f28-49f8-82fb-0380a22fd683")]

[assembly: AssemblyVersion("1.0.*")]
26 changes: 0 additions & 26 deletions Appy.GitDb.Server/packages.config
View file
Open in desktop

This file was deleted.