Making a net45 version of integration tests
This commit is contained in:
Louis DeJardin
Родитель
05cfdbf65e
Коммит
4d8d0369f7
13
Katana.sln
13
Katana.sln
|
|
@ -60,6 +60,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Owin.Host.SystemW
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Owin.Host.IntegrationTests", "tests\Microsoft.Owin.Host.IntegrationTests\Microsoft.Owin.Host.IntegrationTests.csproj", "{4B189181-0978-49FE-9A66-BAE377A7DC80}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Owin.Host.IntegrationTests45", "tests\Microsoft.Owin.Host.IntegrationTests\Microsoft.Owin.Host.IntegrationTests45.csproj", "{9F0C72D8-E43F-4F01-9DEB-123412341234}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -250,6 +252,16 @@ Global
|
|||
{4B189181-0978-49FE-9A66-BAE377A7DC80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{4B189181-0978-49FE-9A66-BAE377A7DC80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{4B189181-0978-49FE-9A66-BAE377A7DC80}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -268,6 +280,7 @@ Global
|
|||
{9F0C72D8-E43F-4F01-9DEB-919191911919} = {E80B5DAB-7D94-4E26-8A9E-98E5A887A72A}
|
||||
{9F0C72D8-E43F-4F01-9DEB-919191919191} = {E80B5DAB-7D94-4E26-8A9E-98E5A887A72A}
|
||||
{4B189181-0978-49FE-9A66-BAE377A7DC80} = {E80B5DAB-7D94-4E26-8A9E-98E5A887A72A}
|
||||
{9F0C72D8-E43F-4F01-9DEB-123412341234} = {E80B5DAB-7D94-4E26-8A9E-98E5A887A72A}
|
||||
{311DF219-244B-4A21-AF09-F594E8235877} = {4EC1647A-7297-45BB-8E4A-9D9D8C301B57}
|
||||
{80D03986-6128-4614-8715-C7E86BD16513} = {4EC1647A-7297-45BB-8E4A-9D9D8C301B57}
|
||||
{1FBD6DF1-9794-48F3-A7F9-1FDDE580240B} = {ABC8FD67-E4C3-4236-AC51-280551470522}
|
||||
|
|
|
|||
|
|
@ -72,51 +72,10 @@ use-standard-goals features='nuget,xunit'
|
|||
-// additional work targets are defined below
|
||||
|
||||
#net45-generate target='initialize'
|
||||
clone-and-tweak-file sourceFile='src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.csproj' destinationFile='src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb45.csproj'
|
||||
@{
|
||||
updateText = updateText
|
||||
.Replace(';NET40', ';NET45')
|
||||
.Replace(@'bin\net40\', @'bin\net45\')
|
||||
.Replace(@'obj\net40\', @'obj\net45\')
|
||||
.Replace(
|
||||
'<ProjectGuid>{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}</ProjectGuid>',
|
||||
'<ProjectGuid>{9F0C72D8-E43F-4F01-9DEB-9E8FE0AE179E}</ProjectGuid>')
|
||||
.Replace(
|
||||
'<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>',
|
||||
'<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>');
|
||||
}
|
||||
clone-and-tweak-file sourceFile='tests/Microsoft.Owin.Host.SystemWeb.Tests/Microsoft.Owin.Host.SystemWeb.Tests.csproj' destinationFile='tests/Microsoft.Owin.Host.SystemWeb.Tests/Microsoft.Owin.Host.SystemWeb45.Tests.csproj'
|
||||
@{
|
||||
updateText = updateText
|
||||
.Replace(';NET40', ';NET45')
|
||||
.Replace(@'bin\net40\', @'bin\net45\')
|
||||
.Replace(@'obj\net40\', @'obj\net45\')
|
||||
.Replace(
|
||||
'<ProjectGuid>{A870323A-14F4-46B8-935E-30A1320FC49B}</ProjectGuid>',
|
||||
'<ProjectGuid>{9F0C72D8-E43F-4F01-9DEB-919191919191}</ProjectGuid>')
|
||||
.Replace(
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.SystemWeb\\Microsoft.Owin.Host.SystemWeb.csproj\">',
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.SystemWeb\\Microsoft.Owin.Host.SystemWeb45.csproj\">')
|
||||
.Replace(
|
||||
'<Project>{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}</Project>',
|
||||
'<Project>{9F0C72D8-E43F-4F01-9DEB-9E8FE0AE179E}</Project>')
|
||||
.Replace(
|
||||
'<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>',
|
||||
'<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>');
|
||||
}
|
||||
clone-and-tweak-file sourceFile='src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.csproj' destinationFile='src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener45.csproj'
|
||||
@{
|
||||
updateText = updateText
|
||||
.Replace(';NET40', ';NET45')
|
||||
.Replace(@'bin\net40\', @'bin\net45\')
|
||||
.Replace(@'obj\net40\', @'obj\net45\')
|
||||
.Replace(
|
||||
'<ProjectGuid>{452C45C7-57A5-4161-BF7D-C1CD5AD4BB84}</ProjectGuid>',
|
||||
'<ProjectGuid>{9F0C72D8-E43F-4F01-9DEB-919191911919}</ProjectGuid>')
|
||||
.Replace(
|
||||
'<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>',
|
||||
'<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>');
|
||||
}
|
||||
apply-net45-changes sourceFile='src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.csproj' destinationFile='src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb45.csproj'
|
||||
apply-net45-changes sourceFile='src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.csproj' destinationFile='src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener45.csproj'
|
||||
apply-net45-changes sourceFile='tests/Microsoft.Owin.Host.SystemWeb.Tests/Microsoft.Owin.Host.SystemWeb.Tests.csproj' destinationFile='tests/Microsoft.Owin.Host.SystemWeb.Tests/Microsoft.Owin.Host.SystemWeb45.Tests.csproj'
|
||||
apply-net45-changes sourceFile='tests/Microsoft.Owin.Host.IntegrationTests/Microsoft.Owin.Host.IntegrationTests.csproj' destinationFile='tests/Microsoft.Owin.Host.IntegrationTests/Microsoft.Owin.Host.IntegrationTests45.csproj'
|
||||
|
||||
#assemblyinfo-initialize target='initialize'
|
||||
var assemblyVersion='${VERSION}'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
|
||||
clone-and-tweak-file
|
||||
@{
|
||||
updateText = updateText
|
||||
.Replace(';NET40', ';NET45')
|
||||
.Replace(@'bin\net40\', @'bin\net45\')
|
||||
.Replace(@'obj\net40\', @'obj\net45\')
|
||||
.Replace(
|
||||
'<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>',
|
||||
'<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>')
|
||||
.Replace(
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.SystemWeb\\Microsoft.Owin.Host.SystemWeb.csproj\">',
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.SystemWeb\\Microsoft.Owin.Host.SystemWeb45.csproj\">')
|
||||
.Replace(
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.HttpListener\\Microsoft.Owin.Host.HttpListener.csproj\">',
|
||||
'<ProjectReference Include=\"..\\..\\src\\Microsoft.Owin.Host.HttpListener\\Microsoft.Owin.Host.HttpListener45.csproj\">')
|
||||
;
|
||||
|
||||
var guids = new[]{
|
||||
Tuple.Create("E31826E6-C29A-4F08-BD4F-E17ACA793BBC", "9F0C72D8-E43F-4F01-9DEB-9E8FE0AE179E"),
|
||||
Tuple.Create("A870323A-14F4-46B8-935E-30A1320FC49B", "9F0C72D8-E43F-4F01-9DEB-919191919191"),
|
||||
Tuple.Create("452C45C7-57A5-4161-BF7D-C1CD5AD4BB84", "9F0C72D8-E43F-4F01-9DEB-919191911919"),
|
||||
Tuple.Create("4B189181-0978-49FE-9A66-BAE377A7DC80", "9F0C72D8-E43F-4F01-9DEB-123412341234"),
|
||||
};
|
||||
foreach(var swap in guids)
|
||||
{
|
||||
updateText = updateText
|
||||
.Replace('>{'+swap.Item1+'}</Project', '>{'+swap.Item2+'}</Project')
|
||||
.Replace('>{'+swap.Item1.ToLower()+'}</Project', '>{'+swap.Item2.ToLower()+'}</Project');
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
var originalText='${System.IO.File.ReadAllText(sourceFile)}'
|
||||
var actualText='${System.IO.File.ReadAllText(destinationFile)}'
|
||||
var actualText='${File.Exists(destinationFile) ? File.ReadAllText(destinationFile) : ""}'
|
||||
var updateText='${originalText}'
|
||||
render
|
||||
@{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{9F0C72D8-E43F-4F01-9DEB-123412341234}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Microsoft.Owin.Host.IntegrationTests</RootNamespace>
|
||||
<AssemblyName>Microsoft.Owin.Host.IntegrationTests</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
<TargetFrameworkProfile />
|
||||
</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>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
<HintPath>..\..\packages\Newtonsoft.Json.4.5.10\lib\net40\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
|
||||
<Private>True</Private>
|
||||
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Shouldly, Version=1.1.1.1, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\packages\Shouldly.1.1.1.1\lib\35\Shouldly.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http.WebRequest" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="xunit">
|
||||
<HintPath>..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="xunit.extensions">
|
||||
<HintPath>..\..\packages\xunit.extensions.1.9.1\lib\net20\xunit.extensions.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\build\CommonAssemblyInfo.cs">
|
||||
<Link>Properties\CommonAssemblyInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="App_Packages\Owin.Extensions.Sources.0.6.3\StartupExtensions.cs" />
|
||||
<Compile Include="App_Packages\Owin.Extensions.Sources.0.6.3\StartupExtensions.Func.cs" />
|
||||
<Compile Include="App_Packages\Owin.Extensions.Sources.0.6.3\StartupExtensions.Type.cs" />
|
||||
<Compile Include="App_Packages\TaskHelpers.Sources.0.1\TaskHelpers.cs" />
|
||||
<Compile Include="App_Packages\TaskHelpers.Sources.0.1\TaskHelpersExtensions.cs" />
|
||||
<Compile Include="SimpleGetTests.cs" />
|
||||
<Compile Include="TestBase.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="TestBaseWorks.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="applicationHost.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="packages.config" />
|
||||
<None Include="web.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Katana.Engine\Katana.Engine.csproj">
|
||||
<Project>{c225eb2e-e7a7-463f-b058-1705f204978e}</Project>
|
||||
<Name>Katana.Engine</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\Microsoft.Owin.Host.HttpListener\Microsoft.Owin.Host.HttpListener45.csproj">
|
||||
<Project>{9f0c72d8-e43f-4f01-9deb-919191911919}</Project>
|
||||
<Name>Microsoft.Owin.Host.HttpListener</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\Microsoft.Owin.Host.SystemWeb\Microsoft.Owin.Host.SystemWeb45.csproj">
|
||||
<Project>{9f0c72d8-e43f-4f01-9deb-9e8fe0ae179e}</Project>
|
||||
<Name>Microsoft.Owin.Host.SystemWeb</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче