huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace makefile.shade and update test TFM to net452

This commit is contained in:
Nate McMaster 2017-02-13 14:25:20 -08:00
parent 450ee8927c
commit d84de39721
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/repo.targets Normal file
View File

@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<AutobahnReportDir>$(ArtifactsDir)autobahnreports\</AutobahnReportDir>
</PropertyGroup>
<Target Name="SetReportDirectory" BeforeTargets="Test">
<SetEnvironmentVariable Variable="AUTOBAHN_SUITES_REPORT_DIR" Value="$(AutobahnReportDir)" />
</Target>
</Project>

15
makefile.shade
View File

@ -1,15 +0,0 @@
use namespace="System.IO"
var VERSION='0.1'
var FULL_VERSION='0.1'
var AUTHORS='Microsoft'
use-standard-lifecycle
k-standard-goals
var AUTOBAHN_REPORTS_DIR='${Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "autobahnreports")}'
#set-autobahn-report-dir target='initialize'
@{
E("AUTOBAHN_SUITES_REPORT_DIR", AUTOBAHN_REPORTS_DIR);
}

7
test/AutobahnTestApp/AutobahnTestApp.csproj
View File

@ -1,16 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<Content Include="TestResources\testCert.pfx" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
<Content Update="web.config" CopyToPublishDirectory="PreserveNewest"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.WebSockets\Microsoft.AspNetCore.WebSockets.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.2.0-*" />
@ -21,4 +25,5 @@
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.2.0-*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
</ItemGroup>
</Project>

3
test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
View File

@ -3,7 +3,8 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
<!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
</PropertyGroup>