[gitattributes] Do CRLF normalization on sln/proj files

They can be used with native line endings.

We now have a shared folder with the dotnet repos and they have CRLF normalization enabled.
This difference leads to conflicts while applying changes from the dotnet repos to mono.

1 files changed, 175 insertions, 175 deletions

diff --git a/mcs/ilasm/ilasm.csproj b/mcs/ilasm/ilasm.csproj
index 9d9f31583be..f2b618db7a5 100644
--- a/mcs/ilasm/ilasm.csproj
+++ b/mcs/ilasm/ilasm.csproj
@@ -1,176 +1,176 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->

-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>

-    <ProjectGuid>{C02B3C37-DB98-40A5-84F0-F98633DA7EE4}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <NoWarn>1699</NoWarn>

-    <LangVersion>latest</LangVersion>

-    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>

-    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">macos</HostPlatform>

-    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>

-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>

-    <NoStdLib>False</NoStdLib>

-    <NoConfig>True</NoConfig>

-    <AssemblyName>ilasm</AssemblyName>

-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

-  </PropertyGroup>

-  <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 -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

-    <OutputPath>./../class/lib/net_4_x-$(HostPlatform)</OutputPath>

-    <IntermediateOutputPath>./../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>HAS_MONO_SECURITY;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

-  </PropertyGroup>

-  <!-- @ALL_PROFILE_PROPERTIES@ -->

-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->

-    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-  </PropertyGroup>

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

-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">

-    <Compile Include="ILParser.cs" />

-  </ItemGroup>

-  <!-- @BUILT_SOURCES@ -->

-  <!--Common files-->

-  <ItemGroup>

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

-    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />

-    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />

-    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

-    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />

-    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />

-    <Compile Include="AssemblyInfo.cs" />

-    <Compile Include="Driver.cs" />

-    <Compile Include="Report.cs" />

-    <Compile Include="codegen\Assembly.cs" />

-    <Compile Include="codegen\BaseClassRef.cs" />

-    <Compile Include="codegen\BaseGenericTypeRef.cs" />

-    <Compile Include="codegen\BaseMethodRef.cs" />

-    <Compile Include="codegen\BaseTypeRef.cs" />

-    <Compile Include="codegen\BranchInstr.cs" />

-    <Compile Include="codegen\CalliInstr.cs" />

-    <Compile Include="codegen\CatchBlock.cs" />

-    <Compile Include="codegen\CodeGen.cs" />

-    <Compile Include="codegen\CustomAttr.cs" />

-    <Compile Include="codegen\DataDef.cs" />

-    <Compile Include="codegen\DebuggingInfo.cs" />

-    <Compile Include="codegen\DeclSecurity.cs" />

-    <Compile Include="codegen\EmitByteInstr.cs" />

-    <Compile Include="codegen\EventDef.cs" />

-    <Compile Include="codegen\ExternFieldRef.cs" />

-    <Compile Include="codegen\ExternMethodRef.cs" />

-    <Compile Include="codegen\ExternTable.cs" />

-    <Compile Include="codegen\ExternTypeRef.cs" />

-    <Compile Include="codegen\FaultBlock.cs" />

-    <Compile Include="codegen\FeatureAttr.cs" />

-    <Compile Include="codegen\FieldDef.cs" />

-    <Compile Include="codegen\FieldInstr.cs" />

-    <Compile Include="codegen\FieldRef.cs" />

-    <Compile Include="codegen\FileRef.cs" />

-    <Compile Include="codegen\FilterBlock.cs" />

-    <Compile Include="codegen\FinallyBlock.cs" />

-    <Compile Include="codegen\GenericArguments.cs" />

-    <Compile Include="codegen\GenericMethodRef.cs" />

-    <Compile Include="codegen\GenericMethodSig.cs" />

-    <Compile Include="codegen\GenericParamRef.cs" />

-    <Compile Include="codegen\GenericParameters.cs" />

-    <Compile Include="codegen\GenericTypeInst.cs" />

-    <Compile Include="codegen\GlobalFieldRef.cs" />

-    <Compile Include="codegen\GlobalMethodRef.cs" />

-    <Compile Include="codegen\HandlerBlock.cs" />

-    <Compile Include="codegen\IFieldRef.cs" />

-    <Compile Include="codegen\IInstr.cs" />

-    <Compile Include="codegen\ISehClause.cs" />

-    <Compile Include="codegen\InstrTable.cs" />

-    <Compile Include="codegen\IntInstr.cs" />

-    <Compile Include="codegen\LabelInfo.cs" />

-    <Compile Include="codegen\LdcInstr.cs" />

-    <Compile Include="codegen\LdstrInstr.cs" />

-    <Compile Include="codegen\LdtokenInstr.cs" />

-    <Compile Include="codegen\Local.cs" />

-    <Compile Include="codegen\MethodDef.cs" />

-    <Compile Include="codegen\MethodInstr.cs" />

-    <Compile Include="codegen\MethodPointerTypeRef.cs" />

-    <Compile Include="codegen\MethodRef.cs" />

-    <Compile Include="codegen\MiscInstr.cs" />

-    <Compile Include="codegen\ModifiableType.cs" />

-    <Compile Include="codegen\Module.cs" />

-    <Compile Include="codegen\ParamDef.cs" />

-    <Compile Include="codegen\PeapiTypeRef.cs" />

-    <Compile Include="codegen\Permission.cs" />

-    <Compile Include="codegen\PermissionMember.cs" />

-    <Compile Include="codegen\PermissionSet.cs" />

-    <Compile Include="codegen\PrimitiveTypeRef.cs" />

-    <Compile Include="codegen\PropertyDef.cs" />

-    <Compile Include="codegen\Sentinel.cs" />

-    <Compile Include="codegen\SimpInstr.cs" />

-    <Compile Include="codegen\SwitchInstr.cs" />

-    <Compile Include="codegen\TryBlock.cs" />

-    <Compile Include="codegen\TypeDef.cs" />

-    <Compile Include="codegen\TypeInstr.cs" />

-    <Compile Include="codegen\TypeManager.cs" />

-    <Compile Include="codegen\TypeRef.cs" />

-    <Compile Include="codegen\TypeSpecFieldRef.cs" />

-    <Compile Include="codegen\TypeSpecMethodRef.cs" />

-    <Compile Include="parser\ScannerAdapter.cs" />

-    <Compile Include="scanner\ILReader.cs" />

-    <Compile Include="scanner\ILTables.cs" />

-    <Compile Include="scanner\ILToken.cs" />

-    <Compile Include="scanner\ILTokenizer.cs" />

-    <Compile Include="scanner\ILTokenizingException.cs" />

-    <Compile Include="scanner\ITokenStream.cs" />

-    <Compile Include="scanner\InstrToken.cs" />

-    <Compile Include="scanner\Location.cs" />

-    <Compile Include="scanner\NumberHelper.cs" />

-    <Compile Include="scanner\StringHelper.cs" />

-    <Compile Include="scanner\StringHelperBase.cs" />

-    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">

-      <Name>genconsts</Name>

-      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

-      <Private>false</Private>

-    </ProjectReference>

-    <ProjectReference Include="$(SolutionDir)\mcs\jay\jay.vcxproj">

-      <Name>jay</Name>

-      <Project>{5d485d32-3b9f-4287-ab24-c8da5b89f537}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

-      <Private>false</Private>

-    </ProjectReference>

-  </ItemGroup>

-  <!--End of common files-->

-  <!-- @ALL_SOURCES@ -->

-  <!-- @COMMON_PROJECT_REFERENCES@ -->

-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">

-    <ProjectReference Include="../class/PEAPI/PEAPI.csproj" />

-    <ProjectReference Include="../class/System/System.csproj" />

-    <ProjectReference Include="../class/Mono.Security/Mono.Security.csproj" />

-  </ItemGroup>

-  <!-- @ALL_REFERENCES@ -->

-  <!-- @ALL_RESOURCES@ -->

-  <PropertyGroup>

-    <!-- Force the pre-build event to run after references have been resolved. The default

-      behavior is to run them before resolving references, which can cause things like

-      culevel.exe to be used before they have been built. -->

-    <PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>

-  </PropertyGroup>

-  <PropertyGroup>

-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay &gt; $(ProjectDir)\ILParser.cs</PreBuildEvent>

-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay &gt; $(ProjectDir)\ILParser.cs</PreBuildEvent>

-  </PropertyGroup>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
+    <ProjectGuid>{C02B3C37-DB98-40A5-84F0-F98633DA7EE4}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <NoWarn>1699</NoWarn>
+    <LangVersion>latest</LangVersion>
+    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
+    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">macos</HostPlatform>
+    <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <NoStdLib>False</NoStdLib>
+    <NoConfig>True</NoConfig>
+    <AssemblyName>ilasm</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <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 -->
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <OutputPath>./../class/lib/net_4_x-$(HostPlatform)</OutputPath>
+    <IntermediateOutputPath>./../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
+    <DefineConstants>HAS_MONO_SECURITY;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
+  </PropertyGroup>
+  <!-- @ALL_PROFILE_PROPERTIES@ -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="ILParser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <!--Common files-->
+  <ItemGroup>
+    <Compile Include="..\build\common\Consts.cs" />
+    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
+    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
+    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />
+    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
+    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Driver.cs" />
+    <Compile Include="Report.cs" />
+    <Compile Include="codegen\Assembly.cs" />
+    <Compile Include="codegen\BaseClassRef.cs" />
+    <Compile Include="codegen\BaseGenericTypeRef.cs" />
+    <Compile Include="codegen\BaseMethodRef.cs" />
+    <Compile Include="codegen\BaseTypeRef.cs" />
+    <Compile Include="codegen\BranchInstr.cs" />
+    <Compile Include="codegen\CalliInstr.cs" />
+    <Compile Include="codegen\CatchBlock.cs" />
+    <Compile Include="codegen\CodeGen.cs" />
+    <Compile Include="codegen\CustomAttr.cs" />
+    <Compile Include="codegen\DataDef.cs" />
+    <Compile Include="codegen\DebuggingInfo.cs" />
+    <Compile Include="codegen\DeclSecurity.cs" />
+    <Compile Include="codegen\EmitByteInstr.cs" />
+    <Compile Include="codegen\EventDef.cs" />
+    <Compile Include="codegen\ExternFieldRef.cs" />
+    <Compile Include="codegen\ExternMethodRef.cs" />
+    <Compile Include="codegen\ExternTable.cs" />
+    <Compile Include="codegen\ExternTypeRef.cs" />
+    <Compile Include="codegen\FaultBlock.cs" />
+    <Compile Include="codegen\FeatureAttr.cs" />
+    <Compile Include="codegen\FieldDef.cs" />
+    <Compile Include="codegen\FieldInstr.cs" />
+    <Compile Include="codegen\FieldRef.cs" />
+    <Compile Include="codegen\FileRef.cs" />
+    <Compile Include="codegen\FilterBlock.cs" />
+    <Compile Include="codegen\FinallyBlock.cs" />
+    <Compile Include="codegen\GenericArguments.cs" />
+    <Compile Include="codegen\GenericMethodRef.cs" />
+    <Compile Include="codegen\GenericMethodSig.cs" />
+    <Compile Include="codegen\GenericParamRef.cs" />
+    <Compile Include="codegen\GenericParameters.cs" />
+    <Compile Include="codegen\GenericTypeInst.cs" />
+    <Compile Include="codegen\GlobalFieldRef.cs" />
+    <Compile Include="codegen\GlobalMethodRef.cs" />
+    <Compile Include="codegen\HandlerBlock.cs" />
+    <Compile Include="codegen\IFieldRef.cs" />
+    <Compile Include="codegen\IInstr.cs" />
+    <Compile Include="codegen\ISehClause.cs" />
+    <Compile Include="codegen\InstrTable.cs" />
+    <Compile Include="codegen\IntInstr.cs" />
+    <Compile Include="codegen\LabelInfo.cs" />
+    <Compile Include="codegen\LdcInstr.cs" />
+    <Compile Include="codegen\LdstrInstr.cs" />
+    <Compile Include="codegen\LdtokenInstr.cs" />
+    <Compile Include="codegen\Local.cs" />
+    <Compile Include="codegen\MethodDef.cs" />
+    <Compile Include="codegen\MethodInstr.cs" />
+    <Compile Include="codegen\MethodPointerTypeRef.cs" />
+    <Compile Include="codegen\MethodRef.cs" />
+    <Compile Include="codegen\MiscInstr.cs" />
+    <Compile Include="codegen\ModifiableType.cs" />
+    <Compile Include="codegen\Module.cs" />
+    <Compile Include="codegen\ParamDef.cs" />
+    <Compile Include="codegen\PeapiTypeRef.cs" />
+    <Compile Include="codegen\Permission.cs" />
+    <Compile Include="codegen\PermissionMember.cs" />
+    <Compile Include="codegen\PermissionSet.cs" />
+    <Compile Include="codegen\PrimitiveTypeRef.cs" />
+    <Compile Include="codegen\PropertyDef.cs" />
+    <Compile Include="codegen\Sentinel.cs" />
+    <Compile Include="codegen\SimpInstr.cs" />
+    <Compile Include="codegen\SwitchInstr.cs" />
+    <Compile Include="codegen\TryBlock.cs" />
+    <Compile Include="codegen\TypeDef.cs" />
+    <Compile Include="codegen\TypeInstr.cs" />
+    <Compile Include="codegen\TypeManager.cs" />
+    <Compile Include="codegen\TypeRef.cs" />
+    <Compile Include="codegen\TypeSpecFieldRef.cs" />
+    <Compile Include="codegen\TypeSpecMethodRef.cs" />
+    <Compile Include="parser\ScannerAdapter.cs" />
+    <Compile Include="scanner\ILReader.cs" />
+    <Compile Include="scanner\ILTables.cs" />
+    <Compile Include="scanner\ILToken.cs" />
+    <Compile Include="scanner\ILTokenizer.cs" />
+    <Compile Include="scanner\ILTokenizingException.cs" />
+    <Compile Include="scanner\ITokenStream.cs" />
+    <Compile Include="scanner\InstrToken.cs" />
+    <Compile Include="scanner\Location.cs" />
+    <Compile Include="scanner\NumberHelper.cs" />
+    <Compile Include="scanner\StringHelper.cs" />
+    <Compile Include="scanner\StringHelperBase.cs" />
+    <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
+      <Name>genconsts</Name>
+      <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)\mcs\jay\jay.vcxproj">
+      <Name>jay</Name>
+      <Project>{5d485d32-3b9f-4287-ab24-c8da5b89f537}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <!--End of common files-->
+  <!-- @ALL_SOURCES@ -->
+  <!-- @COMMON_PROJECT_REFERENCES@ -->
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <ProjectReference Include="../class/PEAPI/PEAPI.csproj" />
+    <ProjectReference Include="../class/System/System.csproj" />
+    <ProjectReference Include="../class/Mono.Security/Mono.Security.csproj" />
+  </ItemGroup>
+  <!-- @ALL_REFERENCES@ -->
+  <!-- @ALL_RESOURCES@ -->
+  <PropertyGroup>
+    <!-- Force the pre-build event to run after references have been resolved. The default
+      behavior is to run them before resolving references, which can cause things like
+      culevel.exe to be used before they have been built. -->
+    <PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay &gt; $(ProjectDir)\ILParser.cs</PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay &gt; $(ProjectDir)\ILParser.cs</PreBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file