Skip to content

[csharp] upgrade dependencies to newer versions #5848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 9 commits into from
Apr 9, 2020
Merged

[csharp] upgrade dependencies to newer versions #5848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e061d7
On .net45 framework, Restsharp version is updated to 106.10.1 Otherwi…
Apr 3, 2020
43b5ed4
Added additionalProperties for library versions and target frameworks
Apr 7, 2020
41d2f1d
Removed unused properties
Apr 7, 2020
cdbf7f3
Added an additional property to test for a specific version of RestSharp
Apr 7, 2020
4381633
Updated csharp samples
Apr 7, 2020
299bcb0
Fixed nuspec.mustache to use library specific additional properties
Apr 7, 2020
7af5d63
Updated csharp samples
Apr 7, 2020
c956c6d
Updating CI/samples.ci csharp petstore test project file.
Apr 8, 2020
010c02c
Updated csharp.md
Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
On .net45 framework, Restsharp version is updated to 106.10.1 Otherwi… 
…se, it stays on version 105.1.0
  • Loading branch information
Olivier Leonard committed Apr 7, 2020
commit 7e061d7f2c5613ce3350833d96f1cc3f7cee26c7
1 change: 1 addition & 0 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ public void processOpts() {
setSupportsAsync(Boolean.FALSE);
} else {
additionalProperties.put(MCS_NET_VERSION_KEY, "4.5.2-api");
additionalProperties.put("isNet45", true);
setTargetFrameworkNuget("net45");
setSupportsAsync(Boolean.TRUE);
}
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ namespace {{packageName}}.Client
{{/netStandard}}
{{^netStandard}}
{{^supportsUWP}}
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType);
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName{{#isNet45}}, param.Value.ContentLength{{/isNet45}}, param.Value.ContentType);
{{/supportsUWP}}
{{#supportsUWP}}
byte[] paramWriter = null;
param.Value.Writer = delegate (Stream stream) { paramWriter = ToByteArray(stream); };
request.AddFile(param.Value.Name, paramWriter, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType);
request.AddFile(param.Value.Name, paramWriter, param.Value.FileName, param.Value.ContentType);
{{/supportsUWP}}
{{/netStandard}}
}
Expand Down Expand Up @@ -215,7 +215,7 @@ namespace {{packageName}}.Client
{{/supportsUWP}}
{{#supportsUWP}}
// Using async method to perform sync call (uwp-only)
var response = RestClient.ExecuteAsync(request).Result;
var response = RestClient.ExecuteTaskAsync(request).Result;
{{/supportsUWP}}
{{/netStandard}}
InterceptResponse(request, response);
Expand Down
22 changes: 18 additions & 4 deletions modules/openapi-generator/src/main/resources/csharp/Project.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,24 @@
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\JsonSubTypes.1.6.0\lib\{{targetFrameworkNuget}}\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.10.1\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.10.1\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.10.1\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.106.10.1\lib\{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}\RestSharp.dll</HintPath>
{{#isNet45}}
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
{{/isNet45}}
{{#isNet40}}
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net4\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net4\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net4\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\net4\RestSharp.dll</HintPath>
{{/isNet40}}
{{^isNet45}}{{^isNet40}}
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
<HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
{{/isNet40}}{{/isNet45}}
</Reference>
{{#generatePropertyChanged}}
<Reference Include="PropertyChanged">
Expand Down
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.7" />
{{/netStandard}}
{{^netStandard}}
{{#isNet45}}
<PackageReference Include="RestSharp" Version="106.10.1" />
{{/isNet45}}
{{^isNet45}}
<PackageReference Include="RestSharp" Version="105.1.0" />
{{/isNet45}}
{{/netStandard}}
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="JsonSubTypes" Version="1.6.0" />
Expand Down
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.7" />
{{/netStandard}}
{{^netStandard}}
{{#isNet45}}
<PackageReference Include="RestSharp" Version="106.10.1" />
{{/isNet45}}
{{^isNet45}}
<PackageReference Include="RestSharp" Version="105.1.0" />
{{/isNet45}}
{{/netStandard}}
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="JsonSubTypes" Version="1.6.0" />
Expand Down
10 changes: 9 additions & 1 deletion modules/openapi-generator/src/main/resources/csharp/packages.config.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RestSharp" version="106.10.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
{{#isNet45}}
<package id="RestSharp" version="106.10.1" targetFramework="net452" developmentDependency="true" />
{{/isNet45}}
{{#isNet40}}
<package id="RestSharp" version="105.1.0" targetFramework="net4" developmentDependency="true" />
{{/isNet40}}
{{^isNet45}}{{^isNet40}}
<package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
{{/isNet40}}{{/isNet45}}
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.6.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
{{#generatePropertyChanged}}
Expand Down
10 changes: 9 additions & 1 deletion modules/openapi-generator/src/main/resources/csharp/packages_test.config.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}net452{{/isNet40}}" />
<package id="RestSharp" version="106.10.1" targetFramework="{{#isNet40}}net4{{/isNet40}}{{^isNet40}}{{targetFrameworkNuget}}{{/isNet40}}" developmentDependency="true" />
{{#isNet45}}
<package id="RestSharp" version="106.10.1" targetFramework="net452" developmentDependency="true" />
{{/isNet45}}
{{#isNet40}}
<package id="RestSharp" version="105.1.0" targetFramework="net4" developmentDependency="true" />
{{/isNet40}}
{{^isNet45}}{{^isNet40}}
<package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
{{/isNet40}}{{/isNet45}}
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
<package id="JsonSubTypes" version="1.6.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
</packages>