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

Merge branch 'release/2.2'

This commit is contained in:
Ajay Bhargav Baaskaran 2019-02-14 16:08:51 -08:00
parent 4a5b6ea169 a8277408d9
commit 7a26d27e8b
2214 changed files with 2094 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -166,7 +166,7 @@
-->
<DeterministicSourcePaths Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">false</DeterministicSourcePaths>
<!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
<MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
<MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
<!-- IIS native projects can only be built on Windows for x86 and x64. -->
<BuildIisNativeProjects Condition="'$(BuildNative)' != 'false' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64')">true</BuildIisNativeProjects>
</PropertyGroup>

34
eng/ProjectReferences.props
View File

@ -89,23 +89,23 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Runtime" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor" ProjectPath="$(RepositoryRoot)src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ApiExplorer" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Core" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Cors" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.DataAnnotations" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Json" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Localization" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.RazorPages" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TagHelpers" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Testing" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ViewFeatures" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ApiExplorer" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Core" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Cors" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.DataAnnotations" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Json" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Formatters.Json\src\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Formatters.Xml\src\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Localization" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Razor.RuntimeCompilation\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.RazorPages" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TagHelpers" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Testing" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ViewFeatures" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Tasks" ProjectPath="$(RepositoryRoot)src\Mvc\Extensions.ApiDescription.Design\src\Microsoft.Extensions.ApiDescription.Design.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" ProjectPath="$(RepositoryRoot)src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />

4
src/Azure/Azure.sln
View File

@ -43,9 +43,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{240BBDB1-3501-4637-8A17-996EA4EBB20B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{9EC158BE-EB9C-4627-931D-B1B95D3210B6}"
EndProject

28
src/Identity/Identity.sln
View File

@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{0FB4E0D1-6822-44EB-99EB-EBAADEDFFFBE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{A20AC82F-1F82-41ED-86AD-FF12A157DA0D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{A20AC82F-1F82-41ED-86AD-FF12A157DA0D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{40D18785-1336-41AD-8577-EF20D3F96EC8}"
EndProject
@ -117,27 +117,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOv
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{5F5CCADC-2485-4CD1-8311-A68293FD415F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{E577FDF3-AC0A-4D07-8A6D-1DAFA9379261}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{E577FDF3-AC0A-4D07-8A6D-1DAFA9379261}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{20FF8D33-45D1-40F4-BEAF-A529290C1A17}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{20FF8D33-45D1-40F4-BEAF-A529290C1A17}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{174C92E9-EA25-4416-BF1E-19F48FE2A472}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{174C92E9-EA25-4416-BF1E-19F48FE2A472}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{03EE3372-4CA3-4615-BDCA-1B34F098CE82}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{03EE3372-4CA3-4615-BDCA-1B34F098CE82}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{E36B945B-B787-4BD3-8293-10FED0D6479E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{E36B945B-B787-4BD3-8293-10FED0D6479E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{87A10D30-9188-4596-9479-750D7D459FF1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{87A10D30-9188-4596-9479-750D7D459FF1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{344224B0-FBFB-4253-B9A8-27F6A8310AFE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{344224B0-FBFB-4253-B9A8-27F6A8310AFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{AE76EC89-F6D1-4DC6-9005-416CE844DFD7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{AE76EC89-F6D1-4DC6-9005-416CE844DFD7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{F7E6FF46-9C2F-4436-9D08-1C53116324A9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{F7E6FF46-9C2F-4436-9D08-1C53116324A9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{C00BD37E-E4BE-4395-8367-37E0A48193FF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{C00BD37E-E4BE-4395-8367-37E0A48193FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{C6E58980-524F-4EA5-B1F4-8E4921F7FDB1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{C6E58980-524F-4EA5-B1F4-8E4921F7FDB1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{B00267C8-5CE0-4262-8305-BD483C769F12}"
EndProject
@ -169,11 +169,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "..\Security\Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{6851694F-D440-41A1-8B89-37FB5919850B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{5F087B72-577F-4280-8718-E3ADB325A0C1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "..\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{5F087B72-577F-4280-8718-E3ADB325A0C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{DEE09DF3-DFBF-4651-A562-88C2592C9E16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{0B3EC292-625E-4C3A-984A-DF41A3501CEE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{0B3EC292-625E-4C3A-984A-DF41A3501CEE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{22A687BB-5170-4312-97CD-0FECA1C3FE98}"
EndProject

2
src/Mvc/test/Directory.Build.props → src/Mvc/Directory.Build.props
View File

@ -1,7 +1,7 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<PropertyGroup Condition=" '$(IsTestProject)' == 'true' ">
<IsPackable>false</IsPackable>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)MvcTests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs → src/Mvc/Extensions.ApiDescription.Design/src/DownloadFile.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs → src/Mvc/Extensions.ApiDescription.Design/src/GetCurrentItems.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs → src/Mvc/Extensions.ApiDescription.Design/src/GetFileReferenceMetadata.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs → src/Mvc/Extensions.ApiDescription.Design/src/GetProjectReferenceMetadata.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs → src/Mvc/Extensions.ApiDescription.Design/src/GetUriReferenceMetadata.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs → src/Mvc/Extensions.ApiDescription.Design/src/MetadataSerializer.cs
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj → src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.csproj
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec → src/Mvc/Extensions.ApiDescription.Design/src/Microsoft.Extensions.ApiDescription.Design.nuspec
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs → src/Mvc/Extensions.ApiDescription.Design/src/Properties/Resources.Designer.cs generated
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx → src/Mvc/Extensions.ApiDescription.Design/src/Resources.resx
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props → src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.props
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets → src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
View File

0
src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets → src/Mvc/Extensions.ApiDescription.Design/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
View File

0
src/Mvc/src/GetDocumentInsider/AnsiConsole.cs → src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
View File

0
src/Mvc/src/GetDocumentInsider/AnsiConstants.cs → src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
View File

0
src/Mvc/src/GetDocumentInsider/AnsiTextWriter.cs → src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandException.cs → src/Mvc/GetDocumentInsider/src/CommandException.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
View File

0
src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs → src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/CommandBase.cs → src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommand.cs → src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs → src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs → src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/HelpCommandBase.cs → src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs
View File

0
src/Mvc/src/GetDocumentInsider/Commands/ProjectCommandBase.cs → src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
View File

0
src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj → src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj
View File

0
src/Mvc/src/GetDocumentInsider/ProductInfo.cs → src/Mvc/GetDocumentInsider/src/ProductInfo.cs
View File

0
src/Mvc/src/GetDocumentInsider/Program.cs → src/Mvc/GetDocumentInsider/src/Program.cs
View File

0
src/Mvc/src/GetDocumentInsider/Properties/Resources.Designer.cs → src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs generated
View File

0
src/Mvc/src/GetDocumentInsider/Reporter.cs → src/Mvc/GetDocumentInsider/src/Reporter.cs
View File

0
src/Mvc/src/GetDocumentInsider/Resources.resx → src/Mvc/GetDocumentInsider/src/Resources.resx
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorExtensions.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorProviderContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/ActionInvokerProviderContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/IActionDescriptorProvider.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvoker.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/IActionInvokerProvider.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs → src/Mvc/Mvc.Abstractions/src/Abstractions/ParameterDescriptor.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintItem.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintProviderContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionSelectorCandidate.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraint.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintFactory.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintMetadata.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs → src/Mvc/Mvc.Abstractions/src/ActionConstraints/IActionConstraintProvider.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs → src/Mvc/Mvc.Abstractions/src/ActionContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescription.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescriptionProviderContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterDescription.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterRouteInfo.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiRequestFormat.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseFormat.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs → src/Mvc/Mvc.Abstractions/src/ApiExplorer/IApiDescriptionProvider.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs → src/Mvc/Mvc.Abstractions/src/Authorization/IAllowAnonymousFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutedContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutingContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs → src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutionDelegate.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/AuthorizationFilterContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ExceptionContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/FilterContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs → src/Mvc/Mvc.Abstractions/src/Filters/FilterDescriptor.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs → src/Mvc/Mvc.Abstractions/src/Filters/FilterItem.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/FilterProviderContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IActionFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAlwaysRunResultFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncActionFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAlwaysRunResultFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncAuthorizationFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncExceptionFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResourceFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IAuthorizationFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IExceptionFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs → src/Mvc/Mvc.Abstractions/src/Filters/IFilterContainer.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs → src/Mvc/Mvc.Abstractions/src/Filters/IFilterFactory.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs → src/Mvc/Mvc.Abstractions/src/Filters/IFilterMetadata.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs → src/Mvc/Mvc.Abstractions/src/Filters/IFilterProvider.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IOrderedFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IResourceFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs → src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutedContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutingContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutionDelegate.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutedContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutingContext.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs → src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutionDelegate.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs → src/Mvc/Mvc.Abstractions/src/Formatters/FormatterCollection.cs
View File

0
src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs → src/Mvc/Mvc.Abstractions/src/Formatters/IInputFormatter.cs
View File

Some files were not shown because too many files have changed in this diff Show More