Skip to content

Commit 509196d

Browse files
gnongsiegnongsie
committed
Fixing issues with dependent packages
1 parent a2e477c commit 509196d

File tree

4 files changed

+44
-41
lines changed

4 files changed

+44
-41
lines changed

‎cybersource-rest-client-dotnet.sln‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
3-
VisualStudioVersion = 14.0.25420.1
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.28307.645
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-client-dotnet", "cybersource-rest-client-dotnet.csproj", "{B65087AA-7650-4636-87A5-3746A802B462}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-client-dotnet", "cybersource-rest-client-dotnet.csproj", "{DBBD2CE3-38E4-45B1-9BE6-21A0E290BF56}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-client-dotnet.Test", "test\cybersource-rest-client-dotnet.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
88
EndProject
99
Global
10-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11-
Debug|Any CPU = Debug|Any CPU
12-
Release|Any CPU = Release|Any CPU
13-
EndGlobalSection
14-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{B65087AA-7650-4636-87A5-3746A802B462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16-
{B65087AA-7650-4636-87A5-3746A802B462}.Debug|Any CPU.Build.0 = Debug|Any CPU
17-
{B65087AA-7650-4636-87A5-3746A802B462}.Release|Any CPU.ActiveCfg = Release|Any CPU
18-
{B65087AA-7650-4636-87A5-3746A802B462}.Release|Any CPU.Build.0 = Release|Any CPU
19-
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20-
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
21-
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
23-
EndGlobalSection
24-
GlobalSection(SolutionProperties) = preSolution
25-
HideSolutionNode = FALSE
26-
EndGlobalSection
10+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11+
Debug|Any CPU = Debug|Any CPU
12+
Release|Any CPU = Release|Any CPU
13+
EndGlobalSection
14+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+
{DBBD2CE3-38E4-45B1-9BE6-21A0E290BF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{DBBD2CE3-38E4-45B1-9BE6-21A0E290BF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{DBBD2CE3-38E4-45B1-9BE6-21A0E290BF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{DBBD2CE3-38E4-45B1-9BE6-21A0E290BF56}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(SolutionProperties) = preSolution
25+
HideSolutionNode = FALSE
26+
EndGlobalSection
27+
GlobalSection(ExtensibilityGlobals) = postSolution
28+
SolutionGuid = {81C31F92-F846-476A-9868-2782DB07363D}
29+
EndGlobalSection
2730
EndGlobal

‎generator/cybersource-csharp-template/TestProject.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
<Reference Include="System.Runtime.Serialization" />
6060
<Reference Include="System.Xml" />
6161
<Reference Include="Newtonsoft.Json">
62-
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
62+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
6363
</Reference>
6464
<Reference Include="RestSharp">
65-
<HintPath>packages\RestSharp.106.5.4\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
65+
<HintPath>..\packages\RestSharp.106.5.4\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
6666
</Reference>
6767
<Reference Include="nunit.framework">
68-
<HintPath>packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
68+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
6969
</Reference>
7070
</ItemGroup>
7171
<ItemGroup>

‎test/cybersource-rest-client-dotnet.Test.csproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
CyberSource Merged Spec
44
@@ -37,6 +37,12 @@ OpenAPI spec version: 0.0.1
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40+
<Reference Include="nunit.framework">
41+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
42+
</Reference>
43+
<Reference Include="RestSharp">
44+
<HintPath>..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
45+
</Reference>
4046
<Reference Include="System" />
4147
<Reference Include="System.Core" />
4248
<Reference Include="System.Xml.Linq" />
@@ -47,28 +53,22 @@ OpenAPI spec version: 0.0.1
4753
<Reference Include="System.Runtime.Serialization" />
4854
<Reference Include="System.Xml" />
4955
<Reference Include="Newtonsoft.Json">
50-
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
51-
</Reference>
52-
<Reference Include="RestSharp">
53-
<HintPath>packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
54-
</Reference>
55-
<Reference Include="nunit.framework">
56-
<HintPath>packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
56+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5757
</Reference>
5858
</ItemGroup>
5959
<ItemGroup>
60-
<Compile Include="**\*.cs"
61-
Exclude="obj\**"/>
60+
<Compile Include="**\*.cs" Exclude="obj\**" />
6261
</ItemGroup>
6362
<ItemGroup>
64-
<None Include="packages.config" />
63+
<None Include="packages.config">
64+
<SubType>Designer</SubType>
65+
</None>
6566
</ItemGroup>
6667
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
6768
<ItemGroup>
68-
<ProjectReference Include="..\cybersource-rest-client-dotnet.csproj">
69-
<Project>{B65087AA-7650-4636-87A5-3746A802B462}</Project>
70-
<Name>cybersource-rest-client-dotnet</Name>
71-
</ProjectReference>
69+
<ProjectReference Include="..\cybersource-rest-client-dotnet.csproj">
70+
<Project>{B65087AA-7650-4636-87A5-3746A802B462}</Project>
71+
<Name>cybersource-rest-client-dotnet</Name>
72+
</ProjectReference>
7273
</ItemGroup>
73-
</Project>
74-
74+
</Project>

‎test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit" version="2.6.4" targetFramework="net45" />
4-
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
4+
<package id="RestSharp" version="106.5.4" targetFramework="net45" developmentDependency="true" />
55
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
66
</packages>

0 commit comments

Comments
 (0)