Update csproj files

3 files changed, 135 insertions, 141 deletions

diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj
index 81bd71e0bad..ea9232213bd 100644
--- a/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd-net_2_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{1163E5E6-A3E7-4093-BEDF-58C3AA24B4B3}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>./../../class/lib/net_2_0</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Simd-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Simd</AssemblyName>

     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699</NoWarn>

@@ -28,40 +27,41 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Simd\AccelMode.cs" />
-   <Compile Include="Mono.Simd\AccelerationAttribute.cs" />
-   <Compile Include="Mono.Simd\ArrayExtensions.cs" />
-   <Compile Include="Mono.Simd\SimdRuntime.cs" />
-   <Compile Include="Mono.Simd\Vector2d.cs" />
-   <Compile Include="Mono.Simd\Vector2ul.cs" />
-   <Compile Include="Mono.Simd\Vector2l.cs" />
-   <Compile Include="Mono.Simd\Vector4f.cs" />
-   <Compile Include="Mono.Simd\Vector4ui.cs" />
-   <Compile Include="Mono.Simd\Vector4i.cs" />
-   <Compile Include="Mono.Simd\Vector8us.cs" />
-   <Compile Include="Mono.Simd\Vector8s.cs" />
-   <Compile Include="Mono.Simd\Vector16b.cs" />
-   <Compile Include="Mono.Simd\Vector16sb.cs" />
-   <Compile Include="Mono.Simd\VectorOperations.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

+    <Compile Include="..\..\build\common\Locale.cs" />

+    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />

+    <Compile Include="Mono.Simd\AccelMode.cs" />

+    <Compile Include="Mono.Simd\ArrayExtensions.cs" />

+    <Compile Include="Mono.Simd\SimdRuntime.cs" />

+    <Compile Include="Mono.Simd\Vector16b.cs" />

+    <Compile Include="Mono.Simd\Vector16sb.cs" />

+    <Compile Include="Mono.Simd\Vector2d.cs" />

+    <Compile Include="Mono.Simd\Vector2l.cs" />

+    <Compile Include="Mono.Simd\Vector2ul.cs" />

+    <Compile Include="Mono.Simd\Vector4f.cs" />

+    <Compile Include="Mono.Simd\Vector4i.cs" />

+    <Compile Include="Mono.Simd\Vector4ui.cs" />

+    <Compile Include="Mono.Simd\Vector8s.cs" />

+    <Compile Include="Mono.Simd\Vector8us.cs" />

+    <Compile Include="Mono.Simd\VectorOperations.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">

@@ -70,26 +70,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">

+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>

+      <Name>corlib\corlib-net_2_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Core\System.Core-net_2_0.csproj">

+      <Project>{45BA4F7D-9E8C-42F8-975F-F2EAA0300B6C}</Project>

+      <Name>System.Core\System.Core-net_2_0</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj
index 6abd56d8810..a9ef3bd2372 100644
--- a/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd-net_4_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{EBB6C6CC-FED4-457A-9606-C225C64FBC7F}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>./../../class/lib/net_4_0</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Simd-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Simd</AssemblyName>

     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699</NoWarn>

@@ -28,40 +27,41 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Simd\AccelMode.cs" />
-   <Compile Include="Mono.Simd\AccelerationAttribute.cs" />
-   <Compile Include="Mono.Simd\ArrayExtensions.cs" />
-   <Compile Include="Mono.Simd\SimdRuntime.cs" />
-   <Compile Include="Mono.Simd\Vector2d.cs" />
-   <Compile Include="Mono.Simd\Vector2ul.cs" />
-   <Compile Include="Mono.Simd\Vector2l.cs" />
-   <Compile Include="Mono.Simd\Vector4f.cs" />
-   <Compile Include="Mono.Simd\Vector4ui.cs" />
-   <Compile Include="Mono.Simd\Vector4i.cs" />
-   <Compile Include="Mono.Simd\Vector8us.cs" />
-   <Compile Include="Mono.Simd\Vector8s.cs" />
-   <Compile Include="Mono.Simd\Vector16b.cs" />
-   <Compile Include="Mono.Simd\Vector16sb.cs" />
-   <Compile Include="Mono.Simd\VectorOperations.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

+    <Compile Include="..\..\build\common\Locale.cs" />

+    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />

+    <Compile Include="Mono.Simd\AccelMode.cs" />

+    <Compile Include="Mono.Simd\ArrayExtensions.cs" />

+    <Compile Include="Mono.Simd\SimdRuntime.cs" />

+    <Compile Include="Mono.Simd\Vector16b.cs" />

+    <Compile Include="Mono.Simd\Vector16sb.cs" />

+    <Compile Include="Mono.Simd\Vector2d.cs" />

+    <Compile Include="Mono.Simd\Vector2l.cs" />

+    <Compile Include="Mono.Simd\Vector2ul.cs" />

+    <Compile Include="Mono.Simd\Vector4f.cs" />

+    <Compile Include="Mono.Simd\Vector4i.cs" />

+    <Compile Include="Mono.Simd\Vector4ui.cs" />

+    <Compile Include="Mono.Simd\Vector8s.cs" />

+    <Compile Include="Mono.Simd\Vector8us.cs" />

+    <Compile Include="Mono.Simd\VectorOperations.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">

@@ -70,26 +70,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">

+      <Project>{280E1B59-BAAA-4E02-99CA-8070BCB2C72E}</Project>

+      <Name>corlib\corlib-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">

+      <Project>{CC96F21E-C45E-4593-BC7F-8331B913E758}</Project>

+      <Name>System.Core\System.Core-net_4_0</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj b/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
index 0bdc6b96493..396697f4f05 100644
--- a/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{82BDC295-E6FC-4B5B-A670-404B6B62E6A6}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>./../../class/lib/net_4_5</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.Simd-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.Simd</AssemblyName>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699</NoWarn>

@@ -28,40 +27,41 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Simd\AccelMode.cs" />
-   <Compile Include="Mono.Simd\AccelerationAttribute.cs" />
-   <Compile Include="Mono.Simd\ArrayExtensions.cs" />
-   <Compile Include="Mono.Simd\SimdRuntime.cs" />
-   <Compile Include="Mono.Simd\Vector2d.cs" />
-   <Compile Include="Mono.Simd\Vector2ul.cs" />
-   <Compile Include="Mono.Simd\Vector2l.cs" />
-   <Compile Include="Mono.Simd\Vector4f.cs" />
-   <Compile Include="Mono.Simd\Vector4ui.cs" />
-   <Compile Include="Mono.Simd\Vector4i.cs" />
-   <Compile Include="Mono.Simd\Vector8us.cs" />
-   <Compile Include="Mono.Simd\Vector8s.cs" />
-   <Compile Include="Mono.Simd\Vector16b.cs" />
-   <Compile Include="Mono.Simd\Vector16sb.cs" />
-   <Compile Include="Mono.Simd\VectorOperations.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

+    <Compile Include="..\..\build\common\Locale.cs" />

+    <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />

+    <Compile Include="Mono.Simd\AccelMode.cs" />

+    <Compile Include="Mono.Simd\ArrayExtensions.cs" />

+    <Compile Include="Mono.Simd\SimdRuntime.cs" />

+    <Compile Include="Mono.Simd\Vector16b.cs" />

+    <Compile Include="Mono.Simd\Vector16sb.cs" />

+    <Compile Include="Mono.Simd\Vector2d.cs" />

+    <Compile Include="Mono.Simd\Vector2l.cs" />

+    <Compile Include="Mono.Simd\Vector2ul.cs" />

+    <Compile Include="Mono.Simd\Vector4f.cs" />

+    <Compile Include="Mono.Simd\Vector4i.cs" />

+    <Compile Include="Mono.Simd\Vector4ui.cs" />

+    <Compile Include="Mono.Simd\Vector8s.cs" />

+    <Compile Include="Mono.Simd\Vector8us.cs" />

+    <Compile Include="Mono.Simd\VectorOperations.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">

@@ -70,26 +70,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">

+      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>

+      <Name>corlib\corlib-net_4_5</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">

+      <Project>{BC9226DD-0D9F-4836-BA8B-87A3E6F06176}</Project>

+      <Name>System.Core\System.Core-net_4_5</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>