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

Remove runtimeconfig.template.json and use repo.targets

This commit is contained in:
Nate McMaster 2017-02-16 16:05:51 -08:00
parent d9f5c82ecc
commit 4039126e16
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/repo.targets Normal file
View File

@ -0,0 +1,7 @@
<Project>
<Target Name="TestNano" DependsOnTargets="Restore">
<MSBuild Targets="VSTest"
Projects="$(MSBuildThisFileDirectory)..\test\E2ETests\E2ETests.csproj"
Properties="Configuration=$(Configuration);VSTestLogger=trx;VSTestTestCaseFilter=E2ETests=NanoServer" />
</Target>
</Project>

5
makefile.shade
View File

@ -1,8 +1,7 @@
use-standard-lifecycle use-standard-lifecycle
k-standard-goals k-standard-goals
#run-nano-tests .initialize #run-nano-tests
@{ @{
var e2eTestsDirectory = Path.Combine(Directory.GetCurrentDirectory(), "test", "E2ETests"); MSBuild("/t:TestNano");
Dotnet("test --logger:trx --filter E2ETests=NanoServer --configuration " + E("Configuration"), e2eTestsDirectory);
} }

5
samples/MusicStore/runtimeconfig.template.json
View File

@ -1,5 +0,0 @@
{
"configProperties": {
"System.GC.Server": true
}
}

1
test/E2ETests/E2ETests.csproj
View File

@ -6,6 +6,7 @@
<TargetFramework>netcoreapp1.1</TargetFramework> <TargetFramework>netcoreapp1.1</TargetFramework>
<UserSecretsId>MusicStore.E2ETests</UserSecretsId> <UserSecretsId>MusicStore.E2ETests</UserSecretsId>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ServerGarbageCollection>true</ServerGarbageCollection>
<RuntimeIdentifiers>win7-x86;win7-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.14.10-x64;ubuntu.15.04-x64;ubuntu.16.04-x64;centos.7-x64;debian.8-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x86;win7-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.14.10-x64;ubuntu.15.04-x64;ubuntu.16.04-x64;centos.7-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>

2
test/E2ETests/Properties/AssemblyInfo.cs
View File

@ -1,3 +1,3 @@
using Xunit; using Xunit;
[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)] [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]

2
test/MusicStore.Test/MusicStore.Test.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp1.1</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier> <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>