Skip to content

Commit 48cdba0

Browse files
olmobrutallolmobrutall
committed
update nugets to .Net Core 3
1 parent 1c8ca4a commit 48cdba0

5 files changed

Lines changed: 18 additions & 37 deletions

File tree

‎Signum.Engine/Signum.Engine.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
2323
<ProjectReference Include="..\Signum.Entities\Signum.Entities.csproj" />
2424
<ProjectReference Include="..\Signum.Utilities\Signum.Utilities.csproj" />
2525
</ItemGroup>
26-
27-
<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
28-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
29-
<Exec command="dotnet &quot;D:\Signum\southwind\Framework\Signum.MSBuildTask\bin\x64\Debug\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
30-
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
31-
</Exec>
32-
</Target>
3326
</Project>

‎Signum.Entities/Signum.Entities.csproj‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<LangVersion>preview</LangVersion>
@@ -10,26 +10,20 @@
1010
<NoWarn>NU1605</NoWarn>
1111
</PropertyGroup>
1212

13-
14-
13+
14+
1515
<ItemGroup>
1616
<PackageReference Include="Signum.Analyzer" Version="2.4.5" />
1717
<PackageReference Include="Signum.MSBuildTask" Version="1.0.7" />
1818
</ItemGroup>
19-
19+
2020
<ItemGroup>
2121
<ProjectReference Include="..\Signum.Utilities\Signum.Utilities.csproj" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
24+
<ItemGroup>
2525
<None Update="Translations\*.xml">
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
</None>
2828
</ItemGroup>
29-
<Target Name="SignumAfterCompile" AfterTargets="AfterCompile" Outputs="$(TargetPath)">
30-
<WriteLinesToFile File="$(BaseIntermediateOutputPath)SignumReferences.txt" Lines="@(ReferencePath)" Overwrite="true" Encoding="Unicode" />
31-
<Exec command="dotnet &quot;D:\Signum\southwind\Framework\Signum.MSBuildTask\bin\x64\Debug\netcoreapp2.1\Signum.MSBuildTask.dll&quot; &quot;@(IntermediateAssembly)&quot; &quot;$(BaseIntermediateOutputPath)SignumReferences.txt&quot;" ConsoleToMSBuild="false">
32-
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
33-
</Exec>
34-
</Target>
3529
</Project>

‎Signum.React/Filters/SignumFilters.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
using Microsoft.AspNetCore.Mvc;
44
using Microsoft.AspNetCore.Mvc.Filters;
55
using Microsoft.AspNetCore.Mvc.Routing;
6+
using Microsoft.AspNetCore.WebUtilities;
67
using Signum.Entities.Basics;
78
using Signum.Utilities;
89
using System;
910
using System.Collections.Generic;
1011
using System.Globalization;
12+
using System.Threading.Tasks;
1113

1214
namespace Signum.React.Filters
1315
{
@@ -160,7 +162,7 @@ public static string Action<T>(this UrlHelper helper, string action, object valu
160162
}
161163
}
162164

163-
public abstract class SignumDisposableResourceFilter : IResourceFilter
165+
public abstract class SignumDisposableResourceFilter : IAsyncResourceFilter
164166
{
165167
public string ResourceKey;
166168

@@ -171,18 +173,10 @@ public SignumDisposableResourceFilter(string key)
171173

172174
public abstract IDisposable? GetResource(ResourceExecutingContext context);
173175

174-
public void OnResourceExecuting(ResourceExecutingContext context)
175-
{
176-
context.HttpContext.Items[ResourceKey] = GetResource(context);
177-
}
178-
179-
public void OnResourceExecuted(ResourceExecutedContext context)
176+
public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
180177
{
181-
if (context.HttpContext.Items.TryGetValue(ResourceKey, out object? result))
182-
{
183-
if (result != null)
184-
((IDisposable)result).Dispose();
185-
}
178+
using (GetResource(context))
179+
await next();
186180
}
187181
}
188182
}

‎Signum.React/Signum.React.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
</PropertyGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview8.19405.7" />
37-
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.5.3">
36+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
37+
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.6.3">
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>

‎Signum.Test/Signum.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="dotMorten.Microsoft.SqlServer.Types" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
2323
<PackageReference Include="Signum.Analyzer" Version="2.4.5" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

0 commit comments

Comments
 (0)