Skip to content

Commit 9f4e427

Browse files
AstnAstn
committed
merged
2 parents 4d1700d + c0a6d05 commit 9f4e427

7 files changed

Lines changed: 47 additions & 11 deletions

File tree

‎AustinHarris.JsonRpcTestN/AustinHarris.JsonRpcTestN.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<?xml version="1.0" encoding="utf-8"?>
3+
=======
4+
<?xml version="1.0" encoding="utf-8"?>
5+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
26
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
37
<PropertyGroup>
48
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,8 +12,11 @@
812
<RootNamespace>AustinHarris.JsonRpcTestN</RootNamespace>
913
<AssemblyName>AustinHarris.JsonRpcTestN</AssemblyName>
1014
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15+
<<<<<<< HEAD
1116
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1217
<RestorePackages>true</RestorePackages>
18+
=======
19+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
1320
</PropertyGroup>
1421
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1522
<DebugSymbols>true</DebugSymbols>
@@ -30,6 +37,7 @@
3037
<ConsolePause>false</ConsolePause>
3138
</PropertyGroup>
3239
<ItemGroup>
40+
<<<<<<< HEAD
3341
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3442
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3543
<Private>True</Private>
@@ -39,6 +47,15 @@
3947
<Private>True</Private>
4048
</Reference>
4149
<Reference Include="System" />
50+
=======
51+
<Reference Include="System" />
52+
<Reference Include="Newtonsoft.Json">
53+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
54+
</Reference>
55+
<Reference Include="nunit.framework">
56+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
57+
</Reference>
58+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
4259
</ItemGroup>
4360
<ItemGroup>
4461
<Compile Include="Test.cs" />
@@ -54,6 +71,7 @@
5471
<Name>AustinHarris.JsonRpc</Name>
5572
</ProjectReference>
5673
</ItemGroup>
74+
<<<<<<< HEAD
5775
<ItemGroup>
5876
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
5977
</ItemGroup>
@@ -64,4 +82,6 @@
6482
</PropertyGroup>
6583
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
6684
</Target>
85+
=======
86+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
6787
</Project>

‎AustinHarris.JsonRpcTestN/Test.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace AustinHarris.JsonRpcTestN
99
{
10+
<<<<<<< HEAD
1011
public class Poco
1112
{
1213
public static Poco WithOffset(int offset)
@@ -24,6 +25,8 @@ public Poco(int offset)
2425
public int Add(int input) { return input + _offset; }
2526
}
2627

28+
=======
29+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
2730
[TestFixture ()]
2831
public class Test
2932
{
@@ -39,6 +42,7 @@ static Test()
3942
new CalculatorService()};
4043
}
4144

45+
<<<<<<< HEAD
4246
[Test()]
4347
public void TestCanCreateMultipleServicesOfSameTypeInTheirOwnSessions()
4448
{
@@ -60,6 +64,8 @@ public void TestCanCreateMultipleServicesOfSameTypeInTheirOwnSessions()
6064
}
6165
}
6266

67+
=======
68+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
6369
[Test ()]
6470
public void TestCanCreateAndRemoveSession()
6571
{

‎AustinHarris.JsonRpcTestN/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<<<<<<< HEAD
34
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
45
<package id="NUnit" version="3.0.1" targetFramework="net45" />
6+
=======
7+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
8+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
9+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
510
</packages>

‎Json-Rpc/AustinHarris.JsonRpc.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@
7575
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
78-
<Reference Include="System" />
79-
</ItemGroup>
80-
<ItemGroup>
81-
<None Include="packages.config" />
8278
</ItemGroup>
8379
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8480
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -95,4 +91,7 @@
9591
<Target Name="AfterBuild">
9692
</Target>
9793
-->
98-
</Project>
94+
<ItemGroup>
95+
<None Include="packages.config" />
96+
</ItemGroup>
97+
</Project>

‎Json-Rpc/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40" />
4-
</packages>
4+
</packages>

‎TestServer_Console/TestServer_Console.csproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
<Reference Include="Microsoft.CSharp" />
6262
<Reference Include="System.Data" />
6363
<Reference Include="System.Xml" />
64+
<Reference Include="Newtonsoft.Json">
65+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
66+
</Reference>
6467
</ItemGroup>
6568
<ItemGroup>
6669
<Compile Include="Program.cs" />
@@ -73,9 +76,6 @@
7376
<Name>AustinHarris.JsonRpc</Name>
7477
</ProjectReference>
7578
</ItemGroup>
76-
<ItemGroup>
77-
<None Include="packages.config" />
78-
</ItemGroup>
7979
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8080
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8181
Other similar extension points exist, see Microsoft.Common.targets.
@@ -84,11 +84,17 @@
8484
<Target Name="AfterBuild">
8585
</Target>
8686
-->
87+
<<<<<<< HEAD
8788
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8889
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8990
<PropertyGroup>
9091
<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>
9192
</PropertyGroup>
9293
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
9394
</Target>
94-
</Project>
95+
=======
96+
<ItemGroup>
97+
<None Include="packages.config" />
98+
</ItemGroup>
99+
>>>>>>> c0a6d05741c6197a3ffaccbe2ee414b049d7d7d1
100+
</Project>

‎TestServer_Console/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40-Client" />
4-
</packages>
4+
</packages>

0 commit comments

Comments
 (0)