Skip to content

Commit

Permalink
update project file to muti-targetframework
Browse files Browse the repository at this point in the history
  • Loading branch information
ShiningRush committed Dec 26, 2017
1 parent e36009c commit 1b54b6f
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 301 deletions.
20 changes: 14 additions & 6 deletions ServiceAnt.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E041832-D5A
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BDFDFA2C-DA6F-4405-B7B0-31D1B0997150}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt.Test", "test\ServiceAnt.test\ServiceAnt.Test.csproj", "{C1990ED7-2C77-453E-BFE3-5F43E1654CF0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt.Test", "test\ServiceAnt.test\ServiceAnt.Test.csproj", "{C1990ED7-2C77-453E-BFE3-5F43E1654CF0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt", "src\ServiceAnt\ServiceAnt.csproj", "{FB6688E2-094A-4D25-9EEA-85C3B7CCC4A2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt", "src\ServiceAnt\ServiceAnt.csproj", "{FB6688E2-094A-4D25-9EEA-85C3B7CCC4A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt.IocInstaller.Castle", "src\ServiceAnt.IocInstaller.Castle\ServiceAnt.IocInstaller.Castle.csproj", "{B64F120C-36DB-4D4A-8D30-D113CF70BF1A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt.IocInstaller.Castle", "src\ServiceAnt.IocInstaller.Castle\ServiceAnt.IocInstaller.Castle.csproj", "{B64F120C-36DB-4D4A-8D30-D113CF70BF1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt.IocInstaller.Castle.Test", "test\ServiceAnt.IocInstaller.Castle.test\ServiceAnt.IocInstaller.Castle.Test.csproj", "{288BFA2A-3CA4-4C7A-B912-C953AD11863A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt.IocInstaller.Castle.Test", "test\ServiceAnt.IocInstaller.Castle.test\ServiceAnt.IocInstaller.Castle.Test.csproj", "{288BFA2A-3CA4-4C7A-B912-C953AD11863A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt.IocInstaller.Autofac", "src\ServiceAnt.IocInstaller.Autofac\ServiceAnt.IocInstaller.Autofac.csproj", "{1FA5221C-9A54-4132-B7CF-CF7CC7A30E59}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt.IocInstaller.Autofac", "src\ServiceAnt.IocInstaller.Autofac\ServiceAnt.IocInstaller.Autofac.csproj", "{1FA5221C-9A54-4132-B7CF-CF7CC7A30E59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceAnt.IocInstaller.Autofac.Test", "test\ServiceAnt.IocInstaller.Autofac.Test\ServiceAnt.IocInstaller.Autofac.Test.csproj", "{ABC9A287-31CC-422B-84A2-6EAEF0BD448E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceAnt.IocInstaller.Autofac.Test", "test\ServiceAnt.IocInstaller.Autofac.Test\ServiceAnt.IocInstaller.Autofac.Test.csproj", "{ABC9A287-31CC-422B-84A2-6EAEF0BD448E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5220EBDE-1FFD-4155-85A9-9A87DF0C073C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4FE1FF00-52E7-4311-A21F-7C34831E62F1}"
ProjectSection(SolutionItems) = preProject
src\Directory.Build.props = src\Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -60,6 +67,7 @@ Global
{288BFA2A-3CA4-4C7A-B912-C953AD11863A} = {BDFDFA2C-DA6F-4405-B7B0-31D1B0997150}
{1FA5221C-9A54-4132-B7CF-CF7CC7A30E59} = {0E041832-D5A5-4220-BD7D-95B03E66FF98}
{ABC9A287-31CC-422B-84A2-6EAEF0BD448E} = {BDFDFA2C-DA6F-4405-B7B0-31D1B0997150}
{4FE1FF00-52E7-4311-A21F-7C34831E62F1} = {5220EBDE-1FFD-4155-85A9-9A87DF0C073C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {52E5EADF-2B54-4C50-BF32-93550974966D}
Expand Down
12 changes: 12 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<PropertyGroup Label="Common package properties">
<Authors>ShiningRush</Authors>
<Copyright>Copyright (c) ServiceAnt contributors. (https://github.com/ShiningRush/ServiceAnt)</Copyright>
<PackageProjectUrl>https://github.com/ShiningRush/ServiceAnt</PackageProjectUrl>
<PackageIconUrl></PackageIconUrl>
<PackageLicenseUrl>https://github.com/ShiningRush/ServiceAnt/blob/master/LICENSE</PackageLicenseUrl>
<PackageReleaseNotes></PackageReleaseNotes>
<NoPackageAnalysis>true</NoPackageAnalysis>
<Version>2.0.0-clinteastwood</Version>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>The DI installer of ServiceAnt for Autofac</Description>
<PackageTags>$(PackageTags);OWIN</PackageTags>
<TargetFramework>net452</TargetFramework>
<Description>The IOC installer of ServiceAnt for Autofac</Description>
<PackageTags>$(PackageTags)</PackageTags>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>The DI installer of ServiceAnt for Castle</Description>
<PackageTags>$(PackageTags);OWIN</PackageTags>
<TargetFramework>net452</TargetFramework>
<Description>The IOC installer of ServiceAnt for Castle</Description>
<PackageTags>$(PackageTags)</PackageTags>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/ServiceAnt/InProcessServiceBus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ private async Task ProcessEvent(string eventName, string message)
}
}

#endregion
#endregion

#region Req/Resp
#region Req/Resp

public void AddRequestHandler(Type eventType, IHandlerFactory factory)
{
Expand Down Expand Up @@ -206,7 +206,7 @@ private async Task<T> ProcessRequest<T>(string eventName, string message)
return (T)requestContext.Response;
}

#endregion
#endregion

private void LogMessage(string type, string value, Exception ex)
{
Expand Down
11 changes: 7 additions & 4 deletions src/ServiceAnt/ServiceAnt.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Nancy extensions for OWIN hosting.</Description>
<PackageTags>$(PackageTags);OWIN</PackageTags>
<TargetFramework>net452</TargetFramework>
<Description>ServiceAnt core lib</Description>
<PackageTags>$(PackageTags)</PackageTags>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("ServiceAnt.IocInstaller.Autofac.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("ServiceAnt.IocInstaller.Autofac.Test")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//[assembly: AssemblyTitle("ServiceAnt.IocInstaller.Autofac.Test")]
//[assembly: AssemblyDescription("")]
//[assembly: AssemblyConfiguration("")]
//[assembly: AssemblyCompany("Microsoft")]
//[assembly: AssemblyProduct("ServiceAnt.IocInstaller.Autofac.Test")]
//[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
//[assembly: AssemblyTrademark("")]
//[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
//[assembly: ComVisible(false)]

[assembly: Guid("abc9a287-31cc-422b-84a2-6eaef0bd448e")]
//[assembly: Guid("abc9a287-31cc-422b-84a2-6eaef0bd448e")]

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
//// [assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
@@ -1,88 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http:https://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{ABC9A287-31CC-422B-84A2-6EAEF0BD448E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ServiceAnt.IocInstaller.Autofac.Test</RootNamespace>
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
<AssemblyName>ServiceAnt.IocInstaller.Autofac.Test</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<ItemGroup>
<Reference Include="Autofac, Version=4.6.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.6.2\lib\net45\Autofac.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<ProjectReference Include="..\..\src\ServiceAnt.IocInstaller.Autofac\ServiceAnt.IocInstaller.Autofac.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="ServiceAntModule_Test.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="Autofac" Version="4.6.2" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ServiceAnt.IocInstaller.Autofac\ServiceAnt.IocInstaller.Autofac.csproj">
<Project>{1fa5221c-9a54-4132-b7cf-cf7cc7a30e59}</Project>
<Name>ServiceAnt.IocInstaller.Autofac</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\ServiceAnt\ServiceAnt.csproj">
<Project>{fb6688e2-094a-4d25-9eea-85c3b7ccc4a2}</Project>
<Name>ServiceAnt</Name>
</ProjectReference>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http:https://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
</Project>
6 changes: 0 additions & 6 deletions test/ServiceAnt.IocInstaller.Autofac.Test/packages.config

This file was deleted.

26 changes: 13 additions & 13 deletions test/ServiceAnt.IocInstaller.Castle.test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("ServiceAnt.IocInstaller.Castle.test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("ServiceAnt.IocInstaller.Castle.test")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//[assembly: AssemblyTitle("ServiceAnt.IocInstaller.Castle.test")]
//[assembly: AssemblyDescription("")]
//[assembly: AssemblyConfiguration("")]
//[assembly: AssemblyCompany("Microsoft")]
//[assembly: AssemblyProduct("ServiceAnt.IocInstaller.Castle.test")]
//[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
//[assembly: AssemblyTrademark("")]
//[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
//[assembly: ComVisible(false)]

[assembly: Guid("288bfa2a-3ca4-4c7a-b912-c953ad11863a")]
//[assembly: Guid("288bfa2a-3ca4-4c7a-b912-c953ad11863a")]

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
//// [assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
Loading

0 comments on commit 1b54b6f

Please sign in to comment.