Merge branch 'develop' into master

autofac · Sep 28, 2020 · 106fe19 · 106fe19
2 parents c308797 + 85e8edc
commit 106fe19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/src/Autofac.Integration.Mvc/Autofac.Integration.Mvc.csproj b/src/Autofac.Integration.Mvc/Autofac.Integration.Mvc.csproj
@@ -9,8 +9,7 @@
     <AssemblyName>Autofac.Integration.Mvc</AssemblyName>
     <AssemblyOriginatorKeyFile>../../Autofac.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageId>Autofac.Integration.Mvc</PackageId>
+    <PackageId>Autofac.Mvc5</PackageId>
     <PackageTags>autofac;di;ioc;dependencyinjection</PackageTags>
     <PackageReleaseNotes>Release notes are at https://github.com/autofac/Autofac.Mvc/releases</PackageReleaseNotes>
     <PackageIcon>icon.png</PackageIcon>
@@ -23,7 +22,6 @@
     <CodeAnalysisRuleSet>../../build/Analyzers.ruleset</CodeAnalysisRuleSet>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedAllSources>true</EmbedAllSources>
-    <CodeAnalysisRuleSet>../../build/Analyzers.ruleset</CodeAnalysisRuleSet>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <Authors>Autofac Contributors</Authors>
     <Company>Autofac</Company>
@@ -35,7 +33,6 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.1.0" />
     <PackageReference Include="Microsoft.AspNet.Razor" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNet.WebPages" Version="3.1.0" />
-
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
@@ -44,11 +41,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
-
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" Condition="Exists('$(MSBuildThisFileDirectory)../../.git')">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

diff --git a/src/Autofac.Integration.Mvc/Autofac.Integration.Mvc.nuspec b/src/Autofac.Integration.Mvc/Autofac.Integration.Mvc.nuspec