Skip to content

Commit

Permalink
ref #2 and #5 - integration with CI and update of README build status…
Browse files Browse the repository at this point in the history
… information.
  • Loading branch information
drr00t committed Aug 24, 2016
1 parent c853b07 commit ba3e88c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
build/

.idea.*/
# Visual Studio 2015 cache/options directory
Expand Down
20 changes: 14 additions & 6 deletions src/TweetNaCl.Tests/TweetNaCl.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<AssemblyName>TweetNaCl.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -31,32 +33,38 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\TweeNaCl\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="LibsodiumTests.cs" />
<Compile Include="TweetNaClJSTests.cs" />
<Compile Include="TweetNaClTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TweetNaCl\TweetNaCl.csproj">
<Project>{c68b2932-c122-4ed6-80b3-80e1d4aa02da}</Project>
<Name>TweeNaCl</Name>
<Name>TweetNaCl</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- 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">
Expand Down
2 changes: 0 additions & 2 deletions src/TweetNaCl.Tests/TweetNaClTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,6 @@ public void TestForMessageEncryption()
Byte[] nonce = new Byte[TweetNaCl.BOX_NONCEBYTES];
Byte[] k = new Byte[TweetNaCl.BOX_BEFORENMBYTES];

var result = -10;

pk = TweetNaCl.CryptoBoxKeypair(sk);
TweetNaCl.RandomBytes(nonce);

Expand Down
15 changes: 15 additions & 0 deletions src/TweetNaCl.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetNaCl", "TweetNaCl\Twee
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetNaCl.Tests", "TweetNaCl.Tests\TweetNaCl.Tests.csproj", "{93DCE450-56A2-40A8-A156-0F76A2A04E67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetNaCl.Bench", "TweetNaCl.Bench\TweetNaCl.Bench.csproj", "{7B6159A9-D5FD-451C-9041-49E0A0E1DEEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{FB8C45F1-5EC8-466E-BEB8-F86923C165BF}"
ProjectSection(SolutionItems) = preProject
..\build.bat = ..\build.bat
..\build.fsx = ..\build.fsx
..\build.sh = ..\build.sh
..\LICENSE = ..\LICENSE
..\README.md = ..\README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C8317219-84BB-413F-A1D5-E6E3EB284185}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,6 +34,8 @@ Global
{93DCE450-56A2-40A8-A156-0F76A2A04E67}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93DCE450-56A2-40A8-A156-0F76A2A04E67}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93DCE450-56A2-40A8-A156-0F76A2A04E67}.Release|Any CPU.Build.0 = Release|Any CPU
{7B6159A9-D5FD-451C-9041-49E0A0E1DEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B6159A9-D5FD-451C-9041-49E0A0E1DEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit ba3e88c

Please sign in to comment.