Skip to content

Commit 137bf3d

Browse files
ryanbrandenburgryanbrandenburg
committed
Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1
2 parents 54e9e55 + 1b46174 commit 137bf3d

File tree

2,005 files changed

+226205
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,005 files changed

+226205
-0
lines changed

‎src/Razor/.editorconfig

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# EditorConfig is awesome:http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Don't use tabs for indentation.
7+
[*]
8+
indent_style = space
9+
# (Please don't specify an indent_size here; that has too many unintended consequences.)
10+
11+
# Code files
12+
[*.{cs,csx,vb,vbx}]
13+
indent_size = 4
14+
15+
# Xml project files
16+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
17+
indent_size = 2
18+
19+
# Xml config files
20+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
21+
indent_size = 2
22+
23+
# JSON files
24+
[*.json]
25+
indent_size = 2
26+
27+
# Dotnet code style settings:
28+
[*.cs]
29+
# Sort using and Import directives with System.* appearing first
30+
dotnet_sort_system_directives_first = true
31+
32+
# Don't use this. qualifier
33+
dotnet_style_qualification_for_field = false:suggestion
34+
dotnet_style_qualification_for_property = false:suggestion
35+
36+
# use int x = .. over Int32
37+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
38+
39+
# use int.MaxValue over Int32.MaxValue
40+
dotnet_style_predefined_type_for_member_access = true:suggestion
41+
42+
# Require var all the time.
43+
csharp_style_var_for_built_in_types = true:suggestion
44+
csharp_style_var_when_type_is_apparent = true:suggestion
45+
csharp_style_var_elsewhere = true:suggestion
46+
47+
# Disallow throw expressions.
48+
csharp_style_throw_expression = false:suggestion
49+
50+
# Newline settings
51+
csharp_new_line_before_open_brace = all
52+
csharp_new_line_before_else = true
53+
csharp_new_line_before_catch = true
54+
csharp_new_line_before_finally = true
55+
csharp_new_line_before_members_in_object_initializers = true
56+
csharp_new_line_before_members_in_anonymous_types = true

‎src/Razor/.gitignore

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
.build/
6+
.testPublish/
7+
*.sln.ide/
8+
_ReSharper.*/
9+
packages/
10+
artifacts/
11+
.build/
12+
PublishProfiles/
13+
*.user
14+
*.suo
15+
*.cache
16+
*.docstates
17+
_ReSharper.*
18+
nuget.exe
19+
project.lock.json
20+
*net45.csproj
21+
*net451.csproj
22+
*k10.csproj
23+
*.psess
24+
*.vsp
25+
*.pidb
26+
*.userprefs
27+
*DS_Store
28+
*.ncrunchsolution
29+
*.*sdf
30+
*.ipch
31+
.build/
32+
.vs/
33+
launchSettings.json
34+
global.json
35+
.vscode/*
36+
BenchmarkDotNet.Artifacts/
37+
Microsoft.VisualStudio.RazorExtension.nuget.props
38+
Microsoft.VisualStudio.RazorExtension.nuget.targets
39+
msbuild.binlog
40+
msbuild.log

‎src/Razor/Directory.Build.props

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<Import
3+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
4+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
5+
6+
<Import Project="version.props" />
7+
<Import Project="build\dependencies.props" />
8+
<Import Project="build\sources.props" />
9+
10+
<PropertyGroup>
11+
<Product>Microsoft ASP.NET Core</Product>
12+
<RepositoryUrl>https://github.com/aspnet/Razor</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
15+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
16+
<SignAssembly>true</SignAssembly>
17+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
18+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19+
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
24+
</ItemGroup>
25+
26+
</Project>

‎src/Razor/Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5+
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
6+
</PropertyGroup>
7+
</Project>

‎src/Razor/NuGetPackageVerifier.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"adx-nonshipping": { // Packages written by the ADX team but that don't ship on NuGet.org (thus, no need to scan anything in them)
3+
"rules": [
4+
// Don't run any rules for packages the ADX team creates but doesn't ship.
5+
],
6+
"packages": {
7+
"Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": {},
8+
"RazorPageGenerator": {},
9+
"Microsoft.CodeAnalysis.Remote.Razor": {},
10+
"Microsoft.VisualStudio.Editor.Razor": {},
11+
"Microsoft.VisualStudio.LanguageServices.Razor": {},
12+
"Microsoft.VisualStudio.Mac.LanguageServices.Razor": {}
13+
}
14+
},
15+
"Default": { // Rules to run for packages not listed in any other set.
16+
"rules": [
17+
"DefaultCompositeRule"
18+
],
19+
"packages": {
20+
"Microsoft.AspNetCore.Razor.Design": {
21+
"exclusions": {
22+
"ASSEMBLY_DESCRIPTION": {
23+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
24+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions."
25+
},
26+
"NEUTRAL_RESOURCES_LANGUAGE": {
27+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
28+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
29+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
30+
},
31+
"ASSEMBLY_PRODUCT": {
32+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
33+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions."
34+
},
35+
"SERVICING_ATTRIBUTE": {
36+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
37+
},
38+
"VERSION_INFORMATIONALVERSION": {
39+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
40+
},
41+
"WRONG_PUBLICKEYTOKEN": {
42+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
43+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
44+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
45+
"tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
46+
"tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
47+
},
48+
"ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
49+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
50+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
51+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
52+
"tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
53+
"tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
54+
},
55+
"ASSEMBLY_FILE_VERSION_MISMATCH": {
56+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
57+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
58+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
59+
"tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
60+
"tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
61+
},
62+
"ASSEMBLY_VERSION_MISMATCH": {
63+
"tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
64+
"tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
65+
"tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
66+
"tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
67+
"tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
68+
}
69+
}
70+
}
71+
}
72+
}
73+
}

‎src/Razor/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Razor
2+
=====
3+
4+
Travis: [![Travis](https://travis-ci.org/aspnet/Razor.svg?branch=dev)](https://travis-ci.org/aspnet/Razor)
5+
6+
The Razor syntax provides a fast, terse, clean and lightweight way to combine server code with HTML to create dynamic web content. This repo contains the parser and the C# code generator for the Razor syntax.
7+
8+
This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://www.github.com/aspnet/home) repo.
9+
10+
## Building from source
11+
12+
To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details.

0 commit comments

Comments
 (0)