Skip to content

Commit 235f47e

Browse files
daniel-kmiecikdaniel-kmiecik
committed
fix: update csharp templates with proper sourceFolder (#12431)
1 parent 8f05c31 commit 235f47e

File tree

29 files changed

+355
-140
lines changed

29 files changed

+355
-140
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ public void processOpts() {
210210
// {{sourceFolder}}
211211
if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
212212
setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
213+
this.testFolder = ((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
213214
} else {
214215
additionalProperties.put(CodegenConstants.SOURCE_FOLDER, this.sourceFolder);
215216
}

‎modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build.bat
2121
## Run in Docker
2222

2323
```
24-
cd src/{{packageName}}
24+
cd {{sourceFolder}}/{{packageName}}
2525
docker build -t {{dockerTag}} .
2626
docker run -p 5000:5000 {{dockerTag}}
2727
```

‎modules/swagger-codegen/src/main/resources/aspnetcore/build.bat.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
@echo off
55

6-
dotnet restore src\{{packageName}}
7-
dotnet build src\{{packageName}}
8-
echo Now, run the following to start the project: dotnet run -p src\{{packageName}}\{{packageName}}.csproj --launch-profile web.
6+
dotnet restore {{sourceFolder}}\{{packageName}}
7+
dotnet build {{sourceFolder}}\{{packageName}}
8+
echo Now, run the following to start the project: dotnet run -p {{sourceFolder}}\{{packageName}}\{{packageName}}.csproj --launch-profile web.
99
echo.

‎modules/swagger-codegen/src/main/resources/aspnetcore/build.sh.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# Generated by: https://github.com/swagger-api/swagger-codegen.git
44
#
55

6-
dotnet restore src/{{packageName}}/ && \
7-
dotnet build src/{{packageName}}/ && \
8-
echo "Now, run the following to start the project: dotnet run -p src/{{packageName}}/{{packageName}}.csproj --launch-profile web"
6+
dotnet restore {{sourceFolder}}/{{packageName}}/ && \
7+
dotnet build {{sourceFolder}}/{{packageName}}/ && \
8+
echo "Now, run the following to start the project: dotnet run -p {{sourceFolder}}/{{packageName}}/{{packageName}}.csproj --launch-profile web"

‎modules/swagger-codegen/src/main/resources/csharp-dotnet2/compile-mono.sh.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\
77
System.Runtime.Serialization.dll \
88
-target:library \
99
-out:bin/{{packageName}}.dll \
10-
-recurse:'src/*.cs' \
10+
-recurse:'{{sourceFolder}}/*.cs' \
1111
-doc:bin/{{packageName}}.xml \
1212
-platform:anycpu

‎modules/swagger-codegen/src/main/resources/csharp/Solution.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio {{^netStandard}}2012{{/netStandard}}{{#netStandard}}14{{/netStandard}}
33
VisualStudioVersion = {{^netStandard}}12.0.0.0{{/netStandard}}{{#netStandard}}14.0.25420.1{{/netStandard}}
44
MinimumVisualStudioVersion = {{^netStandard}}10.0.0.1{{/netStandard}}{{#netStandard}}10.0.40219.1{{/netStandard}}
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{packageName}}", "src\{{packageName}}\{{packageName}}.csproj", "{{packageGuid}}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{packageName}}", "{{sourceFolder}}\{{packageName}}\{{packageName}}.csproj", "{{packageGuid}}"
66
EndProject
7-
{{^excludeTests}}Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{testPackageName}}", "src\{{testPackageName}}\{{testPackageName}}.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
7+
{{^excludeTests}}Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{testPackageName}}", "{{sourceFolder}}\{{testPackageName}}\{{testPackageName}}.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
88
EndProject
99
{{/excludeTests}}Global
1010
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if ! type nuget &>/dev/null; then
4040
fi
4141

4242
mozroots --import --sync
43-
${nuget_cmd} install src/{{packageName}}/packages.config -o packages;
43+
${nuget_cmd} install {{sourceFolder}}/{{packageName}}/packages.config -o packages;
4444

4545
echo "[INFO] Copy DLLs to the 'bin' folder"
4646
mkdir -p bin;
@@ -65,7 +65,7 @@ System.ComponentModel.DataAnnotations.dll,\
6565
System.Runtime.Serialization.dll \
6666
-target:library \
6767
-out:bin/{{packageName}}.dll \
68-
-recurse:'src/{{packageName}}/*.cs' \
68+
-recurse:'{{sourceFolder}}/{{packageName}}/*.cs' \
6969
-doc:bin/{{packageName}}.xml \
7070
-platform:anycpu
7171

‎modules/swagger-codegen/src/main/resources/csharp/compile.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v3.5
1111
{{/supportsAsync}}
1212

1313
if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '.\nuget.exe')"
14-
.\nuget.exe install src\{{packageName}}\packages.config -o packages
14+
.\nuget.exe install {{sourceFolder}}\{{packageName}}\packages.config -o packages
1515

1616
if not exist ".\bin" mkdir bin
1717

@@ -23,5 +23,5 @@ 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
2424
copy packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll bin\PropertyChanged.dll
2525
{{/generatePropertyChanged}}
26-
%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\JsonSubTypes.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll {{#generatePropertyChanged}}/r:bin\Fody.dll;bin\PropertyChanged.Fody.dll;bin\PropertyChanged.dll{{/generatePropertyChanged}} /target:library /out:bin\{{packageName}}.dll /recurse:src\{{packageName}}\*.cs /doc:bin\{{packageName}}.xml
26+
%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\JsonSubTypes.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll {{#generatePropertyChanged}}/r:bin\Fody.dll;bin\PropertyChanged.Fody.dll;bin\PropertyChanged.dll{{/generatePropertyChanged}} /target:library /out:bin\{{packageName}}.dll /recurse:{{sourceFolder}}\{{packageName}}\*.cs /doc:bin\{{packageName}}.xml
2727

‎modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
77
mozroots --import --sync
88

99
echo "[INFO] remove bin/Debug/SwaggerClientTest.dll"
10-
rm src/{{{packageName}}}.Test/bin/Debug/{{{packageName}}}.Test.dll 2> /dev/null
10+
rm {{sourceFolder}}/{{{packageName}}}.Test/bin/Debug/{{{packageName}}}.Test.dll 2> /dev/null
1111

1212
echo "[INFO] install NUnit runners via NuGet"
1313
wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
1414
mozroots --import --sync
15-
mono nuget.exe install src/{{{packageName}}}.Test/packages.config -o packages
15+
mono nuget.exe install {{sourceFolder}}/{{{packageName}}}.Test/packages.config -o packages
1616

1717
echo "[INFO] Install NUnit runners via NuGet"
1818
mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory packages
1919

2020
echo "[INFO] Build the solution and run the unit test"
2121
xbuild {{{packageName}}}.sln && \
22-
mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe src/{{{packageName}}}.Test/bin/Debug/{{{packageName}}}.Test.dll
22+
mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe {{sourceFolder}}/{{{packageName}}}.Test/bin/Debug/{{{packageName}}}.Test.dll

‎modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpClientCodegenTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@ public void testSettersForConfigValues() throws Exception {
3131
public void testAdditionalPropertiesPutForConfigValues() throws Exception {
3232
final CSharpClientCodegen codegen = new CSharpClientCodegen();
3333
codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false);
34+
final String sourceFolder = "newSourceFolder/";
35+
codegen.additionalProperties().put(CodegenConstants.SOURCE_FOLDER, sourceFolder);
36+
3437
codegen.processOpts();
3538

3639
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
40+
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SOURCE_FOLDER), sourceFolder);
3741
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
3842
}
3943

0 commit comments

Comments
 (0)