Browse Source

Merge cf2d2f3d0a into 832a373d31

pull/16/merge
Marcos Meli 10 years ago
parent
commit
64ce99d587
6 changed files with 24 additions and 14 deletions
  1. +9
    -0
      .travis.yml
  2. +3
    -3
      src/DocNet/App.config
  3. +3
    -2
      src/DocNet/Docnet.csproj
  4. +1
    -1
      src/MarkdownDeep/MarkdownDeep.csproj
  5. +4
    -4
      src/MarkdownDeepTests/MarkdownDeepTests.csproj
  6. +4
    -4
      src/MarkdownDeepTests/app.config

+ 9
- 0
.travis.yml View File

@@ -0,0 +1,9 @@
sudo: false
language: csharp
solution: Docnet.sln
install:
- nuget restore Docnet.sln
- nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory testrunner
script:
- xbuild /p:Configuration=Debug Docnet.sln
- mono ./testrunner/NUnit.Runners.3.0.1/tools/nunit-console.exe ./src/MarkdownDeepTests/bin/Debug/MarkdownDeepTests.dll

+ 3
- 3
src/DocNet/App.config View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
</startup>
</configuration>
</configuration>

+ 3
- 2
src/DocNet/Docnet.csproj View File

@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Docnet</RootNamespace>
<AssemblyName>Docnet</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />


+ 1
- 1
src/MarkdownDeep/MarkdownDeep.csproj View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MarkdownDeep</RootNamespace>
<AssemblyName>MarkdownDeep</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>


+ 4
- 4
src/MarkdownDeepTests/MarkdownDeepTests.csproj View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MarkdownDeepTests</RootNamespace>
<AssemblyName>MarkdownDeepTests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -42,13 +42,13 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.mocks">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
</Reference>
<Reference Include="pnunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">


+ 4
- 4
src/MarkdownDeepTests/app.config View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="NUnit">
<section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
<section name="TestRunner" type="System.Configuration.NameValueSectionHandler"/>
</sectionGroup>
</configSections>
<NUnit>
<TestRunner>
<add key="ApartmentState" value="STA" />
<add key="ApartmentState" value="STA"/>
</TestRunner>
</NUnit>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>

Loading…
Cancel
Save