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.

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

[WIP] #96 dotnet core support #204

Closed
wants to merge 62 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
30c0e5a
Update nodatime for netcore
Jun 20, 2017
b8cc55f
Convert src/Logary to new fsproj format
Jun 20, 2017
8930746
Convert Logary.Adapters.Facade
Jun 21, 2017
e224966
Convert Logary.Tests.fsproj
Jun 21, 2017
cfb15db
Convert Logary.CSharp.csproj
Jun 21, 2017
0c22b2b
Convert Logary.Adapters.CommonLogging.fsproj
Jun 21, 2017
6da4de7
Convert Logary.Adapters.EventStore.fsproj
Jun 21, 2017
a80ce59
Added netcore sln file for easier build of net project style
Jun 21, 2017
69f1c4e
Convert Logary.Adapters.FsSql.fsproj
Jun 21, 2017
4c2c4a3
convert Logary.Adapters.log4net.fsproj
Jun 21, 2017
e7ea5a0
Convert Logary.Adapters.NLog.fsproj
Jun 21, 2017
c1ac751
convert Logary.Adapters.Topshelf.fsproj
Jun 21, 2017
d4a0334
Convert Logary.CSharp.Facade/Logary.CSharp.Facade.csproj
Jun 21, 2017
5b43d93
Convert Logary.Metrics.WinPerfCounters.fsproj
Jun 21, 2017
f7887a5
Convert Logary.Targets.AliYun.fsproj
Jun 21, 2017
66dd319
Convert Logary.Targets.ApplicationInsights.fsproj
Jun 22, 2017
6c16e3e
Convert Logary.Targets.DB.fsproj
Jun 22, 2017
9a839c0
Convert Logary.Targets.DB.Migrations.fsproj
Jun 22, 2017
391ff4f
Convert Logary.Targets.ElasticSearch.fsproj
Jun 22, 2017
aef2c50
Convert Logary.Targets.ElmahIO.fsproj
Jun 22, 2017
c4ce7e4
Convert Logary.Targets.Heka.fsproj
Jun 22, 2017
407f750
Convert Logary.Targets.InfluxDb.fsproj
Jun 22, 2017
fa98c85
Convert Logary.Targets.Logstash.fsproj
Jun 22, 2017
6fc1f19
Convert Logary.Targets.Mailgun.fsproj
Jun 22, 2017
6fa7a92
Convert Logary.Targets.RabbitMQ.fsproj
Jun 22, 2017
03510c5
Convert Logary.Targets.Riemann.fsproj
Jun 22, 2017
ac40614
Convert Logary.Targets.Shipper.fsproj
Jun 22, 2017
01bfa13
Convert Logary.Targets.Stackdriver.fsproj
Jun 22, 2017
b9fd50e
Convert Logary.Zipkin.csproj Logary.Targets.Zipkin.fsproj
Jun 22, 2017
1b609d4
Convert Logary.Adapters.log4net.Tests.fsproj
Jun 23, 2017
799e7b6
Convert Cibryy.csproj Libryy.fsproj Logary.Adapters.Facade.Tests.fsproj
Jun 23, 2017
3d1eddd
Convert Logary.CSharp.Tests.csproj
Jun 23, 2017
d2a9841
Convert Logary.Facade.fsproj Logary.Facade.Tests.fsproj
Jun 23, 2017
b827a6d
Convert Logary.IntegrationTests.fsproj
Jun 23, 2017
e92e1d6
Convert Logary.Metrics.WinPerfCounters.Tests.fsproj
Jun 23, 2017
9dc2aa5
Convert Logary.Targets.DB.Tests.fsproj
Jun 27, 2017
d6114db
Convert Logary.Targets.ElasticSearch.Tests.1.fsproj
Jun 27, 2017
e9fdf5b
Convert Logary.Targets.ElmahIO.Tests.fsproj
Jun 27, 2017
f746a5c
Convert Logary.Targets.Heka.Tests.fsproj
Jun 27, 2017
023306c
Convert Logary.Targets.InfluxDb.Tests.fsproj
Jun 28, 2017
689a968
Convert Logary.Targets.Logstash.Tests.fsproj
Jun 28, 2017
5240c3e
Logary.Targets.Mailgun.Tests.fsproj
Jun 28, 2017
ea948d5
Convert Logary.Targets.RabbitMQ.Tests.fsproj
Jun 28, 2017
4951ab1
Convert Logary.Targets.Riemann.Tests.fsproj
Jun 28, 2017
efa604d
Convert Logary.Targets.Stackdriver.Tests.fsproj
Jun 28, 2017
14c29a5
Convert Logary.WinPerfCounters.Tests.fsproj
Jun 28, 2017
a66394a
Convert Logary.Zipkin.Tests.fsproj
Jun 28, 2017
2af93a4
Add tests to Logary.NetCore.sln
Jun 28, 2017
840dd44
Initial Rakefile change for dotnet core cli
Jun 28, 2017
c6e7715
Have travis use dotnet core
Jun 28, 2017
641c7b3
dotnet core supports Trusty and up
Jun 28, 2017
aba46e7
Ensure paket.targets in tools
Jun 28, 2017
893824f
remove duplicate paket.targets
Jun 28, 2017
c42c027
Ensure tools/Paket.Restore.targets
Jun 28, 2017
5f5337c
Set FrameworkPathOverride for travis
Jun 28, 2017
1adebbf
Ignore AssemblyInfoVersion for now
Jun 28, 2017
73abd8c
Move FrameworkPathOverride to env key in travis
Jun 28, 2017
5001d1c
Don't run dotnet clean just yet
Jun 28, 2017
3c2cc49
travis debugging part1
Jun 28, 2017
a804ecf
travis debugging part2
Jun 28, 2017
6754e39
travis debugging part3
Jun 28, 2017
b7cfa47
Run unit tests in Rakefile
Jun 30, 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
42 changes: 42 additions & 0 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Mark that this target file has been loaded. -->
<IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
</PropertyGroup>

<Target Name="PaketRestore" BeforeTargets="_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >

<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" ' />

<PropertyGroup>
<PaketReferencesFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references</PaketReferencesFilePath>
</PropertyGroup>

<ReadLinesFromFile File="$(PaketReferencesFilePath)" >
<Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
</ReadLinesFromFile>

<ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
</PackageReference>
</ItemGroup>

<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>

</Target>
</Project>
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
language: csharp

dist: trusty
dotnet: 1.0.1
mono:
- 4.6.1
- 4.8.1
Expand All @@ -15,6 +16,7 @@ install:
- bundle

script:
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
- bundle exec rake DEBUG=true

matrix:
Expand Down
Loading