From b31a445e85523a9a41b0975203f7ccd1d6f185a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 5 Mar 2019 21:51:35 +0100
Subject: [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.
---
 mcs/class/Mono.C5/Mono.C5.csproj | 194 +++++++++++++++++++--------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

(limited to 'mcs/class/Mono.C5')

diff --git a/mcs/class/Mono.C5/Mono.C5.csproj b/mcs/class/Mono.C5/Mono.C5.csproj
index b8ce65c113e..753849f273a 100644
--- a/mcs/class/Mono.C5/Mono.C5.csproj
+++ b/mcs/class/Mono.C5/Mono.C5.csproj
@@ -1,98 +1,98 @@
-<?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>{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoWarn>1699,169,219,414,1030,3001,3005,3006</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>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AssemblyName>Mono.C5</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>c5.pub</AssemblyOriginatorKeyFile>
-  </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>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" />
-  <!-- @BUILT_SOURCES@ -->
-  <!--Common files-->
-  <ItemGroup>
-    <Compile Include="C5\AssemblyInfo.cs" />
-    <Compile Include="C5\Attributes.cs" />
-    <Compile Include="C5\Builtin.cs" />
-    <Compile Include="C5\Collections.cs" />
-    <Compile Include="C5\Comparer.cs" />
-    <Compile Include="C5\Delegates.cs" />
-    <Compile Include="C5\Dictionaries.cs" />
-    <Compile Include="C5\Enums.cs" />
-    <Compile Include="C5\Events.cs" />
-    <Compile Include="C5\Exceptions.cs" />
-    <Compile Include="C5\Formatting.cs" />
-    <Compile Include="C5\Hashers.cs" />
-    <Compile Include="C5\Interfaces.cs" />
-    <Compile Include="C5\MappedEnumerators.cs" />
-    <Compile Include="C5\Random.cs" />
-    <Compile Include="C5\Records.cs" />
-    <Compile Include="C5\Sorting.cs" />
-    <Compile Include="C5\ViewSupport.cs" />
-    <Compile Include="C5\WrappedArray.cs" />
-    <Compile Include="C5\Wrappers.cs" />
-    <Compile Include="C5\arrays\ArrayList.cs" />
-    <Compile Include="C5\arrays\CircularQueue.cs" />
-    <Compile Include="C5\arrays\HashedArrayList.cs" />
-    <Compile Include="C5\arrays\SortedArray.cs" />
-    <Compile Include="C5\hashing\HashBag.cs" />
-    <Compile Include="C5\hashing\HashDictionary.cs" />
-    <Compile Include="C5\hashing\HashTable.cs" />
-    <Compile Include="C5\heaps\IntervalHeap.cs" />
-    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
-    <Compile Include="C5\linkedlists\LinkedList.cs" />
-    <Compile Include="C5\trees\RedBlackTreeBag.cs" />
-    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
-    <Compile Include="C5\trees\RedBlackTreeSet.cs" />
-  </ItemGroup>
-  <!--End of common files-->
-  <!-- @ALL_SOURCES@ -->
-  <!-- @COMMON_PROJECT_REFERENCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <ProjectReference Include="../System/System.csproj" />
-    <ProjectReference Include="../corlib/corlib.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>
+<?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>{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoWarn>1699,169,219,414,1030,3001,3005,3006</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>True</NoStdLib>
+    <NoConfig>True</NoConfig>
+    <AssemblyName>Mono.C5</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>c5.pub</AssemblyOriginatorKeyFile>
+  </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>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" />
+  <!-- @BUILT_SOURCES@ -->
+  <!--Common files-->
+  <ItemGroup>
+    <Compile Include="C5\AssemblyInfo.cs" />
+    <Compile Include="C5\Attributes.cs" />
+    <Compile Include="C5\Builtin.cs" />
+    <Compile Include="C5\Collections.cs" />
+    <Compile Include="C5\Comparer.cs" />
+    <Compile Include="C5\Delegates.cs" />
+    <Compile Include="C5\Dictionaries.cs" />
+    <Compile Include="C5\Enums.cs" />
+    <Compile Include="C5\Events.cs" />
+    <Compile Include="C5\Exceptions.cs" />
+    <Compile Include="C5\Formatting.cs" />
+    <Compile Include="C5\Hashers.cs" />
+    <Compile Include="C5\Interfaces.cs" />
+    <Compile Include="C5\MappedEnumerators.cs" />
+    <Compile Include="C5\Random.cs" />
+    <Compile Include="C5\Records.cs" />
+    <Compile Include="C5\Sorting.cs" />
+    <Compile Include="C5\ViewSupport.cs" />
+    <Compile Include="C5\WrappedArray.cs" />
+    <Compile Include="C5\Wrappers.cs" />
+    <Compile Include="C5\arrays\ArrayList.cs" />
+    <Compile Include="C5\arrays\CircularQueue.cs" />
+    <Compile Include="C5\arrays\HashedArrayList.cs" />
+    <Compile Include="C5\arrays\SortedArray.cs" />
+    <Compile Include="C5\hashing\HashBag.cs" />
+    <Compile Include="C5\hashing\HashDictionary.cs" />
+    <Compile Include="C5\hashing\HashTable.cs" />
+    <Compile Include="C5\heaps\IntervalHeap.cs" />
+    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
+    <Compile Include="C5\linkedlists\LinkedList.cs" />
+    <Compile Include="C5\trees\RedBlackTreeBag.cs" />
+    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
+    <Compile Include="C5\trees\RedBlackTreeSet.cs" />
+  </ItemGroup>
+  <!--End of common files-->
+  <!-- @ALL_SOURCES@ -->
+  <!-- @COMMON_PROJECT_REFERENCES@ -->
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <ProjectReference Include="../System/System.csproj" />
+    <ProjectReference Include="../corlib/corlib.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>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3