Fixing merge errors and upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 2.0.1 where necessary

This commit is contained in:
Lombiq
2019-02-20 21:18:30 +01:00
parent aced5c3e72
commit becb386adf
111 changed files with 83 additions and 478 deletions

View File

@@ -6,7 +6,6 @@
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net452" />
<package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net452" developmentDependency="true" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
<package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
</packages>