Browse Source

Worked on MSBuildBasedProject

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/dotnet4@4123 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
0b4bd0e3f7
  1. 3
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
  2. 15
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Configuration/AssemblyInfo.cs
  3. 2
      src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml
  4. 10
      src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
  5. 21
      src/Main/Base/Project/Src/Project/MSBuildItemWrapper.cs
  6. 2
      src/Main/Base/Project/Src/Util/ExtensionMethods.cs
  7. 3
      src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs

3
src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj

@ -59,6 +59,9 @@
<None Include="AvalonEdit.AddIn.addin"> <None Include="AvalonEdit.AddIn.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Configuration\AssemblyInfo.cs" /> <Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\AvalonEditDisplayBinding.cs" /> <Compile Include="Src\AvalonEditDisplayBinding.cs" />
<Compile Include="Src\AvalonEditViewContent.cs" /> <Compile Include="Src\AvalonEditViewContent.cs" />

15
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Configuration/AssemblyInfo.cs

@ -12,20 +12,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("AvalonEdit.AddIn")] [assembly: AssemblyTitle("AvalonEdit.AddIn")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AvalonEdit.AddIn")]
[assembly: AssemblyCopyright("Copyright 2008")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// This sets the default COM visibility of types in the assembly to invisible.
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
[assembly: ComVisible(false)]
// The assembly version has following format :
//
// Major.Minor.Build.Revision
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]

2
src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml

@ -97,7 +97,7 @@
Grid.Row="2" Grid.Row="2"
Padding="4,0,4,0" Padding="4,0,4,0"
TextWrapping="Wrap"> TextWrapping="Wrap">
Copyright ©2000-2008 Copyright ©2000-2009
<Hyperlink NavigateUri="mailto:webmaster@icsharpcode.net">IC#SharpCode</Hyperlink> <Hyperlink NavigateUri="mailto:webmaster@icsharpcode.net">IC#SharpCode</Hyperlink>
<Run Text="{x:Static gui:AboutSharpDevelopTabPage.LicenseSentence}" /> <Run Text="{x:Static gui:AboutSharpDevelopTabPage.LicenseSentence}" />
</TextBlock> </TextBlock>

10
src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@ -941,20 +941,18 @@ namespace ICSharpCode.SharpDevelop.Project
throw new ArgumentException("item does not belong to this project", "item"); throw new ArgumentException("item does not belong to this project", "item");
if (!item.IsAddedToProject) if (!item.IsAddedToProject)
return false; return false;
MSBuildItemWrapper backend = (MSBuildItemWrapper)item.BuildItem;
WorkbenchSingleton.AssertMainThread(); using (var c = OpenCurrentConfiguration()) {
throw new NotImplementedException();
/*
lock (SyncRoot) {
if (items.Remove(item)) { if (items.Remove(item)) {
itemsReadOnly = null; // remove readonly variant of item list - will regenerate on next Items call itemsReadOnly = null; // remove readonly variant of item list - will regenerate on next Items call
projectFile.RemoveItem(item.BuildItem); c.Project.RemoveItem(backend.MSBuildItem);
item.BuildItem = null; // make the item free again item.BuildItem = null; // make the item free again
return true; return true;
} else { } else {
throw new InvalidOperationException("Expected that the item is added to this project!"); throw new InvalidOperationException("Expected that the item is added to this project!");
} }
}*/ }
} }
#endregion #endregion

21
src/Main/Base/Project/Src/Project/MSBuildItemWrapper.cs

@ -1,11 +1,10 @@
/* // <file>
* Created by SharpDevelop. // <copyright see="prj:///doc/copyright.txt"/>
* User: Daniel // <license see="prj:///doc/license.txt"/>
* Date: 23.05.2009 // <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
* Time: 01:58 // <version>$Revision$</version>
* // </file>
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -25,6 +24,10 @@ namespace ICSharpCode.SharpDevelop.Project
this.item = item; this.item = item;
} }
public MSBuild.ProjectItem MSBuildItem {
get { return item; }
}
public IProject Project { public IProject Project {
get { return project; } get { return project; }
} }
@ -69,7 +72,7 @@ namespace ICSharpCode.SharpDevelop.Project
item.SetMetadataValue(name, value); item.SetMetadataValue(name, value);
} }
public IEnumerable<string> MetadataNames { public IEnumerable<string> MetadataNames {
get { return item.DirectMetadata.Select(m => m.Name); } get { return item.DirectMetadata.Select(m => m.Name).ToList(); }
} }
} }
} }

2
src/Main/Base/Project/Src/Util/ExtensionMethods.cs

@ -37,6 +37,8 @@ namespace ICSharpCode.SharpDevelop
/// <code>if (MyEvent != null) MyEvent(x,y);</code> /// <code>if (MyEvent != null) MyEvent(x,y);</code>
/// would not be safe. /// would not be safe.
/// </summary> /// </summary>
/// <remarks>Using this method is only thread-safe under the Microsoft .NET memory model,
/// not under the less strict memory model in the CLI specification.</remarks>
public static void RaiseEvent(this EventHandler eventHandler, object sender, EventArgs e) public static void RaiseEvent(this EventHandler eventHandler, object sender, EventArgs e)
{ {
if (eventHandler != null) { if (eventHandler != null) {

3
src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs

@ -13,7 +13,8 @@ using System.Windows.Threading;
namespace ICSharpCode.SharpDevelop namespace ICSharpCode.SharpDevelop
{ {
/// <summary> /// <summary>
/// Description of WpfSynchronizeInvoke. /// Implements the ISynchronizeInvoke interface by using a WPF dispatcher
/// to perform the cross-thread call.
/// </summary> /// </summary>
sealed class WpfSynchronizeInvoke : ISynchronizeInvoke sealed class WpfSynchronizeInvoke : ISynchronizeInvoke
{ {

Loading…
Cancel
Save