File tree Expand file tree Collapse file tree 7 files changed +42
-8
lines changed
AbpCompanyName.AbpProjectName.Core/Web
AbpCompanyName.AbpProjectName.EntityFrameworkCore
AbpCompanyName.AbpProjectName.Web
AbpCompanyName.AbpProjectName.Tests
AbpCompanyName.AbpProjectName.Web.Tests Expand file tree Collapse file tree 7 files changed +42
-8
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ public static class WebContentDirectoryFinder
12
12
{
13
13
public static string CalculateContentRootFolder ( )
14
14
{
15
- var coreAssemblyDirectoryPath = Path . GetDirectoryName ( typeof ( AbpProjectNameCoreModule ) . Assembly . Location ) ;
15
+ var coreAssemblyDirectoryPath = Path . GetDirectoryName ( AppContext . BaseDirectory ) ;
16
16
if ( coreAssemblyDirectoryPath == null )
17
17
{
18
18
throw new ApplicationException ( "Could not find location of AbpCompanyName.AbpProjectName.Core assembly!" ) ;
Original file line number Diff line number Diff line change 19
19
<PackageReference Include =" Abp.EntityFrameworkCore" Version =" 1.5.0" />
20
20
<PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 1.1.1" />
21
21
<PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer.Design" Version =" 1.1.1" />
22
- <PackageReference Include =" Microsoft.EntityFrameworkCore.Tools" Version =" 1.0 .0" >
22
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Tools" Version =" 1.1 .0" >
23
23
<PrivateAssets >All</PrivateAssets >
24
24
</PackageReference >
25
25
</ItemGroup >
Original file line number Diff line number Diff line change 38
38
<PackageReference Include =" Microsoft.Extensions.Options.ConfigurationExtensions" Version =" 1.1.1" />
39
39
<PackageReference Include =" Microsoft.VisualStudio.Web.BrowserLink" Version =" 1.1.0" />
40
40
<PackageReference Include =" Microsoft.VisualStudio.Web.CodeGeneration.Design" Version =" 1.1.0" />
41
- <PackageReference Include =" Microsoft.EntityFrameworkCore.Tools" Version =" 1.0 .0" >
41
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Tools" Version =" 1.1 .0" >
42
42
<PrivateAssets >All</PrivateAssets >
43
43
</PackageReference >
44
44
<PackageReference Include =" Abp.AspNetCore" Version =" 1.5.1" />
Original file line number Diff line number Diff line change 9
9
<GenerateAssemblyConfigurationAttribute >false</GenerateAssemblyConfigurationAttribute >
10
10
<GenerateAssemblyCompanyAttribute >false</GenerateAssemblyCompanyAttribute >
11
11
<GenerateAssemblyProductAttribute >false</GenerateAssemblyProductAttribute >
12
+ <AutoGenerateBindingRedirects >true</AutoGenerateBindingRedirects >
13
+ <GenerateBindingRedirectsOutputType >true</GenerateBindingRedirectsOutputType >
12
14
</PropertyGroup >
13
15
14
16
<ItemGroup >
17
19
</ItemGroup >
18
20
19
21
<ItemGroup >
20
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.0.0-preview-20170106-08 " />
22
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.0.0" />
21
23
<PackageReference Include =" xunit" Version =" 2.2.0" />
22
24
<PackageReference Include =" xunit.extensibility.execution" Version =" 2.2.0" />
23
25
<PackageReference Include =" xunit.runner.visualstudio" Version =" 2.2.0" />
24
26
<PackageReference Include =" Shouldly" Version =" 2.8.2" />
25
27
<PackageReference Include =" Abp.TestBase" Version =" 1.5.1" />
26
- <PackageReference Include =" NSubstitute" Version =" 2.0.0-rc " />
27
- <PackageReference Include =" Castle.Windsor.MsDependencyInjection" Version =" 1.3.0 " />
28
+ <PackageReference Include =" NSubstitute" Version =" 2.0.2 " />
29
+ <PackageReference Include =" Castle.Windsor.MsDependencyInjection" Version =" 1.3.3 " />
28
30
<PackageReference Include =" Microsoft.EntityFrameworkCore.InMemory" Version =" 1.1.1" />
29
- <PackageReference Include =" Microsoft.DotNet.InternalAbstractions" Version =" 1.0.1-beta-003206 " />
31
+ <PackageReference Include =" Microsoft.DotNet.InternalAbstractions" Version =" 1.0.0 " />
30
32
</ItemGroup >
31
33
32
34
<ItemGroup Condition =" '$(TargetFramework)' == 'net461' " >
Original file line number Diff line number Diff line change 10
10
<GenerateAssemblyConfigurationAttribute >false</GenerateAssemblyConfigurationAttribute >
11
11
<GenerateAssemblyCompanyAttribute >false</GenerateAssemblyCompanyAttribute >
12
12
<GenerateAssemblyProductAttribute >false</GenerateAssemblyProductAttribute >
13
+ <AutoGenerateBindingRedirects >true</AutoGenerateBindingRedirects >
14
+ <GenerateBindingRedirectsOutputType >true</GenerateBindingRedirectsOutputType >
13
15
</PropertyGroup >
14
16
15
17
<ItemGroup >
18
20
</ItemGroup >
19
21
20
22
<ItemGroup >
21
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.0.0-preview-20170106-08 " />
23
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.0.0" />
22
24
<PackageReference Include =" xunit" Version =" 2.2.0" />
23
25
<PackageReference Include =" xunit.runner.visualstudio" Version =" 2.2.0" />
24
26
<PackageReference Include =" Microsoft.AspNetCore.Mvc" Version =" 1.1.2" />
31
33
<Reference Include =" Microsoft.CSharp" />
32
34
</ItemGroup >
33
35
36
+ <ItemGroup >
37
+ <Service Include =" {82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
38
+ </ItemGroup >
39
+
40
+ <!-- Below ItemGroup and Target tags are added according to https://github.com/aspnet/Hosting/issues/959#issuecomment-286351703 -->
41
+
42
+ <!-- Solves Problem#2 (404 when executing service calls hosted in other assemblies) -->
43
+ <!-- https://github.com/Microsoft/vstest/issues/196.-->
44
+ <ItemGroup >
45
+ <None Update =" xunit.runner.json" >
46
+ <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory >
47
+ </None >
48
+ </ItemGroup >
49
+
50
+ <!-- https://github.com/NuGet/Home/issues/4412. -->
51
+ <Target Name =" CopyDepsFiles" AfterTargets =" Build" Condition =" '$(TargetFramework)'!=''" >
52
+ <ItemGroup >
53
+ <DepsFilePaths Include =" $([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />
54
+ </ItemGroup >
55
+
56
+ <Copy SourceFiles =" %(DepsFilePaths.FullPath)" DestinationFolder =" $(OutputPath)" Condition =" Exists('%(DepsFilePaths.FullPath)')" />
57
+ </Target >
58
+
59
+
60
+
34
61
</Project >
Original file line number Diff line number Diff line change 3
3
using Abp . AspNetCore . TestBase ;
4
4
using Abp . Dependency ;
5
5
using AbpCompanyName . AbpProjectName . EntityFrameworkCore ;
6
+ using AbpCompanyName . AbpProjectName . Web . Controllers ;
6
7
using Castle . MicroKernel . Registration ;
7
8
using Microsoft . AspNetCore . Builder ;
8
9
using Microsoft . AspNetCore . Hosting ;
10
+ using Microsoft . AspNetCore . Mvc . ApplicationParts ;
9
11
using Microsoft . EntityFrameworkCore ;
10
12
using Microsoft . Extensions . DependencyInjection ;
11
13
using Microsoft . Extensions . Logging ;
Original file line number Diff line number Diff line change
1
+ {
2
+ "shadowCopy" : false
3
+ }
You can’t perform that action at this time.
0 commit comments