diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-03-05 23:51:35 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2019-03-06 10:34:01 +0300 |
commit | b31a445e85523a9a41b0975203f7ccd1d6f185a8 (patch) | |
tree | 3fa9a395ceb204eb33a8abfd235b4c5e7b877633 /mcs/class/SMDiagnostics | |
parent | eb3f7312bd4da3e6ca1e072c06fcb3f1338ad974 (diff) |
[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.
Diffstat (limited to 'mcs/class/SMDiagnostics')
-rw-r--r-- | mcs/class/SMDiagnostics/SMDiagnostics.csproj | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/mcs/class/SMDiagnostics/SMDiagnostics.csproj b/mcs/class/SMDiagnostics/SMDiagnostics.csproj index 83e2b94669f..dc235737d8f 100644 --- a/mcs/class/SMDiagnostics/SMDiagnostics.csproj +++ b/mcs/class/SMDiagnostics/SMDiagnostics.csproj @@ -1,92 +1,92 @@ -<?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>{8B0D1CF1-89E0-4EEE-8122-4FD423FC1B9C}</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>SMDiagnostics</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>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
- <OutputPath>./../../class/lib/xammac_net_4_5</OutputPath>
- <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac_net_4_5</IntermediateOutputPath>
- <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</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\SR.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Activity.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticStrings.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticTraceSource.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EncodingFallbackAwareXmlTextWriter.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogCategory.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogEventId.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogger.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\ExceptionUtility.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\LegacyDiagnosticTrace.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\MachineSettingsSection.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\NativeMethods.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PiiTraceSource.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PlainXmlWriter.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\SafeEventLogWriteHandle.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceSourceKind.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceXPathNavigator.cs" />
- <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Utility.cs" />
- <Compile Include="Assembly\AssemblyInfo.cs" />
- <Compile Include="ReferenceSources\TraceSR.cs" />
- </ItemGroup>
- <!--End of common files-->
- <!-- @ALL_SOURCES@ -->
- <ItemGroup>
- <ProjectReference Include="../System/System.csproj" />
- <ProjectReference Include="../System.Core/System.Core.csproj" />
- <ProjectReference Include="../System.XML/System.Xml.csproj" />
- <ProjectReference Include="../System.ServiceModel.Internals/System.ServiceModel.Internals.csproj" />
- <ProjectReference Include="../System.Configuration/System.Configuration.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>{8B0D1CF1-89E0-4EEE-8122-4FD423FC1B9C}</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>SMDiagnostics</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>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' "> + <OutputPath>./../../class/lib/xammac_net_4_5</OutputPath> + <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac_net_4_5</IntermediateOutputPath> + <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</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\SR.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Activity.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticStrings.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticTraceSource.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EncodingFallbackAwareXmlTextWriter.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogCategory.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogEventId.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogger.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\ExceptionUtility.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\LegacyDiagnosticTrace.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\MachineSettingsSection.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\NativeMethods.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PiiTraceSource.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\PlainXmlWriter.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\SafeEventLogWriteHandle.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceSourceKind.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\TraceXPathNavigator.cs" /> + <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Utility.cs" /> + <Compile Include="Assembly\AssemblyInfo.cs" /> + <Compile Include="ReferenceSources\TraceSR.cs" /> + </ItemGroup> + <!--End of common files--> + <!-- @ALL_SOURCES@ --> + <ItemGroup> + <ProjectReference Include="../System/System.csproj" /> + <ProjectReference Include="../System.Core/System.Core.csproj" /> + <ProjectReference Include="../System.XML/System.Xml.csproj" /> + <ProjectReference Include="../System.ServiceModel.Internals/System.ServiceModel.Internals.csproj" /> + <ProjectReference Include="../System.Configuration/System.Configuration.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 |