Browse Source

Add reference to System.Core when creating .NET 3.5 projects.

Support setting conditional compilation symbols for Boo projects.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2947 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
e0cff7141d
  1. 1
      src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
  2. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm
  3. 10
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs
  4. 9
      src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
  5. 1
      src/Main/Base/Project/Src/Project/CompilableProject.cs
  6. 2
      src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs

1
src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj

@ -6,6 +6,7 @@
<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\booc.*" /> <MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\booc.*" />
<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\*.targets" /> <MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\*.targets" />
<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" /> <MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" />
<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Lang.Extensions.dll" />
</ItemGroup> </ItemGroup>
<Target Name="MyPostBuildTarget"> <Target Name="MyPostBuildTarget">
<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" /> <Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm

@ -40,7 +40,6 @@
<Location value="{X=6,Y=16}" /> <Location value="{X=6,Y=16}" />
<Text value="${res:Dialog.ProjectOptions.BuildOptions.ConditionalSymbols}" /> <Text value="${res:Dialog.ProjectOptions.BuildOptions.ConditionalSymbols}" />
<Anchor value="Top, Left, Right" /> <Anchor value="Top, Left, Right" />
<Visible value="False" />
<TextAlign value="BottomLeft" /> <TextAlign value="BottomLeft" />
<Size value="{Width=492, Height=16}" /> <Size value="{Width=492, Height=16}" />
<TabIndex value="0" /> <TabIndex value="0" />
@ -49,7 +48,6 @@
<Name value="conditionalSymbolsTextBox" /> <Name value="conditionalSymbolsTextBox" />
<TabIndex value="1" /> <TabIndex value="1" />
<Size value="{Width=492, Height=21}" /> <Size value="{Width=492, Height=21}" />
<Visible value="False" />
<Location value="{X=6,Y=36}" /> <Location value="{X=6,Y=36}" />
<Anchor value="Top, Left, Right" /> <Anchor value="Top, Left, Right" />
</System.Windows.Forms.TextBox> </System.Windows.Forms.TextBox>

10
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs

@ -22,12 +22,10 @@ namespace Grunwald.BooBinding
//InitXmlDoc(); //InitXmlDoc();
InitDebugInfo(); InitDebugInfo();
//ConfigurationGuiBinding b; ConfigurationGuiBinding b;
b = helper.BindString("conditionalSymbolsTextBox", "DefineConstants", TextBoxEditMode.EditRawProperty);
//b = helper.BindString("conditionalSymbolsTextBox", "DefineConstants"); b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
//b.TreatPropertyValueAsLiteral = false; b.CreateLocationButton("conditionalSymbolsTextBox");
//b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
//b.CreateLocationButton("conditionalSymbolsTextBox");
helper.BindBoolean("noCorlibCheckBox", "NoStdLib", false).CreateLocationButton("noCorlibCheckBox"); helper.BindBoolean("noCorlibCheckBox", "NoStdLib", false).CreateLocationButton("noCorlibCheckBox");
helper.BindBoolean("duckyCheckBox", "Ducky", false).CreateLocationButton("duckyCheckBox"); helper.BindBoolean("duckyCheckBox", "Ducky", false).CreateLocationButton("duckyCheckBox");

9
src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs

@ -95,10 +95,12 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
InsertCategories(null, categories); InsertCategories(null, categories);
categoryTreeView.TreeViewNodeSorter = new TemplateCategoryComparer(); categoryTreeView.TreeViewNodeSorter = new TemplateCategoryComparer();
categoryTreeView.Sort(); categoryTreeView.Sort();
string initialSelectedCategory = StringParser.Parse("C#\\${res:Templates.File.Categories.WindowsApplications}");
TreeViewHelper.ApplyViewStateString(PropertyService.Get("Dialogs.NewProjectDialog.CategoryTreeState", ""), categoryTreeView); TreeViewHelper.ApplyViewStateString(PropertyService.Get("Dialogs.NewProjectDialog.CategoryTreeState", ""), categoryTreeView);
categoryTreeView.SelectedNode = TreeViewHelper.GetNodeByPath(categoryTreeView, PropertyService.Get("Dialogs.NewProjectDialog.LastSelectedCategory", "C#")); categoryTreeView.SelectedNode = TreeViewHelper.GetNodeByPath(categoryTreeView, PropertyService.Get("Dialogs.NewProjectDialog.LastSelectedCategory", initialSelectedCategory));
} }
void InsertCategories(TreeNode node, IEnumerable<Category> catarray) void InsertCategories(TreeNode node, IEnumerable<Category> catarray)
{ {
foreach (Category cat in catarray) { foreach (Category cat in catarray) {
@ -336,9 +338,12 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
return; return;
} }
if (createNewSolution) { if (createNewSolution) {
ProjectService.LoadSolution(NewSolutionLocation); ProjectService.BeforeLoadSolution();
} }
item.Template.RunOpenActions(cinfo); item.Template.RunOpenActions(cinfo);
if (createNewSolution) {
ProjectService.LoadSolution(NewSolutionLocation);
}
NewProjectLocation = cinfo.createdProjects.Count > 0 ? cinfo.createdProjects[0].FileName : ""; NewProjectLocation = cinfo.createdProjects.Count > 0 ? cinfo.createdProjects[0].FileName : "";
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;

1
src/Main/Base/Project/Src/Project/CompilableProject.cs

@ -431,6 +431,7 @@ namespace ICSharpCode.SharpDevelop.Project
CompilableProject cp = p as CompilableProject; CompilableProject cp = p as CompilableProject;
if (cp != null && cp.TargetFrameworkVersion == "v3.5") { if (cp != null && cp.TargetFrameworkVersion == "v3.5") {
cp.AddDotnet35References(); cp.AddDotnet35References();
cp.Save();
} }
} }
} }

2
src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs

@ -232,7 +232,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
static void BeforeLoadSolution() internal static void BeforeLoadSolution()
{ {
if (openSolution != null) { if (openSolution != null) {
SaveSolutionPreferences(); SaveSolutionPreferences();

Loading…
Cancel
Save