Ver código fonte

[System.Web] Remove duplicate file listings which break msbuild and update csprojs

Miguel de Icaza 9 anos atrás
pai
commit
689ca75d63

+ 1 - 0
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj

@@ -9,6 +9,7 @@
     <OutputType>Exe</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>./../../../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
     <StartupObject>RabbitMQ.Client.Apigen.Apigen</StartupObject>

+ 0 - 2
mcs/class/System.Web/System.Web-net_4_x.csproj

@@ -373,7 +373,6 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
@@ -548,7 +547,6 @@
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
-    <Compile Include="ReferenceSources\SR.cs" />
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />
     <Compile Include="System.Web.Caching\Cache.cs" />

+ 0 - 2
mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj

@@ -373,7 +373,6 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundItemControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
@@ -548,7 +547,6 @@
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
-    <Compile Include="ReferenceSources\SR.cs" />
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />
     <Compile Include="System.Web.Caching\Cache.cs" />

+ 0 - 2
mcs/class/System.Web/System.Web.dll.sources

@@ -24,7 +24,6 @@ Mono.Web.Util/SettingsMapping.cs
 Mono.Web.Util/SettingsMappingManager.cs
 Mono.Web.Util/SettingsMappingWhat.cs
 
-ReferenceSources/SR.cs
 System.Web/ApplicationShutdownReason.cs
 System.Web/BeginEventHandler.cs
 System.Web.Caching/AggregateCacheDependency.cs
@@ -629,7 +628,6 @@ System.Web.UI/HtmlTextWriter.cs
 ../referencesource/System.Web/UI/IDataSource.cs
 ../referencesource/System.Web/UI/IDataSourceViewSchemaAccessor.cs
 ../referencesource/System.Web/UI/IDReferencePropertyAttribute.cs
-../referencesource/System.Web/UI/WebControls/IEditableTextControl.cs
 ../referencesource/System.Web/UI/IExpressionsAccessor.cs
 ../referencesource/System.Web/UI/IFilterResolutionService.cs
 System.Web.UI/IgnoreUnknownContentAttribute.cs

+ 1 - 0
mcs/mcs/mcs-net_4_x.csproj

@@ -9,6 +9,7 @@
     <OutputType>Exe</OutputType>
     <NoWarn>1699</NoWarn>
     <OutputPath>bin\Debug\mcs-net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-bin\Debug\mcs-net_4_x</IntermediateOutputPath>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>