Skip to content

Commit 55f2447

Browse files
TrolldemortedTrolldemorted
committed
use core test project
1 parent 9fe8747 commit 55f2447

File tree

8 files changed

+40
-286
lines changed

8 files changed

+40
-286
lines changed

‎MyGet.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dotnet clean
22
dotnet restore
3-
nuget restore
43
dotnet build
4+
dotnet test libsignal-protocol-dotnet-tests\libsignal-protocol-dotnet-tests.csproj
55
dotnet pack --include-symbols --include-source
6-
rem dotnet test

‎libsignal-protocol-dotnet-tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎libsignal-protocol-dotnet-tests/UnitTest1.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
namespace libsignal_protocol_dotnet_tests
4+
{
5+
[TestClass]
6+
public class UnitTest1
7+
{
8+
[TestMethod]
9+
public void TestMethod1()
10+
{
11+
}
12+
}
13+
}

‎libsignal-protocol-dotnet-tests/app.config

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎libsignal-protocol-dotnet-tests/libsignal-protocol-dotnet-tests.csproj

Lines changed: 13 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,174 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{3CF22022-2321-4EEE-A580-F51A8CF0B716}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>libsignal_protocol_dotnet_tests</RootNamespace>
11-
<AssemblyName>libsignal-protocol-dotnet-tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
16-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
17-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
18-
<IsCodedUITest>False</IsCodedUITest>
19-
<TestProjectType>UnitTest</TestProjectType>
20-
<NuGetPackageImportStamp>
21-
</NuGetPackageImportStamp>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
227
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
24-
<DebugSymbols>true</DebugSymbols>
25-
<DebugType>full</DebugType>
26-
<Optimize>false</Optimize>
27-
<OutputPath>bin\Debug\</OutputPath>
28-
<DefineConstants>DEBUG;TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release\</OutputPath>
36-
<DefineConstants>TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
</PropertyGroup>
40-
<ItemGroup>
41-
<Reference Include="curve25519-dotnet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\curve25519-dotnet.1.3.2\lib\netstandard1.4\curve25519-dotnet.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
46-
</Reference>
47-
<Reference Include="May-dotnet, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\May-dotnet.1.2.3\lib\netstandard1.4\May-dotnet.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
51-
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
54-
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
58-
</Reference>
59-
<Reference Include="System" />
60-
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
62-
</Reference>
63-
<Reference Include="System.ComponentModel.Composition" />
64-
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
66-
</Reference>
67-
<Reference Include="System.Core" />
68-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
69-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
73-
</Reference>
74-
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
76-
</Reference>
77-
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
79-
</Reference>
80-
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
81-
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
82-
</Reference>
83-
<Reference Include="System.IO.Compression.FileSystem" />
84-
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
85-
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
86-
</Reference>
87-
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
89-
</Reference>
90-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
92-
</Reference>
93-
<Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
95-
</Reference>
96-
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97-
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
98-
</Reference>
99-
<Reference Include="System.Numerics" />
100-
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101-
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
102-
</Reference>
103-
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
105-
</Reference>
106-
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
107-
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
108-
</Reference>
109-
<Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110-
<HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
111-
</Reference>
112-
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
113-
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
114-
</Reference>
115-
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
116-
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
117-
</Reference>
118-
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
119-
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
120-
</Reference>
121-
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
122-
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
123-
</Reference>
124-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
125-
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.1\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
126-
</Reference>
127-
<Reference Include="System.Xml" />
128-
<Reference Include="System.Xml.Linq" />
129-
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130-
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
131-
</Reference>
132-
</ItemGroup>
133-
<ItemGroup>
134-
<Compile Include="DateUtil.cs" />
135-
<Compile Include="devices\DeviceConsistencyTest.cs" />
136-
<Compile Include="ecc\Curve25519Test.cs" />
137-
<Compile Include="fingerprint\NumericFingerprintGeneratorTest.cs" />
138-
<Compile Include="groups\GroupCipherTest.cs" />
139-
<Compile Include="groups\InMemorySenderKeyStore.cs" />
140-
<Compile Include="HelperMethods.cs" />
141-
<Compile Include="kdf\HKDFTest.cs" />
142-
<Compile Include="ratchet\ChainKeyTest.cs" />
143-
<Compile Include="ratchet\RatchetingSessionTest.cs" />
144-
<Compile Include="ratchet\RootKeyTest.cs" />
145-
<Compile Include="SessionBuilderTest.cs" />
146-
<Compile Include="SessionCipherTest.cs" />
147-
<Compile Include="SimultaneousInitiateTests.cs" />
148-
<Compile Include="TestInMemoryIdentityKeyStore.cs" />
149-
<Compile Include="TestInMemorySignalProtocolStore.cs" />
150-
<Compile Include="Properties\AssemblyInfo.cs" />
151-
</ItemGroup>
8+
1529
<ItemGroup>
153-
<None Include="app.config" />
154-
<None Include="packages.config" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
12+
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
15513
</ItemGroup>
14+
15615
<ItemGroup>
157-
<ProjectReference Include="..\libsignal-protocol-dotnet\libsignal-protocol-dotnet.csproj">
158-
<Project>{a2c21ab2-85d2-432f-be51-c9d1b6cddec8}</Project>
159-
<Name>libsignal-protocol-dotnet</Name>
160-
</ProjectReference>
16+
<ProjectReference Include="..\libsignal-protocol-dotnet\libsignal-protocol-dotnet.csproj" />
16117
</ItemGroup>
162-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
163-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
164-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
165-
<PropertyGroup>
166-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
167-
</PropertyGroup>
168-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
169-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
170-
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets'))" />
171-
</Target>
172-
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
173-
<Import Project="..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" />
174-
</Project>
18+
19+
</Project>

0 commit comments

Comments
 (0)