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

Switching to use generations TFMs

This commit is contained in:
Pranav K 2015-10-21 18:11:20 -07:00
parent f0a4a9773d
commit ce39864623
18 changed files with 63 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ nuget.exe
*.*sdf *.*sdf
*.ipch *.ipch
project.lock.json project.lock.json
.vs

61
src/Microsoft.AspNet.Razor.Runtime.Precompilation/project.json
View File

@ -1,36 +1,37 @@
{ {
"description": "Supports tag helper resolution during precompilation.", "description": "Supports tag helper resolution during precompilation.",
"version": "4.0.0-*", "version": "4.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/razor" "url": "git://github.com/aspnet/razor"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.Extensions.PropertyActivator.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Microsoft.Extensions.PropertyHelper.Sources": {
"warningsAsErrors": true "version": "1.0.0-*",
"type": "build"
}, },
"dependencies": { "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
"Microsoft.Extensions.PropertyActivator.Sources": { "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
"version": "1.0.0-*", },
"type": "build" "frameworks": {
}, "net451": {
"Microsoft.Extensions.PropertyHelper.Sources": { "frameworkAssemblies": {
"version": "1.0.0-*", "System.Runtime": "4.0.0.0"
"type": "build" }
},
"Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
}, },
"frameworks": { "dotnet5.4": {
"dnx451": { "dependencies": {
"frameworkAssemblies": { "System.Collections.Concurrent": "4.0.11-*",
"System.Runtime": "4.0.0.0" "System.Linq.Expressions": "4.0.11-*",
} "System.Reflection.TypeExtensions": "4.0.1-*"
}, }
"dnxcore50": {
"dependencies": {
"System.Collections.Concurrent": "4.0.11-*",
"System.Linq.Expressions": "4.0.11-*"
}
}
} }
}
} }

2
src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
View File

@ -204,7 +204,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
public bool IsWhiteSpace { get; private set; } = true; public bool IsWhiteSpace { get; private set; } = true;
#if DNXCORE50 #if DOTNET5_4
// This is an abstract method in DNXCore // This is an abstract method in DNXCore
public override void Write(char value) public override void Write(char value)
{ {

4
src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
View File

@ -108,7 +108,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
{ {
TagHelperDesignTimeDescriptor typeDesignTimeDescriptor = null; TagHelperDesignTimeDescriptor typeDesignTimeDescriptor = null;
#if !DNXCORE50 #if !DOTNET5_4
if (designTime) if (designTime)
{ {
var runtimeTypeInfo = typeInfo as RuntimeTypeInfo; var runtimeTypeInfo = typeInfo as RuntimeTypeInfo;
@ -702,7 +702,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
{ {
TagHelperAttributeDesignTimeDescriptor propertyDesignTimeDescriptor = null; TagHelperAttributeDesignTimeDescriptor propertyDesignTimeDescriptor = null;
#if !DNXCORE50 #if !DOTNET5_4
if (designTime) if (designTime)
{ {
var runtimeProperty = property as RuntimePropertyInfo; var runtimeProperty = property as RuntimePropertyInfo;

2
src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if !DNXCORE50 // Cannot accurately resolve the location of the documentation XML file in coreclr. #if !DOTNET5_4 // Cannot accurately resolve the location of the documentation XML file in coreclr.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;

2
src/Microsoft.AspNet.Razor.Runtime/XMLDocumentationProvider.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if !DNXCORE50 #if !DOTNET5_4
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

10
src/Microsoft.AspNet.Razor.Runtime/project.json
View File

@ -22,19 +22,13 @@
} }
}, },
"frameworks": { "frameworks": {
"net45": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Xml": "4.0.0.0", "System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0" "System.Xml.Linq": "4.0.0.0"
} }
}, },
"dnx451": { "dotnet5.4": {
"frameworkAssemblies": {
"System.Xml": "4.0.0.0",
"System.Xml.Linq": "4.0.0.0"
}
},
"dnxcore50": {
"dependencies": { "dependencies": {
"System.Reflection.Extensions": "4.0.1-beta-*", "System.Reflection.Extensions": "4.0.1-beta-*",
"System.Text.RegularExpressions": "4.0.11-beta-*" "System.Text.RegularExpressions": "4.0.11-beta-*"

8
src/Microsoft.AspNet.Razor.Test.Sources/project.json
View File

@ -5,7 +5,11 @@
"xunit.assert": "2.1.0-*" "xunit.assert": "2.1.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { }, "net451": { },
"dotnet": { } "dotnet5.4": {
"dependencies": {
"System.Runtime": "4.0.21-beta-*"
}
}
} }
} }

2
src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs
View File

@ -4,7 +4,7 @@
using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Chunks.Generators;
using Microsoft.AspNet.Razor.CodeGenerators; using Microsoft.AspNet.Razor.CodeGenerators;
using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser;
#if NET45 #if NET451
#endif #endif

4
src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs
View File

@ -310,7 +310,7 @@ namespace Microsoft.AspNet.Razor.Editor
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly)); RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly));
EnsureOnThread(); EnsureOnThread();
#if DNXCORE50 #if DOTNET5_4
var spinWait = new SpinWait(); var spinWait = new SpinWait();
#endif #endif
@ -428,7 +428,7 @@ namespace Microsoft.AspNet.Razor.Editor
else else
{ {
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly)); RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly));
#if DNXCORE50 #if DOTNET5_4
// This does the equivalent of thread.yield under the covers. // This does the equivalent of thread.yield under the covers.
spinWait.SpinOnce(); spinWait.SpinOnce();
#else #else

6
src/Microsoft.AspNet.Razor/Editor/RazorEditorTrace.cs
View File

@ -3,7 +3,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
#if NET45 #if NET451
using System.Globalization; using System.Globalization;
#endif #endif
@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.Editor
bool enabled; bool enabled;
if (Boolean.TryParse(Environment.GetEnvironmentVariable("RAZOR_EDITOR_TRACE"), out enabled)) if (Boolean.TryParse(Environment.GetEnvironmentVariable("RAZOR_EDITOR_TRACE"), out enabled))
{ {
#if NET45 #if NET451
// No Trace in CoreCLR // No Trace in CoreCLR
Trace.WriteLine(RazorResources.FormatTrace_Startup( Trace.WriteLine(RazorResources.FormatTrace_Startup(
@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Razor.Editor
{ {
if (IsEnabled()) if (IsEnabled())
{ {
#if NET45 #if NET451
// No Trace in CoreCLR // No Trace in CoreCLR
Trace.WriteLine(RazorResources.FormatTrace_Format( Trace.WriteLine(RazorResources.FormatTrace_Format(

2
src/Microsoft.AspNet.Razor/Parser/CSharpLanguageCharacteristics.cs
View File

@ -143,7 +143,7 @@ namespace Microsoft.AspNet.Razor.Parser
case CSharpSymbolType.GreaterThan: case CSharpSymbolType.GreaterThan:
return CSharpSymbolType.LessThan; return CSharpSymbolType.LessThan;
default: default:
#if NET45 #if NET451
// No Debug.Fail // No Debug.Fail
Debug.Fail("FlipBracket must be called with a bracket character"); Debug.Fail("FlipBracket must be called with a bracket character");
#else #else

2
src/Microsoft.AspNet.Razor/Parser/HtmlLanguageCharacteristics.cs
View File

@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Razor.Parser
case HtmlSymbolType.CloseAngle: case HtmlSymbolType.CloseAngle:
return HtmlSymbolType.OpenAngle; return HtmlSymbolType.OpenAngle;
default: default:
#if NET45 #if NET451
// No Debug.Fail in CoreCLR // No Debug.Fail in CoreCLR
Debug.Fail("FlipBracket must be called with a bracket character"); Debug.Fail("FlipBracket must be called with a bracket character");

2
src/Microsoft.AspNet.Razor/Parser/ParserContext.cs
View File

@ -326,7 +326,7 @@ namespace Microsoft.AspNet.Razor.Parser
_infiniteLoopGuardCount++; _infiniteLoopGuardCount++;
if (_infiniteLoopGuardCount > InfiniteLoopCountThreshold) if (_infiniteLoopGuardCount > InfiniteLoopCountThreshold)
{ {
#if NET45 #if NET451
// No Debug.Fail in CoreCLR // No Debug.Fail in CoreCLR
Debug.Fail("An internal parser error is causing an infinite loop at this location."); Debug.Fail("An internal parser error is causing an infinite loop at this location.");

2
src/Microsoft.AspNet.Razor/SourceLocation.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Razor
/// <summary> /// <summary>
/// A location in a Razor file. /// A location in a Razor file.
/// </summary> /// </summary>
#if NET45 #if NET451
// No Serializable attribute in CoreCLR (no need for it anymore?) // No Serializable attribute in CoreCLR (no need for it anymore?)
[Serializable] [Serializable]
#endif #endif

2
src/Microsoft.AspNet.Razor/Tokenizer/HtmlTokenizer.cs
View File

@ -158,7 +158,7 @@ namespace Microsoft.AspNet.Razor.Tokenizer
TakeCurrent(); TakeCurrent();
return EndSymbol(HtmlSymbolType.DoubleHyphen); return EndSymbol(HtmlSymbolType.DoubleHyphen);
default: default:
#if NET45 #if NET451
// No Debug.Fail in CoreCLR // No Debug.Fail in CoreCLR
Debug.Fail("Unexpected symbol!"); Debug.Fail("Unexpected symbol!");

2
src/Microsoft.AspNet.Razor/Tokenizer/Tokenizer.cs
View File

@ -281,7 +281,7 @@ namespace Microsoft.AspNet.Razor.Tokenizer
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void AssertCurrent(char current) internal void AssertCurrent(char current)
{ {
#if NET45 #if NET451
// No Debug.Assert with this many arguments in CoreCLR // No Debug.Assert with this many arguments in CoreCLR
Debug.Assert(CurrentCharacter == current, "CurrentCharacter Assumption violated", "Assumed that the current character would be {0}, but it is actually {1}", current, CurrentCharacter); Debug.Assert(CurrentCharacter == current, "CurrentCharacter Assumption violated", "Assumed that the current character would be {0}, but it is actually {1}", current, CurrentCharacter);

5
src/Microsoft.AspNet.Razor/project.json
View File

@ -12,9 +12,8 @@
} }
}, },
"frameworks": { "frameworks": {
"net45": { }, "net451": {},
"dnx451": { }, "dotnet5.4": {
"dnxcore50": {
"dependencies": { "dependencies": {
"System.Diagnostics.Tools": "4.0.1-beta-*", "System.Diagnostics.Tools": "4.0.1-beta-*",
"System.IO.FileSystem": "4.0.1-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",