-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #58 from NSwag/master
Release v2.6
- Loading branch information
Showing
33 changed files
with
899 additions
and
852 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,59 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{CA084154-E758-4A44-938D-7806AF2DD886}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>NSwag.Annotations</RootNamespace> | ||
| <AssemblyName>NSwag.Annotations</AssemblyName> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TargetFrameworkProfile>Profile328</TargetFrameworkProfile> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <DocumentationFile>bin\Release\NSwag.Annotations.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- A reference to the entire .NET Framework is automatically included --> | ||
| <None Include="NSwag.Annotations.nuspec" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="ResponseTypeAttribute.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{CA084154-E758-4A44-938D-7806AF2DD886}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>NSwag.Annotations</RootNamespace> | ||
| <AssemblyName>NSwag.Annotations</AssemblyName> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TargetFrameworkProfile>Profile328</TargetFrameworkProfile> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <DocumentationFile>bin\Release\NSwag.Annotations.xml</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <SignAssembly>true</SignAssembly> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>../NSwag.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- A reference to the entire .NET Framework is automatically included --> | ||
| <None Include="NSwag.Annotations.nuspec" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="ResponseTypeAttribute.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 33 additions & 27 deletions
60
...on/Infrastructure/ReflectionExtensions.cs → ...on/Infrastructure/ReflectionExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,33 @@ | ||
| //----------------------------------------------------------------------- | ||
| // <copyright file="ReflectionExtensions.cs" company="NSwag"> | ||
| // Copyright (c) Rico Suter. All rights reserved. | ||
| // </copyright> | ||
| // <license>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</license> | ||
| // <author>Rico Suter, [email protected]</author> | ||
| //----------------------------------------------------------------------- | ||
|
|
||
| using System; | ||
|
|
||
| namespace NSwag.CodeGeneration.Infrastructure | ||
| { | ||
| internal static class ReflectionExtensions | ||
| { | ||
| public static bool InheritsFrom(this Type type, string typeName) | ||
| { | ||
| var baseType = type.BaseType; | ||
| while (baseType != null) | ||
| { | ||
| if (baseType.Name == typeName) | ||
| return true; | ||
| baseType = baseType.BaseType; | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| //----------------------------------------------------------------------- | ||
| // <copyright file="ReflectionExtensions.cs" company="NSwag"> | ||
| // Copyright (c) Rico Suter. All rights reserved. | ||
| // </copyright> | ||
| // <license>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</license> | ||
| // <author>Rico Suter, [email protected]</author> | ||
| //----------------------------------------------------------------------- | ||
|
|
||
| using System; | ||
| using System.Reflection; | ||
|
|
||
| namespace NSwag.CodeGeneration.Infrastructure | ||
| { | ||
| /// <summary>Provides extension methods for reflection.</summary> | ||
| public static class ReflectionExtensions | ||
| { | ||
| /// <summary>Checks whether the given type inherits from the given type name.</summary> | ||
| /// <param name="type">The type.</param> | ||
| /// <param name="typeName">Name of the type.</param> | ||
| /// <returns>true if the type inherits from typeName.</returns> | ||
| public static bool InheritsFrom(this Type type, string typeName) | ||
| { | ||
| var baseType = type.GetTypeInfo().BaseType; | ||
| while (baseType != null) | ||
| { | ||
| if (baseType.Name == typeName) | ||
| return true; | ||
| baseType = baseType.GetTypeInfo().BaseType; | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.