From 7611f89642aa09c3caa45785a5780ab6cc9658e3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 4 Sep 2018 11:13:13 +0200
Subject: [PATCH] Update nuspec and dependencies

---
 build/NuSpecs/UmbracoCms.Core.nuspec       |  3 ++-
 build/NuSpecs/UmbracoCms.Web.nuspec        |  4 +++-
 build/NuSpecs/UmbracoCms.nuspec            | 22 ++++++++++++++++------
 build/NuSpecs/tools/Web.config.install.xdt |  4 ----
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj   |  2 +-
 src/Umbraco.Web.UI/web.Template.config     |  6 +++---
 6 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 243faff150..daa0018668 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -10,7 +10,7 @@
         <projectUrl>http://umbraco.com/</projectUrl>
         <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
@@ -43,6 +43,7 @@
         </dependencies>
     </metadata>
     <files>
+        <!-- libs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
 
         <!-- docs -->
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 87cc6846c7..eeb23b461e 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -10,7 +10,7 @@
         <projectUrl>http://umbraco.com/</projectUrl>
         <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+        <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
@@ -26,6 +26,7 @@
             <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
             <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
             <dependency id="Examine" version="[1.0.0-beta025,1.999999)" />
+            <dependency id="Lucene.Net.Contrib" version="[3.0.3,3.999999)" />
             <dependency id="HtmlAgilityPack" version="[1.7.2,1.999999)" />
             <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
             <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
@@ -42,6 +43,7 @@
         </dependencies>
     </metadata>
     <files>
+        <!-- libs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 6ec3439bac..7a7f672ea6 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -25,32 +25,42 @@
             <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.22]" />
             <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
             <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
+            <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.0,2.999999)" />
+            <dependency id="Microsoft.Net.Compilers" version="[2.9.0,2.999999)" />
         </dependencies>
     </metadata>
     <files>
+        <!-- files -->
         <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
         <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
         <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
         <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
         <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
         <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
 
-        <file src="tools\install.ps1" target="tools\install.ps1" />
+        <!-- these files are copied by install.ps1 -->
+        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+        <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
 
+        <!-- tools -->
+        <!-- beware! install.ps1 not supported by PackageReference -->
+        <file src="tools\install.ps1" target="tools\install.ps1" />
         <file src="tools\Readme.txt" target="tools\Readme.txt" />
         <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
+
+        <!-- config transforms -->
+        <!-- beware! config transforms not supported by PackageReference -->
         <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
         <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
         <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
         <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
         <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
         <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
+        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME Content\ !! and then... transform?! -->
 
+        <!-- UmbracoCms props and targets -->
         <file src="build\**" target="build" />
     </files>
 </package>
diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 027d1e49a6..fa3ab86ba2 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -150,10 +150,6 @@
 
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
-        </dependentAssembly>
         <dependentAssembly xdt:Transform="Insert">
             <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
             <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b4fb0500cd..ecf405d4f0 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -95,7 +95,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.6" />
     <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.6" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
-    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="1.0.8" />
+    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="2.0.0" />
     <PackageReference Include="Microsoft.Net.Compilers" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
       <!-- development dependency -->
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index f0da7ebe62..771e9cc85f 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -12,7 +12,7 @@
         <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
         <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
         <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" />
-        
+
         <sectionGroup name="umbracoConfiguration">
             <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
             <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
@@ -294,11 +294,11 @@
     <system.codedom>
         <compilers>
             <compiler language="c#;cs;csharp" extension=".cs"
-              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
               warningLevel="4"
                compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
             <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
-             type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+             type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
              warningLevel="4"
              compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
         </compilers>