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

Cleanup 

1. Moving framework assembly references to frameworkassemblies node.
Moving the framework references Removing the RunOnMono flag on Ntlm tests as it never runs on mono
2. Deleted a space from the batch file
3. Adding some pack-exclude items
4. Some general test cleanup.
This commit is contained in:
Praburaj 2014-10-02 12:38:54 -07:00
parent 970418448c
commit 0288c790b0
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MusicStore/Helios.cmd
View File

@ -3,4 +3,4 @@ SET KRE_HOME=%USERPROFILE%\.kre\
REM copy the AspNet.Loader.dll to the bin folder REM copy the AspNet.Loader.dll to the bin folder
call CopyAspNetLoader.cmd call CopyAspNetLoader.cmd
"%ProgramFiles(x86)%\iis Express\iisexpress.exe" /port:5001 /path:"%cd%" "%ProgramFiles(x86)%\iis Express\iisexpress.exe" /port:5001 /path:"%cd%"

1
src/MusicStore/project.json
View File

@ -5,6 +5,7 @@
"description": "Music store application on K", "description": "Music store application on K",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] }, "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
"pack-exclude": "*.cmd",
"webroot": "wwwroot", "webroot": "wwwroot",
"dependencies": { "dependencies": {
"Kestrel": "1.0.0-*", "Kestrel": "1.0.0-*",

14
test/E2ETests/NtlmAuthentationTest.cs
View File

@ -9,17 +9,17 @@ namespace E2ETests
public partial class SmokeTests public partial class SmokeTests
{ {
[Theory] [Theory]
[InlineData(ServerType.Helios, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/", false)] [InlineData(ServerType.Helios, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/")]
[InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5002/", false)] [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5002/")]
[InlineData(ServerType.Helios, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5001/", false)] [InlineData(ServerType.Helios, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5001/")]
//WindowsIdentity not available on CoreCLR //WindowsIdentity not available on CoreCLR
//[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/", false)] //[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")]
//[InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/", false)] //[InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/")]
public void NtlmAuthenticationTest(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl, bool RunTestOnMono = false) public void NtlmAuthenticationTest(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl)
{ {
Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", serverType, kreFlavor, architecture, applicationBaseUrl); Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", serverType, kreFlavor, architecture, applicationBaseUrl);
if (Helpers.SkipTestOnCurrentConfiguration(RunTestOnMono, architecture)) if (Helpers.SkipTestOnCurrentConfiguration(false, architecture))
{ {
Assert.True(true); Assert.True(true);
return; return;

14
test/E2ETests/project.json
View File

@ -8,18 +8,18 @@
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*", "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
"Xunit.KRunner": "1.0.0-*", "Xunit.KRunner": "1.0.0-*",
"Microsoft.AspNet.SignalR.Client": "2.1.1", "Microsoft.AspNet.SignalR.Client": "2.1.1",
"Microsoft.AspNet.WebUtilities": "1.0.0-*" "Microsoft.AspNet.WebUtilities": "1.0.0-*",
"System.Net.Http": "4.0.0.0",
"System.Runtime": "4.0.20.0",
"System.Runtime.Extensions": "4.0.10.0"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "aspnet50": {
"dependencies": { "frameworkAssemblies": {
"System.Runtime": "", //https://github.com/aspnet/KRuntime/issues/687
"System.Runtime.Extensions": "",
"System.Net.Http": "",
"System.Net.Http.WebRequest": "",
"System.Xml": "", "System.Xml": "",
"System.Data": "" "System.Data": ""
} }
} }
} }
} }