Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/SwaggerWcf/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.15")]
[assembly: AssemblyFileVersion("0.2.15")]
[assembly: AssemblyInformationalVersion("0.2.15")]
[assembly: AssemblyVersion("2.2501.2.0")]
[assembly: AssemblyFileVersion("2.2501.2.0")]
[assembly: AssemblyInformationalVersion("2.2501.2.0")]
9 changes: 4 additions & 5 deletions src/SwaggerWcf/Support/Mapper.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
using System;
using SwaggerWcf.Attributes;
using SwaggerWcf.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.ServiceModel;
using System.ServiceModel.Web;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
using SwaggerWcf.Attributes;
using SwaggerWcf.Models;

namespace SwaggerWcf.Support
{
Expand All @@ -30,7 +29,7 @@ internal IEnumerable<Path> FindMethods(Type markedType, IList<Type> definitionsT
List<Path> paths = new List<Path>();
List<Tuple<string, PathAction>> pathActions = new List<Tuple<string, PathAction>>();

List <Type> types;
List<Type> types;
Type serviceType;
if (markedType.IsInterface)
{
Expand Down
5 changes: 4 additions & 1 deletion src/SwaggerWcf/Support/TypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ public static string GetModelWrappedName(this Type type) =>

internal static Info GetServiceInfo(this TypeInfo typeInfo)
{
var infoAttr = typeInfo.GetCustomAttribute<SwaggerWcfServiceInfoAttribute>() ??
var infoAttr = typeInfo.GetCustomAttribute<SwaggerWcfServiceInfoAttribute>();
if (infoAttr == null && SwaggerWcfEndpoint.Info != null)
return SwaggerWcfEndpoint.Info;
else if (infoAttr == null && SwaggerWcfEndpoint.Info == null)
throw new ArgumentException($"{typeInfo.FullName} does not have {nameof(SwaggerWcfServiceInfoAttribute)}");

var info = (Info)infoAttr;
Expand Down
15 changes: 8 additions & 7 deletions src/SwaggerWcf/SwaggerWcf.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.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>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand All @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SwaggerWcf</RootNamespace>
<AssemblyName>SwaggerWcf</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -31,10 +32,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -122,9 +119,13 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="www\swagger-ui.zip" />
<None Include="packages.config" />
<None Include="SwaggerWcf.nuspec" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.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.
Expand Down
4 changes: 0 additions & 4 deletions src/SwaggerWcf/packages.config

This file was deleted.