Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 1db2464

Browse files
jforselljforsell
committed
Removing project.json and adding dependencies to csproj instead.
1 parent 86425fd commit 1db2464

14 files changed

+69
-644
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ bin/
44
obj/
55
*.csproj.user
66
StyleCop.cache
7-
packages.config

‎src/SymphonyOSS.RestApiClient.Generated/OpenApi/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages.config

‎src/SymphonyOSS.RestApiClient.Generated/SymphonyOSS.RestApiClient.Generated.csproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
35+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
36+
<Private>True</Private>
37+
</Reference>
38+
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
3442
<Reference Include="System" />
3543
<Reference Include="System.Core" />
3644
<Reference Include="System.Runtime.Serialization" />
@@ -54,7 +62,7 @@
5462
<None Include="OpenApi\Yaml\AgentApi\**\*.yaml" />
5563
<None Include="OpenApi\Yaml\AuthenticatorApi\**\*.yaml" />
5664
<None Include="OpenApi\Yaml\PodApi\**\*.yaml" />
57-
<None Include="project.json" />
65+
<None Include="packages.config" />
5866
</ItemGroup>
5967
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6068
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/SymphonyOSS.RestApiClient.Generated/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
4+
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
5+
</packages>

‎src/SymphonyOSS.RestApiClient.Generated/project.json

-12
This file was deleted.

‎src/SymphonyOSS.RestApiClient.Generated/project.lock.json

-111
This file was deleted.

‎src/SymphonyOSS.RestApiClient/SymphonyOSS.RestApiClient.csproj

+11-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
35+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
36+
<Private>True</Private>
37+
</Reference>
38+
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
3442
<Reference Include="System" />
3543
<Reference Include="System.Core" />
3644
<Reference Include="System.Xml.Linq" />
@@ -64,15 +72,15 @@
6472
<Compile Include="Api\PodApi\StreamsApi.cs" />
6573
<Compile Include="Api\PodApi\UsersApi.cs" />
6674
</ItemGroup>
67-
<ItemGroup>
68-
<None Include="project.json" />
69-
</ItemGroup>
7075
<ItemGroup>
7176
<ProjectReference Include="..\SymphonyOSS.RestApiClient.Generated\SymphonyOSS.RestApiClient.Generated.csproj">
7277
<Project>{67b81e11-ba65-4c3f-8075-e2c351467980}</Project>
7378
<Name>SymphonyOSS.RestClient.Generated</Name>
7479
</ProjectReference>
7580
</ItemGroup>
81+
<ItemGroup>
82+
<None Include="packages.config" />
83+
</ItemGroup>
7684
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7785
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7886
Other similar extension points exist, see Microsoft.Common.targets.

‎src/SymphonyOSS.RestApiClient/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
4+
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
5+
</packages>

‎src/SymphonyOSS.RestApiClient/project.json

-11
This file was deleted.

‎src/SymphonyOSS.RestApiClient/project.lock.json

-106
This file was deleted.

‎test/SymphonyOSS.RestApiClient.Tests/SymphonyOSS.RestApiClient.Tests.csproj

+27-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
35+
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
36+
<Private>True</Private>
37+
</Reference>
38+
<Reference Include="Moq, Version=4.5.8.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\Moq.4.5.8\lib\net45\Moq.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
3442
<Reference Include="System" />
3543
<Reference Include="System.Core" />
3644
<Reference Include="System.Xml.Linq" />
@@ -39,6 +47,22 @@
3947
<Reference Include="System.Data" />
4048
<Reference Include="System.Net.Http" />
4149
<Reference Include="System.Xml" />
50+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
58+
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
4266
</ItemGroup>
4367
<ItemGroup>
4468
<Compile Include="AgentApiFactoryTest.cs" />
@@ -58,9 +82,6 @@
5882
<Compile Include="SystemApiTest.cs" />
5983
<Compile Include="UsersApiTest.cs" />
6084
</ItemGroup>
61-
<ItemGroup>
62-
<None Include="project.json" />
63-
</ItemGroup>
6485
<ItemGroup>
6586
<ProjectReference Include="..\..\src\SymphonyOSS.RestApiClient.Generated\SymphonyOSS.RestApiClient.Generated.csproj">
6687
<Project>{67b81e11-ba65-4c3f-8075-e2c351467980}</Project>
@@ -74,6 +95,9 @@
7495
<ItemGroup>
7596
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7697
</ItemGroup>
98+
<ItemGroup>
99+
<None Include="packages.config" />
100+
</ItemGroup>
77101
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78102
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
79103
Other similar extension points exist, see Microsoft.Common.targets.

‎test/SymphonyOSS.RestApiClient.Tests/packages.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
4+
<package id="Moq" version="4.5.8" targetFramework="net45" />
5+
<package id="xunit" version="2.1.0" targetFramework="net45" />
6+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
7+
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
8+
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
9+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
10+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
11+
</packages>

0 commit comments

Comments
 (0)