diff --git a/build/buildorder.props b/build/buildorder.props index 5a71a5701c..74e3caa853 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index ee4a71ad2b..57d752b837 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -93,6 +93,14 @@ 2.2.0 2.2.0 + + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 2.2.0 diff --git a/build/repo.props b/build/repo.props index ee8417d7eb..2e33af8567 100644 --- a/build/repo.props +++ b/build/repo.props @@ -93,6 +93,7 @@ $(RepositoryRoot)src\Tools\**\*.*proj; $(RepositoryRoot)src\Middleware\**\*.*proj; $(RepositoryRoot)src\Razor\**\*.*proj; + $(RepositoryRoot)src\Mvc\**\*.*proj; " Exclude=" @(ProjectToExclude); diff --git a/build/submodules.props b/build/submodules.props index 0a0f81a974..8baedbe63a 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -52,7 +52,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 70ce243290..1db3a3f498 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -459,6 +459,163 @@ + + + 2.2.0 + + + + + + + + 2.2.0 + + + + + 2.2.0 + + + + + + + 2.2.0 + + + + + + + + + + + + + + + + + + + + + 2.2.0 + + + + + + + + 2.2.0 + + + + + + + + + 2.2.0 + + + + + + + + 2.2.0 + + + + + + + 2.2.0 + + + + + + + + + + 2.2.0 + + + + + + + + + + + + + + + + + + + + + + + 2.2.0 + + + + + + + 2.2.0 + + + + + + + + + + + + 2.2.0 + + + + + + + + 2.2.0 + + + + + + + + + + + + + + 2.2.0 + + + + + + + 2.2.0 @@ -471,6 +628,25 @@ + + + 2.2.0 + + + + + + + + + + + + + + + + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 075e8e4d39..097cf1c302 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -59,7 +59,23 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. + + + + + + + + + + + + + + + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index eceda0d145..06b0e956cf 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -21,11 +21,14 @@ and are generated based on the last package release. + + + @@ -45,6 +48,7 @@ and are generated based on the last package release. + @@ -58,7 +62,9 @@ and are generated based on the last package release. + + @@ -86,6 +92,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 718fc4f1b3..b730c1927b 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -22,7 +22,6 @@ - @@ -41,11 +40,10 @@ + - - @@ -93,7 +91,6 @@ - @@ -102,5 +99,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index fefa42496b..a49a65b988 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -27,4 +27,16 @@ + + + + + <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)"> + $(MSBuildProjectName) + $(PackageVersion) + + + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 965da850bc..da076a33ca 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -86,7 +86,7 @@ <_ReferenceTemp Remove="@(_ReferenceTemp)" /> - + - 99.9 - - diff --git a/src/Mvc/NuGetPackageVerifier.json b/src/Mvc/NuGetPackageVerifier.json deleted file mode 100644 index f551b83476..0000000000 --- a/src/Mvc/NuGetPackageVerifier.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.Extensions.ApiDescription.Design": { - "Exclusions": { - "BUILD_ITEMS_FRAMEWORK": { - "*": "Package includes tool with different target frameworks." - }, - "SERVICING_ATTRIBUTE": { - "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process" - }, - "WRONG_PUBLICKEYTOKEN": { - "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process" - }, - "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": { - "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process" - }, - "ASSEMBLY_FILE_VERSION_MISMATCH": { - "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process" - }, - "ASSEMBLY_VERSION_MISMATCH": { - "tools/Newtonsoft.Json.dll": "External assembly, not built as part of this process" - } - } - } - } - } -} diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index ec6e654069..54aa4c1949 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -8,6 +8,7 @@ $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS CS8002;$(WarningsNotAsErrors) + true @@ -21,16 +22,16 @@ - - + + - + - - - + + + - + diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index 6e62f39598..38475ea537 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -8,6 +8,7 @@ $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS CS8002;$(WarningsNotAsErrors) + true @@ -21,16 +22,16 @@ - - - + + + - + - + - - + + diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj index dc531b3fdf..998cf3bd61 100644 --- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -1,23 +1,24 @@  netcoreapp2.2 + true - - + + - + - - + + diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index da89cbef0a..6feb0c547c 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -8,12 +8,9 @@ - - - - - - + + + diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props deleted file mode 100644 index 30a3d6a350..0000000000 --- a/src/Mvc/build/dependencies.props +++ /dev/null @@ -1,109 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - 0.9.9 - 0.10.13 - 2.1.1 - 2.1.1 - 2.1.1 - 0.43.0 - 2.1.1.1 - 2.1.1 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-a-rtm-fix-wildcard-16567 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.0.0 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-a-rtm-allow-required-parameters-17081 - 2.2.0-a-rtm-allow-required-parameters-17081 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 5.2.6 - 15.6.82 - 2.8.0 - 2.8.0 - 2.2.0-rtm-35519 - 1.7.0 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.1.0 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 2.0.9 - 2.1.3 - 2.2.0-preview3-27014-02 - 2.2.0-rtm-35519 - 2.2.0-rtm-35519 - 15.6.1 - 4.10.0 - 2.0.3 - 1.0.1 - 11.0.2 - 4.5.0 - 4.5.0 - 4.3.2 - 4.5.1 - 0.10.0 - 2.3.1 - 2.4.0 - - - - diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props deleted file mode 100644 index cbc905abfe..0000000000 --- a/src/Mvc/build/repo.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - true - - - - - - - - - - - - - - diff --git a/src/Mvc/build/sources.props b/src/Mvc/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/Mvc/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj index d9e021ff7a..3690f54057 100644 --- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj +++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj @@ -10,18 +10,17 @@ - + - + - - - - - - - + + + + + + diff --git a/src/Mvc/src/Directory.Build.props b/src/Mvc/src/Directory.Build.props deleted file mode 100644 index a111c45919..0000000000 --- a/src/Mvc/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj index 03d6440c1f..487b5eb175 100644 --- a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj +++ b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj @@ -1,4 +1,4 @@ - + GetDocument.Insider GetDocument Command-line Tool inside man @@ -6,6 +6,7 @@ Exe Microsoft.Extensions.ApiDescription.Tool netcoreapp2.0;net461 + false @@ -13,7 +14,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 1b3f5091ad..80960154f3 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more. @@ -15,12 +15,12 @@ Microsoft.AspNetCore.Mvc.IActionResult - - + + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj index 7e796c0673..dffbba691b 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj @@ -1,4 +1,4 @@ - + CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc @@ -11,7 +11,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj index 97ec69ad41..fe0b7f0b33 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj @@ -1,4 +1,4 @@ - + CSharp Analyzers for ASP.NET Core MVC. aspnetcore;aspnetcoremvc @@ -16,7 +16,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 308a2f225b..eb0e93f65a 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods. @@ -9,7 +9,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index 9e9a1556ca..a75587f0ff 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC core components. Contains common action result types, attribute routing, application model conventions, API explorer, application parts, filters, formatters, model binding, and more. @@ -27,28 +27,27 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj index 379eca0738..1ef6f1f061 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC cross-origin resource sharing (CORS) features. @@ -9,9 +9,9 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 33df42b291..b5484fe05a 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations. @@ -9,9 +9,9 @@ - + - - + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index b203286a9b..8a88bf31f3 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET. @@ -13,8 +13,8 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 18dcb55e3a..184a49032e 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer. @@ -9,6 +9,6 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj index a20bb199aa..a8a888c8fa 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC features that enable globalization and localization of applications. @@ -12,11 +12,11 @@ Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer - + - - - + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj index 4bef4f811f..95d2855007 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC Razor view engine for CSHTML files. @@ -11,14 +11,14 @@ - + - - - + + + @@ -27,6 +27,25 @@ + + + true diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 1655f9da77..0aae8dad12 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC Razor Pages. @@ -9,7 +9,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index 5bd518d2f0..0d120b8905 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more. @@ -13,12 +13,12 @@ - + - - - - + + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj index 058ec2af63..8ad5b1a6e2 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj @@ -1,4 +1,4 @@ - + Support for writing functional tests for MVC applications. @@ -9,11 +9,11 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 878ac41bd4..cb43fd24cf 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers. @@ -14,15 +14,15 @@ Microsoft.AspNetCore.Mvc.ViewComponent - - - + + + - - - - - + + + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj index f6b6300835..686e3eaaa5 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj @@ -1,4 +1,4 @@ - + Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations. @@ -15,11 +15,11 @@ System.Web.Http.ApiController - - + + - - + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj index 9b21543c20..56586c73e0 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and web APIs. ASP.NET Core MVC enables a clean separation of concerns and gives you full control over markup. @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + @@ -26,8 +26,8 @@ None - - + + diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj index 7809b19970..131efab5e3 100644 --- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj +++ b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj @@ -1,4 +1,4 @@ - + $(GenerateNuspecDependsOn);PopulateNuspec diff --git a/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj b/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj index ebda3eb047..5ad59d4ee0 100644 --- a/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj +++ b/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj @@ -1,4 +1,4 @@ - + dotnet-getdocument GetDocument Command-line Tool outside man @@ -7,6 +7,7 @@ Exe Microsoft.Extensions.ApiDescription.Tool netcoreapp2.1 + false @@ -20,6 +21,6 @@ - + diff --git a/src/Mvc/test/Directory.Build.props b/src/Mvc/test/Directory.Build.props index ff13641a43..0ad6f80e28 100644 --- a/src/Mvc/test/Directory.Build.props +++ b/src/Mvc/test/Directory.Build.props @@ -1,5 +1,5 @@ - + netcoreapp2.2 @@ -12,12 +12,4 @@ false $(MSBuildThisFileDirectory)MvcTests.ruleset - - - - - - - - diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj index a02016bd2e..5e8a158fa2 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -6,8 +6,6 @@ - - diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj index b1ca115faa..79dcfec4b7 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj @@ -1,13 +1,12 @@ - + $(StandardTestTfms) - - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index f030903427..d395ba9c6f 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -10,12 +10,11 @@ - - + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj index 053be86a52..efeebda6a8 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj @@ -1,18 +1,18 @@ - + $(StandardTestTfms) + true - - - - + + + - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj index 59269389e9..9e03f19267 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj @@ -1,13 +1,12 @@ - + $(StandardTestTfms) - + - diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index 14f4f05b2f..ac331deea2 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -7,7 +7,7 @@ - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj index 6536b2ef40..96234292a1 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj @@ -1,13 +1,12 @@ - + $(StandardTestTfms) - + - diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj index 14f4f05b2f..ac331deea2 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -7,7 +7,7 @@ - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index ee077d61cc..4899856370 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ - + @@ -50,16 +50,16 @@ - + - - + + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index be6dd3242f..ee79194e3c 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -1,14 +1,14 @@ - + $(StandardTestTfms) - + - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj index 28b41219a9..cf1d2df465 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj @@ -1,11 +1,11 @@ - + $(StandardTestTfms) - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index dfad09da25..36b8087c0e 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -12,11 +12,11 @@ - + - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index 967a8c3ef4..ae6afb89d0 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -1,15 +1,15 @@ - + $(StandardTestTfms) - + - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index fd04152330..bb2bd89542 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -1,14 +1,16 @@ - + $(StandardTestTfms) - - + + - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj index d0fbd363f4..e5b0d12772 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -10,9 +10,9 @@ - - + + - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj index 9ce101241e..c8c669d5e7 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj @@ -1,10 +1,11 @@ - + $(StandardTestTfms) + true - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index 1c7b9e362e..eb45ca869d 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj index 4cf0e46940..290f1cb794 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj @@ -1,18 +1,17 @@ - + $(StandardTestTfms) + true - - + - - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj index 42bdfc7899..778cdddd03 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj @@ -1,18 +1,18 @@ - + $(StandardTestTfms) true true + true - + - - - + + diff --git a/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj b/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj index 48a2919472..9b1a4de692 100644 --- a/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj +++ b/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -11,12 +11,11 @@ - - + + - - - + + diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj index 8e9ee75ed7..ac00f916bf 100644 --- a/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -11,12 +11,11 @@ - - + + - - - + + diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs index fa410dc115..65d7167e6c 100644 --- a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs @@ -4,6 +4,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers { public class Home : PageModel { +#pragma warning disable MVC1001 [ProducesResponseType(302)] public IActionResult OnPost(int id) { @@ -14,5 +15,6 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers return Page(); } +#pragma warning restore MVC1001 } } diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj index 239ce99f78..d05aa847d8 100644 --- a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj +++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj index 212a619b2e..979e5c5222 100644 --- a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj +++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj index 2744228b2e..c0341151c5 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj +++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj @@ -2,6 +2,7 @@ $(StandardTestWebsiteTfms) + true @@ -9,25 +10,25 @@ - - + + - - + + - - + + - - - - - - + + + + + + diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj index 8d0ce3d813..e631ded388 100644 --- a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj +++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj @@ -3,9 +3,10 @@ $(StandardTestWebsiteTfms) true + true - + diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj index 022617ccd6..e532bd02fa 100644 --- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj +++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj @@ -2,16 +2,18 @@ $(StandardTestWebsiteTfms) + true - - - - - + + + + + + diff --git a/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj index 7cb00b8351..3361268a60 100644 --- a/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj +++ b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj @@ -2,15 +2,16 @@ $(StandardTestWebsiteTfms) + true - - + + - - - - + + + + diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props index 2ff6b1fb54..34acb5af38 100644 --- a/src/Mvc/test/WebSites/Directory.Build.props +++ b/src/Mvc/test/WebSites/Directory.Build.props @@ -1,6 +1,6 @@ - + netcoreapp2.2 diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index 52dc3bc28e..c34f7d787c 100644 --- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -5,14 +5,15 @@ full false + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj index 357a7fb863..7ef6adc56d 100644 --- a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj +++ b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj @@ -2,6 +2,8 @@ $(StandardTestWebsiteTfms) + false + true @@ -11,12 +13,12 @@ - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj index c8f6df1d20..e058430689 100644 --- a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj +++ b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj @@ -2,6 +2,7 @@ $(StandardTestWebsiteTfms) + true @@ -10,11 +11,11 @@ - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj index 239ce99f78..d05aa847d8 100644 --- a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj +++ b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index 212a619b2e..546722c75e 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - + + + + - - - diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml index 3706c6cdd2..e2b622f032 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml @@ -21,7 +21,7 @@ @Html.DisplayFor(m => m)
- @Html.Partial("PartialForViewModel") + @(await Html.PartialAsync("PartialForViewModel"))
@(await Component.InvokeAsync()) diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml index 92c0267af8..0028493f0f 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml @@ -15,7 +15,7 @@ }
- @Html.Partial(partialViewName: "LackModel.cshtml") + @(await Html.PartialAsync(partialViewName: "LackModel.cshtml"))
@(await Component.InvokeAsync()) diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml index bf3f5e64d9..d647c0ccc5 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml @@ -24,7 +24,7 @@ @Html.DisplayFor(m => m, templateName: "LackModel")
- @Html.Partial(partialViewName: "DisplayTemplates/LackModel.cshtml") + @(await Html.PartialAsync(partialViewName: "DisplayTemplates/LackModel.cshtml"))
@(await Component.InvokeAsync()) diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj index 73549c2142..5852d7d33c 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj @@ -1,12 +1,13 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) + true - + diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj index 73549c2142..5852d7d33c 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj @@ -1,12 +1,13 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) + true - + diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index c2307238bc..2e041a5844 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -1,23 +1,24 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) false + true - + - - - - + + + + false + true - - - + diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml index 9e0c846031..99cd541a61 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml @@ -1,2 +1,2 @@ @page -@Html.Partial("_FileInShared") \ No newline at end of file +@(await Html.PartialAsync("_FileInShared")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index a0930364cb..9bf21a8adf 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -2,16 +2,18 @@ $(StandardTestWebsiteTfms) + true - + - - - - + + + + + diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml index 4b7d8ae335..0084534e52 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml @@ -1,3 +1,3 @@ -@Html.Partial("../EmbeddedShared/_Partial.cshtml") -@Html.Partial("_EmbeddedPartial") +@(await Html.PartialAsync("../EmbeddedShared/_Partial.cshtml")) +@(await Html.PartialAsync("_EmbeddedPartial")) Tag Helper Link diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml index 1aca712209..03303e5f91 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml @@ -1,2 +1,2 @@ @{ Layout = "../EmbeddedShared/_Layout"; } -@Html.Partial("./EmbeddedPartial") \ No newline at end of file +@(await Html.PartialAsync("./EmbeddedPartial")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj index 9de4814189..f935ea836a 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -3,6 +3,7 @@ $(StandardTestWebsiteTfms) $(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE + true @@ -10,13 +11,14 @@ - + + + + + + + - - - - - diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml index e28dd6e75f..2685d9023f 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml @@ -3,4 +3,4 @@ Layout = "_Layout"; } Page -@Html.Partial("_BackSlashPartial") \ No newline at end of file +@(await Html.PartialAsync("_BackSlashPartial")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml index 0178074b3f..90beca3986 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml @@ -1 +1 @@ -@Html.Partial("_ExpanderPartial") \ No newline at end of file +@(await Html.PartialAsync("_ExpanderPartial")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml index 981fbb5c34..b5623ecf0f 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml @@ -1,3 +1,3 @@ @model Person @Model.Name -@Html.Partial("_Partial", Model.Address) \ No newline at end of file +@(await Html.PartialAsync("_Partial", Model.Address)) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml index 12619d26bf..bb6f49b30c 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml @@ -1,4 +1,4 @@ @{ Layout = null; } -@Html.Partial("PartialMissingSection") \ No newline at end of file +@(await Html.PartialAsync("PartialMissingSection")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml index 3c2c59e986..a02bd71da0 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml @@ -1 +1 @@ -@Html.Partial("_SharedFromPages") +@(await Html.PartialAsync("_SharedFromPages")) diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml index b4396d7849..b1b7d27d9d 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml @@ -1,4 +1,4 @@ @{ var partial = (string)ViewData["Partial"]; } -@Html.Partial(partial) +@(await Html.PartialAsync(partial)) diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml index 46f7e96b35..3c9afbc493 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml @@ -2,5 +2,5 @@ @ViewContext.ExecutingFilePath @ViewContext.View.Path @await Component.InvokeAsync("ComponentForViewWithPaths") - @Html.Partial("_Partial") + @(await Html.PartialAsync("_Partial")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml index 71684f7ea6..b85a43861c 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml +++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml @@ -1,3 +1,3 @@ @inject FrameworkSpecificHelper MyHelper @MyHelper.ExecuteOperation() -@Html.Partial("_Partial") \ No newline at end of file +@(await Html.PartialAsync("_Partial")) \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj index a570b1471e..cb955eae36 100644 --- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -2,6 +2,7 @@ $(StandardTestWebsiteTfms) + true @@ -9,11 +10,11 @@ - + + + + - - - diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index 86d439be9f..282bdd5db7 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -2,15 +2,16 @@ $(StandardTestWebsiteTfms) + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj index 9989c770c6..701d552c4a 100644 --- a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj +++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj @@ -2,12 +2,13 @@ $(StandardTestWebsiteTfms) + true - + - - + + diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index cf4976e941..0148e59a14 100644 --- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -3,14 +3,15 @@ $(StandardTestWebsiteTfms) true + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj index 28f147e981..5e686352ea 100644 --- a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj +++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj @@ -2,6 +2,7 @@ $(StandardTestWebsiteTfms) + true @@ -9,10 +10,10 @@ - + - - - + + + diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index fd4dd53d70..8165cb031c 100644 --- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj index e8cef0d108..eb218807a1 100644 --- a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj +++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj @@ -1,14 +1,15 @@  $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/version.props b/src/Mvc/version.props deleted file mode 100644 index 0f03397e5d..0000000000 --- a/src/Mvc/version.props +++ /dev/null @@ -1,13 +0,0 @@ - - - 2.2.0 - rtm - t000 - a- - - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index 671eee1336..a14f251ce7 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -15,7 +15,7 @@ - +