From 4a2ee801d4323fade05e6095ab7eb9071b7e976f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 29 Sep 2017 22:07:48 +0200
Subject: [PATCH] Fix build

---
 .../Modules/Umbraco.Build/Umbraco.Build.psm1  |  4 +-
 build/NuSpecs/UmbracoCms.Compat7.nuspec       |  4 --
 src/Umbraco.Web/Umbraco.Web.csproj            | 54 +++++++++++++++++++
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/build/Modules/Umbraco.Build/Umbraco.Build.psm1 b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
index ae1ba01951..5cb1028768 100644
--- a/build/Modules/Umbraco.Build/Umbraco.Build.psm1
+++ b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
@@ -218,12 +218,12 @@ function Compile-Umbraco
     /p:OutDir=$tmp\bin\\ `
     /p:WebProjectOutputDir=$tmp\WebApp\\ `
     /p:Verbosity=minimal `
-    /t:Clean`;Rebuild `
+    /t:Rebuild `
     /tv:$toolsVersion `
     /p:UmbracoBuild=True `
     > $tmp\msbuild.compat7.log
 
-  # /p:UmbracoBuild tells the csproj that we are building from PS
+  # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
 }
 
 #
diff --git a/build/NuSpecs/UmbracoCms.Compat7.nuspec b/build/NuSpecs/UmbracoCms.Compat7.nuspec
index 517acf88d4..d2719a694e 100644
--- a/build/NuSpecs/UmbracoCms.Compat7.nuspec
+++ b/build/NuSpecs/UmbracoCms.Compat7.nuspec
@@ -23,9 +23,5 @@
     <!--
     <file src="..\_BuildOutput\bin\Umbraco.Compat7.xml" target="lib\Umbraco.Compat7.xml" />
     -->
-
-    <!-- produce symbols package -->
-    <file src="$BuildTmp$\bin\Umbraco.Compat7.pdb" target="lib" />
-    <file src="$BuildTmp$\..\src\Umbraco.Compat7\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Compat7" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9ea8d78fb2..96271abf97 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -10,6 +10,7 @@
     <RootNamespace>Umbraco.Web</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -1690,4 +1691,57 @@
     </WebReferenceUrl>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  
+  <!--
+    copied from Microsoft.CSharp.targets
+    because we have webservices, we need to SGEN
+    but it's getting confused by us referencing System.ValueTuple which it cannot load
+    
+      Name="UmbGenerateSerializationAssemblies"
+      Condition="'$(_SGenGenerateSerializationAssembliesConfig)' == 'On' or ('@(WebReferenceUrl)'!='' and '$(_SGenGenerateSerializationAssembliesConfig)' == 'Auto')"
+  -->
+  <Target
+        Name="AfterBuild"
+        DependsOnTargets="AssignTargetPaths;Compile;ResolveKeySource"
+        Inputs="$(MSBuildAllProjects);@(IntermediateAssembly)"
+        Outputs="$(IntermediateOutputPath)$(_SGenDllName)">
+
+    <PropertyGroup>
+      <SGenMSBuildArchitecture Condition="'$(SGenMSBuildArchitecture)' == ''">$(PlatformTargetAsMSBuildArchitecture)</SGenMSBuildArchitecture>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple'" />
+    </ItemGroup>
+
+    <Delete
+        Files="$(TargetDir)$(TargetName).XmlSerializers.dll"
+        ContinueOnError="true" />
+     
+     <!--
+     ShouldGenerateSerializer="$(SGenShouldGenerateSerializer)"
+     -->
+    <SGen
+        BuildAssemblyName="$(TargetFileName)"
+        BuildAssemblyPath="$(IntermediateOutputPath)"
+        References="@(FixedReferencePath)"
+        ShouldGenerateSerializer="true"
+        UseProxyTypes="$(SGenUseProxyTypes)"
+        UseKeep="$(SGenUseKeep)"
+        KeyContainer="$(KeyContainerName)"
+        KeyFile="$(KeyOriginatorFile)"
+        DelaySign="$(DelaySign)"
+        ToolPath="$(SGenToolPath)"
+        SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)"
+        EnvironmentVariables="$(SGenEnvironment)"
+        MSBuildArchitecture="$(SGenMSBuildArchitecture)"
+        SerializationAssembly="$(IntermediateOutputPath)$(_SGenDllName)"
+        Platform="$(SGenPlatformTarget)"
+        Types="$(SGenSerializationTypes)">
+
+      <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly"/>
+
+    </SGen>
+
+  </Target>
 </Project>
\ No newline at end of file