Skip to content

Commit 81bbdbe

Browse files
frantumafrantuma
authored
Merge pull request #10249 from swagger-api/asp_sample_update
ASPNET sample update
2 parents ca03c47 + 77b8fa2 commit 81bbdbe

File tree

160 files changed

+16169
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+16169
-27
lines changed

‎bin/aspnetcore-v2.2-petstore-server-interface-controller.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -o samples/server/petstore/aspnetcore-v2.2-interface-controller --interface-controller --aspnet-core-version 2.2"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/aspnetcore-v2.2-petstore-server-interface.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -o samples/server/petstore/aspnetcore-v2.2-interface --interface-only --aspnet-core-version 2.2"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/aspnetcore-v2.2-petstore-server.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29+
ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -o samples/server/petstore/aspnetcore-v2.2 --aspnet-core-version 2.2"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎samples/server/petstore/aspnetcore-interface-controller/IO.Swagger.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.26114.2
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{2E40B6D4-6E18-49F1-9AB5-09A7632EE6CA}"
5+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{19CBD201-C545-44C5-B34D-1036EB6A3049}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|Any CPU = Debug|Any CPU
1010
Release|Any CPU = Release|Any CPU
1111
EndGlobalSection
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{2E40B6D4-6E18-49F1-9AB5-09A7632EE6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{2E40B6D4-6E18-49F1-9AB5-09A7632EE6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{2E40B6D4-6E18-49F1-9AB5-09A7632EE6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{2E40B6D4-6E18-49F1-9AB5-09A7632EE6CA}.Release|Any CPU.Build.0 = Release|Any CPU
13+
{19CBD201-C545-44C5-B34D-1036EB6A3049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{19CBD201-C545-44C5-B34D-1036EB6A3049}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{19CBD201-C545-44C5-B34D-1036EB6A3049}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{19CBD201-C545-44C5-B34D-1036EB6A3049}.Release|Any CPU.Build.0 = Release|Any CPU
1717
EndGlobalSection
1818
GlobalSection(SolutionProperties) = preSolution
1919
HideSolutionNode = FALSE

‎samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ RUN dotnet publish -c Release -o out
1515
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
1616
WORKDIR /app
1717
COPY --from=build-env /app/out .
18-
ENTRYPOINT ["dotnet", "IO.Swagger.dll"]
18+
19+
ENTRYPOINT ["dotnet", "IO.Swagger.dll"]

‎samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Filters/BasePathFilter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
4848
}
4949
}
5050
}
51-
}
51+
}

‎samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/IO.Swagger.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
<ItemGroup>
1818
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
1919
</ItemGroup>
20-
</Project>
20+
</Project>

‎samples/server/petstore/aspnetcore-interface-controller/src/IO.Swagger/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,4 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
144144
}
145145
}
146146
}
147-
}
147+
}

‎samples/server/petstore/aspnetcore-interface-only/IO.Swagger.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.26114.2
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{B886EFE0-BE62-44D9-B491-7BFAB35169C8}"
5+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{A31D0ACE-54F0-4DF2-A17B-2EE10ECC2064}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|Any CPU = Debug|Any CPU
1010
Release|Any CPU = Release|Any CPU
1111
EndGlobalSection
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{B886EFE0-BE62-44D9-B491-7BFAB35169C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{B886EFE0-BE62-44D9-B491-7BFAB35169C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{B886EFE0-BE62-44D9-B491-7BFAB35169C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{B886EFE0-BE62-44D9-B491-7BFAB35169C8}.Release|Any CPU.Build.0 = Release|Any CPU
13+
{A31D0ACE-54F0-4DF2-A17B-2EE10ECC2064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{A31D0ACE-54F0-4DF2-A17B-2EE10ECC2064}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{A31D0ACE-54F0-4DF2-A17B-2EE10ECC2064}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{A31D0ACE-54F0-4DF2-A17B-2EE10ECC2064}.Release|Any CPU.Build.0 = Release|Any CPU
1717
EndGlobalSection
1818
GlobalSection(SolutionProperties) = preSolution
1919
HideSolutionNode = FALSE

‎samples/server/petstore/aspnetcore-interface-only/src/IO.Swagger/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ RUN dotnet publish -c Release -o out
1515
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0
1616
WORKDIR /app
1717
COPY --from=build-env /app/out .
18-
ENTRYPOINT ["dotnet", "IO.Swagger.dll"]
18+
19+
ENTRYPOINT ["dotnet", "IO.Swagger.dll"]

0 commit comments

Comments
 (0)