X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Flinker%2Fmonolinker-net_4_x.csproj;h=00456789333a166a7ace27f6c8ede9619e812b4d;hb=e0026352ead8934cc4d9e7d84482696e7be96bb7;hp=cfff038a83180de83a050e8ef3cf71352ff92d37;hpb=4ae209510f6d1f6cd86ea936fae1c748ce83caf2;p=mono.git

diff --git a/mcs/tools/linker/monolinker-net_4_x.csproj b/mcs/tools/linker/monolinker-net_4_x.csproj
index cfff038a831..00456789333 100644
--- a/mcs/tools/linker/monolinker-net_4_x.csproj
+++ b/mcs/tools/linker/monolinker-net_4_x.csproj
@@ -28,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -36,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -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">
@@ -113,8 +113,8 @@
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
       <Name>System.Xml-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../../class/Mono.Cecil/Mono.Cecil-net_4_x.csproj">
-      <Project>{2C0D558F-0B38-4691-967E-A910A1B995C1}</Project>
+    <ProjectReference Include="../../class/legacy/Mono.Cecil/Mono.Cecil-net_4_x.csproj">
+      <Project>{6DE38817-EC25-433A-AE58-0D30C5E6C460}</Project>
       <Name>Mono.Cecil-net_4_x</Name>
     </ProjectReference>
   </ItemGroup>