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

Merge remote-tracking branch 'origin/release/2.1' into dev 

# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
This commit is contained in:
Pranav K 2018-03-29 12:23:18 -07:00
parent fc1e40e6d1 5ae68a012c
commit f166d0b8a8
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.1.0-preview3-17001 version:2.1.0-preview3-17002
commithash:dda68c56abf0d3b911fe6a2315872c446b314585 commithash:b8e4e6ab104adc94c0719bb74229870e9b584a7f

28
test/Templates.Test/MvcTemplateTest.cs
View File

@ -13,19 +13,23 @@ namespace Templates.Test
{ {
} }
[ConditionalTheory] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
[OSSkipCondition(OperatingSystems.MacOSX)] public void MvcTemplate_NoAuth_Works_NetFramework_ForDefaultTemplate()
[InlineData(null)] => MvcTemplate_NoAuthImpl("net461", languageOverride: default);
[InlineData("F#", Skip = "https://github.com/aspnet/templating/issues/365")]
public void MvcTemplate_NoAuth_Works_NetFramework(string languageOverride)
=> MvcTemplate_NoAuthImpl("net461", languageOverride);
[Theory] [ConditionalFact]
[InlineData(null)] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
[InlineData("F#")] public void MvcTemplate_NoAuth_Works_NetFramework_ForFSharpTemplate()
public void MvcTemplate_NoAuth_Works_NetCore(string languageOverride) => MvcTemplate_NoAuthImpl("net461", languageOverride: "F#");
=> MvcTemplate_NoAuthImpl(null, languageOverride: languageOverride);
[Fact]
public void MvcTemplate_NoAuth_Works_NetCore_ForDefaultTemplate()
=> MvcTemplate_NoAuthImpl(null, languageOverride: default);
[Fact]
public void MvcTemplate_NoAuth_Works_NetCore_ForFSharpTemplate()
=> MvcTemplate_NoAuthImpl(null, languageOverride: "F#");
private void MvcTemplate_NoAuthImpl(string targetFrameworkOverride, string languageOverride) private void MvcTemplate_NoAuthImpl(string targetFrameworkOverride, string languageOverride)
{ {