Skip to content

Commit

Permalink
Update NJS, #2313
Browse files Browse the repository at this point in the history
  • Loading branch information
RicoSuter committed Aug 22, 2019
1 parent 44ead05 commit 07a6cda
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Owin" Version="3.0.1" />
<PackageReference Include="Microsoft.Owin.StaticFiles" Version="3.0.1" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
<PackageReference Include="Owin" Version="1.0" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NSwag.Annotations\NSwag.Annotations.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<DefineConstants>TRACE;RELEASE;FullNet;NET451</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' OR '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.0.23" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.0.23" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
<PackageReference Include="NJsonSchema.CodeGeneration" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<Reference Include="Microsoft.CSharp" />
Expand Down
10 changes: 5 additions & 5 deletions src/NSwag.Commands/NSwag.Commands.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="NConsole" Version="3.9.6519.30868" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.0.22" />
<PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.0.22" />
<PackageReference Include="NJsonSchema.Yaml" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
<PackageReference Include="NJsonSchema.CodeGeneration" Version="10.0.23" />
<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.0.23" />
<PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="10.0.23" />
<PackageReference Include="NJsonSchema.Yaml" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<RootNamespace>NSwag</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NJsonSchema.Yaml" Version="10.0.22" />
<PackageReference Include="NJsonSchema.Yaml" Version="10.0.23" />
<PackageReference Include="YamlDotNet.Signed" Version="5.1.0" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Core/NSwag.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NJsonSchema, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.22\lib\net45\NJsonSchema.dll</HintPath>
<Reference Include="NJsonSchema, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.23\lib\net45\NJsonSchema.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Demo.Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Namotion.Reflection" version="1.0.6" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="NJsonSchema" version="10.0.22" targetFramework="net46" />
<package id="NJsonSchema" version="10.0.23" targetFramework="net46" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="1.0.3" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="Microsoft.CSharp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NJsonSchema, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.22\lib\net45\NJsonSchema.dll</HintPath>
<Reference Include="NJsonSchema, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.23\lib\net45\NJsonSchema.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema.CodeGeneration, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.10.0.22\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
<Reference Include="NJsonSchema.CodeGeneration, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.10.0.23\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.22\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
<Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.23\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
</Reference>
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
<HintPath>..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions src/NSwag.Generation.WebApi.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
<package id="Namotion.Reflection" version="1.0.6" targetFramework="net462" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="NJsonSchema" version="10.0.22" targetFramework="net462" />
<package id="NJsonSchema.CodeGeneration" version="10.0.22" targetFramework="net462" />
<package id="NJsonSchema.CodeGeneration.TypeScript" version="10.0.22" targetFramework="net462" />
<package id="NJsonSchema" version="10.0.23" targetFramework="net462" />
<package id="NJsonSchema.CodeGeneration" version="10.0.23" targetFramework="net462" />
<package id="NJsonSchema.CodeGeneration.TypeScript" version="10.0.23" targetFramework="net462" />
<package id="Swashbuckle" version="5.5.3" targetFramework="net451" />
<package id="Swashbuckle.Core" version="5.5.3" targetFramework="net451" />
<package id="WebActivatorEx" version="2.0" targetFramework="net451" />
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Generation/NSwag.Generation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
<PackageReference Include="NJsonSchema" Version="10.0.23" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NJsonSchema, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.22\lib\net45\NJsonSchema.dll</HintPath>
<Reference Include="NJsonSchema, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.23\lib\net45\NJsonSchema.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Integration.WebAPI/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net46" />
<package id="Namotion.Reflection" version="1.0.6" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="NJsonSchema" version="10.0.22" targetFramework="net46" />
<package id="NJsonSchema" version="10.0.23" targetFramework="net46" />
<package id="Owin" version="1.0" targetFramework="net451" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.22\lib\net45\NJsonSchema.dll</HintPath>
<Reference Include="NJsonSchema, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.23\lib\net45\NJsonSchema.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.Sample.NetGlobalAsax/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<package id="Modernizr" version="2.6.2" targetFramework="net452" />
<package id="Namotion.Reflection" version="1.0.6" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
<package id="NJsonSchema" version="10.0.22" targetFramework="net452" />
<package id="NJsonSchema" version="10.0.23" targetFramework="net452" />
<package id="Owin" version="1.0" targetFramework="net452" />
<package id="Respond" version="1.2.0" targetFramework="net452" />
<package id="WebGrease" version="1.5.2" targetFramework="net452" />
Expand Down
16 changes: 8 additions & 8 deletions src/NSwagStudio/NSwagStudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.22\lib\net45\NJsonSchema.dll</HintPath>
<Reference Include="NJsonSchema, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.10.0.23\lib\net45\NJsonSchema.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema.CodeGeneration, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.10.0.22\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
<Reference Include="NJsonSchema.CodeGeneration, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.10.0.23\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.CSharp.10.0.22\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
<Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.CSharp.10.0.23\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
</Reference>
<Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.0.22.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.22\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
<Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=10.0.23.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
<HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.23\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down
8 changes: 4 additions & 4 deletions src/NSwagStudio/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<package id="Namotion.Reflection" version="1.0.6" targetFramework="net461" />
<package id="NConsole" version="3.9.6519.30868" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="NJsonSchema" version="10.0.22" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration" version="10.0.22" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration.CSharp" version="10.0.22" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration.TypeScript" version="10.0.22" targetFramework="net461" />
<package id="NJsonSchema" version="10.0.23" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration" version="10.0.23" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration.CSharp" version="10.0.23" targetFramework="net461" />
<package id="NJsonSchema.CodeGeneration.TypeScript" version="10.0.23" targetFramework="net461" />
<package id="System.Net.Http" version="4.3.2" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
Expand Down

0 comments on commit 07a6cda

Please sign in to comment.