Browse Source

#D now runs under the latest .NET Framework.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@82 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
commit
f5cd93dd9f
  1. 8
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  2. 4
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
  3. 2
      src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj
  4. 1
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Parser/ExpressionFinder.cs
  5. 8
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
  6. 4
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user
  7. 10
      src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj
  8. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user
  9. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
  10. 32
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
  11. 4
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user
  12. 22
      src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
  13. 4
      src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
  14. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
  15. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/NativeMethods.cs
  16. 8
      src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj
  17. 4
      src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj.user
  18. 8
      src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj
  19. 4
      src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user
  20. 2
      src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
  21. 2
      src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj
  22. 10
      src/AddIns/Misc/StartPage/Project/Src/StartPage.cs
  23. 2
      src/AddIns/Misc/StartPage/Project/StartPage.csproj
  24. 42
      src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj
  25. 4
      src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user
  26. 8
      src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
  27. 4
      src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user
  28. 42
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  29. 4
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
  30. 10
      src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
  31. 2
      src/Main/StartUp/Project/SharpDevelopMain.cs
  32. 2
      src/Main/StartUp/Project/StartUp.csproj
  33. 2
      src/build.bat
  34. 2
      src/clean.bat
  35. 2
      src/releasebuild.bat

8
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}</ProjectGuid>
<AssemblyName>CSharpBinding</AssemblyName>
@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
<SubType>UserControl</SubType>
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
<Compile Include="Src\Parser\Parser.cs" />
<Compile Include="Src\Project\CSharpProject.cs" />
<None Include="CSharpBinding.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
@ -101,6 +101,8 @@ @@ -101,6 +101,8 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Src\PrettyPrinter\Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

4
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

2
src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj

@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
<Compile Include="Src\Project\ILAsmProject.cs" />
<EmbeddedResource Include="Resources\ILAsm-Mode.xshd" />
<Compile Include="ILAsmBinding.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
</ItemGroup>
<ItemGroup>

1
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Parser/ExpressionFinder.cs

@ -12,7 +12,6 @@ namespace VBNetBinding.Parser @@ -12,7 +12,6 @@ namespace VBNetBinding.Parser
public string FindExpression(string inText, int offset)
{
this.text = FilterComments(inText, ref offset);
this.text = text;
this.offset = this.lastAccept = offset;
this.state = START;
if (this.text == null)

8
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BF38FB72-B380-4196-AF8C-95749D726C61}</ProjectGuid>
<AssemblyName>VBNetBinding</AssemblyName>
@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
<SubType>UserControl</SubType>
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
<Compile Include="Src\Parser\Parser.cs" />
<Compile Include="Src\Project\VBNetProject.cs" />
<None Include="VBNetBinding.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
@ -101,6 +101,8 @@ @@ -101,6 +101,8 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Src\PrettyPrinter\Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

4
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

10
src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</ProjectGuid>
<AssemblyName>FormDesigner</AssemblyName>
@ -71,7 +71,9 @@ @@ -71,7 +71,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\FormDesigner\Gui\ShowTabOrder\ITabOrder.cs" />
<Compile Include="Src\FormDesigner\Gui\ShowTabOrder\TabIndexControl.cs" />
<Compile Include="Src\FormDesigner\Gui\ShowTabOrder\TabIndexControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\FormDesigner\Gui\SideTabDesigner.cs" />
<Compile Include="Src\FormDesigner\Gui\SideTabItemDesigner.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\AbstractMenuEditorControl.cs" />
@ -102,7 +104,7 @@ @@ -102,7 +104,7 @@
<EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.FormDesigner.Gui.AssemblyList.resources" />
<EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels.ControlLibrariesPanel.resources" />
<None Include="FormDesigner.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
@ -126,6 +128,8 @@ @@ -126,6 +128,8 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Src\FormDesigner\Util\" />
<Folder Include="Src\FormDesigner\Xml\" />
</ItemGroup>

4
src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
<StartAction>Program</StartAction>
@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs

@ -135,7 +135,7 @@ namespace ICSharpCode.FormDesigner @@ -135,7 +135,7 @@ namespace ICSharpCode.FormDesigner
serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerEventService), new DesignerEventService());
// serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new System.Windows.Forms.Design.WindowsFormsDesignerOptionService(serviceContainer));
serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new System.Windows.Forms.Design.WindowsFormsDesignerOptionService());
serviceContainer.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService());

32
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CBC6C247-747B-4908-B09A-4D2E0F640B6B}</ProjectGuid>
<AssemblyName>ResourceEditor</AssemblyName>
@ -42,23 +42,37 @@ @@ -42,23 +42,37 @@
<Compile Include="Src\Commands\RenameEntryCommand.cs" />
<Compile Include="Src\Commands\SaveEntryAsCommand.cs" />
<Compile Include="Src\DisplayDefinition.cs" />
<Compile Include="Src\ResourceEdit\AbstractImageView.cs" />
<Compile Include="Src\ResourceEdit\AbstractImageView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\BinaryView.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\BitmapView.cs" />
<Compile Include="Src\ResourceEdit\BooleanView.cs" />
<Compile Include="Src\ResourceEdit\CursorView.cs" />
<Compile Include="Src\ResourceEdit\IconView.cs" />
<Compile Include="Src\ResourceEdit\BitmapView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\BooleanView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\CursorView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\IconView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\IResourceView.cs" />
<Compile Include="Src\ResourceEdit\ResourceEditor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\ResourceItem.cs" />
<Compile Include="Src\ResourceEdit\ResourceList.cs" />
<Compile Include="Src\ResourceEdit\TextView.cs" />
<Compile Include="Src\ResourceEdit\ResourceList.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ResourceEdit\TextView.cs">
<SubType>Component</SubType>
</Compile>
<None Include="ResourceEditor.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

4
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

22
src/AddIns/Misc/AddinScout/Project/AddinScout.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}</ProjectGuid>
<RootNamespace>NewProject</RootNamespace>
@ -38,15 +38,23 @@ @@ -38,15 +38,23 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Src\Gui\AddInDetailsPanel.cs" />
<Compile Include="Src\Gui\AddinTreeView.cs" />
<Compile Include="Src\Gui\CodonListPanel.cs" />
<Compile Include="Src\Gui\TreeTreeView.cs" />
<Compile Include="Src\Gui\AddInDetailsPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\AddinTreeView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\CodonListPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\TreeTreeView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\AddInScoutCommand.cs" />
<Compile Include="Src\AddInScoutViewContent.cs" />
<Compile Include="Src\AssemblyInfo.cs" />
<None Include="AddInScout.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
@ -60,6 +68,8 @@ @@ -60,6 +68,8 @@
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

4
src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj

@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<None Include="Debugger.AddIn.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\Pads\BreakPointsPad.cs" />

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/NativeMethods.cs

@ -11,8 +11,8 @@ namespace DebuggerLibrary @@ -11,8 +11,8 @@ namespace DebuggerLibrary
{
internal static class NativeMethods
{
[System.Runtime.ConstrainedExecution.ReliabilityContract(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.CER.Success),
DllImport("kernel32.dll")]
// [System.Runtime.ConstrainedExecution.ReliabilityContract(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.CER.Success),
[DllImport("kernel32.dll")]
public static extern bool CloseHandle(IntPtr handle);
[DllImport("mscoree.dll", CharSet=CharSet.Unicode, PreserveSig=false)]

8
src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}</ProjectGuid>
<OutputType>Library</OutputType>
@ -52,7 +52,9 @@ @@ -52,7 +52,9 @@
</Compile>
<Compile Include="Src\TreeListView\ITreeListViewItemComparer.cs" />
<Compile Include="Src\TreeListView\SelectedTreeListViewItemCollection.cs" />
<Compile Include="Src\TreeListView\TreeListView.cs" />
<Compile Include="Src\TreeListView\TreeListView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\TreeListView\TreeListViewItem.cs" />
<Compile Include="Src\TreeListView\TreeListViewItemCollection.cs" />
<Compile Include="Src\TreeListView\TreeListViewSubItemEdit.cs" />

4
src/AddIns/Misc/Debugger/TreeListView/Project/TreeListView.csproj.user

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

8
src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{8A462940-E5E9-4E85-982D-D4C006EE31D4}</ProjectGuid>
<AssemblyName>HighlightingEditor</AssemblyName>
@ -52,7 +52,9 @@ @@ -52,7 +52,9 @@
<EmbeddedResource Include="Resources\Scheme.xfrm" />
<EmbeddedResource Include="Resources\Span.xfrm" />
<EmbeddedResource Include="Resources\Spans.xfrm" />
<Compile Include="Src\ColorButton.cs" />
<Compile Include="Src\ColorButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\ColorDialog.cs">
<SubType>Form</SubType>
</Compile>
@ -107,7 +109,7 @@ @@ -107,7 +109,7 @@
<SubType>UserControl</SubType>
</Compile>
<None Include="HighlightingEditor.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

4
src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

2
src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj

@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
<SubType>UserControl</SubType>
</Compile>
<None Include="NUnitPad.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

2
src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj

@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
<EmbeddedResource Include="Resources\RegExpTkMainForm.xfrm" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<None Include="RegExpTk.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

10
src/AddIns/Misc/StartPage/Project/Src/StartPage.cs

@ -96,12 +96,12 @@ namespace ICSharpCode.StartPage @@ -96,12 +96,12 @@ namespace ICSharpCode.StartPage
{
e.Cancel = true;
// bug in webbrowser control?
string url = e.Url.Replace("about:blank", "");
string url = e.Url.AbsoluteUri.Replace("about:blank", "");
if (url.StartsWith("project://")) {
try {
ICSharpCode.Core.RecentOpen recOpen = (ICSharpCode.Core.RecentOpen)FileService.RecentOpen;
string prjNumber = e.Url.Substring("project://".Length);
string prjNumber = e.Url.AbsoluteUri.Substring("project://".Length);
prjNumber = prjNumber.Substring(0, prjNumber.Length - 1);
string projectFile = page.projectFiles[int.Parse(prjNumber)];
@ -118,13 +118,13 @@ namespace ICSharpCode.StartPage @@ -118,13 +118,13 @@ namespace ICSharpCode.StartPage
NewBtnClicked(this, EventArgs.Empty);
} else if (url.EndsWith("/opensection")) {
Regex section = new Regex(@".*/(?<section>.+)/opensection", RegexOptions.Compiled);
Match match = section.Match(e.Url);
Match match = section.Match(e.Url.AbsoluteUri);
if (match.Success) {
curSection = match.Result("${section}");
webBrowser.DocumentText = page.Render(curSection);
}
} else {
System.Diagnostics.Process.Start(e.Url);
System.Diagnostics.Process.Start(e.Url.AbsoluteUri);
}
e.Cancel = true;
}

2
src/AddIns/Misc/StartPage/Project/StartPage.csproj

@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
<Compile Include="Src\Main.cs" />
<Compile Include="Src\StartPage.cs" />
<None Include="StartPage.addin">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

42
src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -72,9 +72,15 @@ @@ -72,9 +72,15 @@
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Controls\InertButton.cs" />
<Compile Include="Docking\AutoHideWindow.cs" />
<Compile Include="Docking\AutoHideWindowSplitter.cs" />
<Compile Include="Controls\InertButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\AutoHideWindow.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\AutoHideWindowSplitter.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DisplayingDockList.cs">
<SubType>Code</SubType>
</Compile>
@ -99,23 +105,33 @@ @@ -99,23 +105,33 @@
<Compile Include="Docking\DockPaneCollection.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\DockPanel.cs" />
<Compile Include="Docking\DockPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DockPanelPersist.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\DockPaneSplitter.cs" />
<Compile Include="Docking\DockWindow.cs" />
<Compile Include="Docking\DockPaneSplitter.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DockWindow.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DockWindowCollection.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\DockWindowSplitter.cs" />
<Compile Include="Docking\DockWindowSplitter.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DragHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\DragHandlerBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\DummyControl.cs" />
<Compile Include="Docking\DummyControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\Enums.cs">
<SubType>Code</SubType>
</Compile>
@ -140,7 +156,9 @@ @@ -140,7 +156,9 @@
<Compile Include="Docking\NestedDockingStatus.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Docking\SplitterBase.cs" />
<Compile Include="Docking\SplitterBase.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Helpers\DrawHelper.cs">
<SubType>Code</SubType>
</Compile>
@ -197,6 +215,8 @@ @@ -197,6 +215,8 @@
<Content Include="Docking\CodeDoc\FloatWindowCollection.xml" />
<Content Include="Docking\CodeDoc\Interfaces.xml" />
<Content Include="Docking\CodeDoc\NestedDockingStatus.xml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Configuration\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

4
src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<CopyProjectOption>0</CopyProjectOption>

8
src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</ProjectGuid>
<AssemblyName>ICSharpCode.TextEditor</AssemblyName>
@ -128,7 +128,9 @@ @@ -128,7 +128,9 @@
<Compile Include="Src\Undo\IUndoableOperation.cs" />
<Compile Include="Src\Undo\UndoQueue.cs" />
<Compile Include="Src\Undo\UndoStack.cs" />
<Compile Include="Src\Gui\TextAreaControl.cs" />
<Compile Include="Src\Gui\TextAreaControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\TextAreaMouseHandler.cs" />
<Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\ISyntaxModeFileProvider.cs" />
<Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\SyntaxMode.cs" />

4
src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<StartProgram>..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

42
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.41115</ProductVersion>
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</ProjectGuid>
<AssemblyName>ICSharpCode.SharpDevelop</AssemblyName>
@ -177,13 +177,15 @@ @@ -177,13 +177,15 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideTabItem.cs" />
<Compile Include="Src\Gui\Components\StatusBar\SdStatusBar.cs" />
<Compile Include="Src\Gui\Components\StatusBar\SdStatusBar.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\ContentInterfaces\IPrintable.cs" />
<Compile Include="Src\Gui\Dialogs\AbstractOptionPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\CommonAboutDialog.cs">
<SubType>UserControl</SubType>
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\DirtyFilesDialog.cs" />
<Compile Include="Src\Gui\Dialogs\FolderDialog.cs" />
@ -199,10 +201,10 @@ @@ -199,10 +201,10 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
<SubType>Form</SubType>
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
<SubType>Form</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ViewGPLDialog.cs">
<SubType>Form</SubType>
@ -240,10 +242,18 @@ @@ -240,10 +242,18 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DeployFileOptions.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\GeneralProjectOptions.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AddWebReferenceDialog.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AssemblyReferencePanel.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\COMReferencePanel.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\GacReferencePanel.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\ProjectReferencePanel.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AssemblyReferencePanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\COMReferencePanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\GacReferencePanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\ProjectReferencePanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\SelectReferenceDialog.cs">
<SubType>Form</SubType>
</Compile>
@ -261,7 +271,9 @@ @@ -261,7 +271,9 @@
<Compile Include="Src\Gui\Dialogs\Wizard\WizardDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Pads\FileScout.cs" />
<Compile Include="Src\Gui\Pads\FileScout.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Pads\OpenTaskView.cs" />
<Compile Include="Src\Gui\Pads\PropertyPad\PropertyPad.cs" />
<Compile Include="Src\Gui\Pads\SideBarView.cs" />
@ -274,7 +286,9 @@ @@ -274,7 +286,9 @@
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\XmlForms\SharpDevelopObjectCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopObjectCreator.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" />
<Compile Include="Src\Services\IconService.cs" />
@ -438,7 +452,9 @@ @@ -438,7 +452,9 @@
<Compile Include="Src\Gui\Components\ExtTreeView\ExtTreeNode.cs" />
<Compile Include="Src\Gui\Pads\ClassBrowser\Nodes\ClassNode.cs" />
<Compile Include="Src\Gui\Pads\ClassBrowser\Nodes\MemberNode.cs" />
<Compile Include="Src\Gui\Components\ExtTreeView\ExtTreeView.cs" />
<Compile Include="Src\Gui\Components\ExtTreeView\ExtTreeView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\Components\ExtTreeView\ExtFolderNode.cs" />
<Compile Include="Src\Gui\Pads\CompilerMessageView\TextEventHandler.cs" />
<Compile Include="Src\Gui\Pads\ClassBrowser\Nodes\ReferenceFolderNode.cs" />

4
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>

10
src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs

@ -5,7 +5,11 @@ using ICSharpCode.SharpDevelop.Gui; @@ -5,7 +5,11 @@ using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Project
{
public enum CopyToOutputDirectory {
Never,
Always,
PreserveNewest
}
/// <summary>
/// Description of CompileProjectItem.
/// </summary>
@ -39,9 +43,9 @@ namespace ICSharpCode.SharpDevelop.Project @@ -39,9 +43,9 @@ namespace ICSharpCode.SharpDevelop.Project
[LocalizedProperty("Copy to output Directory",
Description ="Specifies if the file should be copied to the output directory")]
public bool CopyToOutputDirectory {
public CopyToOutputDirectory CopyToOutputDirectory {
get {
return base.Properties.Get("CopyToOutputDirectory", false);
return base.Properties.Get("CopyToOutputDirectory", CopyToOutputDirectory.Never);
}
set {
base.Properties.Set("CopyToOutputDirectory", value);

2
src/Main/StartUp/Project/SharpDevelopMain.cs

@ -144,6 +144,8 @@ namespace ICSharpCode.SharpDevelop @@ -144,6 +144,8 @@ namespace ICSharpCode.SharpDevelop
foreach (ICommand command in commands) {
command.Run();
}
} catch (TreePathNotFoundException) {
// Do nothing.
} catch (XmlException e) {
MessageBox.Show("Could not load XML :" + Environment.NewLine + e.Message);
return;

2
src/Main/StartUp/Project/StartUp.csproj

@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<EmbeddedResource Include="Resources\BitmapResources.resources" />
<None Include="Resources\StartUp.snk" />
<None Include="SharpDevelop.exe.manifest">
<CopyToOutputDirectory>True</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="Resources\SplashScreen.jpg" />
<EmbeddedResource Include="Resources\StringResources.resources" />

2
src/build.bat

@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
@ECHO OFF
%windir%\microsoft.net\framework\v2.0.41115\msbuild
%windir%\microsoft.net\framework\v2.0.50215\msbuild
IF %ERRORLEVEL% NEQ 0 PAUSE

2
src/clean.bat

@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
@ECHO OFF
%windir%\microsoft.net\framework\v2.0.41115\msbuild /t:clean
%windir%\microsoft.net\framework\v2.0.50215\msbuild /t:clean
IF %ERRORLEVEL% NEQ 0 PAUSE

2
src/releasebuild.bat

@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
@ECHO OFF
%windir%\microsoft.net\framework\v2.0.41115\msbuild /property:Configuration=Release
%windir%\microsoft.net\framework\v2.0.50215\msbuild /property:Configuration=Release
IF %ERRORLEVEL% NEQ 0 PAUSE

Loading…
Cancel
Save