2929public class CSharpClientCodegen extends AbstractCSharpCodegen {
3030 @ SuppressWarnings ({"hiding" })
3131 private static final Logger LOGGER = LoggerFactory .getLogger (CSharpClientCodegen .class );
32+ private static final String NET471 = "v4.7.1" ;
3233 private static final String NET45 = "v4.5" ;
3334 private static final String NET40 = "v4.0" ;
3435 private static final String NET35 = "v3.5" ;
@@ -48,10 +49,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
4849 protected String modelDocPath = "docs/" ;
4950
5051 // Defines TargetFrameworkVersion in csproj files
51- protected String targetFramework = NET45 ;
52+ protected String targetFramework = NET471 ;
5253
5354 // Defines nuget identifiers for target framework
54- protected String targetFrameworkNuget = "net45 " ;
55+ protected String targetFrameworkNuget = "net471 " ;
5556 protected boolean supportsAsync = Boolean .TRUE ;
5657 protected boolean supportsUWP = Boolean .FALSE ;
5758 protected boolean netStandard = Boolean .FALSE ;
@@ -106,6 +107,7 @@ public CSharpClientCodegen() {
106107 .put (NET35 , ".NET Framework 3.5 compatible" )
107108 .put (NET40 , ".NET Framework 4.0 compatible" )
108109 .put (NET45 , ".NET Framework 4.5+ compatible" )
110+ .put (NET471 , ".NET Framework 4.71+ compatible" )
109111 .put (NETSTANDARD , ".NET Standard 1.3 compatible" )
110112 .put (UWP , "Universal Windows Platform (IMPORTANT: this will be decommissioned and replaced by v5.0)" )
111113 .build ();
@@ -186,6 +188,16 @@ public CSharpClientCodegen() {
186188
187189 @ Override
188190 public void processOpts () {
191+
192+ // process targetFramework first as it is used to get Template Dir
193+ if (additionalProperties .containsKey (CodegenConstants .DOTNET_FRAMEWORK )) {
194+ setTargetFramework ((String ) additionalProperties .get (CodegenConstants .DOTNET_FRAMEWORK ));
195+ } else {
196+ // Ensure default is set.
197+ setTargetFramework (NET471 );
198+ additionalProperties .put (CodegenConstants .DOTNET_FRAMEWORK , this .targetFramework );
199+ }
200+
189201 super .processOpts ();
190202
191203 /*
@@ -221,14 +233,6 @@ public void processOpts() {
221233 additionalProperties .put (CodegenConstants .VALIDATABLE , validatable );
222234 }
223235
224- if (additionalProperties .containsKey (CodegenConstants .DOTNET_FRAMEWORK )) {
225- setTargetFramework ((String ) additionalProperties .get (CodegenConstants .DOTNET_FRAMEWORK ));
226- } else {
227- // Ensure default is set.
228- setTargetFramework (NET45 );
229- additionalProperties .put (CodegenConstants .DOTNET_FRAMEWORK , this .targetFramework );
230- }
231-
232236 if (NET35 .equals (this .targetFramework )) {
233237 // This is correct, mono will require you build .NET 3.5 sources using 4.0 SDK
234238 additionalProperties .put (MCS_NET_VERSION_KEY , "4" );
@@ -273,10 +277,14 @@ public void processOpts() {
273277
274278 setTargetFrameworkNuget ("net40" );
275279 setSupportsAsync (Boolean .FALSE );
276- } else {
280+ } else if ( NET45 . equals ( this . targetFramework )) {
277281 additionalProperties .put (MCS_NET_VERSION_KEY , "4.5.2-api" );
278282 setTargetFrameworkNuget ("net45" );
279283 setSupportsAsync (Boolean .TRUE );
284+ } else {
285+ additionalProperties .put (MCS_NET_VERSION_KEY , "4.7.1-api" );
286+ setTargetFrameworkNuget ("net471" );
287+ setSupportsAsync (Boolean .TRUE );
280288 }
281289
282290 if (additionalProperties .containsKey (CodegenConstants .GENERATE_PROPERTY_CHANGED )) {
@@ -375,15 +383,17 @@ public void processOpts() {
375383 clientPackageDir , "ReadOnlyDictionary.cs" ));
376384 }
377385
378- if (Boolean .FALSE .equals (this .netStandard ) && Boolean .FALSE .equals (this .netCoreProjectFileFlag )) {
386+ if (Boolean .FALSE .equals (this .netStandard ) && Boolean .FALSE .equals (this .netCoreProjectFileFlag ) && ! NET471 . equals ( this . targetFramework ) ) {
379387 supportingFiles .add (new SupportingFile ("compile.mustache" , "" , "build.bat" ));
380388 supportingFiles .add (new SupportingFile ("compile-mono.sh.mustache" , "" , "build.sh" ));
381389
382- // copy package.config to nuget's standard location for project-level installs
383- supportingFiles .add (new SupportingFile ("packages.config.mustache" , packageFolder + File .separator , "packages.config" ));
390+ if (!NET471 .equals (this .targetFramework )) {
391+ // copy package.config to nuget's standard location for project-level installs
392+ supportingFiles .add (new SupportingFile ("packages.config.mustache" , packageFolder + File .separator , "packages.config" ));
393+ }
384394 // .travis.yml for travis-ci.org CI
385395 supportingFiles .add (new SupportingFile ("travis.mustache" , "" , ".travis.yml" ));
386- } else if (Boolean .FALSE .equals (this .netCoreProjectFileFlag )) {
396+ } else if (Boolean .FALSE .equals (this .netCoreProjectFileFlag ) && ! NET471 . equals ( this . targetFramework ) ) {
387397 supportingFiles .add (new SupportingFile ("project.json.mustache" , packageFolder + File .separator , "project.json" ));
388398 }
389399
@@ -420,7 +430,7 @@ public void processOpts() {
420430 supportingFiles .add (new SupportingFile ("git_push.sh.mustache" , "" , "git_push.sh" ));
421431 supportingFiles .add (new SupportingFile ("gitignore.mustache" , "" , ".gitignore" ));
422432
423- if (optionalAssemblyInfoFlag && Boolean .FALSE .equals (this .netCoreProjectFileFlag )) {
433+ if (optionalAssemblyInfoFlag && Boolean .FALSE .equals (this .netCoreProjectFileFlag ) && ! NET471 . equals ( this . targetFramework ) ) {
424434 supportingFiles .add (new SupportingFile ("AssemblyInfo.mustache" , packageFolder + File .separator + "Properties" , "AssemblyInfo.cs" ));
425435 }
426436 if (optionalProjectFileFlag ) {
@@ -501,6 +511,13 @@ public String getName() {
501511 return "csharp" ;
502512 }
503513
514+ public String getDefaultTemplateDir () {
515+ if (NET471 .equals (this .targetFramework )) {
516+ return "csharp-471" ;
517+ }
518+ return "csharp" ;
519+ }
520+
504521 @ Override
505522 public String getHelp () {
506523 return "Generates a CSharp client library." ;
0 commit comments