Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
aaubry committed Nov 19, 2020
2 parents 3272b73 + 108c192 commit 728de14
Show file tree
Hide file tree
Showing 64 changed files with 1,332 additions and 1,492 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ YamlDotNet/Properties/AssemblyInfo.Generated.cs

/.vs
/YamlDotNet/Properties/AssemblyInfo.cs
BenchmarkDotNet.Artifacts

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ All contributions should be submitted as pull requests.
1. Always add one or more **unit tests** that prove that the feature / fix you are submitting is working correctly.

1. Please **describe the motivation** behind the pull request. Explain what was the problem / requirement. Unless the implementation is self-explanatory, also describe the solution.
* Of course, there's no need to be too verbose. Usually one or two lines will be enough.
* Of course, there's no need to be too verbose. Usually one or two lines will be enough.

## Project organization

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
<PropertyGroup>
<OldToolsVersion>2.0</OldToolsVersion>
<ProjectGuid>{2C86D85C-A483-4F17-8897-2B53DC1DBFA3}</ProjectGuid>
<Configurations>Release</Configurations>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<Import Project="versions.props" />
<ItemGroup>
<None Include="versions.props" />
</ItemGroup>
<Target Name="Build" Outputs="%(TestVersions.Identity)">
<Message Importance="high" Text="BUILDING %(TestVersions.Identity)" />
<MSBuild Projects="..\YamlDotNet.PerformanceTests\YamlDotNet.PerformanceTests.csproj" Targets="Restore;Build" BuildInParallel="$(BuildInParallel)" Properties="Configuration=Release;TestVersion=%(TestVersions.Identity);BaseIntermediateOutputPath=obj\%(TestVersions.Identity)\;MSBuildProjectExtensionsPath=obj\%(TestVersions.Identity)\" />
<Message Importance="high" Text="&#xA;" />
</Target>
<Target Name="Clean">
<RemoveDir Directories="..\YamlDotNet.PerformanceTests\obj\%(TestVersions.Identity)" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<ItemGroup>
<!-- After changing this file, you need to tell Visual Studio to reload the project! -->

<TestVersions Include="3.8.0" />
<TestVersions Include="4.0.0" />
<TestVersions Include="5.3.0" />
<TestVersions Include="8.0.0" />
<TestVersions Include="8.1.2" />
<TestVersions Include="latest" />
</ItemGroup>
</Project>

This file was deleted.

This file was deleted.

0 comments on commit 728de14

Please sign in to comment.