This commit is contained in:
Eugene Sadocoi 2020-01-19 16:35:41 -08:00
Родитель a2fd762f72
Коммит 504bd4bee5
4 изменённых файлов: 36 добавлений и 70 удалений

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

@ -1,13 +0,0 @@
<Project>
<PropertyGroup>
<Version>5.11.1</Version>
<PackageReleaseNotes>This package is compatible with Net Standard 2.0, Net Core 2.0, .NET 4.5, 4.6, and 4.7 frameworks.</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<UnityAbstractionsVersion>5.11.*</UnityAbstractionsVersion>
<UnityContainerVersion>5.11.*</UnityContainerVersion>
</PropertyGroup>
</Project>

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

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\package.props" />
<PropertyGroup>
<FileVersion>$(Version).0</FileVersion>
<AssemblyVersion>$(Version).0</AssemblyVersion>
<PackageId>Unity.Interception</PackageId>
<Description>Unity Interception</Description>
<Copyright>Copyright © Unity Container Project 2018</Copyright>
@ -19,9 +15,36 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>package.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<TargetFrameworks>netstandard2.0;net47;net46;net45;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net48;net47;net46;net45;netcoreapp2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DebugType>Portable</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<DebugType>Full</DebugType>
</PropertyGroup>
<!-- Unity.Container -->
<PropertyGroup>
<UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
</PropertyGroup>
<ItemGroup Condition="Exists('$(UnityContainer)')">
<ProjectReference Include="$(UnityContainer)" />
</ItemGroup>
<ItemGroup Condition="!Exists('$(UnityContainer)')">
<PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
@ -57,29 +80,6 @@
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DebugType>Portable</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<DebugType>Full</DebugType>
</PropertyGroup>
<PropertyGroup>
<UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
</PropertyGroup>
<ItemGroup Condition="Exists('$(UnityContainer)')">
<ProjectReference Include="$(UnityContainer)" />
</ItemGroup>
<ItemGroup Condition="!Exists('$(UnityContainer)')">
<PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="System.Runtime.Remoting" />
@ -97,7 +97,10 @@
<Compile Remove="Interceptors\InstanceInterceptors\TransparentProxyInterception\*.cs" />
</ItemGroup>
<!-- Sourcelink -->
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

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

@ -13,7 +13,7 @@ namespace Microsoft.Practices.Unity.TestSupport
get { return this.initializeWasCalled; }
}
public new ExtensionContext Context
public new IExtensionContext Context
{
get { return base.Context; }
}

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

@ -1,11 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\package.props" />
<PropertyGroup>
<TargetFramework>net47</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>Unity.Interception.Tests</RootNamespace>
<IsPackable>false</IsPackable>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -17,27 +15,5 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Unity.Interception.csproj" />
</ItemGroup>
<PropertyGroup>
<UnityAbstractions>..\..\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
<UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
</PropertyGroup>
<ItemGroup Condition="Exists('$(UnityAbstractions)')">
<ProjectReference Include="$(UnityAbstractions)" />
</ItemGroup>
<ItemGroup Condition="Exists('$(UnityContainer)')">
<ProjectReference Include="$(UnityContainer)" />
</ItemGroup>
<ItemGroup Condition="!Exists('$(UnityAbstractions)')">
<PackageReference Include="Unity.Abstractions" Version="$(UnityAbstractionsVersion)" />
</ItemGroup>
<ItemGroup Condition="!Exists('$(UnityContainer)')">
<PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
</ItemGroup>
</Project>