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

5 files changed, 91 insertions, 91 deletions

diff --git a/msvc/scripts/.gitattributes b/msvc/scripts/.gitattributes
index a3a9caf37c8..24a6d0f41eb 100644
--- a/msvc/scripts/.gitattributes
+++ b/msvc/scripts/.gitattributes
@@ -1,2 +1,2 @@
-/csproj.tmpl -crlf
-/mcs.pre -crlf
+/csproj.tmpl crlf
+/*.pre crlf
diff --git a/msvc/scripts/csproj.tmpl b/msvc/scripts/csproj.tmpl
index ce1440e9911..30369c14510 100644
--- a/msvc/scripts/csproj.tmpl
+++ b/msvc/scripts/csproj.tmpl
@@ -1,62 +1,62 @@
-<?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>@PROJECTGUID@</ProjectGuid>

-    <OutputType>@OUTPUTTYPE@</OutputType>

-    <NoWarn>@DISABLEDWARNINGS@</NoWarn>

-    <LangVersion>@LANGVERSION@</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@

-    @METADATAVERSION@

-    @STARTUPOBJECT@

-    @NOCONFIG@

-    @ALLOWUNSAFE@

-    <AssemblyName>@ASSEMBLYNAME@</AssemblyName>

-    <TargetFrameworkVersion>v@FX_VERSION@</TargetFrameworkVersion>

-@SIGNATURE@

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

-

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

-<!-- @ALL_SOURCES@ -->

-<!-- @COMMON_PROJECT_REFERENCES@ -->

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

-

-@PREBUILD_POSTBUILD@

-</Project>

+<?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>@PROJECTGUID@</ProjectGuid>
+    <OutputType>@OUTPUTTYPE@</OutputType>
+    <NoWarn>@DISABLEDWARNINGS@</NoWarn>
+    <LangVersion>@LANGVERSION@</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@
+    @METADATAVERSION@
+    @STARTUPOBJECT@
+    @NOCONFIG@
+    @ALLOWUNSAFE@
+    <AssemblyName>@ASSEMBLYNAME@</AssemblyName>
+    <TargetFrameworkVersion>v@FX_VERSION@</TargetFrameworkVersion>
+@SIGNATURE@
+  </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>
+
+<!-- @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@ -->
+<!-- @ALL_SOURCES@ -->
+<!-- @COMMON_PROJECT_REFERENCES@ -->
+<!-- @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>
+
+@PREBUILD_POSTBUILD@
+</Project>
diff --git a/msvc/scripts/genconsts.csproj b/msvc/scripts/genconsts.csproj
index a13108547e7..3a2c5136639 100755
--- a/msvc/scripts/genconsts.csproj
+++ b/msvc/scripts/genconsts.csproj
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>

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

-  <PropertyGroup>

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

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

-    <OutputType>Exe</OutputType>

-    <AssemblyName>genconsts</AssemblyName>

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <OutputPath>.\</OutputPath>

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

-    <RunPostBuildEvent>Always</RunPostBuildEvent>

-  </PropertyGroup>

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

-  <PropertyGroup>

-    <PostBuildEvent>cd $(MSBuildProjectDirectory)

-$(TargetPath)</PostBuildEvent>

-  </PropertyGroup>

-  <ItemGroup>

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

-    <Reference Include="System" />

-  </ItemGroup>

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>genconsts</AssemblyName>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <OutputPath>.\</OutputPath>
+    <ProjectGuid>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</ProjectGuid>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>cd $(MSBuildProjectDirectory)
+$(TargetPath)</PostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="genconsts.cs" />
+    <Reference Include="System" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index ee1518a0b5d..f15d107f61f 100755
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -56,7 +56,7 @@ public class KnownProjectInfo {
 }
 
 public class SlnGenerator {
-	public static readonly string NewLine = "\r\n"; //Environment.NewLine; // "\n"; 
+	public static readonly string NewLine = Environment.NewLine;
 	public SlnGenerator (string slnVersion)
 	{
 		Console.Error.WriteLine("// Requested sln version is {0}", slnVersion);
diff --git a/msvc/scripts/mcs.pre b/msvc/scripts/mcs.pre
index 2126ebd7731..217afa908a2 100644
--- a/msvc/scripts/mcs.pre
+++ b/msvc/scripts/mcs.pre
@@ -1,2 +1,2 @@
-$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs

-

+$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs
+