From e0026352ead8934cc4d9e7d84482696e7be96bb7 Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Fri, 11 Nov 2016 18:46:04 +0000
Subject: [PATCH] [msvc] Update csproj files

---
 mcs/tools/linker/monolinker-net_4_x.csproj | 54 +++++++++++-----------
 msvc/scripts/order.xml                     | 11 -----
 net_4_x.sln                                |  6 ---
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/mcs/tools/linker/monolinker-net_4_x.csproj b/mcs/tools/linker/monolinker-net_4_x.csproj
index f6ccd23a3c7..00456789333 100644
--- a/mcs/tools/linker/monolinker-net_4_x.csproj
+++ b/mcs/tools/linker/monolinker-net_4_x.csproj
@@ -48,33 +48,33 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include=".\Mono.Linker.Steps\BaseStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\BlacklistStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\CleanStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\IStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\LoadI18nAssemblies.cs" />
-    <Compile Include=".\Mono.Linker.Steps\LoadReferencesStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\MarkStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\OutputStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\RegenerateGuidStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromAssemblyStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromXApiStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromXmlStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\ResolveStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\SweepStep.cs" />
-    <Compile Include=".\Mono.Linker.Steps\TypeMapStep.cs" />
-    <Compile Include=".\Mono.Linker\Annotations.cs" />
-    <Compile Include=".\Mono.Linker\AssemblyAction.cs" />
-    <Compile Include=".\Mono.Linker\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Linker\AssemblyResolver.cs" />
-    <Compile Include=".\Mono.Linker\Driver.cs" />
-    <Compile Include=".\Mono.Linker\I18nAssemblies.cs" />
-    <Compile Include=".\Mono.Linker\IXApiVisitor.cs" />
-    <Compile Include=".\Mono.Linker\LinkContext.cs" />
-    <Compile Include=".\Mono.Linker\MethodAction.cs" />
-    <Compile Include=".\Mono.Linker\Pipeline.cs" />
-    <Compile Include=".\Mono.Linker\TypePreserve.cs" />
-    <Compile Include=".\Mono.Linker\XApiReader.cs" />
  </ItemGroup>
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\BaseStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\BlacklistStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\CleanStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\IStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\LoadI18nAssemblies.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\LoadReferencesStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\MarkStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\OutputStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\RegenerateGuidStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromXApiStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromXmlStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\SweepStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\TypeMapStep.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Annotations.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyAction.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyResolver.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Driver.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\I18nAssemblies.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\IXApiVisitor.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\LinkContext.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\MethodAction.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Pipeline.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\TypePreserve.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\XApiReader.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 348bedb9c11..cece22ecd78 100644
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -4664,17 +4664,6 @@
       <resources></resources>
       <response>monolinker.exe.sources</response>
     </project>
-    <project dir="tools/tuner" library="Mono.Tuner-net_4_x">
-      <boot>false</boot>
-      <flags>/codepage:65001 -r:./../../class/lib/net_4_x/monolinker.exe -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize /noconfig -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Core.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/Mono.Cecil.dll</flags>
-      <output>Mono.Tuner.dll</output>
-      <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/Mono.Tuner.dll</library_output>
-      <fx_version>4.5</fx_version>
-      <profile>net_4_x</profile>
-      <resources></resources>
-      <response>Mono.Tuner.dll.sources</response>
-    </project>
     <project dir="tools/culevel" library="culevel-net_4_x">
       <boot></boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize /noconfig -r:System -r:System.Xml</flags>
diff --git a/net_4_x.sln b/net_4_x.sln
index d5d409a9f51..e0164c4ebcd 100644
--- a/net_4_x.sln
+++ b/net_4_x.sln
@@ -589,8 +589,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "al-net_4_x", "mcs/tools/al/
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monolinker-net_4_x", "mcs/tools/linker/monolinker-net_4_x.csproj", "{FA920637-C202-4E75-AC0F-1A8DBD631DF1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Tuner-net_4_x", "mcs/tools/tuner/Mono.Tuner-net_4_x.csproj", "{8CCE7044-3466-4599-B09E-9F8E0C2F4614}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "genxs-net_4_x", "mcs/tools/genxs/genxs-net_4_x.csproj", "{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mkbundle-net_4_x", "mcs/tools/mkbundle/mkbundle-net_4_x.csproj", "{3A3DAEC2-3DF4-4968-A191-8D6F207ABA5E}"
@@ -1855,10 +1853,6 @@ Global
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CCE7044-3466-4599-B09E-9F8E0C2F4614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CCE7044-3466-4599-B09E-9F8E0C2F4614}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CCE7044-3466-4599-B09E-9F8E0C2F4614}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CCE7044-3466-4599-B09E-9F8E0C2F4614}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- 
2.25.1