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.
---
 .../System.Data.Services.csproj                    | 302 ++++++++++-----------
 1 file changed, 151 insertions(+), 151 deletions(-)

(limited to 'mcs/class/System.Data.Services')

diff --git a/mcs/class/System.Data.Services/System.Data.Services.csproj b/mcs/class/System.Data.Services/System.Data.Services.csproj
index e86d9dd6785..c144642bb5d 100644
--- a/mcs/class/System.Data.Services/System.Data.Services.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services.csproj
@@ -1,152 +1,152 @@
-<?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>{DB8E657B-E9FE-49E5-AD23-B8144673863F}</ProjectGuid>
-    <OutputType>Library</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>True</NoStdLib>
-    <NoConfig>True</NoConfig>
-    <AssemblyName>System.Data.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../ecma.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;NET_3_5</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="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`1.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`10.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`11.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`12.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`13.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`2.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`3.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`4.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`5.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`6.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`7.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`8.cs" />
-    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`9.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper0.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper1.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper2.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper3.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper4.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper5.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper6.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper7.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapper8.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperMany.cs" />
-    <Compile Include="System.Data.Services.Internal\ProjectedWrapperManyEnd.cs" />
-    <Compile Include="System.Data.Services.Providers\DataServiceProviderMethods.cs" />
-    <Compile Include="System.Data.Services.Providers\IDataServiceMetadataProvider.cs" />
-    <Compile Include="System.Data.Services.Providers\IDataServicePagingProvider.cs" />
-    <Compile Include="System.Data.Services.Providers\IDataServiceQueryProvider.cs" />
-    <Compile Include="System.Data.Services.Providers\IDataServiceStreamProvider.cs" />
-    <Compile Include="System.Data.Services.Providers\IDataServiceUpdateProvider.cs" />
-    <Compile Include="System.Data.Services.Providers\OpenTypeMethods.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSet.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceAssociationSetEnd.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceProperty.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourcePropertyKind.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceSet.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceType.cs" />
-    <Compile Include="System.Data.Services.Providers\ResourceTypeKind.cs" />
-    <Compile Include="System.Data.Services.Providers\ServiceOperation.cs" />
-    <Compile Include="System.Data.Services.Providers\ServiceOperationParameter.cs" />
-    <Compile Include="System.Data.Services.Providers\ServiceOperationResultKind.cs" />
-    <Compile Include="System.Data.Services\ChangeInterceptorAttribute.cs" />
-    <Compile Include="System.Data.Services\DataService.cs" />
-    <Compile Include="System.Data.Services\DataServiceBehavior.cs" />
-    <Compile Include="System.Data.Services\DataServiceConfiguration.cs" />
-    <Compile Include="System.Data.Services\DataServiceException.cs" />
-    <Compile Include="System.Data.Services\DataServiceHost.cs" />
-    <Compile Include="System.Data.Services\DataServiceHostFactory.cs" />
-    <Compile Include="System.Data.Services\DataServiceOperationContext.cs" />
-    <Compile Include="System.Data.Services\DataServiceProcessingPipeline.cs" />
-    <Compile Include="System.Data.Services\DataServiceProcessingPipelineEventArgs.cs" />
-    <Compile Include="System.Data.Services\ETagAttribute.cs" />
-    <Compile Include="System.Data.Services\EntitySetRights.cs" />
-    <Compile Include="System.Data.Services\ExpandSegment.cs" />
-    <Compile Include="System.Data.Services\ExpandSegmentCollection.cs" />
-    <Compile Include="System.Data.Services\HandleExceptionArgs.cs" />
-    <Compile Include="System.Data.Services\IDataServiceConfiguration.cs" />
-    <Compile Include="System.Data.Services\IDataServiceHost.cs" />
-    <Compile Include="System.Data.Services\IDataServiceHost2.cs" />
-    <Compile Include="System.Data.Services\IExpandProvider.cs" />
-    <Compile Include="System.Data.Services\IExpandedResult.cs" />
-    <Compile Include="System.Data.Services\IRequestHandler.cs" />
-    <Compile Include="System.Data.Services\IUpdatable.cs" />
-    <Compile Include="System.Data.Services\IgnorePropertiesAttribute.cs" />
-    <Compile Include="System.Data.Services\MimeTypeAttribute.cs" />
-    <Compile Include="System.Data.Services\ProcessRequestArgs.cs" />
-    <Compile Include="System.Data.Services\QueryInterceptorAttribute.cs" />
-    <Compile Include="System.Data.Services\ServiceOperationRights.cs" />
-    <Compile Include="System.Data.Services\SingleResultAttribute.cs" />
-    <Compile Include="System.Data.Services\UpdateOperations.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>
-  </ItemGroup>
-  <!--End of common files-->
-  <!-- @ALL_SOURCES@ -->
-  <!-- @COMMON_PROJECT_REFERENCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <ProjectReference Include="../System/System.csproj" />
-    <ProjectReference Include="../System.Core/System.Core.csproj" />
-    <ProjectReference Include="../System.ServiceModel/System.ServiceModel.csproj" />
-    <ProjectReference Include="../System.ServiceModel.Web/System.ServiceModel.Web.csproj" />
-    <ProjectReference Include="../System.Data.Services.Client/System.Data.Services.Client.csproj" />
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation.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>{DB8E657B-E9FE-49E5-AD23-B8144673863F}</ProjectGuid>
+    <OutputType>Library</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>True</NoStdLib>
+    <NoConfig>True</NoConfig>
+    <AssemblyName>System.Data.Services</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../ecma.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;NET_3_5</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="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`1.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`10.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`11.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`12.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`13.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`2.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`3.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`4.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`5.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`6.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`7.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`8.cs" />
+    <Compile Include="System.Data.Services.Internal\ExpandedWrapper`9.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper0.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper1.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper2.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper3.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper4.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper5.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper6.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper7.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapper8.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapperMany.cs" />
+    <Compile Include="System.Data.Services.Internal\ProjectedWrapperManyEnd.cs" />
+    <Compile Include="System.Data.Services.Providers\DataServiceProviderMethods.cs" />
+    <Compile Include="System.Data.Services.Providers\IDataServiceMetadataProvider.cs" />
+    <Compile Include="System.Data.Services.Providers\IDataServicePagingProvider.cs" />
+    <Compile Include="System.Data.Services.Providers\IDataServiceQueryProvider.cs" />
+    <Compile Include="System.Data.Services.Providers\IDataServiceStreamProvider.cs" />
+    <Compile Include="System.Data.Services.Providers\IDataServiceUpdateProvider.cs" />
+    <Compile Include="System.Data.Services.Providers\OpenTypeMethods.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceAssociationSet.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceAssociationSetEnd.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceProperty.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourcePropertyKind.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceSet.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceType.cs" />
+    <Compile Include="System.Data.Services.Providers\ResourceTypeKind.cs" />
+    <Compile Include="System.Data.Services.Providers\ServiceOperation.cs" />
+    <Compile Include="System.Data.Services.Providers\ServiceOperationParameter.cs" />
+    <Compile Include="System.Data.Services.Providers\ServiceOperationResultKind.cs" />
+    <Compile Include="System.Data.Services\ChangeInterceptorAttribute.cs" />
+    <Compile Include="System.Data.Services\DataService.cs" />
+    <Compile Include="System.Data.Services\DataServiceBehavior.cs" />
+    <Compile Include="System.Data.Services\DataServiceConfiguration.cs" />
+    <Compile Include="System.Data.Services\DataServiceException.cs" />
+    <Compile Include="System.Data.Services\DataServiceHost.cs" />
+    <Compile Include="System.Data.Services\DataServiceHostFactory.cs" />
+    <Compile Include="System.Data.Services\DataServiceOperationContext.cs" />
+    <Compile Include="System.Data.Services\DataServiceProcessingPipeline.cs" />
+    <Compile Include="System.Data.Services\DataServiceProcessingPipelineEventArgs.cs" />
+    <Compile Include="System.Data.Services\ETagAttribute.cs" />
+    <Compile Include="System.Data.Services\EntitySetRights.cs" />
+    <Compile Include="System.Data.Services\ExpandSegment.cs" />
+    <Compile Include="System.Data.Services\ExpandSegmentCollection.cs" />
+    <Compile Include="System.Data.Services\HandleExceptionArgs.cs" />
+    <Compile Include="System.Data.Services\IDataServiceConfiguration.cs" />
+    <Compile Include="System.Data.Services\IDataServiceHost.cs" />
+    <Compile Include="System.Data.Services\IDataServiceHost2.cs" />
+    <Compile Include="System.Data.Services\IExpandProvider.cs" />
+    <Compile Include="System.Data.Services\IExpandedResult.cs" />
+    <Compile Include="System.Data.Services\IRequestHandler.cs" />
+    <Compile Include="System.Data.Services\IUpdatable.cs" />
+    <Compile Include="System.Data.Services\IgnorePropertiesAttribute.cs" />
+    <Compile Include="System.Data.Services\MimeTypeAttribute.cs" />
+    <Compile Include="System.Data.Services\ProcessRequestArgs.cs" />
+    <Compile Include="System.Data.Services\QueryInterceptorAttribute.cs" />
+    <Compile Include="System.Data.Services\ServiceOperationRights.cs" />
+    <Compile Include="System.Data.Services\SingleResultAttribute.cs" />
+    <Compile Include="System.Data.Services\UpdateOperations.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>
+  </ItemGroup>
+  <!--End of common files-->
+  <!-- @ALL_SOURCES@ -->
+  <!-- @COMMON_PROJECT_REFERENCES@ -->
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <ProjectReference Include="../System/System.csproj" />
+    <ProjectReference Include="../System.Core/System.Core.csproj" />
+    <ProjectReference Include="../System.ServiceModel/System.ServiceModel.csproj" />
+    <ProjectReference Include="../System.ServiceModel.Web/System.ServiceModel.Web.csproj" />
+    <ProjectReference Include="../System.Data.Services.Client/System.Data.Services.Client.csproj" />
+    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation.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