Skip to content

Commit 0051a3d

Browse files
gnongsiegnongsie
committed
+ Fixing dependencies
1 parent 992dac8 commit 0051a3d

9 files changed

+64
-66
lines changed

‎cybersource-rest-client-dotnet.csproj‎

Lines changed: 14 additions & 15 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
@@ -9,7 +9,6 @@ OpenAPI spec version: 0.0.1
99
-->
1010
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1111
<PropertyGroup>
12-
1312
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1413
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1514
<ProjectGuid>{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}</ProjectGuid>
@@ -40,36 +39,36 @@ OpenAPI spec version: 0.0.1
4039
<ItemGroup>
4140
<Reference Include="System" />
4241
<Reference Include="System.Core" />
43-
<Reference Include="System.Web" />
42+
<Reference Include="System.Web" />
4443
<Reference Include="System.Xml.Linq" />
4544
<Reference Include="System.Data.DataSetExtensions" />
4645
<Reference Include="System.ComponentModel.DataAnnotations" />
4746
<Reference Include="Microsoft.CSharp" />
4847
<Reference Include="System.Data" />
4948
<Reference Include="System.Runtime.Serialization" />
5049
<Reference Include="System.Xml" />
51-
<Reference Include="AuthenticationSdk">
52-
<HintPath>packages\CyberSource.Authentication.0.0.0.3\lib\AuthenticationSdk.dll</HintPath>
50+
<Reference Include="AuthenticationSdk">
51+
<HintPath>packages\CyberSource.Authentication.0.0.0.4\lib\AuthenticationSdk.dll</HintPath>
5352
</Reference>
5453
<Reference Include="Newtonsoft.Json">
55-
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
54+
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5655
</Reference>
5756
<Reference Include="RestSharp">
58-
<HintPath>packages\RestSharp.106.5.3\lib\net45.2\RestSharp.dll</HintPath>
57+
<HintPath>packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
5958
</Reference>
6059
</ItemGroup>
6160
<ItemGroup>
62-
<Compile Include="**\*.cs"
63-
Exclude="obj\**;test\**" />
61+
<Compile Include="**\*.cs" Exclude="obj\**;test\**" />
6462
</ItemGroup>
6563
<ItemGroup>
66-
<None Include="packages.config" />
67-
<None Include="cybersource-rest-client-dotnet.nuspec" />
68-
<None Include="README.md" />
64+
<None Include="packages.config">
65+
<SubType>Designer</SubType>
66+
</None>
67+
<None Include="cybersource-rest-client-dotnet.nuspec" />
68+
<None Include="README.md" />
6969
</ItemGroup>
7070
<ItemGroup>
71-
<Content Include="license.txt" />
71+
<Content Include="license.txt" />
7272
</ItemGroup>
7373
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
74-
</Project>
75-
74+
</Project>

‎cybersource-rest-client-dotnet.sln‎

Lines changed: 22 additions & 19 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
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cybersource-rest-client-dotnet", "cybersource-rest-client-dotnet.csproj", "{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}"
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-
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16-
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Debug|Any CPU.Build.0 = Debug|Any CPU
17-
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Release|Any CPU.ActiveCfg = Release|Any CPU
18-
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.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+
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}.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 = {078A960C-7B6D-4B67-98B9-C3CEB151D557}
29+
EndGlobalSection
2730
EndGlobal

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
<Reference Include="System.Runtime.Serialization" />
6969
<Reference Include="System.Xml" />
7070
<Reference Include="AuthenticationSdk">
71-
<HintPath>packages\CyberSource.Authentication.0.0.0.3\lib\AuthenticationSdk.dll</HintPath>
71+
<HintPath>packages\CyberSource.Authentication.0.0.0.4\lib\AuthenticationSdk.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Newtonsoft.Json">
74-
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
74+
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
7575
</Reference>
7676
<Reference Include="RestSharp">
77-
<HintPath>packages\RestSharp.106.5.3\lib\{{targetFrameworkNuget}}.2\RestSharp.dll</HintPath>
77+
<HintPath>packages\RestSharp.106.5.4\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
7878
</Reference>
7979
{{#generatePropertyChanged}}
8080
<Reference Include="PropertyChanged">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
<Reference Include="System.Runtime.Serialization" />
6060
<Reference Include="System.Xml" />
6161
<Reference Include="Newtonsoft.Json">
62-
<HintPath>packages\Newtonsoft.Json.10.0.3\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.3\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
65+
<HintPath>packages\RestSharp.106.5.4\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
6666
</Reference>
6767
<Reference Include="nunit.framework">
6868
<HintPath>packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

‎generator/cybersource-csharp-template/packages_test.config.mustache‎

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

‎generator/cybersource_csharp_sdk_gen.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ rem For changing nuspec filename in csproj file
157157

158158
powershell -Command "(Get-Content ..\src\CyberSource\CyberSource.csproj) | ForEach-Object { $_ -replace '<None Include=\"CyberSource.nuspec\" />', '<None Include=\"cybersource-rest-client-dotnet.nuspec\" />' } | Set-Content ..\src\CyberSource\CyberSource.csproj"
159159

160+
powershell -Command "(Get-Content ..\src\CyberSource.Test\CyberSource.Test.csproj) | ForEach-Object { $_ -replace 'CyberSource\\CyberSource.csproj', 'cybersource-rest-client-dotnet.csproj' } | ForEach-Object { $_ -replace '<Name>CyberSource</Name>', '<Name>cybersource-rest-client-dotnet</Name>' } | Set-Content ..\src\CyberSource.Test\CyberSource.Test.csproj"
161+
160162
rem For Renaming the .csproj file Name from Cybersource to cybersource-rest-client-dotnet
161163
powershell Rename-Item ..\src\CyberSource\CyberSource.csproj cybersource-rest-client-dotnet.csproj
162164
powershell Rename-Item ..\src\CyberSource.Test\CyberSource.Test.csproj cybersource-rest-client-dotnet.Test.csproj

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CyberSource.Authentication" version="0.0.0.4" targetFramework="net461" />
3+
<package id="CyberSource.Authentication" version="0.0.0.4" />
44
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
5-
<package id="RestSharp" version="106.5.3" targetFramework="net461" />
5+
<package id="RestSharp" version="106.5.4" targetFramework="net452" />
66
</packages>

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

Lines changed: 18 additions & 18 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.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
51-
</Reference>
52-
<Reference Include="RestSharp">
53-
<HintPath>packages\RestSharp.106.5.3\lib\net45\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>
66-
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
6767
<ItemGroup>
68-
<ProjectReference Include="..\CyberSource\CyberSource.csproj">
69-
<Project>{4BDBBBF5-440A-4B94-ABFA-91FB8FF61069}</Project>
70-
<Name>CyberSource</Name>
71-
</ProjectReference>
68+
<ProjectReference Include="..\cybersource-rest-client-dotnet.csproj">
69+
<Project>{4bdbbbf5-440a-4b94-abfa-91fb8ff61069}</Project>
70+
<Name>cybersource-rest-client-dotnet</Name>
71+
</ProjectReference>
7272
</ItemGroup>
73-
</Project>
74-
73+
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
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="106.5.3" targetFramework="net45" developmentDependency="true" />
4+
<package id="RestSharp" version="106.5.4" targetFramework="net452" developmentDependency="true" />
55
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
66
</packages>

0 commit comments

Comments
 (0)