Merge in 'release/3.2.8' changes

aspnet · Mar 30, 2022 · 005f94e · 005f94e
2 parents 20c076c + 362b7be
commit 005f94e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/src/WebApiHelpPage/VB/WebApiHelpPage.VB.nuspec b/src/WebApiHelpPage/VB/WebApiHelpPage.VB.nuspec
@@ -8,8 +8,6 @@
     <owners>Microsoft</owners>
     <projectUrl>http://www.asp.net/web-api</projectUrl>
     <repository type="git" url="https://github.com/aspnet/AspNetWebStack"/>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://www.microsoft.com/web/webpi/eula/mvc4extensions_prerelease_eula.htm</licenseUrl>
     <description>The ASP.NET Web API Help Page automatically generates help page content for the web APIs on your site. Visitors to your help page can use this content to learn how to call your web APIs. Everything generated by the help page is fully customizable using ASP.NET MVC and Razor. ASP.NET Web API Help Page is a great addition to any ASP.NET Web API project.</description>
     <summary>The ASP.NET Web API Help Page automatically generates help page content for the web APIs on your site.</summary>
     <dependencies>

diff --git a/src/WebApiHelpPage/VB/WebApiHelpPageVB.vbproj b/src/WebApiHelpPage/VB/WebApiHelpPageVB.vbproj
@@ -11,8 +11,6 @@
     <RunCodeAnalysis>$(CodeAnalysis)</RunCodeAnalysis>
     <CodeAnalysisRuleSet>..\..\Strict.ruleset</CodeAnalysisRuleSet>
     <MyType>Windows</MyType>
-    <!-- Ignore warning about deprecated <licenseUrl> in the .nuspec. -->
-    <NoWarn Condition=" '$(MSBuildRuntimeType)' == 'core' ">$(NoWarn);NU5125</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>

diff --git a/src/WebApiHelpPage/WebApiHelpPage.csproj b/src/WebApiHelpPage/WebApiHelpPage.csproj
@@ -13,8 +13,6 @@
     <CodeAnalysisRuleSet>..\Strict.ruleset</CodeAnalysisRuleSet>
     <DefineConstants>$(DefineConstants);ASPNETMVC</DefineConstants>
     <NoWarn>1591</NoWarn>
-    <!-- Ignore warning about deprecated <licenseUrl> in the .nuspec. -->
-    <NoWarn Condition=" '$(MSBuildRuntimeType)' == 'core' ">$(NoWarn);NU5125</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/src/WebApiHelpPage/WebApiHelpPage.nuspec b/src/WebApiHelpPage/WebApiHelpPage.nuspec
@@ -8,8 +8,6 @@
     <owners>Microsoft</owners>
     <projectUrl>http://www.asp.net/web-api</projectUrl>
     <repository type="git" url="https://github.com/aspnet/AspNetWebStack"/>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://www.microsoft.com/web/webpi/eula/mvc4extensions_prerelease_eula.htm</licenseUrl>
     <description>The ASP.NET Web API Help Page automatically generates help page content for the web APIs on your site. Visitors to your help page can use this content to learn how to call your web APIs. Everything generated by the help page is fully customizable using ASP.NET MVC and Razor. ASP.NET Web API Help Page is a great addition to any ASP.NET Web API project.</description>
     <summary>The ASP.NET Web API Help Page automatically generates help page content for the web APIs on your site.</summary>
     <dependencies>
@@ -22,7 +20,7 @@
       <frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations"  />
     </frameworkAssemblies>
     <language>en-US</language>
-    <tags>Microsoft AspNet WebApi AspNetWebApi HelpPage</tags>    
+    <tags>Microsoft AspNet WebApi AspNetWebApi HelpPage</tags>
   </metadata>
   <files>
     <file src="Areas\HelpPage\App_Start\HelpPageConfig.cs.pp" target="content\Areas\HelpPage\App_Start\HelpPageConfig.cs.pp" />