From 5ff47c03b8d70d8342a066ffeb16bce9fcf43252 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Mon, 13 Feb 2006 22:45:05 +0000 Subject: [PATCH] VB.NET projects can now target different versions of Microsoft's .NET framework. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1148 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Resources/BuildOptions.xfrm | 85 ++++++----- .../Project/Src/OptionPanels/BuildOptions.cs | 3 + .../Project/ICSharpCode.Build.Tasks.csproj | 3 + .../SharpDevelop.Build.VisualBasic.targets | 139 ++++++++++++++++++ 4 files changed, 191 insertions(+), 39 deletions(-) create mode 100644 src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm b/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm index 2c970abeea..924c6f8f6d 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm @@ -8,30 +8,30 @@ + - - + - + - + @@ -41,37 +41,35 @@ - + - - + + - - + - @@ -83,22 +81,22 @@ - - + + - + - - + + - + @@ -113,9 +111,9 @@ - + - + @@ -123,12 +121,11 @@ - + - @@ -144,25 +141,40 @@ - + + + + + + + + + + + + + + + + - + - + @@ -171,7 +183,6 @@ - @@ -179,58 +190,56 @@ - + + - - + - - + - + + - - + - @@ -238,7 +247,6 @@ - @@ -246,25 +254,24 @@ - - + + - - + @@ -276,8 +283,8 @@ - + diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs index ea1266221c..60f3e13f66 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs @@ -56,6 +56,9 @@ namespace VBNetBinding.OptionPanels InitOutputPath(); InitXmlDoc(); + InitTargetFramework(VBNetProject.DefaultTargetsFile, + @"$(SharpDevelopBinPath)\SharpDevelop.Build.VisualBasic.targets"); + InitAdvanced(); InitWarnings(); diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj index eacd29d2bc..d8b483cc05 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj @@ -58,6 +58,9 @@ GlobalAssemblyInfo.cs + + Always + diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets new file mode 100644 index 0000000000..d3efa3602f --- /dev/null +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets @@ -0,0 +1,139 @@ + + + + + $(SystemRoot)\Microsoft.NET\Framework\v1.0.3705 + true + true + + + $(SystemRoot)\Microsoft.NET\Framework\v1.1.4322 + true + true + + + + v1.0 + + + false + + + + + true + + + + + + + + + {CandidateAssemblyFiles}; + $(ReferencePath); + {HintPathFromItem}; + {TargetFrameworkDirectory}; + {AssemblyFolders}; + $(OutputPath); + {GAC} + + + $(VbcToolPath) + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + +