[msvc] Update csproj files

diff --git a/mcs/tools/linker/monolinker-net_4_x.csproj b/mcs/tools/linker/monolinker-net_4_x.csproj
index f6ccd23a3c7de48cbecab02df46930f31c0f9079..00456789333a166a7ace27f6c8ede9619e812b4d 100644 (file)
--- a/mcs/tools/linker/monolinker-net_4_x.csproj
+++ b/mcs/tools/linker/monolinker-net_4_x.csproj
@@ -48,33 +48,33 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include=".\Mono.Linker.Steps\BaseStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\BlacklistStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\CleanStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\IStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\LoadI18nAssemblies.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\LoadReferencesStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\MarkStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\OutputStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\RegenerateGuidStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromAssemblyStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromXApiStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\ResolveFromXmlStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\ResolveStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\SweepStep.cs" />\r
-    <Compile Include=".\Mono.Linker.Steps\TypeMapStep.cs" />\r
-    <Compile Include=".\Mono.Linker\Annotations.cs" />\r
-    <Compile Include=".\Mono.Linker\AssemblyAction.cs" />\r
-    <Compile Include=".\Mono.Linker\AssemblyInfo.cs" />\r
-    <Compile Include=".\Mono.Linker\AssemblyResolver.cs" />\r
-    <Compile Include=".\Mono.Linker\Driver.cs" />\r
-    <Compile Include=".\Mono.Linker\I18nAssemblies.cs" />\r
-    <Compile Include=".\Mono.Linker\IXApiVisitor.cs" />\r
-    <Compile Include=".\Mono.Linker\LinkContext.cs" />\r
-    <Compile Include=".\Mono.Linker\MethodAction.cs" />\r
-    <Compile Include=".\Mono.Linker\Pipeline.cs" />\r
-    <Compile Include=".\Mono.Linker\TypePreserve.cs" />\r
-    <Compile Include=".\Mono.Linker\XApiReader.cs" />\r  </ItemGroup>\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\BaseStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\BlacklistStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\CleanStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\IStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\LoadI18nAssemblies.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\LoadReferencesStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\MarkStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\OutputStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\RegenerateGuidStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromXApiStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveFromXmlStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\ResolveStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\SweepStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker.Steps\TypeMapStep.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Annotations.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyAction.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyInfo.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\AssemblyResolver.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Driver.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\I18nAssemblies.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\IXApiVisitor.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\LinkContext.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\MethodAction.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Pipeline.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\TypePreserve.cs" />\r
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\XApiReader.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 348bedb9c1172f47fc9b0e7b07a39f16a7ac3945..cece22ecd78d5ca0c055dff860963d787cbdd29d 100644 (file)
--- 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 d5d409a9f51ef49e156a6bcddfead00a86b5f7f5..e0164c4ebcd6b12f041d954b00cf6fe6961a0a2a 100644 (file)
--- 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