This commit is contained in:
Eugene Sadovoi 2017-10-22 18:13:18 -04:00
Родитель 043145a39f
Коммит 8fbbd715be
3 изменённых файлов: 8 добавлений и 15 удалений

1
.gitignore поставляемый
Просмотреть файл

@ -23,6 +23,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ib/
# Visual Studio 2015 cache/options directory
.vs/

Просмотреть файл

@ -15,7 +15,6 @@
<PackageId>Unity.Mvc</PackageId>
<Authors>Microsoft.Practices.Unity</Authors>
<Company>Microsoft.Practices.Unity</Company>
<Configurations>Debug;Release;Package</Configurations>
</PropertyGroup>
<ItemGroup>
@ -32,11 +31,6 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>net47;net45</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Package'">
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<TargetFrameworks>net47;net45</TargetFrameworks>
<OutputPath>$(SolutionDir)\lib\</OutputPath>
</PropertyGroup>
@ -51,14 +45,16 @@
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
</ItemGroup>
<PropertyGroup>
<UnityAbstractions>$(SolutionDir)\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
</PropertyGroup>
<ItemGroup Condition="'$(Configuration)'!='Release'">
<ProjectReference Include="..\..\Abstractions\src\Unity.Abstractions.csproj" />
<ItemGroup Condition="Exists('$(UnityAbstractions)')">
<ProjectReference Include="$(UnityAbstractions)" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<ItemGroup Condition="!Exists('$(UnityAbstractions)')">
<PackageReference Include="Unity.Abstractions" Version="2.0.1" />
</ItemGroup>
</Project>

Просмотреть файл

@ -12,17 +12,13 @@
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\src\Unity.Mvc.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
<ProjectReference Include="..\src\Unity.Mvc.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' != 'Release' ">