Skip to content

Commit b71ebbe

Browse files
micrycmicryc
authored
Merge pull request #1276 from swagger-api/CC-32545_Fix_RestSharp_version
Update RestSharp version
2 parents 4c7a000 + 2c9472d commit b71ebbe

11 files changed

+17
-17
lines changed

‎src/main/resources/handlebars/csharp-dotnet2/csproj.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
21-
<PackageReference Include="RestSharp" Version="105.0.1" />
21+
<PackageReference Include="RestSharp" Version="110.2.0" />
2222
</ItemGroup>
2323
</Project>

‎src/main/resources/handlebars/csharp/Project.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.2.0\lib{{backslash}}{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
8080
</Reference>
8181
<Reference Include="RestSharp">
82-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
83-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
84-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
85-
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
82+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
83+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
84+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
85+
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
8686
</Reference>
8787
{{#generatePropertyChanged}}
8888
<Reference Include="PropertyChanged">

‎src/main/resources/handlebars/csharp/README.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
4242
- Newtonsoft.Json >=10.0.3
4343
{{/netStandard}}
4444
{{^netStandard}}
45-
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
45+
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 110.2.0 or later
4646
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
4747
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.2.0 or later
4848

‎src/main/resources/handlebars/csharp/TestProject.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@
7171
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.2.0\lib{{backslash}}{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
7272
</Reference>
7373
<Reference Include="RestSharp">
74-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
75-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
76-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
77-
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
74+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
75+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
76+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
77+
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
7878
</Reference>
7979
<Reference Include="nunit.framework">
8080
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

‎src/main/resources/handlebars/csharp/compile-mono.sh.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ${nuget_cmd} install src/{{packageName}}/packages.config -o packages;
4545
echo "[INFO] Copy DLLs to the 'bin' folder"
4646
mkdir -p bin;
4747
cp packages/Newtonsoft.Json.10.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
48-
cp packages/RestSharp.105.1.0/lib/{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}/RestSharp.dll bin/RestSharp.dll;
48+
cp packages/RestSharp.110.2.0/lib/{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}/RestSharp.dll bin/RestSharp.dll;
4949
cp packages/JsonSubTypes.1.2.0/lib/{{targetFrameworkNuget}}/JsonSubTypes.dll bin/JsonSubTypes.dll
5050
{{#generatePropertyChanged}}
5151
cp packages/Fody.1.29.4/Fody.dll bin/Fody.dll

‎src/main/resources/handlebars/csharp/compile.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if not exist ".\bin" mkdir bin
1717

1818
copy packages\Newtonsoft.Json.10.0.3\lib{{backslash}}{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
1919
copy packages\JsonSubTypes.1.2.0\lib{{backslash}}{{targetFrameworkNuget}}\JsonSubTypes.dll bin\JsonSubTypes.dll
20-
copy packages\RestSharp.105.1.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll bin\RestSharp.dll
20+
copy packages\RestSharp.110.2.0\lib{{backslash}}{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll bin\RestSharp.dll
2121
{{#generatePropertyChanged}}
2222
copy packages\Fody.1.29.4\Fody.dll bin\Fody.dll
2323
copy packages\PropertyChanged.Fody.1.51.3\PropertyChanged.Fody.dll bin\PropertyChanged.Fody.dll

‎src/main/resources/handlebars/csharp/netcore_project.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.7" />
2424
{{/netStandard}}
2525
{{^netStandard}}
26-
<PackageReference Include="RestSharp" Version="105.1.0" />
26+
<PackageReference Include="RestSharp" Version="110.2.0" />
2727
{{/netStandard}}
2828
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
2929
<PackageReference Include="JsonSubTypes" Version="1.2.0" />

‎src/main/resources/handlebars/csharp/netcore_testproject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.7" />
2323
{{/netStandard}}
2424
{{^netStandard}}
25-
<PackageReference Include="RestSharp" Version="105.1.0" />
25+
<PackageReference Include="RestSharp" Version="110.2.0" />
2626
{{/netStandard}}
2727
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
2828
<PackageReference Include="JsonSubTypes" Version="1.2.0" />

‎src/main/resources/handlebars/csharp/nuspec.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<dependency id="NewtonSoft.Json" version="13.0.1" />
3434
<dependency id="JsonSubTypes" version="1.2.0" />
35-
<dependency id="RestSharp" version="105.1.0" />
35+
<dependency id="RestSharp" version="110.2.0" />
3636
{{#generatePropertyChanged}}
3737
<dependency id="Fody" version="1.29.4" />
3838
<dependency id="PropertyChanged.Fody" version="1.51.3" />

‎src/main/resources/handlebars/csharp/packages.config.mustache

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>
3-
<package id="RestSharp" version="105.1.0" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
3+
<package id="RestSharp" version="110.2.0" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
44
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
55
<package id="JsonSubTypes" version="1.2.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
66
{{#generatePropertyChanged}}

0 commit comments

Comments
 (0)