diff options
134 files changed, 775 insertions, 7371 deletions
diff --git a/main/Main.sln b/main/Main.sln index cd3448176f..4308643851 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -55,8 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libstetic", "src\addins\Mon EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsteticui", "src\addins\MonoDevelop.GtkCore\libsteticui\libsteticui.csproj", "{7926DB5B-96A7-47A7-9870-DB42FA5C3548}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prj2make-sharp-lib", "src\addins\prj2make-sharp-lib\prj2make-sharp-lib.csproj", "{0F57E572-2359-4BAF-B302-6478C2E42FA2}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBNetBinding", "VBNetBinding", "{481E1487-E0F1-4C6D-BD71-E572D9A19683}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\addins\VBNetBinding\VBNetBinding.csproj", "{EF91D0B8-53F6-4622-9F26-3ED27815878A}"
@@ -320,13 +318,6 @@ Global {0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {0F57E572-2359-4BAF-B302-6478C2E42FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -994,7 +985,6 @@ Global {961B9266-C44A-42B6-BA3D-3FB229C9C417} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
- {0F57E572-2359-4BAF-B302-6478C2E42FA2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{481E1487-E0F1-4C6D-BD71-E572D9A19683} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{75B9F2DF-4DEA-4007-965D-339563735EBE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
diff --git a/main/configure.in b/main/configure.in index a8b20c677f..13e046963d 100644 --- a/main/configure.in +++ b/main/configure.in @@ -302,7 +302,6 @@ src/addins/CSharpBinding/Autotools/Makefile src/addins/CSharpBinding/AspNet/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile -src/addins/prj2make-sharp-lib/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/libstetic/Makefile diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/MD1AspNetCustomDataItem.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/MD1AspNetCustomDataItem.cs deleted file mode 100644 index 73fc0c617c..0000000000 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/MD1AspNetCustomDataItem.cs +++ /dev/null @@ -1,104 +0,0 @@ -// -// MD1AspNetCustomDataItem.cs -// -// Author: -// Michael Hutchinson <mhutchinson@novell.com> -// -// Copyright (C) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.IO; -using MonoDevelop.Core; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.AspNet.MD1Serialization -{ - - class MD1AspNetCustomDataItem : MonoDevelop.Projects.Formats.MD1.MD1CustomDataItem - { - public override DataCollection Serialize (object obj, ITypeSerializer handler) - { - //serialise as normal - DataCollection data = base.Serialize (obj, handler); - - AspNetAppProject proj = obj as AspNetAppProject; - if (proj == null) - return data; - - //for the old format we need to make sure each Content file that's a web type and is NOT set - //to copy actually gets changed to the FileCopy build target - DataItem files = data ["Contents"] as DataItem; - if (files == null || !files.HasItemData) - return data; - - foreach (object f in files.ItemData) { - DataItem file = f as DataItem; - if (file == null || !file.HasItemData)// || file.Name != "File") - continue; - - DataValue ctod = file ["copyToOutputDirectory"] as DataValue; - if (ctod != null && ctod.Value == "Never") - { - DataValue action = file ["buildaction"] as DataValue; - DataValue name = file ["name"] as DataValue; - if (action != null && name != null && action.Value == "Content") - { - WebSubtype type = AspNetAppProject.DetermineWebSubtype (name.Value); - if (type != WebSubtype.None && type != WebSubtype.Code) { - file.Extract ("copyToOutputDirectory"); - int index = file.ItemData.IndexOf (action); - file.ItemData.Remove (action); - file.ItemData.Insert (index, new DataValue ("buildaction", "FileCopy")); - } - } - } - } - - return data; - } - - public override void Deserialize (object obj, ITypeSerializer handler, DataCollection data) - { - //deserialise as normal - base.Deserialize (obj, handler, data); - - AspNetAppProject proj = obj as AspNetAppProject; - if (proj == null) - return; - - //find files that are web content and have been deserialised from the obsolete "FileCopy" BuildAction - foreach (MonoDevelop.Projects.ProjectFile pf in proj.Files) { - if (pf.BuildAction != MonoDevelop.Projects.BuildAction.Content - || pf.CopyToOutputDirectory != MonoDevelop.Projects.FileCopyMode.Always) - continue; - - WebSubtype type = proj.DetermineWebSubtype (pf); - if (type != WebSubtype.None && type != WebSubtype.Code) { - //and mark them to not copy, since we don't actually want this; - // the obsolete behaviour was a hack - pf.CopyToOutputDirectory = MonoDevelop.Projects.FileCopyMode.None; - } - } - } - } -} diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/md1format.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/md1format.xml deleted file mode 100644 index 11a4d7d121..0000000000 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.MD1Serialization/md1format.xml +++ /dev/null @@ -1,13 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.AspNet.AspNetAppProject" customDataItem="MonoDevelop.AspNet.MD1Serialization.MD1AspNetCustomDataItem" > - <ItemProperty member="xspParameters" name = "XspParameters" /> - <ItemProperty member="verifyCodeBehindFields" name = "VerifyCodeBehindFields" /> - <ItemProperty member="verifyCodeBehindEvents" name = "VerifyCodeBehindEvents" /> - <ItemProperty member="webDeployTargets" name = "WebDeployTargets" /> - <ItemProperty member="webDeployTargets" scope="*" name="Target" valueType="MonoDevelop.AspNet.Deployment.WebDeployTarget" /> - </DataItem> - <DataItem class = "MonoDevelop.AspNet.AspNetAppProjectConfiguration" > - <ItemProperty member="disableCodeBehindGeneration" name="AspNet/DisableCodeBehindGeneration" defaultValue="false"/> - <ItemProperty member="nonStandardOutputDirectory" name="AspNet/nonStandardOutputDirectory" defaultValue="false"/> - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml index fe7608f3ff..a9d81804a9 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml @@ -249,10 +249,6 @@ xsdFile = "xhtml1-frameset.xsd" />
</Extension>
- <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps">
- <SerializationMap resource="md1format.xml" />
- </Extension>
-
<Extension path = "/MonoDevelop/Deployment/DeployServiceExtensions">
<Class id="AspNetDeploy" insertbefore="PrepareDeploy" class = "MonoDevelop.AspNet.Deployment.AspNetDeployServiceExtension" />
</Extension>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj index 8133f35249..f9466d77f7 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj @@ -205,9 +205,6 @@ <EmbeddedResource Include="Templates\WebConfig-SubDir.xft.xml"> <LogicalName>WebConfig-SubDir.xft.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.AspNet.MD1Serialization\md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="Templates\WebContentForm-CodeBehind.xft.xml"> <LogicalName>WebContentForm-CodeBehind.xft.xml</LogicalName> </EmbeddedResource> @@ -276,7 +273,6 @@ <Compile Include="MonoDevelop.AspNet.StateEngine\AspNetDom.cs" /> <Compile Include="MonoDevelop.AspNet.StateEngine\AspNetDirectiveState.cs" /> <Compile Include="MonoDevelop.AspNet.StateEngine\AspNetServerCommentState.cs" /> - <Compile Include="MonoDevelop.AspNet.MD1Serialization\MD1AspNetCustomDataItem.cs" /> <Compile Include="MonoDevelop.AspNet.Deployment\AspNetDeployServiceExtension.cs" /> <Compile Include="MonoDevelop.AspNet.Parser\Directive.cs" /> <Compile Include="MonoDevelop.AspNet.Completion\SimpleLists.cs" /> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs index f0486a084f..d02a958794 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs @@ -83,17 +83,6 @@ namespace MonoDevelop.AspNet { base.OnEndLoad (); - if (FileFormat.Id == "MD1") { - foreach (AspNetAppProjectConfiguration conf in Configurations) { - //migrate settings once - if (!conf.nonStandardOutputDirectory) { - conf.nonStandardOutputDirectory = true; - conf.OutputDirectory = String.IsNullOrEmpty (BaseDirectory)? "bin" : Path.Combine (BaseDirectory, "bin"); - } - } - } - base.OnEndLoad (); - //FIX: old version of MD didn't set CompileTarget to Library for ASP.NET projects, // but implicitly assumed they were always libraries. This is not compatible with VS/MSBuild, // so we automatically "upgrade" this value. diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs index 7b36426f74..07a8e6e268 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs @@ -51,9 +51,6 @@ namespace MonoDevelop.AspNet [ItemProperty ("AspNet/DisableCodeBehindGeneration", DefaultValue = false)] bool disableCodeBehindGeneration = false; - //MD1 compatibility - internal bool nonStandardOutputDirectory = false; - public bool DisableCodeBehindGeneration { get { return disableCodeBehindGeneration; } set { disableCodeBehindGeneration = value; } diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml index b5473ab34a..edf237841b 100644 --- a/main/src/addins/CBinding/CBinding.addin.xml +++ b/main/src/addins/CBinding/CBinding.addin.xml @@ -230,10 +230,6 @@ <SolutionItem type="CBinding.CProject" extension="cproj" guid="{2857B73E-F847-4B02-9238-064979017E93}"/> </Extension> - <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <SerializationMap resource="md1format.xml" /> - </Extension> - <!-- Current Autotools AddIn is very .NET specific <Module> <Runtime> diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj index 2f83da0c6b..fd0286c6ef 100644 --- a/main/src/addins/CBinding/CBinding.csproj +++ b/main/src/addins/CBinding/CBinding.csproj @@ -239,9 +239,6 @@ <EmbeddedResource Include="icons\cpp-icon-32.png"> <LogicalName>cpp-icon-32.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="templates\ConsoleObjCProject.xpt.xml"> <LogicalName>ConsoleObjCProject.xpt.xml</LogicalName> </EmbeddedResource> diff --git a/main/src/addins/CBinding/md1format.xml b/main/src/addins/CBinding/md1format.xml deleted file mode 100644 index 9b00c93af9..0000000000 --- a/main/src/addins/CBinding/md1format.xml +++ /dev/null @@ -1,27 +0,0 @@ -<SerializationMap> - <DataItem class = "CBinding.CProject"> - <ItemProperty member="compiler_manager" name="compiler" valueType="CBinding.CCompiler"/> - <ItemProperty member="language" /> - <ItemProperty member="target" name="Target"/> - <ItemProperty member="Packages" /> - </DataItem> - <DataItem class = "CBinding.CProjectConfiguration"> - <ItemProperty member="output" name="Output/output"/> - <ItemProperty member="target" name="Build/target"/> - <ItemProperty member="includes" name="Includes"/> - <ItemProperty member="includes" scope="*" name="Include" valueType="System.String"/> - <ItemProperty member="libpaths" name="LibPaths"/> - <ItemProperty member="libpaths" scope="*" name="LibPath" valueType="System.String"/> - <ItemProperty member="libs" name="Libs"/> - <ItemProperty member="libs" scope="*" name="Lib" valueType="System.String"/> - <ItemProperty member="warning_level" name="CodeGeneration/WarningLevel"/> - <ItemProperty member="warnings_as_errors" name="CodeGeneration/WarningsAsErrors"/> - <ItemProperty member="optimization" name="CodeGeneration/OptimizationLevel"/> - <ItemProperty member="extra_compiler_args" name="CodeGeneration/ExtraCompilerArguments"/> - <ItemProperty member="extra_linker_args" name="CodeGeneration/ExtraLinkerArguments"/> - <ItemProperty member="define_symbols" name="CodeGeneration/DefineSymbols"/> - <ItemProperty member="source_directory_path" name="SourceDirectory" serializationDataType="MonoDevelop.Projects.PathDataType"/> - <ItemProperty member="use_ccache" name="UseCcache" defaultValue="false"/> - <ItemProperty member="precompileHeaders" name="PrecompileHeaders" defaultValue="true"/> - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml index 7cc0a38cd1..8bf7e78a4d 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml +++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml @@ -103,10 +103,6 @@ <Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.UnitTestTextEditorExtension" /> </Extension> - <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <SerializationMap resource="md1format.xml" /> - </Extension> - <Extension path = "/MonoDevelop/Core/StockIcons"> <StockIcon stockid = "md-csharp-file" resource = "C#.FileIcon" size="Menu" /> <StockIcon stockid = "md-csharp-project" resource = "csharp-project-16.png" size="Menu"/> diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index 00597b426f..bc11ea072e 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -189,9 +189,6 @@ <EmbeddedResource Include="templates\AssemblyInfo.xft.xml"> <LogicalName>AssemblyInfo.xft.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="icons\csharp-project-16.png"> <LogicalName>csharp-project-16.png</LogicalName> </EmbeddedResource> diff --git a/main/src/addins/CSharpBinding/md1format.xml b/main/src/addins/CSharpBinding/md1format.xml deleted file mode 100644 index 64d49a560e..0000000000 --- a/main/src/addins/CSharpBinding/md1format.xml +++ /dev/null @@ -1,19 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.CSharp.Project.CSharpCompilerParameters"> - <LiteralProperty name="compiler" value="Mcs" /> - <ItemProperty member="warninglevel" name = "warninglevel"/> - <ItemProperty member="noWarnings" name="nowarn" defaultValue=""/> - <ItemProperty member="optimize" name="optimize"/> - <ItemProperty member="unsafecode" name="unsafecodeallowed"/> - <ItemProperty member="generateOverflowChecks" name="generateoverflowchecks"/> - <ItemProperty member="mainclass" name="mainclass" defaultValue=""/> - <ItemProperty member="definesymbols" name="definesymbols" defaultValue="" /> - <ItemProperty member="win32Icon" name="win32Icon" defaultValue="" serializationDataType="MonoDevelop.Projects.PathDataType"/> - <ItemProperty member="win32Resource" name="win32Resource" defaultValue="" /> - <ItemProperty member="codePage" name="codepage" defaultValue="0"/> - <ItemProperty member="additionalArgs" name="additionalargs" defaultValue="" /> - <ItemProperty member="LangVersion" name="langversion" defaultValue="Default"/> - <ItemProperty member="treatWarningsAsErrors" name="warningsAsErrors" defaultValue="False"/> - <ItemProperty member="warningsNotAsErrors" name="warningsNotAsErrors" defaultValue=""/> - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml index e9be8574d7..226b186130 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml @@ -35,13 +35,4 @@ <Extension path = "/MonoDevelop/ProjectModel/PolicySets/Mono" >
<Policies resource="Policies.xml"/>
</Extension>
-
- <!-- for MD1 migration -->
- <Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
- <ItemProperty class = "MonoDevelop.Projects.SolutionItem"
- name = "MonoDevelop.ChangeLogAddIn.ChangeLogInfo" type = "MonoDevelop.ChangeLogAddIn.OldChangeLogData" />
- <ItemProperty class = "MonoDevelop.Projects.Solution"
- name = "MonoDevelop.ChangeLogAddIn.ChangeLogInfo" type = "MonoDevelop.ChangeLogAddIn.OldChangeLogData" />
- </Extension>
-
</ExtensionModel>
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj index 70b039d20d..158af5dd6d 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj @@ -119,7 +119,6 @@ <Compile Include="gtk-gui\MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs" /> <Compile Include="ChangeLogService.cs" /> <Compile Include="ChangeLogPolicy.cs" /> - <Compile Include="OldChangeLogData.cs" /> <Compile Include="AddinInfo.cs" /> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs index 6d6800d1e0..587bb5db7c 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs +++ b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs @@ -121,7 +121,6 @@ namespace MonoDevelop.ChangeLogAddIn static ChangeLogPolicy GetPolicy (SolutionItem item) { - OldChangeLogData.Migrate (item); return item.Policies.Get<ChangeLogPolicy> (); } } diff --git a/main/src/addins/ChangeLogAddIn/OldChangeLogData.cs b/main/src/addins/ChangeLogAddIn/OldChangeLogData.cs deleted file mode 100644 index e5f2ac4616..0000000000 --- a/main/src/addins/ChangeLogAddIn/OldChangeLogData.cs +++ /dev/null @@ -1,100 +0,0 @@ -// -// OldChangeLogData.cs -// -// Author: -// Michael Hutchinson <mhutchinson@novell.com> -// -// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using System; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.ChangeLogAddIn -{ - - [DataItem ("ChangeLogInfo")] - class OldChangeLogData - { - [ItemProperty] - readonly ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy; - - OldChangeLogData () - { - } - - enum ChangeLogPolicyEnum - { - NoChangeLog, - UseParentPolicy, - UpdateNearestChangeLog, - OneChangeLogInProjectRootDirectory, - OneChangeLogInEachDirectory - } - - public static void Migrate (SolutionItem entry) - { - if (entry.ParentFolder != null) - Migrate (entry.ParentFolder); - - var data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData; - if (data == null) - return; - - entry.ExtendedProperties.Remove ("MonoDevelop.ChangeLogAddIn.ChangeLogInfo"); - - if (entry.Policies.DirectGet<ChangeLogPolicy> () != null) - return; - - ChangeLogPolicyEnum policy = data.policy; - - if ((entry is SolutionFolder) && ((SolutionFolder)entry).IsRoot) { - if (policy == ChangeLogPolicyEnum.UseParentPolicy) - policy = ChangeLogPolicyEnum.UpdateNearestChangeLog; - } - - ChangeLogUpdateMode mode; - VcsIntegration intEnabled = VcsIntegration.Enabled; - - switch (policy) { - case ChangeLogPolicyEnum.UseParentPolicy: - return; - case ChangeLogPolicyEnum.NoChangeLog: - mode = ChangeLogUpdateMode.None; - intEnabled = VcsIntegration.None; - break; - case ChangeLogPolicyEnum.OneChangeLogInEachDirectory: - mode = ChangeLogUpdateMode.Directory; - break; - case ChangeLogPolicyEnum.OneChangeLogInProjectRootDirectory: - mode = ChangeLogUpdateMode.ProjectRoot; - break; - case ChangeLogPolicyEnum.UpdateNearestChangeLog: - mode = ChangeLogUpdateMode.Nearest; - break; - default: - throw new InvalidOperationException ("Unknown value '" + policy + "'"); - } - - entry.Policies.Set (new ChangeLogPolicy (mode, intEnabled, null)); - } - } -} diff --git a/main/src/addins/ChangeLogAddIn/Policies.xml b/main/src/addins/ChangeLogAddIn/Policies.xml index a727ac56a1..3da243b398 100644 --- a/main/src/addins/ChangeLogAddIn/Policies.xml +++ b/main/src/addins/ChangeLogAddIn/Policies.xml @@ -1,3 +1,3 @@ <ChangeLogPolicy id="Mono" UpdateMode="Directory" VcsIntegration="Enabled" allowDiffSerialize="True"> <MessageStyle Header="${Date:yyyy-MM-dd} ${AuthorName} <${AuthorEmail}>

" Indent="	" FirstFilePrefix="* " FileSeparator=":
* " LastFilePostfix=": " LineAlign="2" InterMessageLines="1" IncludeDirectoryPaths="False"/> -</ChangeLogPolicy>
\ No newline at end of file +</ChangeLogPolicy> diff --git a/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs b/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs index 948bc69453..12a02a3337 100644 --- a/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs +++ b/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs @@ -41,19 +41,6 @@ namespace MonoDevelop.ChangeLogAddIn return widget = new ProjectOptionPanelWidget (this); } - public override void Initialize (OptionsDialog dialog, object dataObject) - { - var solutionItem = dataObject as SolutionItem; - if (solutionItem != null) - OldChangeLogData.Migrate (solutionItem); - else { - var solution = dataObject as Solution; - if (solution != null) - OldChangeLogData.Migrate (solution.RootFolder); - } - base.Initialize (dialog, dataObject); - } - protected override string PolicyTitleWithMnemonic { get { return GettextCatalog.GetString ("ChangeLog _Policy"); diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml index 986e617bd2..2071ab2593 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml @@ -196,8 +196,4 @@ <Extension path = "/MonoDevelop/Ide/ProjectFeatures"> <!-- <Class class = "MonoDevelop.Deployment.Gui.PackagingFeature" /> --> </Extension> - - <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <SerializationMap resource="md1format.xml" /> - </Extension> </Addin> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj index 625a9feff4..658b2b47fc 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj @@ -158,7 +158,6 @@ <Compile Include="MonoDevelop.Deployment.Gui\SshFuseFileCopyConfigurationEditorWidget.cs" /> <Compile Include="gtk-gui\MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs" /> <Compile Include="MonoDevelop.Deployment.Gui\SshFuseFileCopyConfigurationEditor.cs" /> - <Compile Include="MonoDevelop.Deployment\MD1Serializer.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="gtk-gui\gui.stetic"> @@ -179,9 +178,6 @@ <EmbeddedResource Include="icons\packaging-16.png"> <LogicalName>packaging-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/MD1Serializer.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/MD1Serializer.cs deleted file mode 100644 index 181b613d32..0000000000 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/MD1Serializer.cs +++ /dev/null @@ -1,125 +0,0 @@ -// MD1Serializer.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.Collections.Generic; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Formats.MD1; - -namespace MonoDevelop.Deployment -{ - public class MD1Serializer: ICustomDataItemHandler - { - public DataCollection Serialize (object obj, ITypeSerializer handler) - { - PackageBuilder pb = (PackageBuilder) obj; - List<string> items = new List<string> (); - foreach (SolutionItem sitem in pb.GetChildEntries ()) { - string file = MD1ProjectService.GetItemFileName (sitem); - if (file != null) - items.Add (file); - else if (handler.SerializationContext.ProgressMonitor != null) - handler.SerializationContext.ProgressMonitor.ReportWarning ("Can't save reference to item '" + sitem.Name + "'"); - } - string rootFile = MD1ProjectService.GetItemFileName (pb.RootSolutionItem); - if (rootFile == null && handler.SerializationContext.ProgressMonitor != null) - handler.SerializationContext.ProgressMonitor.ReportWarning ("Can't save reference to item '" + pb.RootSolutionItem.Name + "'"); - - pb.SetSolutionItemMd1 (rootFile, items.ToArray ()); - return handler.Serialize (obj); - } - - public void Deserialize (object obj, ITypeSerializer handler, DataCollection data) - { - handler.Deserialize (obj, data); - } - - } - - public class MD1ProjectFileSerializer : ICustomDataItemHandler - { - static string[] keys = new string[] { - "DeployService.Deploy", - "DeployService.TargetDirectoryId", - "DeployService.RelativeDeployPath", - "DeployService.UseProjectRelativePath", - "DeployService.HasPathReferences", - "DeployService.FileAttributes" - }; - - public DataCollection Serialize (object obj, ITypeSerializer handler) - { - DataCollection data = handler.Serialize (obj); - ProjectFile file = (ProjectFile) obj; - - //if the file is marked to copy to output, the deploy settings are useless, so strip them out and return - if (file.CopyToOutputDirectory != FileCopyMode.None) { - foreach (string key in keys) { - data.Extract (key); - } - return data; - } - - //if the file was FileCopyMode.None and is BuildAction.Content and is marked to deploy, then we can - //map it back to a FileCopy build action - if (file.BuildAction == BuildAction.Content) { - object val = file.ExtendedProperties ["DeployService.Deploy"]; - if (val != null && (bool) val) { - data.Extract ("buildaction"); - data.Add (new DataValue ("buildaction", "FileCopy")); - } - } - - return data; - } - - public void Deserialize (object obj, ITypeSerializer handler, DataCollection data) - { - //find whether is was marked as FileCopy - DataValue value = data ["buildaction"] as DataValue; - bool isFileCopy = value != null && value.Value == "FileCopy"; - - handler.Deserialize (obj, data); - ProjectFile file = (ProjectFile) obj; - - //if it wasn't, no fancy migrations to do - if (!isFileCopy) - return; - - //if there were any deploy settings remaining in the project file, then the file isn't "copy to output" - //but instead should be marked to deploy - foreach (string key in keys) { - if (file.ExtendedProperties.Contains (key)) { - file.CopyToOutputDirectory = FileCopyMode.None; - file.ExtendedProperties ["DeployService.Deploy"] = true; - return; - } - } - } - } -} diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs index 51d8cd6cc3..3df5f51486 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs @@ -52,11 +52,6 @@ namespace MonoDevelop.Deployment List<SolutionItem> childCombineEntries; SolutionItem rootSolutionItem; - -#region MD 1.0 compatibility fields - string[] md1ChildEntries; - string md1RootEntry; -#endregion public PackageBuilder () { @@ -126,9 +121,7 @@ namespace MonoDevelop.Deployment { childEntries = new List<SolutionItemReference> (other.childEntries); rootEntry = other.rootEntry; - md1ChildEntries = other.md1ChildEntries; - md1RootEntry = other.md1RootEntry; - + if (other.childCombineEntries != null) childCombineEntries = new List<SolutionItem> (other.childCombineEntries); else @@ -190,12 +183,6 @@ namespace MonoDevelop.Deployment childEntries.Add (e); } - internal void SetSolutionItemMd1 (string siRoot, string[] children) - { - md1RootEntry = siRoot; - md1ChildEntries = children; - } - void UpdateEntryNames () { this.rootEntry = new SolutionItemReference (rootSolutionItem); @@ -206,13 +193,8 @@ namespace MonoDevelop.Deployment public SolutionItem RootSolutionItem { get { - if (rootSolutionItem == null && (rootEntry != null || md1RootEntry != null)) { - if (md1RootEntry != null) { - rootSolutionItem = GetEntryMD1 (md1RootEntry); - md1RootEntry = null; - } else - rootSolutionItem = GetEntry (rootEntry); - } + if (rootSolutionItem == null && rootEntry != null) + rootSolutionItem = GetEntry (rootEntry); return rootSolutionItem; } } @@ -261,16 +243,6 @@ namespace MonoDevelop.Deployment childCombineEntries = new List<SolutionItem> (); - if (md1ChildEntries != null) { - foreach (string it in md1ChildEntries) { - SolutionItem re = GetEntryMD1 (it); - if (re != null && !(re is UnknownSolutionItem)) - childCombineEntries.Add (re); - } - md1ChildEntries = null; - return childCombineEntries.ToArray (); - } - foreach (SolutionItemReference en in childEntries) { SolutionItem re = GetEntry (en); if (re != null && !(re is UnknownSolutionItem)) @@ -346,41 +318,5 @@ namespace MonoDevelop.Deployment } return common; } - - SolutionItem GetEntryMD1 (string fileName) - { - foreach (WorkspaceItem it in IdeApp.Workspace.Items) { - SolutionItem fi = FindEntryMD1 (it, FileService.GetFullPath (fileName)); - if (fi != null) - return fi; - } - return Services.ProjectService.ReadSolutionItem (new NullProgressMonitor (), fileName); - } - - SolutionItem FindEntryMD1 (object item, string fileName) - { - if (item is SolutionItem) { - string file = MonoDevelop.Projects.Formats.MD1.MD1ProjectService.GetItemFileName ((SolutionItem)item); - if (file != null && FileService.GetFullPath (file) == fileName) - return (SolutionItem) item; - } - - if (item is Solution) { - return FindEntryMD1 (((Solution)item).RootFolder, fileName); - } - else if (item is SolutionFolder) { - foreach (SolutionItem ce in ((SolutionFolder)item).Items) { - SolutionItem fi = FindEntryMD1 (ce, fileName); - if (fi != null) return fi; - } - } - else if (item is Workspace) { - foreach (WorkspaceItem wi in ((Workspace)item).Items) { - SolutionItem fi = FindEntryMD1 (wi, fileName); - if (fi != null) return fi; - } - } - return null; - } } } diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/md1format.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/md1format.xml deleted file mode 100644 index 4503c10700..0000000000 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/md1format.xml +++ /dev/null @@ -1,11 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.Deployment.PackageBuilder" customDataItem="MonoDevelop.Deployment.MD1Serializer"> - <ItemProperty member="excludedFiles" name="ExcludedFiles"/> - <ItemProperty member="excludedFiles" scope="*" name="File"/> - <ItemProperty member="md1ChildEntries" name="ChildEntries"/> - <ItemProperty member="md1ChildEntries" scope="*" name="Entry" serializationDataType="MonoDevelop.Projects.PathDataType"/> - <ItemProperty member="md1RootEntry" name="rootEntry" serializationDataType="MonoDevelop.Projects.PathDataType"/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.ProjectFile" customDataItem = "MonoDevelop.Deployment.MD1ProjectFileSerializer" > - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am index bc2ac6c3ea..032913f6c1 100644 --- a/main/src/addins/Makefile.am +++ b/main/src/addins/Makefile.am @@ -19,7 +19,6 @@ SUBDIRS = \ NUnit \
MonoDeveloperExtensions \
VBNetBinding \
- prj2make-sharp-lib \
MonoDevelop.GtkCore \
ChangeLogAddIn \
MonoDevelop.WebReferences \
diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj index 3299bce55a..b589a05445 100644 --- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj +++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj @@ -147,9 +147,6 @@ <EmbeddedResource Include="Gui\nunit-overlay-32.png"> <LogicalName>nunit-overlay-32.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> @@ -175,7 +172,6 @@ <Compile Include="Gui\NUnitAssemblyGroupNodeBuilder.cs" /> <Compile Include="Gui\NUnitAssemblyGroupConfigurationNodeBuilder.cs" /> <Compile Include="Gui\TestAssemblyNodeBuilder.cs" /> - <Compile Include="Project\NUnitAssemblyGroupFileFormat.cs" /> <Compile Include="Project\NUnitAssemblyGroupProject.cs" /> <Compile Include="Project\TestAssembly.cs" /> <Compile Include="Project\TestAssemblyCollection.cs" /> diff --git a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml index 29946b9d05..b9af482d66 100644 --- a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml +++ b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml @@ -192,11 +192,6 @@ <Extension path = "/MonoDevelop/Ide/FileTemplates"> <FileTemplate id = "NUnitTestClass" resource = "NUnitTestClass.xft.xml"/> </Extension> - - <Extension path = "/MonoDevelop/ProjectModel/FileFormats"> - <FileFormat id="NUnitAssemblyGroupFileFormat" - class="MonoDevelop.NUnit.NUnitAssemblyGroupFileFormat"/> - </Extension> <Extension path = "/MonoDevelop/NUnit/TestProviders"> <Class id="SystemTestProvider" class="MonoDevelop.NUnit.SystemTestProvider" /> diff --git a/main/src/addins/NUnit/Project/NUnitAssemblyGroupFileFormat.cs b/main/src/addins/NUnit/Project/NUnitAssemblyGroupFileFormat.cs deleted file mode 100644 index 702ae8c0c8..0000000000 --- a/main/src/addins/NUnit/Project/NUnitAssemblyGroupFileFormat.cs +++ /dev/null @@ -1,126 +0,0 @@ -// -// NUnitAssemblyGroupFileFormat.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - - -using System; -using System.IO; -using System.Xml; -using System.Collections.Generic; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Core; -using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MD1; - -namespace MonoDevelop.NUnit -{ - public class NUnitAssemblyGroupFileFormat: IFileFormat - { - public string Name { - get { return "NUnit assembly group"; } - }
-
- public FilePath GetValidFormatName (object obj, FilePath fileName) - { - return fileName.ChangeExtension (".md-nunit"); - }
-
- public bool CanReadFile (FilePath file, Type expectedType) - { - return expectedType.IsAssignableFrom (typeof(NUnitAssemblyGroupProject)) && Path.GetExtension (file) == ".md-nunit"; - } - - public bool CanWriteFile (object obj) - { - return false; - }
-
- public void WriteFile (FilePath file, object obj, IProgressMonitor monitor) - { - WriteFile (file, file, obj, monitor); - }
-
- public void ExportFile (FilePath file, object obj, IProgressMonitor monitor) - { - WriteFile (((NUnitAssemblyGroupProject)obj).FileName, file, obj, monitor); - }
-
- public List<FilePath> GetItemFiles (object obj) - {
- return new List<FilePath> (); - }
-
- void WriteFile (FilePath file, FilePath outFile, object obj, IProgressMonitor monitor) - { - }
-
- public object ReadFile (FilePath file, Type expectedType, IProgressMonitor monitor) - { - XmlTextReader reader = new XmlTextReader (new StreamReader (file)); - try { - monitor.BeginTask (string.Format (GettextCatalog.GetString ("Loading project: {0}"), file), 1); - - reader.MoveToContent (); - - XmlDataSerializer ser = new XmlDataSerializer (MD1ProjectService.DataContext); - ser.SerializationContext.BaseFile = file; - - SolutionEntityItem entry = (SolutionEntityItem) ser.Deserialize (reader, typeof(NUnitAssemblyGroupProject)); - entry.FileName = file; - return entry; - } - catch (Exception ex) { - monitor.ReportError (string.Format (GettextCatalog.GetString ("Could not load project: {0}"), file), ex); - throw; - } - finally { - monitor.EndTask (); - reader.Close (); - } - } - - public void ConvertToFormat (object obj) - { - } - - public bool SupportsMixedFormats { - get { return false; } - } - - public IEnumerable<string> GetCompatibilityWarnings (object obj) - { - yield break; - } - - public bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework) - { - return true; - } - } -} - diff --git a/main/src/addins/NUnit/md1format.xml b/main/src/addins/NUnit/md1format.xml deleted file mode 100644 index b113d058bf..0000000000 --- a/main/src/addins/NUnit/md1format.xml +++ /dev/null @@ -1,18 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.CSharp.Project.CSharpCompilerParameters"> - <ItemProperty member="warninglevel" name = "warninglevel"/> - <ItemProperty member="noWarnings" name="nowarn" defaultValue=""/> - <ItemProperty member="optimize" name="optimize"/> - <ItemProperty member="unsafecode" name="unsafecodeallowed"/> - <ItemProperty member="generateOverflowChecks" name="generateoverflowchecks"/> - <ItemProperty member="mainclass" name="mainclass"/> - <ItemProperty member="definesymbols" name="definesymbols" defaultValue="" /> - <ItemProperty member="generateXmlDocumentation" name="generatexmldocumentation"/> - <ItemProperty member="win32Icon" name="win32Icon" defaultValue="" /> - <ItemProperty member="win32Resource" name="win32Resource" defaultValue="" /> - <ItemProperty member="codePage" name="codepage" defaultValue="0"/> - <ItemProperty member="additionalArgs" name="additionalargs" defaultValue="" /> - <ItemProperty member="langVersion" name="langversion" defaultValue="Default"/> - <LiteralProperty name="compiler" value="Mcs" /> - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml index de2ae6f1f8..b34ad10065 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml +++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml @@ -21,10 +21,6 @@ import="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" resourceHandler="MonoDevelop.VBNetBinding.VBNetResourceIdBuilder"/> </Extension> - - <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <SerializationMap resource="md1format.xml" /> - </Extension> <Extension path = "/MonoDevelop/Ide/FileFilters"> <FileFilter id = "VBNet" diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj index ff2ee6b54c..b39ea2d8ff 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.csproj +++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj @@ -124,9 +124,6 @@ <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/VBNetBinding/md1format.xml b/main/src/addins/VBNetBinding/md1format.xml deleted file mode 100644 index 1451c26eda..0000000000 --- a/main/src/addins/VBNetBinding/md1format.xml +++ /dev/null @@ -1,16 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.VBNetBinding.VBCompilerParameters"> - <ItemProperty member="noWarnings" name="nowarn"/> - <ItemProperty member="optimize" name="optimize"/> - <ItemProperty member="generateOverflowChecks" name="generateoverflowchecks"/> - <ItemProperty member="definesymbols" name="definesymbols" /> - <ItemProperty member="additionalParameters" name="additionalParameters" /> - <ItemProperty member="defineDebug" name="defineDebug" /> - <ItemProperty member="defineTrace" name="defineTrace" /> - <ItemProperty member="debugType" name="debugType" /> - <ItemProperty member="documentationFile" name="documentationFile" /> - <ItemProperty member="warningsAsErrors" name="warningsAsErrors" /> - <ItemProperyt member="treatWarningsAsErrors" name="treatWarningsAsErrors" /> - <ItemProperty member="warningLevel" name="warningLevel" /> - </DataItem> -</SerializationMap>
\ No newline at end of file diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs index 073b83e8ec..e17d2678a5 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs @@ -67,23 +67,9 @@ namespace MonoDevelop.VersionControl string projectFn = null; - string[] list = System.IO.Directory.GetFiles(path); - foreach (string str in list ) { - if (str.EndsWith (".mds", System.StringComparison.Ordinal)) { - projectFn = str; - break; - } - } - if ( projectFn == null ) { - foreach ( string str in list ) { - if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) { - projectFn = str; - break; - } - } - } - if ( projectFn == null ) { - foreach (string str in list ) { + string[] list = System.IO.Directory.GetFiles (path); + if (projectFn == null) { + foreach (string str in list) { if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) { projectFn = str; break; diff --git a/main/src/addins/prj2make-sharp-lib/AddinInfo.cs b/main/src/addins/prj2make-sharp-lib/AddinInfo.cs deleted file mode 100644 index 4ef96e62f5..0000000000 --- a/main/src/addins/prj2make-sharp-lib/AddinInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ - -using System; -using Mono.Addins; -using Mono.Addins.Description; - -[assembly:Addin ("Prj2Make", - Namespace = "MonoDevelop", - Version = MonoDevelop.BuildInfo.Version, - Category = "Project Import and Export")] - -[assembly:AddinName ("Visual Studio .NET Project Support")] -[assembly:AddinDescription ("Importer for VS2003 projects")] - -[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)] -[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)] -[assembly:AddinDependency ("CSharpBinding", MonoDevelop.BuildInfo.Version)] -[assembly:AddinDependency ("VBBinding", MonoDevelop.BuildInfo.Version)] diff --git a/main/src/addins/prj2make-sharp-lib/AssemblyInfo.cs b/main/src/addins/prj2make-sharp-lib/AssemblyInfo.cs deleted file mode 100644 index d0838d5d35..0000000000 --- a/main/src/addins/prj2make-sharp-lib/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Autogenerated from prj2make-sharp-lib.addin.xml - -using System.Reflection; - -[assembly: AssemblyProduct ("MonoDevelop")] -[assembly: AssemblyTitle ("Visual Studio .NET Project Support")] -[assembly: AssemblyDescription ("Importer for VS2003 projects")] -[assembly: AssemblyVersion ("2.6")] -[assembly: AssemblyCopyright ("LGPL")] diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog deleted file mode 100644 index 6cae48ac22..0000000000 --- a/main/src/addins/prj2make-sharp-lib/ChangeLog +++ /dev/null @@ -1,1364 +0,0 @@ -2010-05-11 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003ProjectFileFormat.cs: Remove option of converting to - MD 1.0 format. - -2010-03-22 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Bumped MD version. - -2010-03-17 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.csproj: - * VS2003ProjectFileFormat.cs: - * prj2make-sharp-lib.addin.xml: Merged MD.Projects into - MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components - into MD.Ide. - -2010-02-18 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am: Remove asp.net dependency. - -2009-10-30 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2009-10-29 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.csproj: Flush. - -2009-10-09 Mike Krüger <mkrueger@novell.com> - - * MsPrjHelper.cs: Track namespace renamings. - -2009-10-08 Ankit Jain <jankit@novell.com> - - * prj2make-sharp-lib.csproj: Use \ instead of '/' in the Import. - -2009-10-08 Ankit Jain <jankit@novell.com> - - * prj2make-sharp-lib.csproj: Add md.targets . - -2009-10-07 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Update license. - -2009-10-07 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2009-09-28 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Use the new DotNetAssemblyProject class - instead of DotNetProject, which is now abstract. - -2009-09-02 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Create default configurations for the - imported solution. Fixes bug #504600 - Rebuild solution - doesn't trigger a real build. - -2009-08-26 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.csproj: Updated dependencies. We now - depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4. - -2009-08-20 Lluis Sanchez Gual <lluis@novell.com> - - * CsprojInfo.cs: - * MsPrjHelper.cs: - * VS2003ProjectFileFormat.cs: Make sure the project has the - 2003 format before trying to import it. Properly import - assembly references. - -2009-08-13 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Use the new AssemblyContext class to query - and resolve assemblies. - -2009-08-11 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003ProjectFileFormat.cs: Add support for reading vs2003 - projects and solutions when not running in the IDE. - -2009-08-10 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.csproj: Don't make local copies of - project references. - -2009-07-03 Mike Krüger <mkrueger@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.csproj: Added MonoDevelop.Refactoring - reference. (otherwise build would break) - -2009-06-15 Michael Hutchinson <mhutchinson@novell.com> - - * MsPrjHelper.cs: Track assembly lookup APIs. - -2009-05-19 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003ProjectFileFormat.cs: Use the new FilePath class for - handling file and directory paths. - -2009-05-01 Michael Hutchinson <mhutchinson@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.csproj: - * prj2make-sharp-lib.addin.xml: - * MSBuildProjectServiceExtension.cs: - * SilverlightMSBuildProjectExtension.cs: Remove unused code - and extensions. - -2009-04-17 Mike Kestner <mkestner@novell.com> - - * prj2make-sharp-lib.csproj: don't require specific - gtk-sharp version. - -2009-04-15 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2009-04-15 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Add support for multiple target runtimes. - -2009-03-13 Michael Hutchinson <mhutchinson@novell.com> - - * prj2make-sharp-lib.csproj: Don't local-copy project refs. - -2009-03-13 Mike Krüger <mkrueger@novell.com> - - * prj2make-sharp-lib.csproj: Moved text editor to core - -2009-03-10 Mike Krüger <mkrueger@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.csproj: Monodevelop changed the reference - a bit. - -2009-03-10 Mike Krüger <mkrueger@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.csproj: Updated nrefactory references. - -2009-02-25 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Track api changes. - -2009-02-08 Michael Hutchinson <mhutchinson@novell.com> - - * prj2make-sharp-lib.csproj: Exorcise more unwanted local - copy. - -2009-02-06 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: - * prj2make-sharp-lib.csproj: Migrated to MSBuild file format. - -2009-02-03 Lluis Sanchez Gual <lluis@novell.com> - - * AssemblyInfo.cs: - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2009-02-03 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Fix target gtk# version. - -2009-02-03 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Flush. - -2009-01-30 Mike Krüger <mkrueger@novell.com> - - * Makefile.am: - * prj2make-sharp-lib.mdp: Fixed project (didn't compile without - mono.texteditor reference on my system). - -2009-01-26 Michael Hutchinson <mhutchinson@novell.com> - - * prj2make-sharp-lib.mdp: Flush project format changes. - -2008-12-12 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: All projects now require fx 3.5. - -2008-12-11 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003ProjectFileFormat.cs: Track API changes. - -2008-12-09 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Don't require a specific version of - Mono.Addins. - -2008-12-04 Lluis Sanchez Gual <lluis@novell.com> - - * PrjxInfo.cs: - * Makefile.am: - * PrjHelper.cs: - * MsPrjHelper.cs: - * MdPrjHelper.cs: - * sharp_d_prjx.cs: - * sharp_d_cmbx.cs: - * prj2make-sharp-lib.mdp: - * VS2003ProjectFileFormat.cs: Removed a bunch of unused code and fixed - some issues with the importer. Fixes bug #450209 - Unable to load - SharpSSH VS 2003 project: "Object reference not set to an instance of - an object". - -2008-12-04 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am: Make it work for parallel build. - -2008-12-02 Michael Hutchinson <mhutchinson@novell.com> - - * Makefile.am: - * AssemblyInfo.cs: - * AssemblyInfo.cs.in: - * prj2make-sharp-lib.mdp: Add AssemblyInfo.cs files that are - autogenerated from the addin manifests. - -2008-11-05 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2008-10-20 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am, prj2make-sharp-lib.mdp: Fix build again. - -2008-10-20 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am, prj2make-sharp-lib.mdp: Fix build. - -2008-10-01 Michael Hutchinson <mhutchinson@novell.com> - - * MsPrjHelper.cs, SilverlightMSBuildProjectExtension.cs, - MSBuildProjectServiceExtension.cs: Track API. - -2008-09-12 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Updated generated code. - -2008-07-29 Mike Krüger <mkrueger@novell.com> - - * prj2make-sharp-lib.mdp: Removed some parts of the documentation - service. - -2008-06-16 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Track api changes. - -2008-06-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Fix extension paths. - -2008-06-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2008-05-23 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003ProjectFileFormat.cs: Track api changes. - -2008-05-22 Lluis Sanchez Gual <lluis@novell.com> - - * MSBuildProjectServiceExtension.cs: Replaced - ICompilerResult/DefaultCompilerResult/CompilerResults by a new - BuildResult class, which has owner information at error level, so - it is possible to know which project generated an error when - building a solution. Updated Task and TaskService to use the new - owner information. - -2008-05-21 Lluis Sanchez Gual <lluis@novell.com> - - * PrjHelper.cs, MsPrjHelper.cs, VS2003ProjectFileFormat.cs, - MSBuildProjectServiceExtension.cs, Makefile.am, - prj2make-sharp-lib.mdp: New project model changes. - -2008-03-04 Mike Krüger <mkrueger@novell.com> - - * VS2003SlnFileFormat.cs, VS2003ProjectFileFormat.cs, SlnFileFormat.cs: - Worked on gnome hig compliant alerts. - -2008-01-25 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Update MD version. - -2008-01-24 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Simplification, AddExtensionNodeHandler calls - the handler for all existing extensions. Thanks to lluis. - -2008-01-24 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Read the full list of extensions only at init - time and handle ExtensionChange.Add correctly. - -2008-01-23 Ankit Jain <jankit@novell.com> - - Fix bug#353042. - * SlnData.cs (HeaderComment): New. - (VersionString): New. - * SlnFileFormat.cs: Retain the header comment string and version and use - that when writing .sln . - -2008-01-22 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Updated add-in category and description. - -2008-01-22 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs: Map "Content" to BuildAction.Nothing, better than - Exclude. - -2008-01-22 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Add try/catch for event handlers. - -2008-01-20 Ankit Jain <jankit@novell.com> - - * Change Console.WriteLines to LoggingService calls. - -2008-01-19 Ankit Jain <jankit@novell.com> - - * MSBuildProjectExtension.cs (IsLanguage): New. - (LanguageId): New. - * DefaultMSBuildProjectExtension.cs: Override the language properties. - * CSharpMSBuildProjectExtension.cs: Likewise. - * VBNetMSBuildProjectExtension.cs: Likewise. - * MSBuildFileFormat.cs (ProjectTypeGuids): Rename to .. - (LanguageTypeGuids): .. this. Fill this from the extensions. - * SlnFileFormat.cs: Remove hardcoded .csproj/.vbproj. - * Utils.cs (GetLanguage): Use the extensions for this. - -2008-01-14 Ankit Jain <jankit@novell.com> - - * VS2003SlnFileFormat.cs: Handle being called in a non-gui mode. - -2007-12-21 Miguel de Icaza <miguel@novell.com> - - * Utils.cs (MapAndResolvePath): this routine only value add was to - call Path.GetFullPath, the problem is that the internals of - SlnMaker.MapPath could be internally broken if not fully formed - internally (in particular when coping with non-existing - directories and files). - - * MsPrjHelper.cs (SlnMaker.MapPath): a handful of changes to help - consumers of this class. It now always returns paths that are - Path.GetFullPath processed first. This just makes the code - homogenous. - - Uses Directory.GetFileSystemEntries instead of trying to be smart - about Directories and Files and handling them separatedly, as in - Unix symlinks are not accounted for (which breaks if the full path - name contains symlinks). - - It now also handles "..", which avoids the bug of OutputPath - entries ending up with "../DIR/../DIR/../DIR" as I reported - privately to Ankit a few days ago. - - This should fix the Paint.NET 3 problems. - -2007-12-18 Ankit Jain <jankit@novell.com> - - Fix bug #349362 - * CSharpResourceIdBuilder.cs: - * VBNetResourceIdBuilder.cs: If the source file has no class defined, - then treat it as if the resource had no dependent source file. - This also fixes my previous incorrect patch for bug #349099. - -2007-12-18 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadNestedProjects): Handle empty section. - -2007-12-17 Ankit Jain <jankit@novell.com> - - Fix bug #349099. - * CSharpResourceIdBuilder.cs: - * VBNetResourceIdBuilder.cs: Allow both class and struct. - -2007-12-17 Ankit Jain <jankit@novell.com> - - * Minor fixes like use String.Empty instead of "" etc. - -2007-12-14 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Use monitor's Begin/EndTask. - * SlnFileFormat.cs: Likewise. - -2007-12-13 Lluis Sanchez Gual <lluis@novell.com> - - * MdPrjHelper.cs, DefaultMSBuildProjectExtension.cs, MSBuildFileFormat.cs: - Fix warnings. - -2007-12-12 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Bump add-in versions. - -2007-12-11 Ankit Jain <jankit@novell.com> - - * DefaultMSBuildProjectExtension.cs: Improve error message. - -2007-12-11 Ankit Jain <jankit@novell.com> - - Fix bug #324333. - * SlnFileFormat.cs (SolutionFolder): New. - (LoadSolution): Use the new SolutionFolder class for solution folders. - -2007-12-07 Ankit Jain <jankit@novell.com> - - Fix bug #341643. - * DefaultMSBuildProjectExtension.cs: Set DeployProperties.UseProjectRelativePath - for all deploy files. - * MSBuildFileFormat.cs (HandleFilePropertyChanged): Set "CopyToOutputDirectory" - if build action changed to FileCopy. - * Makefile.am: - * prj2make-sharp-lib.mdp: Add reference to MonoDevelop.Deployment project. - -2007-12-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml, Makefile.am, prj2make-sharp-lib.mdp: - Directory reorganization. - -2007-11-24 David Makovský (Yakeen) <yakeen@sanyas-on.net> - - * MSBuildProjectServiceExtension.cs: corected translatable string to - support plural forms. - -2007-11-21 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Fix build. EnableViewState is not used anymore. - -2007-11-09 Michael Hutchinson <mhutchinson@novell.com> - - * DefaultMSBuildProjectExtension.cs, SlnFileFormat.cs, pkgconfiginvoker.cs, - MSBuildFileFormat.cs: Track LoggingService API changes. Remove some - Console.WriteLines that were duplicating the logging. - -2007-11-02 Lluis Sanchez Gual <lluis@novell.com> - - * SlnFileFormat.cs: Use RootCombine instead of CurrentOpenCombine when - possible. - -2007-10-29 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2007-10-23 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Project file names updated by change in MD path - functions. - -2007-10-23 Ankit Jain <jankit@novell.com> - - * SlnData.cs (Guid): Should have enclosing {}. - -2007-10-12 Mike Krüger <mkrueger@novell.com> - - * CSharpResourceIdBuilder.cs, VBNetMSBuildProjectExtension.cs, - CSharpMSBuildProjectExtension.cs, DefaultMSBuildProjectExtension.cs, - Utils.cs, SlnFileFormat.cs, MSBuildFileFormat.cs: Applied changes that - were neccassary for to the new FileService. - -2007-10-09 Ankit Jain <jankit@novell.com> - - * CSharpResourceIdBuilder.cs: Handle localized resources. - * VBNetResourceIdBuilder.cs: Handle localized resources. - * Utils.cs (TrySplitResourceName): New. - -2007-09-28 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (GetContents): Set DependsOn to its absolute path. - -2007-09-28 Ankit Jain <jankit@novell.com> - - * DefaultMSBuildProjectExtension.cs (FileToXmlElement): Handle existing - XmlElements. Update LogicalName and DependentUpon correctly. - * MSBuildFileFormat.cs (WriteFileInternal): Always update XmlElements for - project files. - (HandleFileRenamed): Use FileToXmlElement to correctly update the xml - element. - * Utils.cs (RemoveChild): New. - -2007-09-27 Ankit Jain <jankit@novell.com> - - * MSBuildProjectExtension.cs: New. - * DefaultMSBuildProjectExtension.cs: New. - - Move language specific stuff from MSBuildFileFormat into the respective extensions. - * CSharpMSBuildProjectExtension.cs: New. - * VBNetMSBuildProjectExtension.cs: New. - * SilverlightMSBuildProjectExtension.cs: New. - - * Utils.cs: New. Move utility methods from MSBuildFileFormat to here. - * MSBuildData.cs (ExtensionChain): New. - (FlavorPropertiesParent): New. - (TypeGuids): New. - - * SlnFileFormat.cs: Track api changes. - - * Makefile.am: Update. - * prj2make-sharp-lib.addin.xml: Update. Add new ExtensionPoint for - MSBuildProjectExtension. - -2007-09-21 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Bump MD version. - -2007-09-17 Ankit Jain <jankit@novell.com> - - * MSBuildProjectServiceExtension.cs (GetDefaultResourceId): Split into - this and ... - (GetDefaultResourceIdInternal): this. static method. - * MsPrjHelper.cs (SlnMaker.GetContents): Set resource id using vs.net - rules. - -2007-09-17 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (WriteFileInternal): Emit RootNamespace for - global config element. - -2007-09-17 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (WriteFileInternal): Emit RootNamespace for C# - also. Derived from patch by Eric Butler <eric@extremeboredom.net> - -2007-09-15 Ankit Jain <jankit@novell.com> - - * MSBuildProject.cs: Remove. - * MSBuildSolution.cs: Remove. - - * MSBuildFileFormat.cs (GetMSBuildData): New. - Update to track changes. - * SlnFileFormat.cs (.cctor): Add handler for HandleAddEntry. - (GetSlnData): New. - (HandleAddEntry): - (SetHandlers): - (HandleCombineEntryAdded): - (ConvertToMSBuild): Move here from MSBuildSolution. - Update to track changes. - * SlnData.cs (ProjectsByGuid): Move here from MSBuildSolution. - * MSBuildProjectServiceExtension.cs (GetDefaultResourceId): Override. - Moved from MSBuildProject to here. - - * MsPrjHelper.cs: Update to use ProjectService.GetDefaultResourceId . - * VS2003ProjectFileFormat.cs: Update. - * VS2003SlnFileFormat.cs: Update. - - * Makefile.am: Update. - * prj2make-sharp-lib.mdp: Update. - -2007-09-13 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReferenceToXmlElement): Handle invalid assembly - reference. - -2007-09-12 Ankit Jain <jankit@novell.com> - - Fix bug#82688. - * MSBuildFileFormat.cs (ReferenceToXmlElement): Set Name for project - reference only when creating a new element. - * SlnFileFormat.cs (LoadSolution): Resolve any unresolved project - references using the project guids. - -2007-09-11 Ankit Jain <jankit@novell.com> - - Fix bug#82736. - * MSBuildFileFormat.cs (ReadConfig): Unescape OutputPath. - -2007-08-23 Ankit Jain <jankit@novell.com> - - * MSBuildProjectServiceExtension.cs (GenerateXamlPartialClass): Generate - partial classes with xamlg only if required. - -2007-08-22 Ankit Jain <jankit@novell.com> - - Fix bug #82517. - * CsprojInfo.cs (LoadPrjFromFile): Use the 'using' pattern for FileStream. - (.ctor): Rethrow exception. - * MsPrjHelper.cs (ParseSolution): Add 'monitor' param. Use monitor for - reporting errors. We stop trying to load the solution if any of the projects - fail to load. - (MsSlnHelper): Add 'monitor' param. - * PrjHelper.cs (MakerMain): Track changes in api. - -2007-08-21 Andrés G. Aragoneses <knocte@gmail.com> - - Improve fix for bug #82398. - * MSBuildProjectServiceExtension.cs (GenerateXamlPartialClass): Use MONO_IOMAP=drive, - and only on Unix. - -2007-08-14 Ankit Jain <jankit@novell.com> - - Fix bug #82398. - * MSBuildProjectServiceExtension.cs (GenerateXamlPartialClass): Run with - xamlg with MONO_IOMAP=all. - -2007-08-14 Lluis Sanchez Gual <lluis@novell.com> - - * SlnFileFormat.cs: Small performance improvement in CanReadFile. Added - missing null checks in GetSlnFileVersion. - -2007-08-13 Ankit Jain <jankit@novell.com> - - Fix bug #82389 - * MSBuildFileFormat.cs (ReadItemGroups): Handle "CopyToOutputDirectory" - tag. We support this only for non-build files currently. - (FileToXmlElement): Emit CopyToOutputDirectory for FileCopy files. - -2007-08-13 Ankit Jain <jankit@novell.com> - - Fix bug #82343. - * MSBuildFileFormat.cs (WriteFileInternal): Use "\r\n" as new line chars - to stay compatible with vs2005 project files. - * SlnFileFormat.cs (WriteFileInternal): Small compatibility fixes. - -2007-08-13 Ankit Jain <jankit@novell.com> - - * MSBuildProjectServiceExtension.cs: Add missing copyright/license. - -2007-08-13 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Small compatibility fixes. - -2007-08-10 Ankit Jain <jankit@novell.com> - - Fix bug #82394. - * MSBuildProjectServiceExtension.cs (Build): Abort build if error in - generating partial classes with xamlg. - (GenerateXamlPartialClass): Report any errors with CompilerError. Parse - line/col numbers also. - (RegexErrorLinePos): New. - -2007-08-10 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Allow version 10.00 also. - * MSBuildFileFormat.cs (ReadItemGroup): Handle SilverlightPage - ItemGroup. - * MSBuildProjectServiceExtension.cs: New. Handle generation of partial - classes for SilverlightPages. - * prj2make-sharp-lib.addin.xml: Add the ProjectServiceExtension. - * Makefile.am: Update. - * prj2make-sharp-lib.mdp: Update. - -2007-08-09 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml, Makefile.am, prj2make-sharp-lib.mdp: - Reorganized the extension point hierarchy. Embedded all add-in manifests - as resources. - -2007-07-30 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib-Commands.cs: Removed unused file. - -2007-07-11 Ankit Jain <jankit@novell.com> - - * prj2make-sharp-lib.addin.xml: Update Name, Description and Authors. - -2007-07-10 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (GetSlnFileVersion): Use static Regex objects - - SlnFileFormat.SlnVersionRegex and SlnFileFormat.ProjectRegex . - * VS2003SlnFileFormat (GetSlnFileVersion): Likewise. - * SlnFileFormat.cs (SlnVersionRegex): - (ProjectRegex): Make internal. - -2007-07-10 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (projNameInfo): - (projGuidInfo): Should not be static. - (ParseSolution): Use 'using' pattern with the StreamReader. - (CreatePrjxFromCsproj): Use 'using' pattern with the TextFileReader. - Set the fileName on the project object after it has been read. This - ensures that in case of unreadable/non-existant file, user gets a useful - error. - -2007-06-18 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (CanonicalizePath): New. Escapes, normalizes and - converts '/' to '\\' for a path. - Update code to use this when emitting paths to the *proj file. - * SlnFileFormat.cs (WriteProjects): Emit path using windows path - seperator. - (LoadSolution): Use SlnMaker.MapPath instead of the local copy. - (MapPath): Remove, unused now. - -2007-06-18 Ankit Jain <jankit@novell.com> - - * MSBuildSolution.cs (NeedsReload): Override. Return false for solution - folders. - -2007-06-18 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (FileToXmlElement): Emit a "Link" element for - files external to the project. - -2007-06-07 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (NormalizeRelativePath): Moved to - Runtime.FileService . - * SlnFileFormat.cs: Track api change. - * CSharpResourceIdBuilder.cs: Track api change. - -2007-06-05 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReferenceToXmlElement): Handle invalid project - reference. - (WriteFileInternal): OptionExplicit and OptionStrict values need to be - written as On/Off. - -2007-06-01 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReadItemGroups): Don't ignore resources external - to the project directory. These now get handled by the *ResourceIdBuilder. - * CSharpResourceIdBuilder.cs: If the file is external to the project, - then use only the filename. - -2007-06-01 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReadItemGroups): If reference name cannot be - resolved, then try to find the correct case for the assembly name. - (AssemblyNamesTable): New. - -2007-05-31 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Don't remove './' from the paths. VS2005 is not - able to handle paths with '/' but no './' prefix. - -2007-05-31 Ankit Jain <jankit@novell.com> - - Fix #81776. - * MSBuildFileFormat.cs (Escape): New. - (Unescape): New. - MSBuild literals need to be escaped/unescaped. - Update code to escape/unescape relevant values. - -2007-05-29 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (MapPath): Small optimization. Return path if it - exists. - -2007-05-24 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Remove "./" prefixes from paths before emitting. - * MSBuildFileFormat.cs: Likewise. - (NormalizeRelativePath): New. Taken from AutotoolsContext.cs . - -2007-05-22 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (CreatePrjxFromCsproj): Rethrow the exception. - (MsSlnToCmbxHelper): Likewise. - -2007-05-18 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (FileToXmlElement): Ignore directories for - BuildAction.Compile, return null. - Update code to avoid adding nulls to ProjectFileElements. - -2007-05-11 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am, prj2make-sharp-lib.mdp: Updated. - -2007-05-09 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml, Makefile.am: Flush - -2007-05-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml, Makefile.am: Migration to Mono.Addins. - -2007-05-03 Lluis Sanchez Gual <lluis@novell.com> - - * MonoDevelop.Projects/Combine.cs, - MonoDevelop.Projects/CombineEntryEventArgs.cs, - MonoDevelop.Projects.Parser/DefaultParserService.cs: Added a - Reloading property to the argument of the entry add/remove events - of Combine, which is set to true if the entry is being only - reloaded, not actually removed/added to the combine. - -2007-04-27 Ankit Jain <jankit@novell.com> - - * MSBuildSolution.cs (UpdateProjectReferences): Remove. - -2007-04-27 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (WriteNestedProjects): Add @root param. Nested - project info should be emitted wrt @root. - -2007-04-26 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (GetExportFiles): Implement. - * SlnFileFormat.cs (GetExportFiles): Implement. - -2007-04-26 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (HandleFilePropertyChanged): ProjectFile.DependsOn can - be null. - -2007-04-26 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (WriteFile): Allow writing for non-root combines - which don't have a msbuild combine as parent. Convert any non-msbuild - child projects to msbuild format, and Save all child entries. - * MSBuildFileFormat.cs (.ctor): Remove .ctor with @language parameter. - (WriteFileInternal): Always save updated References. - (ReferenceToXmlElement): Update if element already exists. - * MSBuildSolution.cs (.cctor): IdeApp.ProjectOperations could be null - when invoked from command line. - (HandleAddEntry): Remove call to UpdateProjectReferences. - (ConvertToMSBuild): Simplify. Change the fileformat, if required, and - Save. - * SlnData.cs (.ctor): New constructors for setting the guid. - * VS2003SlnFileFormat.cs, VS2003ProjectFileFormat.cs: Track api changes. - -2007-04-19 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003SlnFileFormat.cs, VS2003ProjectFileFormat.cs: Track api - changes. - * MSBuildSolution.cs, prj2make-sharp-lib.addin.xml, SlnFileFormat.cs, - MSBuildFileFormat.cs: Merge the proj and sln file formats in a - single msbuild file format which can handle both types of files. - * Makefile.am, prj2make-sharp-lib.mdp: Updated. - -2007-03-29 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Write out list of files and references in - WriteFile instead of in SaveProject. - * MSBuildSolution.cs: Cannot convert a non-dotnet project. - -2007-03-29 Lluis Sanchez Gual <lluis@novell.com> - - * VS2003SlnFileFormat.cs, VS2003ProjectFileFormat.cs: VS2003 file - format can't write files. - * prj2make-sharp-lib.mdp: Disable local-copy references. - -2007-02-21 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs: Don't swallow exceptions. Catch specific - exceptions. - -2007-02-20 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Avoid issuing duplicate warnings. - -2007-02-20 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Avoid creating unnecessary guids. - -2007-02-20 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Don't use the file service for file moves, it might - have side effects. - * MSBuildFileFormat.cs: Likwise. - * VS2003ProjectFileFormat.cs: Add copyright notice. - * VS2003SlnFileFormat.cs: Likwise. - -2007-02-20 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Project type guids are per-project type, support - that. - (WriteProjects): Add a 'monitor' param. - -2007-02-19 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (WriteFile): Use File.Delete for deleting temporary - files. - * MSBuildFileFormat.cs (WriteFile): Likewise. - (CanReadFile): Use XmlReader.MoveToContent to get to the content nodes. - (LoadProject): Skip non-element (eg. comment) nodes when looking for - root. - * VS2003ProjectFileFormat.cs (CanReadFile): Use XmlReader.MoveToContent to - get to the content nodes. - -2007-02-16 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Change add-in versions to 0.13. - -2007-02-15 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Updated. - -2007-02-13 Ankit Jain <jankit@novell.com> - - * VS2003SlnFileFormat.cs: New. - * VS2003ProjectFileFormat.cs: New. - * MSBuildProject.cs (GetDefaultResourceIdInternal): Make static. - * MsPrjHelper.cs (CreatePrjxFromCsproj): Add new overload. - (MsSlnToCmbxHelper): Likewise. - Set DefaultNamespace. Set resource id. - * MSBuildSolution.cs (HandleAddEntry): Handle adding vs2003 sln/project. - (ConvertToMSBuild): Make internal. - (UpdateProjectReferences): Likewise. - * prj2make-sharp-lib.addin.xml: Remove references to importing VS2003 project. - Add new file formats. - * SlnFileFormat.cs: Add null check. - * MSBuildFileFormat.cs (CanReadFile): Check root element of the *proj file. - Make condition regex static. - * prj2make-sharp-lib.mdp, Makefile.am: Sync mdp project with makefile. - -2007-02-12 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Make regex objects static. - -2007-02-12 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (CanReadFile): Check sln version. - (LoadSolution): Likewise. Handle invalid project paths. - (GetSlnFileVersion): Fix. - * MSBuildFileFormat.cs (WriteFile): Throw if @node is not a - DotNetProject. - (FileToXmlElement): Set DependentUpon only if required. - -2007-02-07 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Use a TextFileReader to open the VS file, since it - can auto-detect the file encoding. - * prj2make-sharp-lib.mdp: Minor update. - -2007-02-01 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReadItemGroups): Check for invalid paths. - (GetValidPath): New. - -2007-01-27 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReferenceToXmlElement): Use System.Reflection to - get assembly name instead of cecil. - * Makefile.am: Remove reference to Mono.Cecil . - -2007-01-24 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Remove use of StreamReader.EndOfStream to be - compilable with mono 1.1.13.8 - -2007-01-20 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (HandleCombineEntryAdded): - (SetHandlers): - (ConvertToMSBuild): - (UpdateProjectReferences): Move to .. - * MSBuildSolution.cs: .. here. - * MSBuildFileFormat.cs (ReadConfig): Fix a warning. - -2007-01-19 Ankit Jain <jankit@novell.com> - - * prj2make-sharp-lib.addin.xml: Add dependency on VBBinding. - Fix bug #80555. - -2007-01-18 Marek Sieradzki <marek.sieradzki@gmail.com> - - * MsPrjHelper.cs: Remove warning. - -2007-01-09 Lluis Sanchez Gual <lluis@novell.com> - - * MSBuildSolution.cs, SlnFileFormat.cs: Track api changes. - -2006-12-28 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadSolution): Set Version to "0.1". Temporary hack. - * MSBuildFileFormat.cs (LoadProject): Likewise. - -2006-12-27 Ankit Jain <jankit@novell.com> - - * SlnData.cs (SectionExtras): New. - * SlnFileFormat.cs (LoadProjectConfigurationMappings): Preserve lines - that we cannot parse or correspond to projects that could not load. - (WriteFileInternal): Write lines that we could not parse when reading. - -2006-12-26 Ankit Jain <jankit@novell.com> - - * MSBuildSolution.cs (HandleAddEntry): Fix order of arguments to AskQuestion. - -2006-12-26 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadProjectConfigurationMappings): Update to - changes. - (FindCombineConfigurationEntry): Replace with ... - (GetConfigEntryForProject): ... this. Create the entries if not found. - (GetConfigEntry): New. - -2006-12-22 Ankit Jain <jankit@novell.com> - - * MSBuildSolution.cs: - * SlnFileFormat.cs: - * MSBuildFileFormat.cs: - Use GettextCatalog.GetString for all user visibile strings, except debug - output. - -2006-12-22 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadSolution): Preserve the project's sln lines - if the project loading fails. - -2006-12-21 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (SetForNullCondition): New. - (CheckNullCondition): New. - New methods to get default values for config and platform. - (ReadConfig): Add 'default_platform' param. - (ParseCondition): Left side of the condition decides the number of - elements returned. - (SaveProject): Emit elements for default Configuration and Platform, - set to "Debug" and "AnyCPU". - -2006-12-19 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (WriteFileInternal): Fix typo in writing default - Platform. - -2006-12-18 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadSolution): Don't overwrite the project name. - * MSBuildFileFormat.cs (SetupHandlers): Re-enable NameChanged event - handler. - (HandleRename): Ignore if the project is not part of a combine. - -2006-12-18 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (LoadProjectConfigurationMappings): Config name can - have a '.' in it, handle that. - -2006-12-18 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (WriteProjectConfigurations): Temporary workaround - to allow importing of projects/solutions into a msbuild solution to work. - Minor refactoring. - Line numbers are 1-based. - -2006-12-18 Ankit Jain <jankit@novell.com> - - * MSBuildSolution.cs (ProjectsByGuid): New. - * SlnFileFormat.cs: Treat config names like 'Debug|Any CPU' as the - config name for md, i.e., don't split. Generate ProjectConfigurationPlatforms - in the .sln file. - (WriteFileInternal): Generate SolutionConfigurationPlatforms and - ProjectConfigurationPlatforms. - (WriteProjectConfigurations): New. - (HandleCombineEntryAdded): Add projects from the new combine to the root - combine's ProjectsByGuid table. - (LoadSolution): Add project to the guid table. Emit exception message, - and ReportWarning. Load ProjectConfigurationPlatforms. - (LoadProjectConfigurationMappings): New. - (FindCombineConfigurationEntry): New. - (LoadConfigurations): Rename to .. - (LoadSolutionConfigurations): .. this. - - * MSBuildFileFormat.cs: Treat 'Debug|Any CPU' as config name, but write - back correctly to the *proj file. - (GetConfigName): New. - (GetConfigPlatform): New. - -2006-12-17 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Added missing files. - * SlnFileFormat.cs, MSBuildFileFormat.cs: Track changes in the - FileService class. - -2006-12-15 Ankit Jain <jankit@novell.com> - - * IResourceIdBuilder.cs: New. - * CSharpResourceIdBuilder.cs: New. - * VBNetResourceIdBuilder.cs: New. - - * MSBuildFileFormat.cs: Move MSBuildData and MSBuildProject classes to .. - * MSBuildData.cs: .. this and .. - * MSBuildProject.cs: .. this. - - * SlnFileFormat.cs: Move SlnData and MSBuildSolution classes to .. - * SlnData.cs: .. this and .. - * MSBuildSolution.cs : .. this. - - * Makefile.am: Add new files. - -2006-12-15 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (GetDefaultResourceIdInternal): Return null if - no class name is found. - -2006-12-15 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReadItemGroups): Add a 'monitor' param. - Resource file cannot be outside the project directory. - DependentUpon is relative to the directory of the embedded resource. - (FileToXmlElement): Write DependentUpon info. - (HandleFilePropertyChanged): Likewise. - - (MSBuildProject.GetDefaultResourceIdInternal): Build embedded resource - id when the file depends on a cs file. - (GetNextCSToken): Very Simple tokenizer for c# files. - -2006-12-13 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (ReadConfig): Read Win32Resource. - (WriteFileInternal): Write Win32Resource. - (ReadItemGroups): Emit a warning if Include attribute is not found. - -2006-12-12 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (SlnFileFormat.WriteFile): Write to a temporary file - and if successful, then rename to the intended file. - Split into this and .. - (SlnFileFormat.WriteFileInternal): .. this. Preserve text corresponding - to projects that we could not load. - (SlnFileFormat.LoadSolution): Use MSBuildSolution instead of Combine. - (SlnFileFormat.HandleCombineEntryAdded): Move code for updating project - references to .. - (SlnFileFormat.UpdateProjectReferences): .. here. - (SlnFileFormat.ConvertToMSBuild): Return CombineEntry. Set file name for solution folder. - - (SlnFileFormat.Section): Make it top level class. - (SlnData): New class. - (MSBuildSolution): New class. - - * MSBuildFileFormat.cs (MSBuildFileFormat.WriteFile): Write to a temporary file - and if successful, then rename to the intended file. - (MSBuildFileFormat.ReadConfig): Read ApplicationIcon also. - (MSBuildFileFormat.SaveProject): Remove @file param. - (MSBuildFileFormat.LoadProject): Set project's DefaultNamespace. Use - MSBuildProject instead of DotNetProject. - (MSBuildFileFormat.ReferenceToXmlElement): Set the correct guid for a - project reference. - (MSBuildFileFormat.FileToXmlElement): For EmbedAsResource, set the - LogicalName if required (see the comment in the code). - (MSBuildFileFormat.ReadItemGroups): Add "Content". - For EmbeddedResource, use LogicalName if available. - - (MSBuildFileFormat.MSBuildProject): New. - -2006-12-08 Ankit Jain <jankit@novell.com> - - * MSBuildFileFormat.cs (WriteFileInternal): Trimming '{', '}' not - required for new guids. - Use MSBuildData.Guid for project references. - -2006-12-08 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Move extra .sln specific info from - ExtendedProperties to SlnData and store that in the ExtendedProperties. - * MSBuildFileFormat.cs: Likewise, move to MSBuildData. - -2006-12-03 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (WriteProjects): Add 'baseDirectory' param. - Path should be relative to solution file's directory. - (HandleCombineEntryAdded): Emit 'guid' with the project reference. - Path should be relative to the project's base directory. - * MSBuildFileFormat.cs (AppendChild): Make internal. - -2006-12-03 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (HandleCombineEntryAdded): Update project references - after conversion. - -2006-12-02 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (SetHandlers): Add a 'setEntries' param. Setting - handlers on entries is required when loading from a file. - -2006-12-02 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs (SetHandlers): Don't set handlers on contained - combines. Set *Added handler instead of *Modified. - (HandleCombineEntryModified): Remove. - (HandleCombineEntryAdded): New. - (ConvertToMSBuild): New. Convert a Mds/Mdp based project to msbuild - format (if required). - * MSBuildFileFormat.cs (WriteFile): Split into this and .. - (WriteFileInternal): .. this. Create a new XmlDocument if required. - (SaveProject): Save a DotNetProject to the corresponding .*proj . - (LoadProject): Set handlers. - (SetupHandlers): New. - (ReferenceToXmlNode): New. - (FileToXmlNode): New. - (HandleFileRenamed): New. - -2006-11-29 Ankit Jain <jankit@novell.com> - - * SlnFileFormat.cs: Add basic write/save support. - * MSBuildFileFormat.cs (WriteFile): OutputPath should be relative. - (ParseProject): Rename to .. - (LoadProject): .. this. Set default name of the project. - Create new config only if it doesn't already exist. - (HandleRename): Change the name of the project file when the project is - renamed. - -2006-11-20 Ankit Jain <jankit@novell.com> - - * MsPrjHelper.cs (MapPath): Make "internal static". Change "\" to "/" only - if required. - * prj2make-sharp-lib.add.in.xml: Add extensions for ProjectFileFormats - and FileFilter. - * Makefile.am: Add references to MonoDevelop.Components and Mono.Cecil . - Add MSBuildFileFormat.cs and SlnFileFormat.cs - - * SlnFileFormat.cs: VS2005 solution file support. - * MSBuildFileFormat.cs: MSBuild project file support. - Initial commit for support of vs2005 solutions/projects. - -2006-11-11 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.mdp: Build the project using the 2.0 profile. - -2006-09-19 Jacob Ilsø Christensen <jacobilsoe@gmail.com> - - * .: Added svn:ignore for prj2make-sharp-lib.pidb - -2006-09-07 Andrés G. Aragoneses <knocte@gmail.com> - - * prj2make-sharp-lib.addin.xml: Added '2003' version to label so as not to - confuse newcomers who may think VS2005 is supported. Of course, this should be - removed when 2005 support is added. - -2006-07-03 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Updated versions. - -2006-05-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Updated versions. - * prj2make-sharp-lib.mdp: Updated. - -2006-03-30 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Updated references. - -2006-03-24 Lluis Sanchez Gual <lluis@novell.com> - - * Makefile.am: Use an unified format. Patch by Matze Braun. - * prj2make-sharp-lib.addin.xml: Updated add-in versions. - -2006-03-23 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib/MsPrjHelper.cs: Track api changes. - -2006-02-19 Andrés G. Aragoneses <knocte@gmail.com> - - * prj2make-sharp-lib.addin.xml: Improved a label string. - -2006-01-04 Alexandre Miguel Pedro Gomes <alexmipego@gmail.com> - - * prj2make-sharp-lib.addin.xml: Added icon to "Import VS Solution" - option. - -2005-11-21 Lluis Sanchez Gual <lluis@novell.com> - - * MsPrjHelper.cs: Factorized code from getting the location of a package - in a method. Take into account that the package may not be installed. - * pkgconfiginvoker.cs: Don't crash if pkg-config returns an error. - -2005-11-18 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Fixed command placement in menu. - -2005-11-10 Lluis Sanchez Gual <lluis@novell.com> - - * csproj_ver2003.cs: Fixed some fields (patch by Jim Albert). - * PrjHelper.cs: - * prj2make-sharp-lib-Commands.cs: Show a progress monitor while importing. - Other minor fixes. - * MsPrjHelper.cs: Use the MonoDevelop.Projects api to generate the projects. - Many other bug fixes. - * prj2make-sharp-lib.addin.xml: Added new dependency. - * Makefile.am: Added new assembly references. - -2005-10-10 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Fixed addin header information. - Use "id" attribuet instead of "name" to identify addins. - -2005-10-04 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: Added addin dependencies. - -2005-06-28 Raja R Harinath <rharinath@novell.com> - - * Makefile.am (FILES): Move AssemblyInfo.cs ... - (GENERATED_FILES): ... here. - -2005-04-25 Lluis Sanchez Gual <lluis@novell.com> - - * prj2make-sharp-lib.addin.xml: - * prj2make-sharp-lib-Commands.cs: Use the new syntax for defining - commands and implementing commands. - -2005-04-17 John Luke <john.luke@gmail.com> - - * Makefile.am: fix distcheck - -2005-03-18 Francisco "Paco" Martinez <paco@mfcon.com> - * MsPrjHelpe.cs: - Mono 2.0 has been commented out until further notice. - Gtk# 2.0 is searched first for a match otherwise it goes to Gtk# 1.0 - Added Gecko# 2.0 (0.7) is searched first for a match otherwise it goes to Gecko# 1.0 (0.6) - - * MsPrjHelper.cs and MdPrjHelper.cs: - I also included the changes inside the patch in http://bugzilla.ximian.com/show_bug.cgi?id=73705. - -2004-08-07 Todd Berman <tberman@off.net> - - * AssemblyInfo.cs.in: Use new ASSEMBLY_VERSION variable. - -2004-06-17 John Luke <jluke@cfl.rr.com> - - * Makefile.am: add reference to MonoDevelop.Gui.Widgets - * *.Makefile: remove generated makefile from svn - * prj2make-sharp-Commands.cs : use MonoDevelop.Gui.Widgets.FileSelector - instead of Gtk.FileSelection - -2004-06-14 Francisco "Paco" Martinez <paco@mfcon.com> - - Changes to correctly specify GAC type references on imported projects from VS .NET csproj files - - Files changed - * MdPrjHelper.cs - * MsPrjHelper.cs - * Prj2MakeSharp.prjx -- modernized the GAC references - * PrjxInfo.cs - * Makefile.am -- include the added pkgconfiginvoker.cs file to the compilation - - Files added - * pkgconfiginvoker.cs -- This should be removed or depracated in future releases to avoid duplicity of - functionality - -2004-05-31 Francisco "Paco" Martinez <paco@mfcon.com> - - * src/Addin/prj2make-sharp-lib/MsPrjHelper.cs: corrects problems with - the import of items flag as content so it will not try to build those - -2004-05-17 Todd Berman <tberman@sevenl.net> - - * prj2make-sharp-lib-Commands.cs: use HOME instead of Personal - -2004-04-25 Francisco "Paco" Martinez <paco@mfcon.com> - Files removed - * AssemblyInfo.cs -- This file is now generated in the build by - AssemblyInfo.cs.in - -2004-04-25 Francisco "Paco" Martinez <paco@mfcon.com> - - Files changed - * ChangeLog -- Edited to better reflect the files included in the original import into the repository. - - Files added - * AssemblyInfo.cs - * AssemblyInfo.cs.in - * CsprojInfo.cs - * csproj_ver2003.cs - * Makefile.am - * MdPrjHelper.cs - * MsPrjHelper.cs - * prj2make-sharp-lib.addin.xml - * prj2make-sharp-lib.cmbx - * prj2make-sharp-lib-Commands.cs - * prj2make-sharp-lib.prjx - * PrjHelper.cs - * PrjxInfo.cs - * sharp_d_cmbx.cs - * sharp_d_prjx.cs diff --git a/main/src/addins/prj2make-sharp-lib/CsprojInfo.cs b/main/src/addins/prj2make-sharp-lib/CsprojInfo.cs deleted file mode 100644 index 3b965fba9f..0000000000 --- a/main/src/addins/prj2make-sharp-lib/CsprojInfo.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.Collections; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Xml; -using System.Xml.Serialization; -using MonoDevelop.Projects; - -namespace MonoDevelop.Prj2Make -{ - class CsprojInfo - { - public readonly string name; - public readonly string guid; - public readonly string csprojpath; - public string makename; - public string makename_ext; - public string assembly_name; - public string res; - public string src; - private bool m_bAllowUnsafeCode; - private MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject m_projObject; - public bool NeedsConversion = true; - - public string ext_refs = ""; - public string switches = ""; - - public bool AllowUnsafeCode - { - get { return m_bAllowUnsafeCode; } - } - - public MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject Proyecto - { - get { return m_projObject; } - } - - // Project desirialization - protected MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject LoadPrjFromFile (string strIn) - { - using (FileStream fs = new FileStream (strIn, FileMode.Open)) { - - XmlSerializer xmlSer = new XmlSerializer (typeof(MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject)); - MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject prjObj = (MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject) xmlSer.Deserialize (fs); - fs.Close(); - return (prjObj); - } - } - - public CsprojInfo(bool isUnixMode, bool isMcsMode, string name, string guid, string csprojpath) - { - this.name = name; - this.guid = guid; - this.csprojpath = csprojpath; - - makename = name.Replace('.','_').ToUpper(); - makename_ext = makename + "_EXT"; - m_bAllowUnsafeCode = false; - - // convert backslashes to slashes - csprojpath = csprojpath.Replace("\\", "/"); - - // loads the file in order to deserialize and - // build the object graph - try - { - FileFormat format = Services.ProjectService.FileFormats.GetFileFormatForFile (csprojpath, typeof(SolutionEntityItem)); - if (format != null && format.Id != "VS2003ProjectFileFormat") { - NeedsConversion = false; - return; - } - - m_projObject = LoadPrjFromFile (csprojpath); - } - catch (Exception exc) - { - Console.WriteLine ( - String.Format ("Could not load the file {0}\nException: {1}", - csprojpath, - exc.ToString ()) - ); - throw; - } - - // Establish if the allow unsafe code flag is true - foreach (MonoDevelop.Prj2Make.Schema.Csproj.Config cf in m_projObject.CSHARP.Build.Settings.Config) - { - if(cf.AllowUnsafeBlocks == true) - m_bAllowUnsafeCode = true; - } - - switch (m_projObject.CSHARP.Build.Settings.OutputType) - { - case "Library": - makename_ext = makename + "_DLL"; - assembly_name = m_projObject.CSHARP.Build.Settings.AssemblyName + ".dll"; - switches += " -target:library"; - break; - - case "Exe": - makename_ext = makename + "_EXE"; - assembly_name = m_projObject.CSHARP.Build.Settings.AssemblyName + ".exe"; - switches += " -target:exe"; - break; - - case "WinExe": - makename_ext = makename + "_EXE"; - assembly_name = m_projObject.CSHARP.Build.Settings.AssemblyName + ".exe"; - switches += " -target:winexe"; - break; - - default: - throw new NotSupportedException("Unsupported OutputType: " + m_projObject.CSHARP.Build.Settings.OutputType); - - } - - src = ""; - string basePath = Path.GetDirectoryName(csprojpath); - string s; - - foreach (MonoDevelop.Prj2Make.Schema.Csproj.File fl in m_projObject.CSHARP.Files.Include) - { - if(fl.BuildAction == MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.Compile) - { - if (src != "") - { - src += " \\\n\t"; - } - - s = System.IO.Path.Combine(basePath, fl.RelPath); - s = s.Replace("\\", "/"); - if (SlnMaker.slash != "/") - s = s.Replace("/", SlnMaker.slash); - - // Test for spaces - if (isUnixMode == false) { - // We are in win32 using a cmd.exe or other - // DOS shell - if(s.IndexOf(' ') > -1) { - src += String.Format("\"{0}\"", s); - } else { - src += s; - } - } else { - // We are in *NIX or some other - // GNU like shell - src += s.Replace(" ", "\\ "); - } - } - } - - res = ""; - string rootNS = m_projObject.CSHARP.Build.Settings.RootNamespace; - string relPath; - foreach (MonoDevelop.Prj2Make.Schema.Csproj.File fl in m_projObject.CSHARP.Files.Include) - { - if(fl.BuildAction == MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.EmbeddedResource) - { - if (res != "") { - res += " \\\n\t"; - } - - relPath = fl.RelPath.Replace("\\", "/"); - s = System.IO.Path.Combine(basePath, relPath); - s = String.Format("-resource:{0},{1}", s, rootNS + "." + relPath.Replace("/", ".")); - s = s.Replace("\\", "/"); - if (SlnMaker.slash != "/") - s = s.Replace("/", SlnMaker.slash); - res += s; - } - } - } - } -} diff --git a/main/src/addins/prj2make-sharp-lib/Makefile.am b/main/src/addins/prj2make-sharp-lib/Makefile.am deleted file mode 100644 index deb0ebdaf3..0000000000 --- a/main/src/addins/prj2make-sharp-lib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/xbuild.include
\ No newline at end of file diff --git a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs deleted file mode 100644 index 2d8d41c259..0000000000 --- a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs +++ /dev/null @@ -1,578 +0,0 @@ -using System; -using System.Collections; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Xml; -using System.Xml.Serialization; - -using MonoDevelop.Prj2Make.Schema.Csproj; -using MonoDevelop.Projects; -using MonoDevelop.Projects.Text; -using MonoDevelop.Core; -using MonoDevelop.Ide.Gui; - -using MonoDevelop.Core.Assemblies; -using MonoDevelop.CSharp.Project; - - -namespace MonoDevelop.Prj2Make -{ - public class SlnMaker - { - public static string slash; - Hashtable projNameInfo = new Hashtable(); - Hashtable projGuidInfo = new Hashtable(); - private string prjxFileName; - private string m_strSlnVer; - private string m_strCsprojVer; - private bool m_bIsUnix; - private bool m_bIsMcs; - private bool m_bIsUsingLib; - - TargetFramework fx = Runtime.SystemAssemblyService.GetTargetFramework (TargetFrameworkMoniker.NET_1_1); - - // Flag use to determine if the LIB variable will be used in - // the Makefile that prj2make generates - public bool IsUsingLib - { - get{ return m_bIsUsingLib; } - set{ m_bIsUsingLib = value; } - } - - - // Determines if the makefile is intended for nmake or gmake for urposes of path separator character - public bool IsUnix - { - get{ return m_bIsUnix; } - set{ m_bIsUnix = value; } - } - - // Determines if using MCS or CSC - public bool IsMcs - { - get{ return m_bIsMcs; } - set{ m_bIsMcs = value; } - } - - public string SlnVersion - { - get { return m_strSlnVer; } - set { m_strSlnVer = value; } - } - - public string CsprojVersion - { - get { return m_strCsprojVer; } - set { m_strCsprojVer = value; } - } - - // Shuld contain the file name - // of the most resent prjx generation - public string PrjxFileName { - get { return prjxFileName; } - } - - // Default constructor - public SlnMaker() - { - m_bIsUnix = false; - m_bIsMcs = false; - m_bIsUsingLib = false; - } - - // Utility function to determine the sln file version - protected string GetSlnFileVersion(string strInSlnFile) - { - string strVersion = null; - string strInput = null; - Match match; - FileStream fis = new FileStream(strInSlnFile, FileMode.Open, FileAccess.Read, FileShare.Read); - StreamReader reader = new StreamReader(fis); - strInput = reader.ReadLine(); - - match = SlnVersionRegex.Match(strInput); - if (match.Success) - { - strVersion = match.Groups[1].Value; - } - - // Close the stream - reader.Close(); - - // Close the File Stream - fis.Close(); - - return strVersion; - } - - // Utility function to determine the csproj file version - protected string GetCsprojFileVersion(string strInCsprojFile) - { - string strRetVal = null; - XmlDocument xmlDoc = new XmlDocument(); - - xmlDoc.Load(strInCsprojFile); - strRetVal = xmlDoc.SelectSingleNode("/VisualStudioProject/CSHARP/@ProductVersion").Value; - - return strRetVal; - } - - protected void ParseMsCsProj(string fname) - { - string projectName = System.IO.Path.GetFileNameWithoutExtension (fname); - string csprojPath = System.IO.Path.GetFileName (fname); - string projectGuid = ""; - - CsprojInfo pi = new CsprojInfo (m_bIsUnix, m_bIsMcs, projectName, projectGuid, csprojPath); - - projNameInfo[projectName] = pi; - projGuidInfo[projectGuid] = pi; - } - - protected void ParseSolution(string fname, IProgressMonitor monitor) - { - FileStream fis = new FileStream(fname,FileMode.Open, FileAccess.Read, FileShare.Read); - using (StreamReader reader = new StreamReader(fis)) { - while (true) - { - string s = reader.ReadLine(); - Match match; - - match = ProjectRegex.Match(s); - if (match.Success) - { - string projectName = match.Groups[2].Value; - string csprojPath = match.Groups[3].Value; - string projectGuid = match.Groups[4].Value; - - try { - if (csprojPath.EndsWith (".csproj") && !csprojPath.StartsWith("http://")) - { - csprojPath = MapPath (Path.GetDirectoryName (fname), csprojPath); - CsprojInfo pi = new CsprojInfo (m_bIsUnix, m_bIsMcs, projectName, projectGuid, csprojPath); - projNameInfo[projectName] = pi; - projGuidInfo[projectGuid] = pi; - } - } catch (Exception ex) { - Console.WriteLine (GettextCatalog.GetString ("Could not import project:") + csprojPath); - Console.WriteLine (ex.ToString ()); - monitor.ReportError (GettextCatalog.GetString ("Could not import project:") + csprojPath, ex); - throw; - } - } - - if (s.StartsWith("Global")) - { - break; - } - } - } - } - - public SolutionEntityItem CreatePrjxFromCsproj (string csprojFileName, IProgressMonitor monitor) - { - try { - FileFormat format = Services.ProjectService.FileFormats.GetFileFormatForFile (csprojFileName, typeof(SolutionEntityItem)); - if (format != null && format.Id != "VS2003ProjectFileFormat") - return (SolutionEntityItem) Services.ProjectService.ReadSolutionItem (monitor, csprojFileName); - - MonoDevelop.Prj2Make.Schema.Csproj.VisualStudioProject csprojObj = null; - - monitor.BeginTask (GettextCatalog.GetString ("Importing project: ") + csprojFileName, 4); - - DotNetAssemblyProject prjxObj = new DotNetAssemblyProject ("C#", null, null); - - prjxFileName = String.Format ("{0}.mdp", - Path.Combine (Path.GetDirectoryName (csprojFileName), - Path.GetFileNameWithoutExtension (csprojFileName)) - ); - - // Load the csproj - using (TextFileReader fsIn = new TextFileReader (csprojFileName)) { - XmlSerializer xmlDeSer = new XmlSerializer (typeof(VisualStudioProject)); - csprojObj = (VisualStudioProject) xmlDeSer.Deserialize (fsIn); - } - - monitor.Step (1); - - // Begin prjxObj population - prjxObj.FileName = prjxFileName; - prjxObj.Name = Path.GetFileNameWithoutExtension(csprojFileName); - prjxObj.Description = ""; - prjxObj.NewFileSearch = NewFileSearch.None; - prjxObj.DefaultNamespace = csprojObj.CSHARP.Build.Settings.RootNamespace; - - GetContents (prjxObj, csprojObj.CSHARP.Files.Include, prjxObj.Files, monitor); - monitor.Step (1); - - GetReferences (prjxObj, csprojObj.CSHARP.Build.References, prjxObj.References, monitor); - monitor.Step (1); - - prjxObj.Configurations.Clear (); - foreach (Config cblock in csprojObj.CSHARP.Build.Settings.Config) - { - prjxObj.Configurations.Add (CreateConfigurationBlock ( - prjxObj, - cblock, - csprojObj.CSHARP.Build.Settings.AssemblyName, - csprojObj.CSHARP.Build.Settings.OutputType, - monitor - )); - } - monitor.Step (1); - return prjxObj; - - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not import project:") + csprojFileName, ex); - throw; - } finally { - monitor.EndTask (); - } - } - - public Solution MsSlnToCmbxHelper (string slnFileName, IProgressMonitor monitor) - { - Solution solution = new Solution(); - - monitor.BeginTask (GettextCatalog.GetString ("Importing solution"), 2); - try - { - // We invoke the ParseSolution - // by passing the file obtained - ParseSolution (slnFileName, monitor); - - // Create all of the prjx files form the csproj files - monitor.BeginTask (null, projNameInfo.Values.Count * 2); - - foreach (CsprojInfo pi in projNameInfo.Values) { - string mappedPath = MapPath (Path.GetDirectoryName (slnFileName), pi.csprojpath); - if (mappedPath == null) { - monitor.Step (2); - monitor.ReportWarning (GettextCatalog.GetString ("Project file not found: ") + pi.csprojpath); - continue; - } - SolutionEntityItem prj; - if (pi.NeedsConversion) - prj = CreatePrjxFromCsproj (mappedPath, monitor); - else - prj = (DotNetProject) Services.ProjectService.ReadSolutionItem (monitor, mappedPath); - - if (prj == null) - return null; - - monitor.Step (1); - solution.RootFolder.Items.Add (prj); - foreach (ItemConfiguration conf in prj.Configurations) { - if (!solution.GetConfigurations ().Contains (conf.Id)) - solution.AddConfiguration (conf.Id, false); - } - monitor.Step (1); - } - - monitor.EndTask (); - monitor.Step (1); - - solution.SetLocation (Path.GetDirectoryName (slnFileName), Path.GetFileNameWithoutExtension(slnFileName)); - - monitor.Step (1); - return solution; - } - catch (Exception e) - { - monitor.ReportError (GettextCatalog.GetString ("The solution could not be imported."), e); - throw; - } - finally - { - monitor.EndTask (); - } - } - - protected void GetReferences (Project project, MonoDevelop.Prj2Make.Schema.Csproj.Reference[] References, ProjectReferenceCollection references, IProgressMonitor monitor) - { - if (References == null || References.Length == 0) - return; - - monitor.BeginTask (null, 5 + References.Length); - - try { - // Get the GAC path - string strBasePathMono1_0 = GetPackageDirectory ("mono", "mono/1.0"); - - monitor.Step (1); - - string strBasePathGtkSharp = GetPackageDirectory ("gtk-sharp", "mono/gtk-sharp"); - - monitor.Step (1); - - string strBasePathGtkSharp2_0 = GetPackageDirectory ("gtk-sharp-2.0", "mono/gtk-sharp-2.0"); - - monitor.Step (1); - - string strBasePathGeckoSharp = GetPackageDirectory ("gecko-sharp", "mono/gecko-sharp"); - - monitor.Step (1); - - string strBasePathGeckoSharp2_0 = GetPackageDirectory ("gecko-sharp-2.0", "mono/gecko-sharp-2.0"); - - string[] monoLibs = new string [] { - strBasePathMono1_0, - strBasePathGtkSharp2_0, - strBasePathGtkSharp, - strBasePathGeckoSharp2_0, - strBasePathGeckoSharp - }; - - // Iterate through the reference collection of the csproj file - foreach (MonoDevelop.Prj2Make.Schema.Csproj.Reference rf in References) - { - monitor.Step (1); - - ProjectReference rfOut = null; - - if (rf.Package != null && rf.Package.Length != 0) - { - rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Project, Path.GetFileName (rf.Name)); - rfOut.LocalCopy = true; - references.Add (rfOut); - } - else if (rf.AssemblyName != null) - { - string rname = rf.AssemblyName; - if (rname == "System.XML") - rname = "System.Xml"; - - string oref = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (rname, fx); - if (oref == null) { - if (rf.HintPath != null) { - string asm = MapPath (project.ItemDirectory, rf.HintPath); - if (!System.IO.File.Exists (asm)) - monitor.ReportWarning (GettextCatalog.GetString ("Referenced assembly not found: ") + asm); - ProjectReference aref = new ProjectReference (MonoDevelop.Projects.ReferenceType.Assembly, asm); - references.Add (aref); - continue; - } - monitor.ReportWarning (GettextCatalog.GetString ("Assembly reference could not be imported: ") + rf.AssemblyName); - continue; - } - rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, oref); - rfOut.LocalCopy = true; - references.Add (rfOut); - } - else if (rf.HintPath != null) - { - // HACK - under Unix filenames are case sensitive - // Under Windows there's no agreement on Xml vs XML ;-) - if (Path.GetFileName (rf.HintPath) == "System.XML.dll") - { - ProjectReference pref = GetMonoReferece (strBasePathMono1_0, "System.Xml.dll"); - if (pref != null) { - references.Add (pref); - continue; - } - } else { - foreach (string libDir in monoLibs) { - if (libDir == null) continue; - if (rf.HintPath == null) - continue; - rfOut = GetMonoReferece (libDir, rf.HintPath); - if (rfOut != null) - break; - } - - if (rfOut == null) { - rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, Path.GetFileName (rf.HintPath)); - rfOut.LocalCopy = true; - } - references.Add (rfOut); - } - } - else { - monitor.ReportWarning (GettextCatalog.GetString ("Assembly reference could not be imported: ") + rf.Name); - } - } - } finally { - monitor.EndTask (); - } - } - - string GetPackageDirectory (string package, string subdir) - { - string dir = MonoDevelop.Prj2Make.PkgConfigInvoker.GetPkgVariableValue (package, "libdir"); - return dir != null ? Path.Combine (dir.TrimEnd(), subdir) : null; - } - - ProjectReference GetMonoReferece (string libPath, string reference) - { - string strRefFileName = Path.Combine (libPath, Path.GetFileName (reference)); - - // Test to see if file exist in GAC location - if (System.IO.File.Exists (strRefFileName)) { - ProjectReference rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (strRefFileName, fx)); - rfOut.LocalCopy = true; - return rfOut; - } - return null; - } - - protected void GetContents (MonoDevelop.Projects.Project project, MonoDevelop.Prj2Make.Schema.Csproj.File[] Include, ProjectFileCollection files, IProgressMonitor monitor) - { - if (Include == null || Include.Length == 0) - return; - - // Iterate through the file collection of the csproj file - foreach(MonoDevelop.Prj2Make.Schema.Csproj.File fl in Include) - { - ProjectFile flOut = new ProjectFile (); - - string name; - if ((fl.Link == null) || (fl.Link.Length == 0)) { - name = MapPath (project.BaseDirectory, fl.RelPath); - } else { - name = MapPath (null, fl.Link); - } - - if (name == null) { - monitor.ReportWarning (GettextCatalog.GetString ("Can't import file: ") + fl.RelPath); - continue; - } - flOut.Name = name; - // Adding here as GetDefaultResourceIdInternal needs flOut.Project - files.Add (flOut); - - switch (fl.SubType) - { - case "Code": - flOut.Subtype = Subtype.Code; - break; - } - - switch (fl.BuildAction) - { - case MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.Compile: - flOut.BuildAction = BuildAction.Compile; - break; - case MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.Content: - flOut.BuildAction = BuildAction.Content; - break; - case MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.EmbeddedResource: - flOut.BuildAction = BuildAction.EmbeddedResource; - break; - case MonoDevelop.Prj2Make.Schema.Csproj.FileBuildAction.None: - flOut.BuildAction = BuildAction.None; - break; - } - // DependentUpon is relative to flOut - flOut.DependsOn = MapPath (Path.GetDirectoryName (flOut.Name), fl.DependentUpon); - flOut.Data = ""; - } - } - - protected SolutionItemConfiguration CreateConfigurationBlock (MonoDevelop.Projects.DotNetProject project, Config ConfigBlock, string AssemblyName, string OuputType, IProgressMonitor monitor) - { - DotNetProjectConfiguration confObj = project.CreateConfiguration (ConfigBlock.Name) as DotNetProjectConfiguration; - - confObj.RunWithWarnings = false; - confObj.DebugMode = ConfigBlock.DebugSymbols; - project.CompileTarget = (CompileTarget) Enum.Parse (typeof(CompileTarget), OuputType, true); - - string dir = MapPath (project.BaseDirectory, ConfigBlock.OutputPath); - if (dir == null) { - dir = Path.Combine ("bin", ConfigBlock.Name); - monitor.ReportWarning (string.Format (GettextCatalog.GetString ("Output directory '{0}' can't be mapped to a local directory. The directory '{1}' will be used instead"), ConfigBlock.OutputPath, dir)); - } - confObj.OutputDirectory = dir; - confObj.OutputAssembly = AssemblyName; - - CSharpCompilerParameters compilerParams = new CSharpCompilerParameters (); - compilerParams.WarningLevel = ConfigBlock.WarningLevel; - compilerParams.NoWarnings = ""; - compilerParams.Optimize = ConfigBlock.Optimize; - compilerParams.DefineSymbols = ConfigBlock.DefineConstants; - compilerParams.UnsafeCode = ConfigBlock.AllowUnsafeBlocks; - compilerParams.GenerateOverflowChecks = ConfigBlock.CheckForOverflowUnderflow; - - return confObj; - } - - internal static string MapPath (string basePath, string relPath) - { - if (relPath == null || relPath.Length == 0) - return null; - - string path = relPath; - if (Path.DirectorySeparatorChar != '\\') - path = path.Replace ("\\", "/"); - - if (char.IsLetter (path [0]) && path.Length > 1 && path[1] == ':') - return null; - - if (basePath != null) - path = Path.Combine (basePath, path); - - if (System.IO.File.Exists (path)){ - return Path.GetFullPath (path); - } - - if (Path.IsPathRooted (path)) { - - // Windows paths are case-insensitive. When mapping an absolute path - // we can try to find the correct case for the path. - - string[] names = path.Substring (1).Split ('/'); - string part = "/"; - - for (int n=0; n<names.Length; n++) { - string[] entries; - - if (names [n] == ".."){ - part = Path.GetFullPath (part + "/.."); - continue; - } - - entries = Directory.GetFileSystemEntries (part); - - string fpath = null; - foreach (string e in entries) { - if (string.Compare (Path.GetFileName (e), names[n], true) == 0) { - fpath = e; - break; - } - } - if (fpath == null) { - // Part of the path does not exist. Can't do any more checking. - part = Path.GetFullPath (part); - for (; n < names.Length; n++) - part += "/" + names[n]; - return part; - } - - part = fpath; - } - return Path.GetFullPath (part); - } else { - return Path.GetFullPath (path); - } - } - - // static regexes - static Regex projectRegex = null; - internal static Regex ProjectRegex { - get { - if (projectRegex == null) - projectRegex = new Regex(@"Project\(""(\{[^}]*\})""\) = ""(.*)"", ""(.*)"", ""(\{[^{]*\})"""); - return projectRegex; - } - } - - static Regex slnVersionRegex = null; - internal static Regex SlnVersionRegex { - get { - if (slnVersionRegex == null) - slnVersionRegex = new Regex (@"Microsoft Visual Studio Solution File, Format Version (\d?\d.\d\d)"); - return slnVersionRegex; - } - } - } -} diff --git a/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs b/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs deleted file mode 100644 index 192a90f3a9..0000000000 --- a/main/src/addins/prj2make-sharp-lib/VS2003ProjectFileFormat.cs +++ /dev/null @@ -1,275 +0,0 @@ -// -// VS2003ProjectFileFormat.cs -// -// Author: -// Ankit Jain <jankit@novell.com> -// -// Copyright (C) 2007 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using MonoDevelop.Core; -using MonoDevelop.Core.ProgressMonitoring; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Projects; - -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; -using System.Xml; -using MonoDevelop.Projects.Extensions; -using MonoDevelop.Ide; - -namespace MonoDevelop.Prj2Make -{ - public class VS2003ProjectFileFormat : IFileFormat - { - GuiHelper helper; - - public VS2003ProjectFileFormat () - { - } - - public string Name { - get { return "Visual Studio 2003"; } - } - - GuiHelper GuiHelper { - get { - if (helper == null) - helper = new GuiHelper (); - return helper; - } - }
-
- public FilePath GetValidFormatName (object obj, FilePath fileName) - { - return fileName; - }
-
- public bool CanReadFile (FilePath file, Type expectedObjectType) - { - if (expectedObjectType.IsAssignableFrom (typeof(Solution)) && String.Compare (file.Extension, ".sln", true) == 0) { - string ver = GetSlnFileVersion (file); - if (ver == "7.00" || ver == "8.00") - return true; - } - - if (!expectedObjectType.IsAssignableFrom (typeof(DotNetProject))) - return false; - - if (String.Compare (file.Extension, ".csproj", true) != 0 && - String.Compare (file.Extension, ".vbproj", true) != 0) - return false; - - try { - using (XmlReader xr = XmlReader.Create (file)) { - xr.MoveToContent (); - if (xr.NodeType == XmlNodeType.Element && String.Compare (xr.LocalName, "VisualStudioProject") == 0) - return true; - } - } catch { - return false; - } - - return false; - } - - public bool CanWriteFile (object obj) - { - return false; - }
-
- public void WriteFile (FilePath file, object node, IProgressMonitor monitor) - { - }
-
- public object ReadFile (FilePath file, Type expectedType, IProgressMonitor monitor) - { - if (expectedType.IsAssignableFrom (typeof(DotNetProject))) - return ReadProjectFile (file, monitor); - else - return ReadSolutionFile (file, monitor); - }
-
- public object ReadProjectFile (FilePath fileName, IProgressMonitor monitor) - { - if (IdeApp.IsInitialized) { - TargetConvert choice = GuiHelper.QueryProjectConversion (fileName); - if (choice == TargetConvert.None) - throw new InvalidOperationException ("VS2003 projects are not supported natively."); - - SolutionEntityItem project = ImportCsproj (fileName); - project.FileName = fileName; - - if (choice == TargetConvert.MonoDevelop) { - project.FileFormat = IdeApp.Services.ProjectService.FileFormats.GetFileFormat ("MD1"); - } else if (choice == TargetConvert.VisualStudio) { - project.FileFormat = IdeApp.Services.ProjectService.FileFormats.GetFileFormat ("MSBuild05"); - } - - project.Save (monitor); - return project; - } - else { - SolutionEntityItem project = ImportCsproj (fileName); - project.FileName = fileName; - return project; - } - }
-
- public object ReadSolutionFile (FilePath fileName, IProgressMonitor monitor) - { - if (IdeApp.IsInitialized) { - TargetConvert choice = GuiHelper.QuerySolutionConversion (fileName); - if (choice == TargetConvert.None) - throw new InvalidOperationException ("VS2003 solutions are not supported natively."); - - Solution solution = ImportSln (fileName); - - if (choice == TargetConvert.MonoDevelop) { - solution.ConvertToFormat (IdeApp.Services.ProjectService.FileFormats.GetFileFormat ("MD1"), true); - } else if (choice == TargetConvert.VisualStudio) { - solution.ConvertToFormat (IdeApp.Services.ProjectService.FileFormats.GetFileFormat ("MSBuild05"), true); - } - - solution.Save (monitor); - return solution; - } - else - return ImportSln (fileName); - }
-
- internal SolutionEntityItem ImportCsproj (FilePath fileName) - { - SolutionEntityItem project = null; - SlnMaker slnmaker = new SlnMaker (); - try { - IProgressMonitor m = IdeApp.IsInitialized ? GuiHelper.CreateProgressMonitor () : new ConsoleProgressMonitor (); - using (m) { - project = slnmaker.CreatePrjxFromCsproj (fileName, m); - } - } catch (Exception e) { - LoggingService.LogError ("exception while converting: " + e.ToString ()); - throw; - } - - return project; - } - - public void ConvertToFormat (object obj) - { - }
-
- public List<FilePath> GetItemFiles (object obj) - {
- return new List<FilePath> (); - } - - // Converts a vs2003 solution to a Combine object
- internal Solution ImportSln (FilePath fileName) - { - SlnMaker slnmaker = new SlnMaker (); - Solution solution = null; - IProgressMonitor m = IdeApp.IsInitialized ? GuiHelper.CreateProgressMonitor () : new ConsoleProgressMonitor (); - - try { - solution = slnmaker.MsSlnToCmbxHelper (fileName, m); - } catch (Exception e) { - LoggingService.LogError ("exception while converting : " + e.ToString ()); - throw; - } finally { - if (m != null) - m.Dispose (); - } - - return solution; - } - - // Utility function to determine the sln file version - string GetSlnFileVersion(string strInSlnFile) - { - using (var stream = File.OpenText (strInSlnFile)) { - // ReadLine returns null at EOF which makes the regex throw an ArgNull exception - var match = SlnMaker.SlnVersionRegex.Match (stream.ReadLine () ?? ""); - if (!match.Success) - match = SlnMaker.SlnVersionRegex.Match (stream.ReadLine () ?? ""); - - return match.Success ? match.Groups[1].Value : null; - } - } - - public bool SupportsMixedFormats { - get { return false; } - } - - public IEnumerable<string> GetCompatibilityWarnings (object obj) - { - yield break; - } - - public bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework) - { - return framework.Id == MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_1_1; - } - } - - enum TargetConvert - { - None, - VisualStudio, - MonoDevelop - } - - class GuiHelper: GuiSyncObject - { - TargetConvert QueryConversion (string text) - { - AlertButton vs2005 = new AlertButton (GettextCatalog.GetString ("Convert to MSBuild")); - - AlertButton choice = MessageService.AskQuestion (text, - GettextCatalog.GetString ("Converting to MSBuild format will overwrite existing files."), - AlertButton.Cancel, vs2005); - if (choice == vs2005) - return TargetConvert.VisualStudio; - else - return TargetConvert.None; - } - - public TargetConvert QueryProjectConversion (string file) - { - string text = GettextCatalog.GetString ("The project file {0} is a Visual Studio 2003 project. It must be converted to a MSBuild project.", file); - return QueryConversion (text); - } - - public TargetConvert QuerySolutionConversion (string file) - { - string text = GettextCatalog.GetString ("The solution file {0} is a Visual Studio 2003 solution. It must be converted to a MSBuild project.", file); - return QueryConversion (text); - } - - public IProgressMonitor CreateProgressMonitor () - { - return new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, false, true, false); - } - } -} diff --git a/main/src/addins/prj2make-sharp-lib/csproj_ver2003.cs b/main/src/addins/prj2make-sharp-lib/csproj_ver2003.cs deleted file mode 100644 index e4891f8a5e..0000000000 --- a/main/src/addins/prj2make-sharp-lib/csproj_ver2003.cs +++ /dev/null @@ -1,285 +0,0 @@ -namespace MonoDevelop.Prj2Make.Schema.Csproj { - using System.Xml.Serialization; - - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Build { - - /// <remarks/> - public Settings Settings; - - /// <remarks/> - [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] - public Reference[] References; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Settings { - - /// <remarks/> - [System.Xml.Serialization.XmlElementAttribute("Config")] - public Config[] Config; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string ApplicationIcon; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string AssemblyKeyContainerName; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string AssemblyName; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string AssemblyOriginatorKeyFile; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DefaultClientScript; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DefaultHTMLPageLayout; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DefaultTargetSchema; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool DelaySign; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string OutputType; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string PreBuildEvent; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string PostBuildEvent; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string RootNamespace; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string RunPostBuildEvent; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string StartupObject; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Config { - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Name; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool AllowUnsafeBlocks; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public long BaseAddress; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool CheckForOverflowUnderflow; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string ConfigurationOverrideFile; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DefineConstants; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DocumentationFile; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool DebugSymbols; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public short FileAlignment; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool IncrementalBuild; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool NoStdLib; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string NoWarn; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool Optimize; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string OutputPath; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool RegisterForComInterop; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool RemoveIntegerChecks; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool TreatWarningsAsErrors; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public System.SByte WarningLevel; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Reference { - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Name; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string AssemblyName; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string HintPath; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Project; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Package; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class CSHARP { - - /// <remarks/> - public Build Build; - - /// <remarks/> - public Files Files; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string ProjectType; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string ProductVersion; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public System.Decimal SchemaVersion; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string ProjectGuid; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Files { - - /// <remarks/> - [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] - public File[] Include; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class File { - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string RelPath; - - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Link; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public FileBuildAction BuildAction; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string SubType; - - /// <remarks/> - [System.Xml.Serialization.XmlAttributeAttribute()] - public string DependentUpon; - } - - /// <remarks/> - public enum FileBuildAction { - - /// <remarks/> - Compile, - - /// <remarks/> - Content, - - /// <remarks/> - EmbeddedResource, - - /// <remarks/> - None, - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class Include { - - /// <remarks/> - [System.Xml.Serialization.XmlElementAttribute("File")] - public File[] File; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class References { - - /// <remarks/> - [System.Xml.Serialization.XmlElementAttribute("Reference")] - public Reference[] Reference; - } - - /// <remarks/> - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public class VisualStudioProject { - - /// <remarks/> - public CSHARP CSHARP; - } -} diff --git a/main/src/addins/prj2make-sharp-lib/pkgconfiginvoker.cs b/main/src/addins/prj2make-sharp-lib/pkgconfiginvoker.cs deleted file mode 100644 index cac7091556..0000000000 --- a/main/src/addins/prj2make-sharp-lib/pkgconfiginvoker.cs +++ /dev/null @@ -1,98 +0,0 @@ -// created on 6/8/2004 at 5:44 AM -using System; -using System.Diagnostics; -using MonoDevelop.Core; - -namespace MonoDevelop.Prj2Make -{ - public sealed class PkgConfigInvoker - { - - public static string GetPkgConfigVersion() - { - string pkgout = null; - - pkgout = RunPkgConfig("--version"); - - if(pkgout != null) - { - return pkgout; - } - - return null; - } - - public static string GetPkgVariableValue(string strPkg, string strVarName) - { - string pkgout = null; - - pkgout = RunPkgConfig(String.Format("--variable={0} {1}", - strVarName, strPkg)); - - if(pkgout != null) - { - return pkgout; - } - - return null; - } - - public static string GetPkgConfigModuleVersion(string strPkg) - { - string pkgout = null; - - pkgout = RunPkgConfig(String.Format("--modversion {0}", strPkg)); - - if(pkgout != null) - { - return pkgout; - } - - return null; - } - - public static string RunPkgConfig(string strArgLine) - { - string pkgout; - - ProcessStartInfo pi = new ProcessStartInfo (); - pi.FileName = "pkg-config"; - pi.RedirectStandardOutput = true; - pi.UseShellExecute = false; - pi.Arguments = strArgLine; - Process p = null; - try
- { - p = Process.Start (pi); - }
- catch (Exception e)
- { - Console.WriteLine("Couldn't run pkg-config: " + e.Message); - Environment.Exit (1); - } - - if (p.StandardOutput == null)
- { - LoggingService.LogDebug ("Specified package did not return any information"); - } - - pkgout = p.StandardOutput.ReadToEnd (); - p.WaitForExit (); - if (p.ExitCode != 0)
- { - LoggingService.LogDebug ("pkg-config command failed: pkg-config " + strArgLine); - return null; - } - - if (pkgout != null)
- { - p.Close (); - return pkgout; - } - - p.Close (); - - return null; - } - } -} diff --git a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml deleted file mode 100644 index a5b241702a..0000000000 --- a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml +++ /dev/null @@ -1,7 +0,0 @@ -<ExtensionModel> - <Extension path = "/MonoDevelop/ProjectModel/FileFormats"> - <FileFormat id="VS2003ProjectFileFormat" - class="MonoDevelop.Prj2Make.VS2003ProjectFileFormat"/> - </Extension> -</ExtensionModel> - diff --git a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.csproj b/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.csproj deleted file mode 100644 index c029485d96..0000000000 --- a/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.csproj +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{0F57E572-2359-4BAF-B302-6478C2E42FA2}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>prj2makesharplib</RootNamespace> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>True</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>False</Optimize> - <OutputPath>..\..\..\build\AddIns\MonoDevelop.MsVisualStudio</OutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <AssemblyName>MonoDevelop.MsVisualStudio</AssemblyName> - <Execution> - <Execution clr-version="Net_2_0" /> - </Execution> - <DefineConstants>DEBUG</DefineConstants> - <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.MsVisualStudio\MonoDevelop.MsVisualStudio.xml</DocumentationFile> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>True</Optimize> - <OutputPath>..\..\..\build\AddIns\MonoDevelop.MsVisualStudio</OutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <AssemblyName>prj2make-sharp-lib</AssemblyName> - <Execution> - <Execution clr-version="Net_2_0" /> - </Execution> - <DebugSymbols>true</DebugSymbols> - <NoWarn>1591;1573</NoWarn> - <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.MsVisualStudio\prj2make-sharp-lib.xml</DocumentationFile> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - <Reference Include="Mono.Posix" /> - <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> - <SpecificVersion>False</SpecificVersion> - </Reference> - <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> - <SpecificVersion>False</SpecificVersion> - </Reference> - <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> - <SpecificVersion>False</SpecificVersion> - </Reference> - <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> - <SpecificVersion>False</SpecificVersion> - </Reference> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> - <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> - <Name>MonoDevelop.Core</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> - <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> - <Name>MonoDevelop.Ide</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj"> - <Project>{9BC670A8-1851-40EC-9685-279F4C98433D}</Project> - <Name>MonoDevelop.Deployment</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\VBNetBinding\VBNetBinding.csproj"> - <Project>{EF91D0B8-53F6-4622-9F26-3ED27815878A}</Project> - <Name>VBNetBinding</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj"> - <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project> - <Name>CSharpBinding</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj"> - <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> - <Name>Mono.TextEditor</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj"> - <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project> - <Name>MonoDevelop.Refactoring</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> - <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> - <Name>Mono.Addins</Name> - <Private>False</Private> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Compile Include="MsPrjHelper.cs" /> - <Compile Include="CsprojInfo.cs" /> - <Compile Include="pkgconfiginvoker.cs" /> - <Compile Include="csproj_ver2003.cs" /> - <Compile Include="VS2003ProjectFileFormat.cs" /> - <Compile Include="AssemblyInfo.cs" /> - <Compile Include="AddinInfo.cs" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="prj2make-sharp-lib.addin.xml"> - <LogicalName>prj2make-sharp-lib.addin.xml</LogicalName> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <None Include="Makefile.am" /> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> -</Project> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml index ef77b844a5..fc7f55be6f 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml @@ -129,11 +129,6 @@ <ExtensionNode name="DotNetProject" type="MonoDevelop.Projects.Extensions.DotNetProjectNode"/> <ExtensionNode name="DotNetProjectSubtype" type="MonoDevelop.Projects.Extensions.DotNetProjectSubtypeNode"/> </ExtensionPoint> - - <ExtensionPoint path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <Description>Serialization maps for the MonoDevelop 1.0 file format</Description> - <ExtensionNode name="SerializationMap" type="MonoDevelop.Projects.Extensions.SerializationMapNode"/> - </ExtensionPoint> <ExtensionPoint path = "/MonoDevelop/ProjectModel/PolicyTypes" name = "Policy types"> <Description>Types for per-project policies language binding. These types must be serializable.</Description> @@ -260,10 +255,6 @@ <Class id="FinalStep" class = "MonoDevelop.Core.FileSystem.DummyFileSystemExtension" /> </Extension> - <Extension path = "/MonoDevelop/ProjectModel/MD1SerializationMaps"> - <SerializationMap resource="md1format.xml" /> - </Extension> - <Extension path = "/MonoDevelop/ProjectModel/PolicySets" > <PolicySet id="Mono" _name="Mono" allowDiffSerialize="true"> <!-- <Policies resource="" /> --> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 061b8c1858..aa86b3bf5c 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -332,19 +332,10 @@ <Compile Include="MonoDevelop.Projects.Extensions\IResourceHandler.cs" /> <Compile Include="MonoDevelop.Projects.Extensions\IPathHandler.cs" /> <Compile Include="MonoDevelop.Projects.Extensions\IAssemblyReferenceHandler.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1CustomDataItem.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1DotNetProjectHandler.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1FileFormat.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1ProjectService.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1SolutionEntityItemHandler.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\CombineConfiguration.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\CombineConfigurationEntry.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\CmbxFileFormat.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\PrjxFileFormat.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\CombineConfigurationSet.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\CombineStartupMode.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1SolutionItemHandler.cs" /> - <Compile Include="MonoDevelop.Projects.Formats.MD1\BuildActionDataType.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildFileFormat.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MSBuild\MSBuildProjectHandler.cs" /> <Compile Include="MonoDevelop.Projects.Formats.MSBuild\SlnFileFormat.cs" /> @@ -463,6 +454,7 @@ <Compile Include="MonoDevelop.Core.Web\CredentialProviderExtensions.cs" /> <Compile Include="MonoDevelop.Core.Web\WebService.cs" /> <Compile Include="MonoDevelop.Core.Logging\AssertLoggingTraceListener.cs" /> + <Compile Include="MonoDevelop.Projects.Formats.MD1\MD1ProjectService.cs" /> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> @@ -489,9 +481,6 @@ <EmbeddedResource Include="frameworks\framework_NET_4_0.xml"> <LogicalName>framework_NET_4_0.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="md1format.xml"> - <LogicalName>md1format.xml</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="frameworks\framework_NET_4_5.xml"> <LogicalName>framework_NET_4_5.xml</LogicalName> </EmbeddedResource> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/BuildActionDataType.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/BuildActionDataType.cs deleted file mode 100644 index 459982a708..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/BuildActionDataType.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// BuildActionDataType.cs -// -// Author: -// Michael Hutchinson <mhutchinson@novell.com> -// -// Copyright (C) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Core; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - - /// <summary> - /// Maps some build action names between the MD1 format and the standard MSBuild equivalents - /// </summary> - class BuildActionDataType : PrimitiveDataType - { - string EmbedAsResource = "EmbedAsResource"; - string Nothing = "Nothing"; - string Exclude = "Exclude"; - - public BuildActionDataType (Type type): base (type) - { - } - - internal protected override DataNode OnSerialize (SerializationContext serCtx, object mapData, object value) - { - string str = value as string; - switch (str) { - case "None": - str = Nothing; - break; - case "EmbeddedResource": - str = EmbedAsResource; - break; - case "Content": - str = Exclude; - break; - } - return new DataValue (Name, str); - } - - internal protected override object OnDeserialize (SerializationContext serCtx, object mapData, DataNode data) - { - string str = ((DataValue)data).Value; - switch (str) { - case "Nothing": - str = BuildAction.None; - break; - case "EmbedAsResource": - str = BuildAction.EmbeddedResource; - break; - case "FileCopy": - case "Exclude": - str = BuildAction.Content; - break; - } - return str; - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CmbxFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CmbxFileFormat.cs deleted file mode 100644 index 4284513e97..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CmbxFileFormat.cs +++ /dev/null @@ -1,485 +0,0 @@ -// -// CmbxFileFormat.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.IO; -using System.Xml; -using MonoDevelop.Core; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - interface ICombineReader { - object ReadCombine (XmlReader reader); - } - - class CombineReaderV2: XmlConfigurationReader, ICombineReader - { - DataSerializer serializer; - ArrayList entries = new ArrayList (); - IProgressMonitor monitor; - Type objectType; - string baseFile; - - public CombineReaderV2 (DataSerializer serializer, IProgressMonitor monitor, Type objectType) - { - this.serializer = serializer; - this.objectType = objectType; - baseFile = serializer.SerializationContext.BaseFile; - this.monitor = monitor; - } - - public object ReadCombine (XmlReader reader) - { - DataItem data = (DataItem) Read (reader); - - // Both combine and SolutionFolder use the same element name, but the types are different - if (data.Name == "Combine" && objectType == typeof(SolutionFolder)) - data.Name = "SolutionFolder"; - - SolutionFolder folder; - IExtendedDataItem obj = (IExtendedDataItem) serializer.CreateInstance (objectType, data); - Solution sol = obj as Solution; - if (sol != null) { - folder = sol.RootFolder; - sol.ConvertToFormat (MD1ProjectService.FileFormat, false); - sol.FileName = serializer.SerializationContext.BaseFile; - folder.ExtendedProperties ["FileName"] = serializer.SerializationContext.BaseFile; - } - else { - folder = (SolutionFolder) obj; - obj.ExtendedProperties ["FileName"] = serializer.SerializationContext.BaseFile; - } - - // The folder entries must be added before deserializing the folder - // since other folder members depend on it - - foreach (SolutionItem ce in entries) - folder.Items.Add (ce); - - serializer.Deserialize (obj, data); - - if (sol != null) { - CreateSolutionConfigurations (sol); - LoadStartupMode (sol); - } - - - return obj; - } - - protected override DataNode ReadChild (XmlReader reader, DataItem parent) - { - if (reader.LocalName == "Entries") { - if (reader.IsEmptyElement) { reader.Skip(); return null; } - string basePath = Path.GetDirectoryName (baseFile); - reader.ReadStartElement (); - - ArrayList files = new ArrayList (); - while (MoveToNextElement (reader)) { - string nodefile = reader.GetAttribute ("filename"); - nodefile = FileService.RelativeToAbsolutePath (basePath, nodefile); - files.Add (nodefile); - reader.Skip (); - } - - monitor.BeginTask (GettextCatalog.GetString ("Loading solution: {0}", baseFile), files.Count); - try { - foreach (string nodefile in files) { - try { - if (Path.GetExtension (nodefile).ToLower () == ".mds") { - entries.Add (ReadSolutionFolder (nodefile, monitor)); - } - else { - SolutionEntityItem entry = (SolutionEntityItem) Services.ProjectService.ReadSolutionItem (monitor, nodefile); - entries.Add (entry); - } - } catch (Exception ex) { - UnknownSolutionItem entry = new UnknownSolutionItem (); - entry.FileName = nodefile; - entry.LoadError = ex.Message; - entries.Add (entry); - monitor.ReportError (GettextCatalog.GetString ("Could not load item: {0}", nodefile), ex); - } - monitor.Step (1); - } - } finally { - monitor.EndTask (); - } - - reader.ReadEndElement (); - return null; - } - - return base.ReadChild (reader, parent); - } - - void CreateSolutionConfigurations (Solution sol) - { - CombineConfigurationSet configs = (CombineConfigurationSet) sol.ExtendedProperties ["Configurations"]; - foreach (CombineConfiguration config in configs.Configurations) { - SolutionConfiguration sconf = config.SolutionConfiguration ?? new SolutionConfiguration (config.Name); - sol.Configurations.Add (sconf); - } - - foreach (SolutionEntityItem item in sol.GetAllSolutionItems<SolutionEntityItem> ()) { - - List<IExtendedDataItem> chain = new List<IExtendedDataItem> (); - SolutionItem it = item; - while (it != null) { - chain.Insert (0, it); - it = it.ParentFolder; - } - chain [0] = sol; - - foreach (SolutionConfiguration sconfig in sol.Configurations) { - SolutionConfigurationEntry se = sconfig.AddItem (item); - string itemConfig = FindItemConfiguration (chain, sconfig.Id); - if (itemConfig != null) { - se.Build = true; - se.ItemConfiguration = itemConfig; - } - else - se.Build = false; - } - } - - sol.DefaultConfigurationId = configs.Active; - } - - void LoadStartupMode (Solution sol) - { - // Recursively look for startup items. If there is more than one, - // it means it is a multi startup solution. - List<SolutionEntityItem> items = new List<SolutionEntityItem> (); - FindStartupItems (sol, sol.RootFolder, items); - - if (items.Count == 1) { - sol.SingleStartup = true; - sol.StartupItem = items [0]; - } else if (items.Count > 1) { - sol.SingleStartup = false; - sol.MultiStartupItems.AddRange (items); - } - } - - void FindStartupItems (Solution sol, SolutionFolder folder, List<SolutionEntityItem> items) - { - CombineStartupMode startupMode = (CombineStartupMode) folder.ExtendedProperties ["StartMode"]; - if (startupMode != null) { - if (startupMode.SingleStartup) { - SolutionItem it = FindItemByName (folder, startupMode.StartEntryName); - if (it is SolutionFolder) - FindStartupItems (sol, (SolutionFolder)it, items); - else if (it is SolutionEntityItem) - items.Add ((SolutionEntityItem) it); - return; - } else { - foreach (CombineStartupEntry cse in startupMode.Entries) { - if (cse.Type == "Execute") { - SolutionItem it = FindItemByName (folder, cse.Entry); - if (it is SolutionFolder) - FindStartupItems (sol, (SolutionFolder)it, items); - else if (it is SolutionEntityItem) - items.Add ((SolutionEntityItem) it); - } - } - } - } - } - - SolutionItem FindItemByName (SolutionFolder folder, string name) - { - foreach (SolutionItem it in folder.Items) - if (it.Name == name) - return it; - return null; - } - - string FindItemConfiguration (List<IExtendedDataItem> chain, string configId) - { - for (int n=0; n < chain.Count - 1; n++) { - CombineConfigurationSet configs = (CombineConfigurationSet) chain[n].ExtendedProperties ["Configurations"]; - if (configs == null) - return null; - SolutionItem item = (SolutionItem) chain [n+1]; - CombineConfiguration combineConfig = configs.GetConfig (configId); - if (combineConfig == null) { - monitor.ReportWarning ("Configuration '" + configId + "' not found in solution item '" + item.Name + "'."); - return null; - } - string mappedConfigId = combineConfig.GetMappedConfig (item.Name); - if (mappedConfigId == null) - return null; - if (mappedConfigId != string.Empty) - configId = mappedConfigId; - } - return configId; - } - - object ReadSolutionFolder (string file, IProgressMonitor monitor) - { - XmlTextReader reader = new XmlTextReader (new StreamReader (file)); - reader.MoveToContent (); - - string version = reader.GetAttribute ("version"); - if (version == null) - version = reader.GetAttribute ("fileversion"); - - DataSerializer serializer = new DataSerializer (MD1ProjectService.DataContext, file); - - try { - if (version != "2.0") - throw new MD1UnknownProjectVersion (file, version); - ICombineReader combineReader = new CombineReaderV2 (serializer, monitor, typeof(SolutionFolder)); - return combineReader.ReadCombine (reader); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not load solution: {0}", file), ex); - throw; - } finally { - reader.Close (); - } - } - - protected override XmlConfigurationReader GetChildReader (MonoDevelop.Core.Serialization.DataItem parent) - { - // Don't reuse this serializer for children, since it has solution-specific serialization code - return XmlConfigurationReader.DefaultReader; - } - - } - - class CombineWriterV2: XmlConfigurationWriter - { - SolutionFolder folder; - DataSerializer serializer; - IProgressMonitor monitor; - Type objectType; - - public CombineWriterV2 (DataSerializer serializer, IProgressMonitor monitor, Type objectType) - { - this.serializer = serializer; - this.monitor = monitor; - this.objectType = objectType; - } - - public void WriteCombine (XmlWriter writer, object item) - { - if (item is Solution) { - Solution sol = (Solution) item; - folder = sol.RootFolder; - CreateCombineConfigurations (sol.RootFolder); - CreateStartupModes (sol); - } - else - folder = (SolutionFolder) item; - - DataItem data = (DataItem) serializer.Serialize (item, objectType); - - // Both combine and SolutionFolder use the same element name, but the types are different - if (data.Name == "SolutionFolder" && objectType == typeof(SolutionFolder)) - data.Name = "Combine"; - - Write (writer, data); - } - - void CreateStartupModes (Solution sol) - { - // Initialize the startup modes - ReadOnlyCollection<SolutionFolder> folders = sol.GetAllSolutionItems<SolutionFolder> (); - foreach (SolutionFolder folder in folders) { - CombineStartupMode startupMode = new CombineStartupMode (); - startupMode.SingleStartup = true; - startupMode.StartEntryName = null; - foreach (SolutionItem it in folder.Items) - startupMode.AddEntry (it.Name); - folder.ExtendedProperties ["StartMode"] = startupMode; - } - - // Get the list of startup items - IEnumerable<SolutionEntityItem> items; - if (sol.SingleStartup) - items = new SolutionEntityItem [] { sol.StartupItem }; - else - items = sol.MultiStartupItems; - - // Setup the startup modes - foreach (SolutionEntityItem it in items) { - if (it == null) - continue; - SolutionFolder folder = it.ParentFolder; - SolutionItem prevItem = it; - while (folder != null) { - CombineStartupMode startupMode = (CombineStartupMode) folder.ExtendedProperties ["StartMode"]; - if (startupMode.SingleStartup) { - // If a start entry is already set, convert to multi startup mode - if (startupMode.StartEntryName == null) - startupMode.StartEntryName = prevItem.Name; - else if (startupMode.StartEntryName != prevItem.Name) { - startupMode.SingleStartup = false; - startupMode.MakeExecutable (startupMode.StartEntryName); - startupMode.MakeExecutable (prevItem.Name); - } - } else { - // Already multi startup, just add the new item - startupMode.MakeExecutable (prevItem.Name); - } - prevItem = folder; - folder = folder.ParentFolder; - } - } - - // Set the startup item for folders which don't have one - foreach (SolutionFolder folder in folders) { - CombineStartupMode startupMode = (CombineStartupMode) folder.ExtendedProperties ["StartMode"]; - if (startupMode.SingleStartup && startupMode.StartEntryName == null) { - if (folder.Items.Count > 0) - startupMode.StartEntryName = folder.Items [0].Name; - } - } - } - - void CreateCombineConfigurations (SolutionFolder folder) - { - IDictionary extendedProperties = folder.ExtendedProperties; - - CombineConfigurationSet configs = CreateCombineConfigurationSet (folder.ParentSolution, folder.IsRoot); - configs.Active = folder.ParentSolution.DefaultConfigurationId; - - extendedProperties ["Configurations"] = configs; - - foreach (SolutionItem it in folder.Items) { - - if (it is SolutionFolder) { - foreach (SolutionConfiguration conf in folder.ParentSolution.Configurations) { - CombineConfiguration cc = configs.GetConfig (conf.Id); - CombineConfigurationEntry ce = new CombineConfigurationEntry (it.Name, true, conf.Id); - cc.Entries.Add (ce); - } - CreateCombineConfigurations ((SolutionFolder) it); - } - else if (it is SolutionEntityItem) { - SolutionEntityItem sit = (SolutionEntityItem) it; - foreach (SolutionConfiguration conf in folder.ParentSolution.Configurations) { - CombineConfiguration cc = configs.GetConfig (conf.Id); - SolutionConfigurationEntry sce = conf.GetEntryForItem (sit); - CombineConfigurationEntry ce = null; - if (sce == null) - ce = new CombineConfigurationEntry (it.Name, true, conf.Id); - else - ce = new CombineConfigurationEntry (it.Name, sce.Build, sce.ItemConfiguration); - cc.Entries.Add (ce); - } - } - } - } - - CombineConfigurationSet CreateCombineConfigurationSet (Solution sol, bool isRoot) - { - CombineConfigurationSet cset = new CombineConfigurationSet (); - foreach (SolutionConfiguration conf in sol.Configurations) { - CombineConfiguration cc = new CombineConfiguration (); - cc.Name = conf.Id; - if (isRoot) - cc.SolutionConfiguration = conf; - cset.Configurations.Add (cc); - } - return cset; - } - - protected override void WriteChildren (XmlWriter writer, DataItem item) - { - base.WriteChildren (writer, item); - - writer.WriteStartElement ("Entries"); - foreach (SolutionItem entry in folder.Items) { - writer.WriteStartElement ("Entry"); - - string baseDir = Path.GetDirectoryName (serializer.SerializationContext.BaseFile); - string fname = null; - - if (entry is SolutionFolder) { - SolutionFolder cfolder = (SolutionFolder) entry; - fname = cfolder.ExtendedProperties ["FileName"] as string; - if (fname == null) { - // Guess a good file name for the mds file. - if (Directory.Exists (Path.Combine (baseDir, cfolder.Name))) - fname = Path.Combine (Path.Combine (baseDir, cfolder.Name), cfolder.Name + ".mds"); - else - fname = Path.Combine (baseDir, cfolder.Name + ".mds"); - } - } - else if (entry is SolutionEntityItem) { - fname = ((SolutionEntityItem)entry).FileName; - } - if (fname == null) - throw new InvalidOperationException ("Don't know how to save item of type " + entry.GetType ()); - - string relfname = FileService.AbsoluteToRelativePath (baseDir, fname); - writer.WriteAttributeString ("filename", relfname); - writer.WriteEndElement (); - if (entry is SolutionEntityItem) - ((SolutionEntityItem)entry).Save (monitor); - else - WriteSolutionFolder ((SolutionFolder) entry, fname, monitor); - } - writer.WriteEndElement (); - } - - void WriteSolutionFolder (SolutionFolder folder, string file, IProgressMonitor monitor) - { - StreamWriter sw = new StreamWriter (file); - try { - monitor.BeginTask (GettextCatalog.GetString ("Saving solution: {0}", file), 1); - XmlTextWriter tw = new XmlTextWriter (sw); - tw.Formatting = Formatting.Indented; - DataSerializer serializer = new DataSerializer (MD1ProjectService.DataContext, file); - CombineWriterV2 combineWriter = new CombineWriterV2 (serializer, monitor, typeof(SolutionFolder)); - combineWriter.WriteCombine (tw, folder); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not save solution: {0}", file), ex); - throw; - } finally { - monitor.EndTask (); - sw.Close (); - } - } - - protected override XmlConfigurationWriter GetChildWriter (MonoDevelop.Core.Serialization.DataNode data) - { - // Don't reuse this serializer for children, since it has solution-specific serialization code - return XmlConfigurationWriter.DefaultWriter; - } - - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfiguration.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfiguration.cs deleted file mode 100644 index 326f1f20f9..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfiguration.cs +++ /dev/null @@ -1,115 +0,0 @@ -// CombineConfiguration.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.Collections.Generic; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - class CombineConfiguration: ICustomDataItem - { - [ItemProperty] - string name; - - [ExpandedCollection] - [ItemProperty ("Entry", ValueType=typeof(CombineConfigurationEntry))] - List<CombineConfigurationEntry> entries = new List<CombineConfigurationEntry> (); - - SolutionConfiguration solutionConfiguration; - - public string Name { - get { - return name; - } - set { - name = value; - } - } - - public List<CombineConfigurationEntry> Entries { - get { - return entries; - } - set { - entries = value; - } - } - - public SolutionConfiguration SolutionConfiguration { - get { - return solutionConfiguration; - } - set { - solutionConfiguration = value; - } - } - - public string GetMappedConfig (string itemName) - { - foreach (CombineConfigurationEntry ce in entries) { - if (ce.Name == itemName) { - if (ce.Build) - return ce.Configuration; - else - return null; - } - } - return null; - } - - public DataCollection Serialize (ITypeSerializer handler) - { - DataCollection col = handler.Serialize (this); - if (solutionConfiguration != null) { - DataItem it = (DataItem) handler.SerializationContext.Serializer.Serialize (solutionConfiguration); - col.Merge (it.ItemData); - } - return col; - } - - public void Deserialize (ITypeSerializer handler, DataCollection data) - { - DataItem item = new DataItem (); - item.Name = "SolutionConfiguration"; - DataCollection col = item.ItemData; - - foreach (DataNode val in data) { - if (val.Name != "name" && val.Name != "ctype" && val.Name != "Entry") - col.Add (val); - } - - handler.Deserialize (this, data); - - if (data.Count > 0) { - solutionConfiguration = new SolutionConfiguration (name); - handler.SerializationContext.Serializer.Deserialize (solutionConfiguration, item); - } - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationEntry.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationEntry.cs deleted file mode 100644 index df3eb28de5..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationEntry.cs +++ /dev/null @@ -1,82 +0,0 @@ -// CombineConfigurationEntry.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - class CombineConfigurationEntry - { - [ItemProperty] - bool build; - - [ItemProperty] - string name; - - [ItemProperty] - string configuration; - - public CombineConfigurationEntry () - { - } - - public CombineConfigurationEntry (string name, bool build, string configuration) - { - this.name = name; - this.build = build; - this.configuration = configuration; - } - - public bool Build { - get { - return build; - } - set { - build = value; - } - } - - public string Name { - get { - return name; - } - set { - name = value; - } - } - - public string Configuration { - get { - return configuration; - } - set { - configuration = value; - } - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationSet.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationSet.cs deleted file mode 100644 index 8cec06a5ec..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineConfigurationSet.cs +++ /dev/null @@ -1,70 +0,0 @@ -// CombineConfigurationSet.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.Collections.Generic; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - [DataInclude (typeof(CombineConfiguration))] - class CombineConfigurationSet - { - [ItemProperty] - string active; - - [ExpandedCollection] - [ItemProperty ("Configuration", ValueType=typeof(object))] - List<CombineConfiguration> configurations = new List<CombineConfiguration> (); - - public string Active { - get { - return active; - } - set { - active = value; - } - } - - public List<CombineConfiguration> Configurations { - get { - return configurations; - } - set { - configurations = value; - } - } - - public CombineConfiguration GetConfig (string configId) - { - foreach (CombineConfiguration c in configurations) - if (c.Name == configId) - return c; - return null; - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineStartupMode.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineStartupMode.cs deleted file mode 100644 index 21c7a6d3d5..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/CombineStartupMode.cs +++ /dev/null @@ -1,77 +0,0 @@ -// CombineStartupMode.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.Collections.Generic; -using MonoDevelop.Projects; -using MonoDevelop.Core.Serialization; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - class CombineStartupMode - { - [ItemProperty ("startupentry")] - public string StartEntryName; - - [ItemProperty ("single")] - public bool SingleStartup = true; - - [ExpandedCollection] - [ItemProperty ("Execute", ValueType=typeof(CombineStartupEntry))] - public List<CombineStartupEntry> Entries = new List<CombineStartupEntry> (); - - public void AddEntry (string name) - { - CombineStartupEntry e = new CombineStartupEntry (); - e.Entry = name; - e.Type = "None"; - Entries.Add (e); - } - - public CombineStartupEntry FindEntry (string name) - { - foreach (CombineStartupEntry cse in Entries) - if (cse.Entry == name) - return cse; - return null; - } - - public void MakeExecutable (string name) - { - FindEntry (name).Type = "Execute"; - } - } - - class CombineStartupEntry - { - [ItemProperty ("type")] - public string Type; - - [ItemProperty ("entry")] - public string Entry; - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs deleted file mode 100644 index d5464056c9..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs +++ /dev/null @@ -1,193 +0,0 @@ -// MD1CustomDataItem.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.IO; -using MonoDevelop.Core; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Core.Assemblies; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - public class MD1CustomDataItem: ICustomDataItemHandler - { - public virtual DataCollection Serialize (object obj, ITypeSerializer handler) - { - if (obj is ProjectFile) { - ProjectFile pf = (ProjectFile) obj; - DataCollection data = handler.Serialize (obj); - - //Map the Content build action to the old FileCopy action if CopyToOutputDirectory is set - if (pf.BuildAction == BuildAction.Content && pf.CopyToOutputDirectory != FileCopyMode.None) { - DataValue value = data ["buildaction"] as DataValue; - if (value != null) { - data.Remove (value); - data.Add (new DataValue ("buildaction", "FileCopy")); - data.Extract ("copyToOutputDirectory"); - } - } - // Don't store the resource id if it matches the default. - if (pf.BuildAction == BuildAction.EmbeddedResource && pf.ResourceId != Path.GetFileName (pf.FilePath)) - data.Add (new DataValue ("resource_id", pf.ResourceId)); - return data; - } - else if (obj is SolutionEntityItem) { - DotNetProject project = obj as DotNetProject; - if (project != null) { - foreach (DotNetProjectConfiguration config in project.Configurations) - config.ExtendedProperties ["Build/target"] = project.CompileTarget.ToString (); - } - DataCollection data = handler.Serialize (obj); - SolutionEntityItem item = (SolutionEntityItem) obj; - if (item.DefaultConfiguration != null) { - DataItem confItem = data ["Configurations"] as DataItem; - if (confItem != null) { - confItem.UniqueNames = true; - if (item.ParentSolution != null) - confItem.ItemData.Add (new DataValue ("active", item.ParentSolution.DefaultConfigurationId)); - } - } - if (project != null) { - data.Extract ("targetFramework"); - data.Add (new DataValue ("targetFramework", project.TargetFramework.Id.ToLegacyIdString ())); - } - WriteItems (handler, (SolutionEntityItem) obj, data); - return data; - } - else if (obj is ProjectReference) { - ProjectReference pref = (ProjectReference) obj; - DataCollection data = handler.Serialize (obj); - string refto = pref.Reference; - if (pref.ReferenceType == ReferenceType.Assembly) { - string basePath = Path.GetDirectoryName (handler.SerializationContext.BaseFile); - refto = FileService.AbsoluteToRelativePath (basePath, refto); - } else if (pref.ReferenceType == ReferenceType.Package && pref.LoadedReference != null) - refto = pref.LoadedReference; - - data.Add (new DataValue ("refto", refto)); - return data; - } - return handler.Serialize (obj); - } - - void WriteItems (ITypeSerializer handler, SolutionEntityItem item, DataCollection data) - { - DataItem items = new DataItem (); - items.Name = "Items"; - foreach (object it in item.Items) { - if (it is ProjectFile || it is ProjectReference) - continue; // Already handled by serializer - DataNode node = handler.SerializationContext.Serializer.Serialize (it, it.GetType ()); - items.ItemData.Add (node); - } - if (items.HasItemData) - data.Add (items); - } - - public virtual void Deserialize (object obj, ITypeSerializer handler, DataCollection data) - { - if (obj is ProjectFile) { - ProjectFile pf = (ProjectFile) obj; - - //Map the old FileCopy action to the Content BuildAction with CopyToOutputDirectory set to "always" - //BuildActionDataType handles mapping the BuildAction to "Content" - DataValue value = data ["buildaction"] as DataValue; - bool isFileCopy = value != null && value.Value == "FileCopy"; - - DataValue resourceId = data.Extract ("resource_id") as DataValue; - - handler.Deserialize (obj, data); - if (isFileCopy) - pf.CopyToOutputDirectory = FileCopyMode.Always; - - if (resourceId != null) - pf.ResourceId = resourceId.Value; - } - else if (obj is SolutionEntityItem) { - DataValue ac = null; - DataItem confItem = data ["Configurations"] as DataItem; - if (confItem != null) - ac = (DataValue) confItem.ItemData.Extract ("active"); - - DataItem items = data.Extract ("Items") as DataItem; - if (items != null) - ReadItems (handler, (SolutionEntityItem)obj, items); - - handler.Deserialize (obj, data); - if (ac != null) { - SolutionEntityItem item = (SolutionEntityItem) obj; - item.DefaultConfigurationId = ac.Value; - } - DotNetProject np = obj as DotNetProject; - if (np != null) { - // Import the framework version - TargetFrameworkMoniker fx = null; - DataValue vfx = data["targetFramework"] as DataValue; - if (vfx != null) - fx = TargetFrameworkMoniker.Parse (vfx.Value); - else { - vfx = data ["clr-version"] as DataValue; - if (vfx != null && vfx.Value == "Net_2_0") - fx = TargetFrameworkMoniker.NET_2_0; - else if (vfx != null && vfx.Value == "Net_1_1") - fx = TargetFrameworkMoniker.NET_1_1; - } - if (fx != null) - np.TargetFramework = Runtime.SystemAssemblyService.GetTargetFramework (fx); - - // Get the compile target from one of the configurations - if (np.Configurations.Count > 0) - np.CompileTarget = (CompileTarget) Enum.Parse (typeof(CompileTarget), (string) np.Configurations [0].ExtendedProperties ["Build/target"]); - } - } - else if (obj is ProjectReference) { - ProjectReference pref = (ProjectReference) obj; - DataValue refto = data.Extract ("refto") as DataValue; - handler.Deserialize (obj, data); - if (refto != null) { - pref.Reference = refto.Value; - if (pref.ReferenceType == ReferenceType.Assembly) { - string basePath = Path.GetDirectoryName (handler.SerializationContext.BaseFile); - pref.Reference = FileService.RelativeToAbsolutePath (basePath, pref.Reference); - } - } - } else - handler.Deserialize (obj, data); - } - - void ReadItems (ITypeSerializer handler, SolutionEntityItem item, DataItem items) - { - foreach (DataNode node in items.ItemData) { - DataType dtype = handler.SerializationContext.Serializer.DataContext.GetConfigurationDataType (node.Name); - if (dtype != null && typeof(ProjectItem).IsAssignableFrom (dtype.ValueType)) { - ProjectItem it = (ProjectItem) handler.SerializationContext.Serializer.Deserialize (dtype.ValueType, node); - item.Items.Add (it); - } - } - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs index becbcb3938..c370403ffa 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1DotNetProjectHandler.cs @@ -28,16 +28,12 @@ using System; using System.IO; using System.Diagnostics; -using System.Globalization; using System.Collections.Generic; using System.CodeDom.Compiler; using System.Text.RegularExpressions; -using System.Xml; using MonoDevelop.Core; -using MonoDevelop.Core.Assemblies; using MonoDevelop.Core.Execution; using MonoDevelop.Projects.Extensions; -using MonoDevelop.Projects.Formats.MSBuild; using Microsoft.Build.BuildEngine; namespace MonoDevelop.Projects.Formats.MD1 diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs index e71ed434ef..669a0e92c7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1FileFormat.cs @@ -36,15 +36,7 @@ using MonoDevelop.Core; namespace MonoDevelop.Projects.Formats.MD1 { - class MD1UnknownProjectVersion : Exception - { - public MD1UnknownProjectVersion (string filename, string unsupportedVersion) - : base (GettextCatalog.GetString ("The file '{0}' has an unknown format version (version '{1}')'.", filename, unsupportedVersion)) - { - } - } - - internal class MD1FileFormat: IFileFormat + class MD1FileFormat: IFileFormat { public bool SupportsMixedFormats { get { return true; } @@ -52,47 +44,25 @@ namespace MonoDevelop.Projects.Formats.MD1 public FilePath GetValidFormatName (object obj, FilePath fileName) { - if (obj is Project) - return Path.ChangeExtension (fileName, ".mdp"); - else if (obj is Solution) - return Path.ChangeExtension (fileName, ".mds"); - else if (obj is WorkspaceItem) + if (obj is WorkspaceItem && !(obj is Solution)) return Path.ChangeExtension (fileName, ".mdw"); - else - return Path.ChangeExtension (fileName, ".mdse"); + throw new InvalidOperationException (); }
public bool CanReadFile (FilePath file, Type expectedType) { string ext = Path.GetExtension (file).ToLower (); - - if (ext == ".mds" && expectedType.IsAssignableFrom (typeof(Solution))) - return true; - else if (ext == ".mdp" && expectedType.IsAssignableFrom (typeof(Project))) - return true; - else if (ext == ".mdw" && expectedType.IsAssignableFrom (typeof(WorkspaceItem))) - return true; - return ext == ".mdse" && expectedType.IsAssignableFrom (typeof(SolutionEntityItem)); + return ext == ".mdw" && expectedType.IsAssignableFrom (typeof(WorkspaceItem)); } public bool CanWriteFile (object obj) { - return (obj is SolutionEntityItem) || (obj is WorkspaceItem); + return (obj is WorkspaceItem && !(obj is Solution)); }
public List<FilePath> GetItemFiles (object obj) {
- List<FilePath> list = new List<FilePath> (); - if (obj is Solution) { - Solution sol = (Solution) obj; - list.Add (sol.FileName); - foreach (SolutionFolder f in sol.GetAllSolutionItems<SolutionFolder> ()) { - string fn = f.ExtendedProperties ["FileName"] as string; - if (!string.IsNullOrEmpty (fn)) - list.Add (fn); - } - } - return list; + return new List<FilePath> (); }
public void WriteFile (FilePath file, object node, IProgressMonitor monitor) @@ -121,56 +91,8 @@ namespace MonoDevelop.Projects.Formats.MD1 void WriteFileInternal (FilePath actualFile, FilePath outFile, object node, IProgressMonitor monitor) { - if (node is Project) { - WriteProject (actualFile, outFile, (Project) node, monitor); - } - else if (node is Solution) { - WriteSolution (actualFile, outFile, (Solution) node, monitor); - } - else if (node is WorkspaceItem) { - WriteWorkspaceItem (actualFile, outFile, (WorkspaceItem) node, monitor); - } - else { - WriteSolutionEntityItem (actualFile, outFile, node, monitor); - } - }
-
- void WriteProject (FilePath actualFile, FilePath outFile, Project project, IProgressMonitor monitor) - { - StreamWriter sw = new StreamWriter (outFile); - try { - monitor.BeginTask (GettextCatalog.GetString("Saving project: {0}", actualFile), 1); - XmlDataSerializer ser = new XmlDataSerializer (MD1ProjectService.DataContext); - ser.SerializationContext.BaseFile = actualFile; - ser.SerializationContext.ProgressMonitor = monitor; - ser.Serialize (sw, project, typeof(Project)); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not save project: {0}", actualFile), ex); - throw; - } finally { - monitor.EndTask (); - sw.Close (); - } - }
-
- void WriteSolution (FilePath actualFile, FilePath outFile, Solution solution, IProgressMonitor monitor) - { - StreamWriter sw = new StreamWriter (outFile); - try { - monitor.BeginTask (GettextCatalog.GetString ("Saving solution: {0}", actualFile), 1); - XmlTextWriter tw = new XmlTextWriter (sw); - tw.Formatting = Formatting.Indented; - DataSerializer serializer = new DataSerializer (MD1ProjectService.DataContext, actualFile); - CombineWriterV2 combineWriter = new CombineWriterV2 (serializer, monitor, typeof(Solution)); - combineWriter.WriteCombine (tw, solution); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not save solution: {0}", actualFile), ex); - throw; - } finally { - monitor.EndTask (); - sw.Close (); - } - }
+ WriteWorkspaceItem (actualFile, outFile, (WorkspaceItem) node, monitor); + } void WriteWorkspaceItem (FilePath actualFile, FilePath outFile, WorkspaceItem item, IProgressMonitor monitor) { @@ -205,65 +127,17 @@ namespace MonoDevelop.Projects.Formats.MD1 } }
- void WriteSolutionEntityItem (FilePath actualFile, FilePath outFile, object node, IProgressMonitor monitor) - { - StreamWriter sw = new StreamWriter (outFile); - try { - monitor.BeginTask (string.Format (GettextCatalog.GetString("Saving solution item: {0}"), actualFile), 1); - XmlDataSerializer ser = new XmlDataSerializer (MD1ProjectService.DataContext); - ser.SerializationContext.BaseFile = actualFile; - ser.SerializationContext.ProgressMonitor = monitor; - ser.Serialize (sw, node, typeof(SolutionEntityItem)); - } catch (Exception ex) { - monitor.ReportError (string.Format (GettextCatalog.GetString ("Could not save solution item: {0}"), actualFile), ex); - } finally { - monitor.EndTask (); - sw.Close (); - } - }
-
public object ReadFile (FilePath fileName, Type expectedType, IProgressMonitor monitor) { + string ext = Path.GetExtension (fileName).ToLower (); + if (ext != ".mdw") + throw new ArgumentException (); + object readObject = null; - + ProjectExtensionUtil.BeginLoadOperation (); try { - string ext = Path.GetExtension (fileName).ToLower (); - - if (ext == ".mdp") { - object project = ReadProjectFile (fileName, monitor); - if (project is DotNetProject) - ((DotNetProject)project).SetItemHandler (new MD1DotNetProjectHandler ((DotNetProject) project)); - readObject = project; - } - else if (ext == ".mds") { - readObject = ReadCombineFile (fileName, monitor); - } - else if (ext == ".mdw") { - readObject = ReadWorkspaceItemFile (fileName, monitor); - } - else { - XmlTextReader reader = new XmlTextReader (new StreamReader (fileName)); - try { - monitor.BeginTask (string.Format (GettextCatalog.GetString ("Loading solution item: {0}"), fileName), 1); - reader.MoveToContent (); - XmlDataSerializer ser = new XmlDataSerializer (MD1ProjectService.DataContext); - ser.SerializationContext.BaseFile = fileName; - ser.SerializationContext.ProgressMonitor = monitor; - SolutionEntityItem entry = (SolutionEntityItem) ser.Deserialize (reader, typeof(SolutionEntityItem)); - entry.FileName = fileName; - MD1ProjectService.InitializeHandler (entry); - readObject = entry; - } - catch (Exception ex) { - monitor.ReportError (string.Format (GettextCatalog.GetString ("Could not load solution item: {0}"), fileName), ex); - throw; - } - finally { - monitor.EndTask (); - reader.Close (); - } - } + readObject = ReadWorkspaceItemFile (fileName, monitor); } finally { ProjectExtensionUtil.EndLoadOperation (); } @@ -274,64 +148,6 @@ namespace MonoDevelop.Projects.Formats.MD1 return readObject; }
- object ReadCombineFile (FilePath file, IProgressMonitor monitor) - { - XmlTextReader reader = new XmlTextReader (new StreamReader (file)); - reader.MoveToContent (); - - string version = reader.GetAttribute ("version"); - if (version == null) version = reader.GetAttribute ("fileversion"); - - DataSerializer serializer = new DataSerializer (MD1ProjectService.DataContext, file); - ICombineReader combineReader = null; - - if (version == "2.0" || version == "2.1") - combineReader = new CombineReaderV2 (serializer, monitor, typeof(Solution)); - - try { - if (combineReader != null) - return combineReader.ReadCombine (reader); - else - throw new MD1UnknownProjectVersion (file, version); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not load solution: {0}", file), ex); - throw; - } finally { - reader.Close (); - } - }
-
- object ReadProjectFile (FilePath fileName, IProgressMonitor monitor) - { - XmlTextReader reader = null; - try { - reader = new XmlTextReader (new StreamReader (fileName)); - reader.MoveToContent (); - - string version = reader.GetAttribute ("version"); - if (version == null) version = reader.GetAttribute ("fileversion"); - - DataSerializer serializer = new DataSerializer (MD1ProjectService.DataContext, fileName); - IProjectReader projectReader = null; - - monitor.BeginTask (GettextCatalog.GetString ("Loading project: {0}", fileName), 1); - - if (version == "2.0" || version == "2.1") { - projectReader = new ProjectReaderV2 (serializer); - return projectReader.ReadProject (reader); - } - else - throw new MD1UnknownProjectVersion (fileName, version); - } catch (Exception ex) { - monitor.ReportError (GettextCatalog.GetString ("Could not load project: {0}", fileName), ex); - throw; - } finally { - monitor.EndTask (); - if (reader != null) - reader.Close (); - } - }
-
object ReadWorkspaceItemFile (FilePath fileName, IProgressMonitor monitor) { XmlTextReader reader = new XmlTextReader (new StreamReader (fileName)); @@ -358,9 +174,6 @@ namespace MonoDevelop.Projects.Formats.MD1 public void ConvertToFormat (object obj) { - SolutionItem item = obj as SolutionItem; - if (item != null) - MD1ProjectService.InitializeHandler (item); }
public IEnumerable<string> GetCompatibilityWarnings (object obj) diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs index 68c57e7630..250404fc5d 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1ProjectService.cs @@ -25,94 +25,29 @@ // // -using System; -using Mono.Addins; -using MonoDevelop.Core; using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Extensions; namespace MonoDevelop.Projects.Formats.MD1 { - public class MD1ProjectService + static class MD1ProjectService { static DataContext dataContext; - static XmlMapAttributeProvider attributeProvider; - - const string MD1SerializationMapsExtensionPath = "/MonoDevelop/ProjectModel/MD1SerializationMaps"; - + public static DataContext DataContext { get { if (dataContext == null) { - dataContext = new DataContext (attributeProvider); + dataContext = new DataContext (); Services.ProjectService.InitializeDataContext (dataContext); } return dataContext; } } - static MD1ProjectService () - { - attributeProvider = new XmlMapAttributeProvider (); - AddinManager.AddExtensionNodeHandler (MD1SerializationMapsExtensionPath, OnMapsChanged); - - Services.ProjectService.DataContextChanged += delegate { - // Regenerate the data context - dataContext = null; - }; - } - - static void OnMapsChanged (object s, ExtensionNodeEventArgs args) - { - if (args.Change == ExtensionChange.Add) { - SerializationMapNode node = (SerializationMapNode) args.ExtensionNode; - attributeProvider.AddMap (node.Addin, node.FileContent, node.FileId); - } - else { - SerializationMapNode node = (SerializationMapNode) args.ExtensionNode; - attributeProvider.RemoveMap (node.FileId); - } - - // Regenerate the data context - dataContext = null; - } - public static FileFormat FileFormat { get { return Services.ProjectService.FileFormats.GetFileFormat ("MD1"); } } - - public static string GetItemFileName (SolutionItem item) - { - if (item is SolutionEntityItem) - return ((SolutionEntityItem)item).FileName; - return (string) item.ExtendedProperties ["FileName"]; - } - - public static void SetItemFileName (SolutionItem item, string fileName) - { - if (item is SolutionEntityItem) - ((SolutionEntityItem)item).FileName = fileName; - else - item.ExtendedProperties ["FileName"] = fileName; - } - - public static void InitializeHandler (SolutionItem item) - { - if (item is DotNetProject) { - DotNetProject p = (DotNetProject) item; - item.SetItemHandler (new MD1DotNetProjectHandler (p)); - p.FileName = FileFormat.GetValidFileName (p, p.FileName); - } - else if (item is SolutionEntityItem) { - SolutionEntityItem it = (SolutionEntityItem) item; - item.SetItemHandler (new MD1SolutionEntityItemHandler (it)); - it.FileName = FileFormat.GetValidFileName (it, it.FileName); - } - else { - item.SetItemHandler (new MD1SolutionItemHandler (item)); - } - } } } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/PrjxFileFormat.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/PrjxFileFormat.cs deleted file mode 100644 index 21a81916fb..0000000000 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/PrjxFileFormat.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -// FileFormatManager.cs -// -// Author: -// Lluis Sanchez Gual -// -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.IO; -using System.Xml; -using MonoDevelop.Core.Serialization; -using MonoDevelop.Core; - -namespace MonoDevelop.Projects.Formats.MD1 -{ - interface IProjectReader { - Project ReadProject (XmlReader reader); - } - - class ProjectReaderV2: XmlConfigurationReader, IProjectReader - { - DataSerializer serializer; - - public ProjectReaderV2 (DataSerializer serializer) - { - this.serializer = serializer; - } - - public Project ReadProject (XmlReader reader) - { - DataNode data = Read (reader); - Project project = (Project) serializer.Deserialize (typeof(Project), data); - project.FileFormat = MD1ProjectService.FileFormat; - project.FileName = serializer.SerializationContext.BaseFile; - return project; - } - } -} diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs index 1bedba3038..6117019232 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs @@ -502,22 +502,19 @@ namespace MonoDevelop.Projects } throw new InvalidOperationException ("Project type '" + type + "' not found"); } - + + //TODO: find solution that contains the project if possible public Solution GetWrapperSolution (IProgressMonitor monitor, string filename) { // First of all, check if a solution with the same name already exists FileFormat[] formats = Services.ProjectService.FileFormats.GetFileFormats (filename, typeof(SolutionEntityItem)); if (formats.Length == 0) - formats = new FileFormat [] { DefaultFileFormat }; + formats = new [] { DefaultFileFormat }; Solution tempSolution = new Solution (); - FileFormat solutionFileFormat; - if (formats [0].CanWrite (tempSolution)) - solutionFileFormat = formats [0]; - else - solutionFileFormat = MonoDevelop.Projects.Formats.MD1.MD1ProjectService.FileFormat; + FileFormat solutionFileFormat = formats.FirstOrDefault (f => f.CanWrite (tempSolution)) ?? DefaultFileFormat; string solFileName = solutionFileFormat.GetValidFileName (tempSolution, filename); diff --git a/main/src/core/MonoDevelop.Core/md1format.xml b/main/src/core/MonoDevelop.Core/md1format.xml deleted file mode 100644 index f92a445415..0000000000 --- a/main/src/core/MonoDevelop.Core/md1format.xml +++ /dev/null @@ -1,91 +0,0 @@ -<SerializationMap> - <DataItem class = "MonoDevelop.Projects.Solution" name="Combine"> - <LiteralProperty name="fileversion" value="2.0" /> - <ItemProperty member="description" defaultValue="" /> - <ItemProperty member="version" defaultValue="0.1"/> - <ItemProperty member="outputdir" name="outputpath" serializationDataType="MonoDevelop.Projects.PathDataType" /> - <ItemMember name="CombineConfigurations" type="MonoDevelop.Projects.Formats.MD1.CombineConfigurationSet"/> - <ItemProperty member="CombineConfigurations" name="Configurations" /> - <ItemMember name="StartMode" type="MonoDevelop.Projects.Formats.MD1.CombineStartupMode"/> - <ItemProperty member="StartMode" name="StartMode" /> - <ItemProperty member="Policies" skipEmpty="true" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.SolutionFolder" name="SolutionFolder"> - <ItemProperty member="name" /> - <LiteralProperty name="fileversion" value="2.0" /> - <ItemMember name="CombineConfigurations" type="MonoDevelop.Projects.Formats.MD1.CombineConfigurationSet"/> - <ItemProperty member="CombineConfigurations" name="Configurations" /> - <ItemMember name="StartMode" type="MonoDevelop.Projects.Formats.MD1.CombineStartupMode"/> - <ItemProperty member="StartMode" name="StartMode" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.SolutionItem"> - <ItemProperty member="Policies" skipEmpty="true" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.SolutionEntityItem" name="CombineEntry" fallbackType="MonoDevelop.Projects.UnknownSolutionItem" customDataItem="MonoDevelop.Projects.Formats.MD1.MD1CustomDataItem"> - <ItemProperty member="releaseVersion" name = "releaseVersion" defaultValue="0.1"/> - <ItemProperty member="syncReleaseVersion" name = "syncReleaseVersion" defaultValue="true"/> - <ItemProperty member="Name" name="name"/> - <LiteralProperty name="fileversion" value="2.0" /> - <ItemProperty member="Configurations"/> - <ItemProperty member="Configurations" scope="*" name="Configuration" valueType="MonoDevelop.Projects.SolutionItemConfiguration"/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.Project" fallbackType="MonoDevelop.Projects.UnknownProject"> - <ItemProperty member="description" defaultValue=""/> - <ItemProperty member="newFileSearch" name="newfilesearch" defaultValue="None" /> - <ItemProperty member="Files" name="Contents" /> - <ItemProperty member="Files" scope="*" name="File" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.DotNetProject" name="AbstractDotNetProject"> - <ItemProperty member="languageName" name="language"/> - <ItemProperty member="UsePartialTypes" defaultValue="true"/> - <ItemProperty member="defaultNamespace" name="DefaultNamespace" defaultValue="" /> - <ItemProperty member="References" name="References" /> - <ItemProperty member="LanguageParameters" skipEmpty="true" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.DotNetAssemblyProject" name="DotNetProject"> - </DataItem> - <DataItem class = "MonoDevelop.Projects.DotNetProjectConfiguration"> - <ItemProperty member="assembly" name="Output/assembly"/> - <ItemProperty member="signAssembly" name="Output/signAssembly" defaultValue="false" /> - <ItemProperty member="delaySign" name="Output/delaySign" defaultValue="false" /> - <ItemProperty member="assemblyKeyFile" name="Output/assemblyKeyFile" defaultValue="" /> - <LiteralProperty name="Execution/runtime" value="MsNet" /> - <ItemMember name="md1_CompileTarget" type="System.String"/> - <ItemProperty member="md1_CompileTarget" name="Build/target"/> - <ItemProperty member="CompilationParameters" name="CodeGeneration" fallbackType="MonoDevelop.Projects.UnknownCompilationParameters"/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.ItemConfiguration"> - <ItemProperty member="Id" name="name" /> - <ItemProperty member="customCommands" name="CustomCommands" /> - <ItemProperty member="customCommands" name="Command" scope="*" /> - </DataItem> - <DataItem class = "MonoDevelop.Projects.ProjectConfiguration"> - <ItemProperty member="outputDirectory" name="Output/directory" serializationDataType="MonoDevelop.Projects.PathDataType"/> - <ItemProperty member="debugMode" name="Build/debugmode" /> - <ItemProperty member="runWithWarnings" name="Execution/runwithwarnings" /> - <ItemProperty member="commandLineParameters" name="Execution/commandlineparameters" defaultValue =""/> - <ItemProperty member="externalConsole" name="Execution/externalconsole" defaultValue="false" /> - <ItemProperty member="pauseConsoleOutput" name="Execution/consolepause" /> - <ItemProperty member="environmentVariables" name="EnvironmentVariables" skipEmpty="true" /> - <ItemProperty member="environmentVariables" name="Variable" scope="item"/> - <ItemProperty member="environmentVariables" name="name" scope="key"/> - <ItemProperty member="environmentVariables" name="value" scope="value"/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.ProjectFile" customDataItem="MonoDevelop.Projects.Formats.MD1.MD1CustomDataItem"> - <ItemProperty member="filename" name="name" serializationDataType="MonoDevelop.Projects.PathDataType"/> - <ItemProperty member="subtype" name="subtype"/> - <ItemProperty member="buildaction" name="buildaction" serializationDataType="MonoDevelop.Projects.Formats.MD1.BuildActionDataType" /> - <ItemProperty member="dependsOn" name="dependson" defaultValue=""/> - <ItemProperty member="copyToOutputDirectory" name="copyToOutputDirectory" defaultValue="None"/> - <ItemProperty member="visible" name="visible" defaultValue="true"/> - <ItemProperty member="contentType" name="contentType" defaultValue=""/> - <ItemProperty member="generator" name="generator" defaultValue=""/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.ProjectReference" fallbackType="MonoDevelop.Projects.UnknownProjectReference" customDataItem="MonoDevelop.Projects.Formats.MD1.MD1CustomDataItem"> - <ItemProperty member="internalReferenceType" name="type" /> - <ItemProperty member="localCopy" name="localcopy" /> - <ItemProperty member="SpecificVersion" name="specificVersion" defaultValue="True"/> - </DataItem> - <DataItem class = "MonoDevelop.Projects.SolutionConfiguration"> - </DataItem> -</SerializationMap> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml index 2e98914e99..0c0b9c2284 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml @@ -222,12 +222,6 @@ <FileFilter id = "MSBuildProject" _label = "Project Files" extensions = "*.*proj"/> - <FileFilter id = "Combine" - _label = "MD 1.0 Solution Files" - extensions = "*.mds"/> - <FileFilter id = "Project" - _label = "MD 1.0 Project Files" - extensions = "*.mdp"/> <FileFilter id = "Workbench" _label = "MD Workbench" extensions = "*.mdw"/> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs index ee7510ec2d..e47096f132 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs @@ -704,7 +704,7 @@ namespace MonoDevelop.Ide }; dlg.AddAllFilesFilter (); - dlg.DefaultFilter = dlg.AddFilter (GettextCatalog.GetString ("Project Files"), "*.*proj", "*.mdp"); + dlg.DefaultFilter = dlg.AddFilter (GettextCatalog.GetString ("Project Files"), "*.*proj"); if (dlg.Run ()) { try { diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs index 3277519be0..d811facff2 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs @@ -87,7 +87,7 @@ namespace MonoDevelop.Projects public void CreateConsoleProject () { Solution sol = TestProjectsChecks.CreateConsoleSolution ("console-project-msbuild"); - sol.ConvertToFormat (Util.FileFormatMSBuild05, true); + sol.ConvertToFormat (Util.FileFormatMSBuild10, true); sol.Save (Util.GetMonitor ()); // msbuild format @@ -98,31 +98,14 @@ namespace MonoDevelop.Projects // Make sure we compare using the same guid Project p = sol.Items [0] as Project; string guid = p.ItemId; - solXml = solXml.Replace (guid, "{DC577202-654B-4FDB-95C7-8CC5DDF6D32D}"); - projectXml = projectXml.Replace (guid, "{DC577202-654B-4FDB-95C7-8CC5DDF6D32D}"); + solXml = solXml.Replace (guid, "{969F05E2-0E79-4C5B-982C-8F3DD4D46311}"); + projectXml = projectXml.Replace (guid, "{969F05E2-0E79-4C5B-982C-8F3DD4D46311}"); string solFile = Util.GetSampleProjectPath ("generated-console-project", "TestSolution.sln"); string projectFile = Util.GetSampleProjectPath ("generated-console-project", "TestProject.csproj"); - Assert.AreEqual (File.ReadAllText (solFile), solXml); - Assert.AreEqual (Util.GetXmlFileInfoset (projectFile), projectXml); - - // MD1 format - - sol.ConvertToFormat (Util.FileFormatMD1, true); - sol.Save (Util.GetMonitor ()); - - solXml = Util.GetXmlFileInfoset (sol.FileName); - projectXml = Util.GetXmlFileInfoset (((SolutionEntityItem)sol.Items [0]).FileName); - - solFile = Util.GetSampleProjectPath ("generated-console-project", "TestSolution.mds"); - projectFile = Util.GetSampleProjectPath ("generated-console-project", "TestProject.mdp"); - - Assert.AreEqual (Util.GetXmlFileInfoset (solFile), solXml, "solXml: " + sol.FileName); - Assert.AreEqual (Util.GetXmlFileInfoset (projectFile), projectXml, "projectXml: " + ((SolutionEntityItem)sol.Items [0]).FileName); - -// sol.FileFormat = Services.ProjectService.FileFormats.GetFileFormat ("MSBuild08"); -// sol.Save (Util.GetMonitor ()); + Assert.AreEqual (Util.ToWindowsEndings (File.ReadAllText (solFile)), solXml); + Assert.AreEqual (Util.ToWindowsEndings (Util.GetXmlFileInfoset (projectFile)), projectXml); } [Test] diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs index a5e2367881..a1b8225b33 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs @@ -25,141 +25,15 @@ // // -using System; using System.IO; using NUnit.Framework; using UnitTests; -using MonoDevelop.Core; namespace MonoDevelop.Projects { - [TestFixture()] + [TestFixture] public class MdsTests: TestBase { - [Test()] - public void LoadSaveBuildConsoleProject() - { - string solFile = Util.GetSampleProject ("csharp-console-mdp", "csharp-console-mdp.mds"); - - WorkspaceItem item = Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - Assert.IsTrue (item is Solution); - - Solution sol = (Solution) item; - TestProjectsChecks.CheckBasicMdConsoleProject (sol); - string projectFile = ((Project)sol.Items [0]).FileName; - - BuildResult cr = item.Build (Util.GetMonitor (), (SolutionConfigurationSelector) "Debug"); - Assert.IsNotNull (cr); - Assert.AreEqual (0, cr.ErrorCount); - Assert.AreEqual (0, cr.WarningCount); - - string solXml = Util.GetXmlFileInfoset (solFile); - string projectXml = Util.GetXmlFileInfoset (projectFile); - - sol.Save (Util.GetMonitor ()); - - Assert.AreEqual (solXml, Util.GetXmlFileInfoset (solFile), "Saved solution file"); - Assert.AreEqual (projectXml, Util.GetXmlFileInfoset (projectFile), "Saved project file"); - } - - [Test()] - public void NestedSolutions() - { - string solFile = Util.GetSampleProject ("nested-solutions-mdp", "nested-solutions-mdp.mds"); - - WorkspaceItem item = Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - Assert.IsTrue (item is Solution); - - Solution sol = (Solution) item; - - BuildResult cr = item.Build (Util.GetMonitor (), (SolutionConfigurationSelector) "Debug"); - Assert.IsNotNull (cr); - Assert.AreEqual (0, cr.ErrorCount); - Assert.AreEqual (0, cr.WarningCount); - Assert.AreEqual (6, cr.BuildCount); - - string dir = Path.GetDirectoryName (solFile); - string solXml = Util.GetXmlFileInfoset (solFile); - string p1Xml = Util.GetXmlFileInfoset (dir, "console-project", "console-project.mdp"); - string s1Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "nested-solution1.mds"); - string s2Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution2.mds"); - string plib1Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "library1", "library1.mdp"); - string plib2Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "library2", "library2.mdp"); - string p2Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "console-project2", "console-project2.mdp"); - string s3Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "nested-solution3.mds"); - string plib3Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library3", "library3.mdp"); - string plib4Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library4", "library4.mdp"); - - sol.Save (Util.GetMonitor ()); - - string solXml2 = Util.GetXmlFileInfoset (solFile); - string p1Xml2 = Util.GetXmlFileInfoset (dir, "console-project", "console-project.mdp"); - string s1Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "nested-solution1.mds"); - string s2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution2.mds"); - string plib1Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "library1", "library1.mdp"); - string plib2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "library2", "library2.mdp"); - string p2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "console-project2", "console-project2.mdp"); - string s3Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "nested-solution3.mds"); - string plib3Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library3", "library3.mdp"); - string plib4Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library4", "library4.mdp"); - - Assert.AreEqual (solXml, solXml2, "solXml"); - Assert.AreEqual (p1Xml, p1Xml2, "p1Xml"); - Assert.AreEqual (s1Xml, s1Xml2, "s1Xml"); - Assert.AreEqual (s2Xml, s2Xml2, "s2Xml"); - Assert.AreEqual (plib1Xml, plib1Xml2, "plib1Xml"); - Assert.AreEqual (plib2Xml, plib2Xml2, "plib2Xml"); - Assert.AreEqual (p2Xml, p2Xml2, "p2Xml"); - Assert.AreEqual (s3Xml, s3Xml2, "s3Xml"); - Assert.AreEqual (plib3Xml, plib3Xml2, "plib3Xml"); - Assert.AreEqual (plib4Xml, plib4Xml2, "plib4Xml"); - } - - [Test()] - public void CreateNestedSolutions() - { - Solution sol = TestProjectsChecks.CreateProjectWithFolders ("nested-solutions-md1"); - sol.ConvertToFormat (Util.FileFormatMD1, true); - - sol.Save (Util.GetMonitor ()); - - string solFile = Util.GetSampleProjectPath ("nested-solutions-mdp", "nested-solutions-mdp.mds"); - string dir = Path.GetDirectoryName (solFile); - string solXml = Util.GetXmlFileInfoset (solFile); - string p1Xml = Util.GetXmlFileInfoset (dir, "console-project", "console-project.mdp"); - string s1Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "nested-solution1.mds"); - string s2Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution2.mds"); - string plib1Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "library1", "library1.mdp"); - string plib2Xml = Util.GetXmlFileInfoset (dir, "nested-solution1", "library2", "library2.mdp"); - string p2Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "console-project2", "console-project2.mdp"); - string s3Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "nested-solution3.mds"); - string plib3Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library3", "library3.mdp"); - string plib4Xml = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library4", "library4.mdp"); - - dir = Path.GetDirectoryName (sol.FileName); - string solXml2 = Util.GetXmlFileInfoset (solFile); - string p1Xml2 = Util.GetXmlFileInfoset (dir, "console-project", "console-project.mdp"); - string s1Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "nested-solution1.mds"); - string s2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution2.mds"); - string plib1Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "library1", "library1.mdp"); - string plib2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution1", "library2", "library2.mdp"); - string p2Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "console-project2", "console-project2.mdp"); - string s3Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "nested-solution3.mds"); - string plib3Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library3", "library3.mdp"); - string plib4Xml2 = Util.GetXmlFileInfoset (dir, "nested-solution2", "nested-solution3", "library4", "library4.mdp"); - - Assert.AreEqual (solXml, solXml2, "solXml"); - Assert.AreEqual (p1Xml, p1Xml2, "p1Xml"); - Assert.AreEqual (s1Xml, s1Xml2, "s1Xml"); - Assert.AreEqual (s2Xml, s2Xml2, "s2Xml"); - Assert.AreEqual (plib1Xml, plib1Xml2, "plib1Xml"); - Assert.AreEqual (plib2Xml, plib2Xml2, "plib2Xml"); - Assert.AreEqual (p2Xml, p2Xml2, "p2Xml"); - Assert.AreEqual (s3Xml, s3Xml2, "s3Xml"); - Assert.AreEqual (plib3Xml, plib3Xml2, "plib3Xml"); - Assert.AreEqual (plib4Xml, plib4Xml2, "plib4Xml"); - } - [Test] public void TestSaveWorkspace () { @@ -183,30 +57,5 @@ namespace MonoDevelop.Projects Assert.IsTrue (File.Exists (sol.FileName)); Assert.IsTrue (File.Exists (p.FileName)); } - - - [Test] - public void TestCreateLoadSaveConsoleProject () - { - TestProjectsChecks.TestCreateLoadSaveConsoleProject ("MD1"); - } - - [Test] - public void GenericProject () - { - TestProjectsChecks.CheckGenericItemProject ("MD1"); - } - - [Test] - public void TestLoadSaveSolutionFolders () - { - TestProjectsChecks.TestLoadSaveSolutionFolders ("MD1"); - } - - [Test] - public void TestLoadSaveResources () - { - TestProjectsChecks.TestLoadSaveResources ("MD1"); - } } } diff --git a/main/tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs deleted file mode 100644 index c1652c304d..0000000000 --- a/main/tests/UnitTests/MonoDevelop.Projects/PackagingTests.cs +++ /dev/null @@ -1,334 +0,0 @@ -// PackagingTests.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using NUnit.Framework; -using UnitTests; -using MonoDevelop.Core; -using MonoDevelop.Projects; -using MonoDevelop.Deployment.Targets; -using MonoDevelop.Autotools; - -namespace MonoDevelop.Deployment -{ - [TestFixture] - [Ignore ("Most of these tests fail and no-one is maintaining this addin at the moment")] - public class PackagingTests: TestBase - { - string tarDir = null; - int packId = 0; - -#region Binaries package - [Test] - public void ConsoleProjectBins () - { - string[] binFiles = new string[] { - "ConsoleProject.exe", - "ConsoleProject.exe.mdb", - "consoleproject" - }; - RunTestBinariesPackage ("console-project/ConsoleProject.sln", binFiles); - } - - [Test] - public void ConsoleProjectWithLibsMdpBins () - { - string[] binFiles = new string[] { - "console-with-libs-mdp.exe", - "console-with-libs-mdp.exe.mdb", - "console-with-libs-mdp", - "library1.dll", - "library1.dll.mdb", - "library1.pc", - "library2.dll", - "library2.pc", - "library2.dll.mdb" - }; - RunTestBinariesPackage ("console-with-libs-mdp/console-with-libs-mdp.mds", binFiles); - } -#endregion - -#region Sources package - - [Test] - public void ConsoleProjectSources () - { - RunTestSourcesPackage ("console-project/ConsoleProject.sln"); - } - - [Test] - public void ConsoleProjectWithLibsMdpSources () - { - RunTestSourcesPackage ("console-with-libs-mdp/console-with-libs-mdp.mds"); - } - - [Test] - public void NestedSolutionsMdpSources () - { - RunTestSourcesPackage ("nested-solutions-mdp/nested-solutions-mdp.mds"); - } -#endregion - -#region Tarball package - - // Console project - - string[] filesConsoleProjectTarball = new string[] { - "bin/consoleproject", - "lib/consoleproject/ConsoleProject.exe", - "lib/consoleproject/ConsoleProject.exe.mdb" - }; - - [Test] - public void ConsoleProjectTarball () - { - RunTestTarballPackage ("console-project/ConsoleProject.sln", false, "Debug", filesConsoleProjectTarball); - } - - [Test] - public void ConsoleProjectTarballAutotools () - { - RunTestTarballPackage ("console-project/ConsoleProject.sln", true, "Debug", filesConsoleProjectTarball); - } - - - // ConsoleProjectWithLibsMdpTarball - - string[] filesConsoleProjectWithLibsMdpTarball = new string[] { - "bin/console-with-libs-mdp", - "lib/console-with-libs-mdp/console-with-libs-mdp.exe", - "lib/console-with-libs-mdp/console-with-libs-mdp.exe.mdb", - "lib/console-with-libs-mdp/library1.dll", - "lib/console-with-libs-mdp/library1.dll.mdb", - "lib/console-with-libs-mdp/library2.dll", - "lib/console-with-libs-mdp/library2.dll.mdb", - "lib/pkgconfig/library1.pc", - "lib/pkgconfig/library2.pc" - }; - - [Test] - public void ConsoleProjectWithLibsMdpTarball () - { - RunTestTarballPackage ("console-with-libs-mdp/console-with-libs-mdp.mds", false, "Debug", filesConsoleProjectWithLibsMdpTarball); - } - - [Test] - public void ConsoleProjectWithLibsMdpTarballAutotools () - { - RunTestTarballPackage ("console-with-libs-mdp/console-with-libs-mdp.mds", true, "Debug", filesConsoleProjectWithLibsMdpTarball); - } - - string[] filesNestedSolutionsMdpTarball = new string[] { - "bin/console-project", - "bin/console-project2", - "lib/nested-solutions-mdp/console-project.exe", - "lib/nested-solutions-mdp/console-project.exe.mdb", - "lib/nested-solutions-mdp/console-project2.exe", - "lib/nested-solutions-mdp/console-project2.exe.mdb", - "lib/nested-solutions-mdp/library1.dll", - "lib/nested-solutions-mdp/library1.dll.mdb", - "lib/nested-solutions-mdp/library2.dll", - "lib/nested-solutions-mdp/library2.dll.mdb", - "lib/nested-solutions-mdp/library3.dll", - "lib/nested-solutions-mdp/library3.dll.mdb", - "lib/nested-solutions-mdp/library4.dll", - "lib/nested-solutions-mdp/library4.dll.mdb", - "lib/pkgconfig/library1.pc", - "lib/pkgconfig/library2.pc", - "lib/pkgconfig/library3.pc", - "lib/pkgconfig/library4.pc", - }; - - [Test] - public void NestedSolutionsMdpTarball () - { - RunTestTarballPackage ("nested-solutions-mdp/nested-solutions-mdp.mds", false, "Debug", filesNestedSolutionsMdpTarball); - } - - [Test] - public void NestedSolutionsMdpTarballAutotools () - { - RunTestTarballPackage ("nested-solutions-mdp/nested-solutions-mdp.mds", true, "Debug", filesNestedSolutionsMdpTarball); - } - -#endregion - -#region Support methods - - void RunTestBinariesPackage (string solFile, string[] expectedFiles) - { - solFile = Util.GetSampleProject (solFile); - Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor(), solFile); - - BinariesZipPackageBuilder pb = new BinariesZipPackageBuilder (); - pb.SetSolutionItem (sol.RootFolder, sol.GetAllSolutionItems<SolutionItem> ()); - - pb.TargetFile = GetTempTarFile ("binzip"); - pb.Platform = "Linux"; - pb.Configuration = "Debug"; - - if (!DeployService.BuildPackage (Util.GetMonitor (), pb)) - Assert.Fail ("Package generation failed"); - - CheckTarContents (pb.TargetFile, expectedFiles, true); - } - - void RunTestSourcesPackage (string solFile) - { - solFile = Util.GetSampleProject (solFile); - Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor(), solFile); - - SourcesZipPackageBuilder pb = new SourcesZipPackageBuilder (); - pb.FileFormat = sol.FileFormat; - pb.SetSolutionItem (sol.RootFolder, sol.GetAllSolutionItems<SolutionItem> ()); - - pb.TargetFile = GetTempTarFile ("sourceszip"); - - if (!DeployService.BuildPackage (Util.GetMonitor (), pb)) - Assert.Fail ("Package generation failed"); - - List<string> files = new List<string> (); - foreach (string f in sol.GetItemFiles (true)) { - files.Add (sol.GetRelativeChildPath (f)); - } - CheckTarContents (pb.TargetFile, files.ToArray (), true); - } - - void RunTestTarballPackage (string solFile, bool autotools, string config, string[] expectedFiles) - { - solFile = Util.GetSampleProject (solFile); - Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor(), solFile); - - TarballDeployTarget pb = new TarballDeployTarget (); - pb.SetSolutionItem (sol.RootFolder, sol.GetAllSolutionItems<SolutionItem> ()); - pb.TargetDir = Util.CreateTmpDir ("tarball-target-dir"); - pb.DefaultConfiguration = config; - pb.GenerateFiles = true; - pb.GenerateAutotools = autotools; - - if (!DeployService.BuildPackage (Util.GetMonitor (), pb)) - Assert.Fail ("Package generation failed"); - - string tarfile = Directory.GetFiles (pb.TargetDir) [0]; - - Untar (tarfile, null); - - string[] dirs = Directory.GetDirectories (pb.TargetDir); - Assert.AreEqual (1, dirs.Length); - - string tarDir = dirs [0]; - string prefix = Path.Combine (pb.TargetDir, "install"); - - if (!Exec (Path.Combine (tarDir, "configure"), "--prefix=" + prefix, tarDir)) - Assert.Fail ("Configure script failed"); - - if (!Exec ("make", "all", tarDir)) - Assert.Fail ("Build failed"); - - if (!Exec ("make", "install", tarDir)) - Assert.Fail ("Install failed"); - - CheckDirContents (prefix, expectedFiles); - } - - - string GetTempTarFile (string hint) - { - if (tarDir == null) - tarDir = Util.CreateTmpDir ("packages"); - return Path.Combine (tarDir, hint + "-" + (packId++) + ".tar.gz"); - } - - void CheckTarContents (string file, string[] expectedFiles, bool checkInSubdir) - { - Assert.IsTrue (File.Exists (file), "tar file not found"); - - string dir = Util.CreateTmpDir ("tar-contents"); - Untar (file, dir); - - if (checkInSubdir) { - string[] dirs = Directory.GetDirectories (dir); - Assert.IsTrue (dirs.Length == 1, "No unique subdir found in tar"); - Assert.IsTrue (Directory.GetFiles(dir).Length == 0, "No unique subdir found in tar"); - dir = Path.Combine (dir, dirs[0]); - } - CheckDirContents (dir, expectedFiles); - } - - void CheckDirContents (string dir, string[] expectedFiles) - { - List<string> validFiles = new List<string> (); - foreach (string f in expectedFiles) { - string tf = Path.Combine (dir, f); - Assert.IsTrue (File.Exists (tf), "Content check: file not found: " + Path.GetFullPath (tf)); - validFiles.Add (Path.GetFullPath (tf)); - } - CheckValidFiles (dir, validFiles); - } - - void CheckValidFiles (string dir, List<string> validFiles) - { - foreach (string f in Directory.GetFiles (dir)) - Assert.IsFalse (!validFiles.Contains (Path.GetFullPath(f)), "Content check: extra file: " + Path.GetFullPath(f)); - foreach (string d in Directory.GetDirectories (dir)) - CheckValidFiles (d, validFiles); - } - - void Untar (string file, string dir) - { - if (dir == null) - dir = Path.GetDirectoryName (file); - Exec ("tar", "xvfz " + file + " -C " + dir, null); - } - - bool Exec (string file, string args, string workDir) - { - Process proc = new Process (); - proc.StartInfo.UseShellExecute = false; - proc.StartInfo.RedirectStandardOutput = true; - proc.StartInfo.RedirectStandardError = true; - proc.StartInfo.FileName = file; - proc.StartInfo.Arguments = args; - if (workDir != null) - proc.StartInfo.WorkingDirectory = workDir; - proc.Start (); - string sout = proc.StandardOutput.ReadToEnd (); - sout += proc.StandardError.ReadToEnd (); - proc.WaitForExit (); - if (proc.ExitCode == 0) - return true; - else { - Console.WriteLine (sout); - return false; - } - } - } -#endregion -} diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs index 9a98f7c64d..9d53e47f58 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs @@ -183,9 +183,9 @@ namespace MonoDevelop.Projects Assert.AreEqual (Path.Combine (tmp, "test4.sln"), (string) sol.FileName); Assert.AreEqual (4, nameChanges); - sol.ConvertToFormat (Util.FileFormatMD1, true); + sol.ConvertToFormat (Util.FileFormatMSBuild10, true); Assert.AreEqual ("test4", sol.Name); - Assert.AreEqual (Path.Combine (tmp, "test4.mds"), (string) sol.FileName); + Assert.AreEqual (Path.Combine (tmp, "test4.sln"), (string) sol.FileName); Assert.AreEqual (4, nameChanges); } @@ -221,11 +221,11 @@ namespace MonoDevelop.Projects Assert.AreEqual (Path.Combine (Path.GetTempPath (), "test4.csproj"), (string) prj.FileName); Assert.AreEqual (4, nameChanges); - prj.FileFormat = Util.FileFormatMD1; + prj.FileFormat = Util.FileFormatMSBuild12; Assert.AreEqual ("test4", prj.Name); - Assert.AreEqual (Path.Combine (Path.GetTempPath (), "test4.mdp"), (string) prj.FileName); + Assert.AreEqual (Path.Combine (Path.GetTempPath (), "test4.csproj"), (string) prj.FileName); Assert.AreEqual (4, nameChanges); - Assert.AreEqual ("MD1", prj.FileFormat.Id); + Assert.AreEqual ("MSBuild12", prj.FileFormat.Id); // Projects inherit the file format from the parent solution Solution sol = new Solution (); @@ -255,16 +255,16 @@ namespace MonoDevelop.Projects Assert.IsFalse (p.NeedsReload); // Changing format must reset the reload flag (it's like we just created a new solution in memory) - sol.ConvertToFormat (Util.FileFormatMD1, true); + sol.ConvertToFormat (Util.FileFormatMSBuild10, true); Assert.IsFalse (sol.NeedsReload); Assert.IsFalse (p.NeedsReload); - sol.ConvertToFormat (Util.FileFormatMSBuild05, true); + sol.ConvertToFormat (Util.FileFormatMSBuild12, true); Assert.IsFalse (sol.NeedsReload); Assert.IsFalse (p.NeedsReload); sol.RootFolder.Items.Remove (p); Assert.IsFalse (p.NeedsReload); - p.FileFormat = Util.FileFormatMD1; + p.FileFormat = Util.FileFormatMSBuild12; Assert.IsFalse (p.NeedsReload); sol.RootFolder.Items.Add (p); Assert.IsFalse (p.NeedsReload); @@ -274,35 +274,35 @@ namespace MonoDevelop.Projects Assert.IsFalse (p.NeedsReload); sol.RootFolder.Items.Add (p); Assert.IsFalse (p.NeedsReload); - - string mdsSolFile = Util.GetSampleProject ("csharp-console-mdp", "csharp-console-mdp.mds"); - Solution mdsSol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), mdsSolFile); - Project pmds = mdsSol.Items [0] as Project; - Assert.IsFalse (mdsSol.NeedsReload); - Assert.IsFalse (pmds.NeedsReload); + + string solFile2 = Util.GetSampleProject ("csharp-console", "csharp-console.sln"); + Solution sol2 = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile2); + Project p2 = sol2.Items [0] as Project; + Assert.IsFalse (sol2.NeedsReload); + Assert.IsFalse (p2.NeedsReload); // Check reloading flag in another solution string solFile = sol.FileName; - Solution sol2 = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - Assert.IsFalse (sol2.NeedsReload); + Solution sol3 = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); + Assert.IsFalse (sol3.NeedsReload); - Project p2 = sol2.Items [0] as Project; - Assert.IsFalse (p2.NeedsReload); + Project p3 = sol3.Items [0] as Project; + Assert.IsFalse (p3.NeedsReload); System.Threading.Thread.Sleep (1000); sol.Save (Util.GetMonitor ()); - Assert.IsTrue (sol2.NeedsReload); + Assert.IsTrue (sol3.NeedsReload); } [Test()] public void ReloadingReferencedProject () { - string solFile = Util.GetSampleProject ("console-with-libs-mdp", "console-with-libs-mdp.mds"); + string solFile = Util.GetSampleProject ("console-with-libs", "console-with-libs.sln"); Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs-mdp"); + DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs"); DotNetProject lib2 = (DotNetProject) sol.FindProjectByName ("library2"); Assert.AreEqual (3, p.References.Count); @@ -343,10 +343,10 @@ namespace MonoDevelop.Projects [Test()] public void NeedsBuilding () { - string solFile = Util.GetSampleProject ("console-with-libs-mdp", "console-with-libs-mdp.mds"); + string solFile = Util.GetSampleProject ("console-with-libs", "console-with-libs.sln"); Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs-mdp"); + DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs"); Assert.IsNotNull (p); DotNetProject lib1 = (DotNetProject) sol.FindProjectByName ("library1"); Assert.IsNotNull (lib1); @@ -363,13 +363,13 @@ namespace MonoDevelop.Projects BuildResult res = p.Build (Util.GetMonitor (), config, true); foreach (BuildError er in res.Errors) - Console.WriteLine (er.ToString ()); + Console.WriteLine (er); Assert.AreEqual (0, res.ErrorCount); Assert.AreEqual (0, res.WarningCount); Assert.AreEqual (3, res.BuildCount); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsTrue (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -386,10 +386,10 @@ namespace MonoDevelop.Projects [Test()] public void BuildingAndCleaning () { - string solFile = Util.GetSampleProject ("console-with-libs-mdp", "console-with-libs-mdp.mds"); + string solFile = Util.GetSampleProject ("console-with-libs", "console-with-libs.sln"); Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); - DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs-mdp"); + DotNetProject p = (DotNetProject) sol.FindProjectByName ("console-with-libs"); DotNetProject lib1 = (DotNetProject) sol.FindProjectByName ("library1"); DotNetProject lib2 = (DotNetProject) sol.FindProjectByName ("library2"); @@ -411,8 +411,8 @@ namespace MonoDevelop.Projects Assert.AreEqual (0, res.WarningCount); Assert.AreEqual (3, res.BuildCount); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsTrue (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -421,8 +421,8 @@ namespace MonoDevelop.Projects // Clean the workspace ws.Clean (Util.GetMonitor (), "Debug"); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsFalse (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -435,8 +435,8 @@ namespace MonoDevelop.Projects Assert.AreEqual (0, res.WarningCount); Assert.AreEqual (3, res.BuildCount); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsTrue (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsTrue (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsTrue (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -445,8 +445,8 @@ namespace MonoDevelop.Projects // Clean the solution sol.Clean (Util.GetMonitor (), "Debug"); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsFalse (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -459,8 +459,8 @@ namespace MonoDevelop.Projects Assert.AreEqual (0, res.WarningCount); Assert.AreEqual (1, res.BuildCount); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs-mdp.exe"))); - Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs-mdp.exe")))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", "console-with-libs.exe"))); + Assert.IsFalse (File.Exists (Util.Combine (p.BaseDirectory, "bin", "Debug", GetMdb ("console-with-libs.exe")))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", "library1.dll"))); Assert.IsFalse (File.Exists (Util.Combine (lib1.BaseDirectory, "bin", "Debug", GetMdb ("library1.dll")))); Assert.IsTrue (File.Exists (Util.Combine (lib2.BaseDirectory, "bin", "Debug", "library2.dll"))); @@ -484,35 +484,32 @@ namespace MonoDevelop.Projects // Change solution format of unsaved solution - sol.ConvertToFormat (Util.FileFormatMD1, true); + sol.ConvertToFormat (Util.FileFormatMSBuild10, true); - Assert.AreEqual ("MD1", sol.FileFormat.Id); - Assert.AreEqual ("MD1", p.FileFormat.Id); + Assert.AreEqual ("MSBuild10", sol.FileFormat.Id); + Assert.AreEqual ("MSBuild10", p.FileFormat.Id); - sol.ConvertToFormat (Util.FileFormatMSBuild05, true); + sol.ConvertToFormat (Util.FileFormatMSBuild12, true); - Assert.AreEqual ("MSBuild05", sol.FileFormat.Id); - Assert.AreEqual ("MSBuild05", p.FileFormat.Id); + Assert.AreEqual ("MSBuild12", sol.FileFormat.Id); + Assert.AreEqual ("MSBuild12", p.FileFormat.Id); // Change solution format of saved solution sol.Save (Util.GetMonitor ()); - sol.ConvertToFormat (Util.FileFormatMD1, false); + sol.ConvertToFormat (Util.FileFormatMSBuild05, false); - Assert.AreEqual ("MD1", sol.FileFormat.Id); + Assert.AreEqual ("MSBuild05", sol.FileFormat.Id); Assert.AreEqual ("MSBuild05", p.FileFormat.Id); - p.FileFormat = Util.FileFormatMD1; - Assert.AreEqual ("MD1", p.FileFormat.Id); - // Add new project Project newp = new DotNetAssemblyProject ("C#"); Assert.AreEqual ("MSBuild10", newp.FileFormat.Id); sol.RootFolder.Items.Add (newp); - Assert.AreEqual ("MD1", newp.FileFormat.Id); + Assert.AreEqual ("MSBuild05", newp.FileFormat.Id); // Add saved project @@ -529,7 +526,7 @@ namespace MonoDevelop.Projects [Test()] public void BuildConfigurationMappings () { - string solFile = Util.GetSampleProject ("test-build-configs", "test-build-configs.mds"); + string solFile = Util.GetSampleProject ("test-build-configs", "test-build-configs.sln"); Solution sol = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile); DotNetProject lib1 = (DotNetProject) sol.FindProjectByName ("Lib1"); diff --git a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs index 1df04e1289..f19a1bf769 100644 --- a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs +++ b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs @@ -45,7 +45,7 @@ namespace MonoDevelop.Projects Assert.AreEqual (1, sol.Items.Count); Assert.IsTrue (sol.Items [0] is DotNetProject, "Project is DotNetProject"); DotNetProject project = (DotNetProject) sol.Items [0]; - Assert.AreEqual ("csharp-console-mdp", project.Name); + Assert.AreEqual ("csharp-console", project.Name); // Check files @@ -244,101 +244,6 @@ namespace Foo { project.FileName = pfile; } - public static Solution CreateProjectWithFolders (string hint) - { - string dir = Util.CreateTmpDir (hint); - Directory.CreateDirectory (Util.Combine (dir, "console-project")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution1")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution1", "library1")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution1", "library2")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution2")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution2", "console-project2")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution2", "nested-solution3")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution2", "nested-solution3", "library3")); - Directory.CreateDirectory (Util.Combine (dir, "nested-solution2", "nested-solution3", "library4")); - - Solution sol = new Solution (); - sol.FileName = Path.Combine (dir, "nested-solutions-mdp"); - SolutionConfiguration scDebug = sol.AddConfiguration ("Debug", true); - SolutionConfiguration scRelease = sol.AddConfiguration ("Release", true); - - DotNetProject project1 = CreateProject (Util.Combine (dir, "console-project"), "C#", "console-project"); - project1.Files.Add (new ProjectFile (Path.Combine (project1.BaseDirectory, "Program.cs"))); - project1.Files.Add (new ProjectFile (Path.Combine (project1.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - sol.RootFolder.Items.Add (project1); - - // nested-solution1 - - SolutionFolder folder1 = new SolutionFolder (); - sol.RootFolder.Items.Add (folder1); - folder1.Name = "nested-solution1"; - - DotNetProject projectLib1 = CreateProject (Util.Combine (dir, "nested-solution1", "library1"), "C#", "library1"); - projectLib1.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - projectLib1.Files.Add (new ProjectFile (Path.Combine (projectLib1.BaseDirectory, "MyClass.cs"))); - projectLib1.Files.Add (new ProjectFile (Path.Combine (projectLib1.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - projectLib1.CompileTarget = CompileTarget.Library; - folder1.Items.Add (projectLib1); - - DotNetProject projectLib2 = CreateProject (Util.Combine (dir, "nested-solution1", "library2"), "C#", "library2"); - projectLib2.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - projectLib2.Files.Add (new ProjectFile (Path.Combine (projectLib2.BaseDirectory, "MyClass.cs"))); - projectLib2.Files.Add (new ProjectFile (Path.Combine (projectLib2.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - projectLib2.CompileTarget = CompileTarget.Library; - folder1.Items.Add (projectLib2); - - // nested-solution2 - - SolutionFolder folder2 = new SolutionFolder (); - folder2.Name = "nested-solution2"; - sol.RootFolder.Items.Add (folder2); - - DotNetProject project2 = CreateProject (Util.Combine (dir, "nested-solution2", "console-project2"), "C#", "console-project2"); - project2.Files.Add (new ProjectFile (Path.Combine (project2.BaseDirectory, "Program.cs"))); - project2.Files.Add (new ProjectFile (Path.Combine (project2.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - project2.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - - // nested-solution3 - - SolutionFolder folder3 = new SolutionFolder (); - folder3.Name = "nested-solution3"; - - DotNetProject projectLib3 = CreateProject (Util.Combine (dir, "nested-solution2", "nested-solution3", "library3"), "C#", "library3"); - projectLib3.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - projectLib3.Files.Add (new ProjectFile (Path.Combine (projectLib3.BaseDirectory, "MyClass.cs"))); - projectLib3.Files.Add (new ProjectFile (Path.Combine (projectLib3.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - projectLib3.CompileTarget = CompileTarget.Library; - folder3.Items.Add (projectLib3); - - DotNetProject projectLib4 = CreateProject (Util.Combine (dir, "nested-solution2", "nested-solution3", "library4"), "C#", "library4"); - projectLib4.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - projectLib4.Files.Add (new ProjectFile (Path.Combine (projectLib4.BaseDirectory, "MyClass.cs"))); - projectLib4.Files.Add (new ProjectFile (Path.Combine (projectLib4.BaseDirectory, "Properties", "AssemblyInfo.cs"))); - projectLib4.CompileTarget = CompileTarget.Library; - folder3.Items.Add (projectLib4); - - folder2.Items.Add (folder3); - folder2.Items.Add (project2); - - string file = Path.Combine (dir, "TestSolution.sln"); - sol.FileName = file; - - project1.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")); - project1.References.Add (new ProjectReference (projectLib1)); - project1.References.Add (new ProjectReference (projectLib2)); - project1.References.Add (new ProjectReference (projectLib3)); - project1.References.Add (new ProjectReference (projectLib4)); - - project2.References.Add (new ProjectReference (projectLib3)); - project2.References.Add (new ProjectReference (projectLib4)); - - Assert.AreEqual (2, sol.Configurations.Count); - Assert.AreEqual (6, scDebug.Configurations.Count); - Assert.AreEqual (6, scRelease.Configurations.Count); - - return sol; - } - public static void CheckGenericItemProject (string fileFormat) { Solution sol = new Solution (); diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj index 600e03856b..c2d385bb30 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -253,7 +253,6 @@ <Compile Include="MonoDevelop.Projects\MonoDeveloperFormatTests.cs" /> <Compile Include="MonoDevelop.Projects\ProjectTests.cs" /> <Compile Include="MonoDevelop.Projects\WorkspaceTests.cs" /> - <Compile Include="MonoDevelop.Projects\PackagingTests.cs" /> <Compile Include="MonoDevelop.Projects\MakefileTests.cs" /> <Compile Include="MonoDevelop.Projects\LocalCopyTests.cs" /> <Compile Include="MonoDevelop.Projects\TextFormatterTests.cs" /> diff --git a/main/tests/UnitTests/Util.cs b/main/tests/UnitTests/Util.cs index 660a6e0058..e3dcf4ae64 100644 --- a/main/tests/UnitTests/Util.cs +++ b/main/tests/UnitTests/Util.cs @@ -36,7 +36,7 @@ using MonoDevelop.Projects; namespace UnitTests { - public class Util + public static class Util { static string rootDir; static int projectId = 1; @@ -56,10 +56,6 @@ namespace UnitTests get { return Path.Combine (TestsRootDir, "tmp"); } } - public static FileFormat FileFormatMD1 { - get { return Services.ProjectService.FileFormats.GetFileFormat ("MD1"); } - } - public static FileFormat FileFormatMSBuild05 { get { return Services.ProjectService.FileFormats.GetFileFormat ("MSBuild05"); } } @@ -67,6 +63,14 @@ namespace UnitTests public static FileFormat FileFormatMSBuild08 { get { return Services.ProjectService.FileFormats.GetFileFormat ("MSBuild08"); } } + + public static FileFormat FileFormatMSBuild10 { + get { return Services.ProjectService.FileFormats.GetFileFormat ("MSBuild10"); } + } + + public static FileFormat FileFormatMSBuild12 { + get { return Services.ProjectService.FileFormats.GetFileFormat ("MSBuild12"); } + } public static IProgressMonitor GetMonitor () { @@ -119,6 +123,11 @@ namespace UnitTests doc.Load (file); return Infoset (doc); } + + public static string ToWindowsEndings (string s) + { + return s.Replace ("\r\n", "\n").Replace ("\n", "\r\n"); + } static void CopyDir (string src, string dst) { diff --git a/main/tests/test-projects/ChangeLog b/main/tests/test-projects/ChangeLog deleted file mode 100644 index 533aae8875..0000000000 --- a/main/tests/test-projects/ChangeLog +++ /dev/null @@ -1,259 +0,0 @@ -2009-02-13 Michael Hutchinson <mhutchinson@novell.com> - - * generated-console-project/TestSolution.mds: Remove unnecessary - attribute that was breaking test. - -2009-01-27 Lluis Sanchez Gual <lluis@novell.com> - - * completion-db-test/CompletionDbTest/Main.cs: - * completion-db-test/Library2/SharedNamespace.cs: - * completion-db-test/CompletionDbTest/Replacements: - * completion-db-test/CompletionDbTest/PartialTest2.cs: - * completion-db-test/CompletionDbTest/PartialTest1.cs: - * completion-db-test/CompletionDbTest/CompletionDbTest.csproj: - * completion-db-test/CompletionDbTest/Replacements/EmptyFile.cs: - * completion-db-test/CompletionDbTest/Replacements/PartialTest2.cs: - * completion-db-test/CompletionDbTest/Replacements/GenericRewrite.cs: - Added replacement files, to be used to simulate changes in files. - -2009-01-27 Lluis Sanchez Gual <lluis@novell.com> - - * completion-db-test/CompletionDbTest/Main.cs: Updated tests. - -2009-01-20 Lluis Sanchez Gual <lluis@novell.com> - - * completion-db-test/CompletionDbTest/GenericRewrite.cs: - * completion-db-test/CompletionDbTest/CompletionDbTest.csproj: Added new - test. - -2009-01-15 Michael Hutchinson <mhutchinson@novell.com> - - * vs-local-copy/solution-folder: - * vs-local-copy/solution-folder/quux.txt: - * vs-local-copy/solution-folder/app.config: - * vs-local-copy/VSLocalCopyTest/VSLocalCopyTest.csproj: Test local-copy - of external files. Patch from Sam Chuparkoff. - -2009-01-12 Michael Hutchinson <mhutchinson@novell.com> - - * vs-local-copy/ClassLibrary1/foo: - * vs-local-copy/VSLocalCopyTest/folder: - * vs-local-copy/ClassLibrary1/foo/bar.txt: - * vs-local-copy/VSLocalCopyTest/folder/baz.txt: - * vs-local-copy/ClassLibrary1/ClassLibrary1.csproj: - * vs-local-copy/VSLocalCopyTest/VSLocalCopyTest.csproj: Update - local-copy test to make sure paths are included. Covers "Bug 459311 - - Copying files to output directory in MonoDevelop". - -2008-12-16 Lluis Sanchez Gual <lluis@novell.com> - - * generated-console-project/TestProject.mdp: - * generated-console-project/TestProject.csproj: - * nested-solutions-mdp/console-project/console-project.mdp: - * nested-solutions-mdp/nested-solution1/library1/library1.mdp: - * nested-solutions-mdp/nested-solution1/library2/library2.mdp: - * csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp: - * nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp: - * nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp: - * nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp: - * test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj: - * test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj: - Track changes done in the serialization format. - - * completion-db-test/Library1/MyClass.cs: - * completion-db-test/Library2/MyClass.cs: - * completion-db-test/CompletionDbTest.sln: - * completion-db-test/Library1/Library1.csproj: - * completion-db-test/Library2/AssemblyInfo.cs: - * completion-db-test/Library1/AssemblyInfo.cs: - * completion-db-test/CompletionDbTest/Main.cs: - * completion-db-test/Library2/Library2.csproj: - * completion-db-test/Library2/SharedNamespace.cs: - * completion-db-test/Library1/SharedNamespace.cs: - * completion-db-test/Library2/GenericSubclassing.cs: - * completion-db-test/Library1/GenericSubclassing.cs: - * completion-db-test/CompletionDbTest/AssemblyInfo.cs: - * completion-db-test/CompletionDbTest/SharedNamespace.cs: - * completion-db-test/CompletionDbTest/CompletionDbTest.csproj: Added new - tests for the code completion database. - -2008-10-31 Lluis Sanchez Gual <lluis@novell.com> - - * resources-tester/ResourcesTester/Subfolder/FormFile2.Designer.cs: Fix - build of test solution. - -2008-10-30 Lluis Sanchez Gual <lluis@novell.com> - - * test-build-configs/Lib4/Lib4.mdp: - * test-build-configs/Lib3/Lib3.mdp: - * test-build-configs/Lib2/Lib2.mdp: Fix test solutions. - -2008-10-23 Lluis Sanchez Gual <lluis@novell.com> - - * test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj: - Fixed invalid project file. - -2008-10-23 Lluis Sanchez Gual <lluis@novell.com> - - * test-configuration-merging: - * test-configuration-merging/TestConfigurationMerging: - * test-configuration-merging/TestConfigurationMerging.sln: - * test-configuration-merging/TestConfigurationMerging/Main.cs: - * test-configuration-merging/TestConfigurationMerging/AssemblyInfo.cs: - * test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj: - * test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj: - Add new test projects. - -2008-10-01 Michael Hutchinson <mhutchinson@novell.com> - - * vs-local-copy, vs-local-copy/ClassLibrary5, - vs-local-copy/ClassLibrary5/Properties, - vs-local-copy/ClassLibrary5/Properties/AssemblyInfo.cs, - vs-local-copy/ClassLibrary5/Class5.cs, - vs-local-copy/ClassLibrary5/ClassLibrary5.csproj, - vs-local-copy/VSLocalCopyTest.sln, vs-local-copy/ClassLibrary1, - vs-local-copy/ClassLibrary1/TextFile1.txt, - vs-local-copy/ClassLibrary1/ClassLibrary1.csproj, - vs-local-copy/ClassLibrary1/Class1.cs, - vs-local-copy/ClassLibrary1/Properties, - vs-local-copy/ClassLibrary1/Properties/AssemblyInfo.cs, - vs-local-copy/ClassLibrary2, - vs-local-copy/ClassLibrary2/TextFile2.txt, - vs-local-copy/ClassLibrary2/Class2.cs, - vs-local-copy/ClassLibrary2/ClassLibrary2.csproj, - vs-local-copy/ClassLibrary2/Properties, - vs-local-copy/ClassLibrary2/Properties/AssemblyInfo.cs, - vs-local-copy/ClassLibrary3, - vs-local-copy/ClassLibrary3/Properties, - vs-local-copy/ClassLibrary3/Properties/AssemblyInfo.cs, - vs-local-copy/ClassLibrary3/Class3.cs, - vs-local-copy/ClassLibrary3/ClassLibrary3.csproj, - vs-local-copy/ClassLibrary4, - vs-local-copy/ClassLibrary4/Properties, - vs-local-copy/ClassLibrary4/Properties/AssemblyInfo.cs, - vs-local-copy/ClassLibrary4/ClassLibrary4.csproj, - vs-local-copy/ClassLibrary4/Class4.cs, - vs-local-copy/VSLocalCopyTest, - vs-local-copy/VSLocalCopyTest/Program.cs, - vs-local-copy/VSLocalCopyTest/Properties, - vs-local-copy/VSLocalCopyTest/Properties/AssemblyInfo.cs, - vs-local-copy/VSLocalCopyTest/VSLocalCopyTest.csproj: Add a test - project for local copy of files and references. - -2008-06-04 Lluis Sanchez Gual <lluis@novell.com> - - * test-build-configs, test-build-configs/test-build-configs.mds, - test-build-configs/Lib1, test-build-configs/Lib1/MyClass.cs, - test-build-configs/Lib1/AssemblyInfo.cs, - test-build-configs/Lib1/Lib1.mdp, test-build-configs/Lib2, - test-build-configs/Lib2/MyClass.cs, - test-build-configs/Lib2/AssemblyInfo.cs, - test-build-configs/Lib2/Lib2.mdp, test-build-configs/Lib3, - test-build-configs/Lib3/MyClass.cs, - test-build-configs/Lib3/AssemblyInfo.cs, - test-build-configs/Lib3/Lib3.mdp, test-build-configs/Lib4, - test-build-configs/Lib4/MyClass.cs, - test-build-configs/Lib4/AssemblyInfo.cs, - test-build-configs/Lib4/Lib4.mdp: New tests for checking solution - configuration mappings. - -2008-06-04 Lluis Sanchez Gual <lluis@novell.com> - - * generated-console-project/TestSolution.sln, - console-project/ConsoleProject.sln: Test fixes. - -2008-05-23 Lluis Sanchez Gual <lluis@novell.com> - - * generated-console-project/TestProject.mdp, - generated-console-project/TestSolution.sln, - console-project/ConsoleProject.sln: Fix tests. - -2008-05-21 Lluis Sanchez Gual <lluis@novell.com> - - * console-with-libs-mdp/console-with-libs-mdp/console-with-libs-mdp.mdp, - console-with-libs-mdp/console-with-libs-mdp/AssemblyInfo.cs, - console-with-libs-mdp/console-with-libs-mdp/Main.cs, - console-with-libs-mdp/console-with-libs-mdp.mds, - console-with-libs-mdp/library1/MyClass.cs, - console-with-libs-mdp/library1/AssemblyInfo.cs, - console-with-libs-mdp/library2/MyClass.cs, - console-with-libs-mdp/library2/AssemblyInfo.cs, - console-with-libs-mdp/library2/library2.mdp, - generated-console-project/TestProject.csproj, - generated-console-project/TestProject.mdp, - generated-console-project/TestSolution.sln, - generated-console-project/TestSolution.mds, - nunit-assembly-group/nunit-assembly-group.mds, - nunit-assembly-group/nunit-assembly-group.md-nunit, - console-project/ConsoleProject.sln, - console-project/ConsoleProject/ConsoleProject.csproj, - console-project/ConsoleProject/Program.cs, - console-project/ConsoleProject/Properties/AssemblyInfo.cs, - console-project-with-makefile/Makefile.include, - console-project-with-makefile/configure, - console-project-with-makefile/ConsoleProject.sln, - console-project-with-makefile/rules.make, - console-project-with-makefile/ConsoleProject/ConsoleProject.csproj, - console-project-with-makefile/ConsoleProject/Program.cs, - console-project-with-makefile/ConsoleProject/Properties/AssemblyInfo.cs, - console-project-with-makefile/ConsoleProject/Makefile, - console-project-with-makefile/ConsoleProject/consoleproject.in, - console-project-with-makefile/Makefile, - nested-solutions-mdp/nested-solutions-mdp.mds, - nested-solutions-mdp/console-project/AssemblyInfo.cs, - nested-solutions-mdp/console-project/console-project.mdp, - nested-solutions-mdp/console-project/Main.cs, - nested-solutions-mdp/nested-solution1/nested-solution1.mds, - nested-solutions-mdp/nested-solution1/library1/MyClass.cs, - nested-solutions-mdp/nested-solution1/library1/AssemblyInfo.cs, - nested-solutions-mdp/nested-solution1/library1/library1.mdp, - nested-solutions-mdp/nested-solution1/library2/MyClass.cs, - nested-solutions-mdp/nested-solution1/library2/AssemblyInfo.cs, - nested-solutions-mdp/nested-solution1/library2/library2.mdp, - nested-solutions-mdp/nested-solution2/nested-solution3/nested-solution3.mds, - nested-solutions-mdp/nested-solution2/nested-solution3/library3/MyClass.cs, - nested-solutions-mdp/nested-solution2/nested-solution3/library3/AssemblyInfo.cs, - nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.pidb, - nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp, - nested-solutions-mdp/nested-solution2/nested-solution3/library4/MyClass.cs, - nested-solutions-mdp/nested-solution2/nested-solution3/library4/AssemblyInfo.cs, - nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.pidb, - nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp, - nested-solutions-mdp/nested-solution2/nested-solution2.mds, - nested-solutions-mdp/nested-solution2/console-project2/AssemblyInfo.cs, - nested-solutions-mdp/nested-solution2/console-project2/console-project2.pidb, - nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp, - nested-solutions-mdp/nested-solution2/console-project2/Main.cs, - resources-tester/ResourcesTester/ResourcesTester.csproj, - resources-tester/ResourcesTester/BitmapCultured.ca.bmp, - resources-tester/ResourcesTester/FormFile.resx, - resources-tester/ResourcesTester/Subfolder/BitmapCultured2.ca.bmp, - resources-tester/ResourcesTester/Subfolder/FormFile2.resx, - resources-tester/ResourcesTester/Subfolder/FormFile2.ca.resx, - resources-tester/ResourcesTester/Subfolder/FormFile2.Designer.cs, - resources-tester/ResourcesTester/Subfolder/FormFile2.cs, - resources-tester/ResourcesTester/Subfolder/Normal2.resx, - resources-tester/ResourcesTester/Subfolder/Cultured2.ca.resx, - resources-tester/ResourcesTester/Subfolder/Bitmap2.bmp, - resources-tester/ResourcesTester/Subfolder/Normal2.Designer.cs, - resources-tester/ResourcesTester/FormFile.ca.resx, - resources-tester/ResourcesTester/FormFile.Designer.cs, - resources-tester/ResourcesTester/FormFile.cs, - resources-tester/ResourcesTester/Normal.resx, - resources-tester/ResourcesTester/Cultured.ca.resx, - resources-tester/ResourcesTester/Bitmap1.bmp, - resources-tester/ResourcesTester/Normal.Designer.cs, - resources-tester/ResourcesTester/Program.cs, - resources-tester/ResourcesTester/Properties/Settings.settings, - resources-tester/ResourcesTester/Properties/AssemblyInfo.cs, - resources-tester/ResourcesTester/Properties/Settings.Designer.cs, - resources-tester/ResourcesTester/Properties/Resources.resx, - resources-tester/ResourcesTester/Properties/Resources.Designer.cs, - resources-tester/ResourcesTester.sln, - csharp-console-mdp/csharp-console-mdp.mds, - csharp-console-mdp/csharp-console-mdp/AssemblyInfo.cs, - csharp-console-mdp/csharp-console-mdp/Main.cs, - csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp: New - unit test infrastructure. - - diff --git a/main/tests/test-projects/ContactBook/ContactBook.mds b/main/tests/test-projects/ContactBook/ContactBook.mds deleted file mode 100644 index e88cafd1ce..0000000000 --- a/main/tests/test-projects/ContactBook/ContactBook.mds +++ /dev/null @@ -1,24 +0,0 @@ -<Combine defaultDeployTarget="Install irectory" name="ContactBook" fileversion="2.0" MakePkgConfig="False" MakeLibPC="True"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="ContactBook" configuration="Debug" /> - <Entry build="True" name="CustomWidgets" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="ContactBook" configuration="Release" /> - <Entry build="True" name="CustomWidgets" configuration="Release" /> - </Configuration> - </Configurations> - <DeployTargets> - <DeployTarget Handler="MonoDevelop.DirectoryDeploy" Name="Install irectory" ctype="DirectoryDeployTarget" /> - <DeployTarget Handler="MonoDevelop.Autotools.Deployer" Name="Release Tarball" DefaultConfiguration="Debug" ctype="TarballDeployTarget" /> - </DeployTargets> - <StartMode startupentry="ContactBook" single="True"> - <Execute type="None" entry="ContactBook" /> - <Execute type="None" entry="CustomWidgets" /> - </StartMode> - <Entries> - <Entry filename="./ContactBook/ContactBook.mdp" /> - <Entry filename="./CustomWidgets/CustomWidgets.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/ContactBook/ContactBook.sln b/main/tests/test-projects/ContactBook/ContactBook.sln new file mode 100644 index 0000000000..911f8d094e --- /dev/null +++ b/main/tests/test-projects/ContactBook/ContactBook.sln @@ -0,0 +1,40 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContactBook", "ContactBook\ContactBook.csproj", "{73900FE9-EA37-44A6-B673-EDD62C6B755B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomWidgets", "CustomWidgets\CustomWidgets.csproj", "{AF8B29A8-B968-4C13-8FFE-D795803BBAB9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {73900FE9-EA37-44A6-B673-EDD62C6B755B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73900FE9-EA37-44A6-B673-EDD62C6B755B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73900FE9-EA37-44A6-B673-EDD62C6B755B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73900FE9-EA37-44A6-B673-EDD62C6B755B}.Release|Any CPU.Build.0 = Release|Any CPU + {AF8B29A8-B968-4C13-8FFE-D795803BBAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF8B29A8-B968-4C13-8FFE-D795803BBAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF8B29A8-B968-4C13-8FFE-D795803BBAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF8B29A8-B968-4C13-8FFE-D795803BBAB9}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = ContactBook\ContactBook.csproj + defaultDeployTarget = Install irectory + name = ContactBook + MakePkgConfig = False + MakeLibPC = True + DeployTargets = $0 + $0.DeployTarget = $1 + $1.Handler = MonoDevelop.DirectoryDeploy + $1.Name = Install irectory + $1.ctype = DirectoryDeployTarget + $0.DeployTarget = $2 + $2.Handler = MonoDevelop.Autotools.Deployer + $2.Name = Release Tarball + $2.DefaultConfiguration = Debug + $2.ctype = TarballDeployTarget + EndGlobalSection +EndGlobal diff --git a/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj b/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj new file mode 100644 index 0000000000..725a5b840b --- /dev/null +++ b/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{73900FE9-EA37-44A6-B673-EDD62C6B755B}</ProjectGuid> + <OutputType>Exe</OutputType> + <RootNamespace>ContactBook</RootNamespace> + <AssemblyName>ContactBook</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Content Include="gtk-gui\gui.stetic" /> + </ItemGroup> + <ItemGroup> + <Compile Include="gtk-gui\generated.cs" /> + <Compile Include="MainWindow.cs" /> + <Compile Include="Main.cs" /> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="GlobalActionGroup.cs" /> + <Compile Include="gtk-gui\ContactBook.GlobalActionGroup.cs" /> + <Compile Include="gtk-gui\MainWindow.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Web.Services" /> + <Reference Include="Mono.Posix" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\CustomWidgets\CustomWidgets.csproj"> + <Project>{AF8B29A8-B968-4C13-8FFE-D795803BBAB9}</Project> + <Name>CustomWidgets</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/ContactBook/ContactBook/ContactBook.mdp b/main/tests/test-projects/ContactBook/ContactBook/ContactBook.mdp deleted file mode 100644 index 16c809593e..0000000000 --- a/main/tests/test-projects/ContactBook/ContactBook/ContactBook.mdp +++ /dev/null @@ -1,37 +0,0 @@ -<Project name="ContactBook" fileversion="2.0" DefaultNamespace="ContactBook" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="ContactBook" /> - <Build debugmode="True" target="Exe" /> - <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="ContactBook" /> - <Build debugmode="False" target="Exe" /> - <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File subtype="Code" buildaction="Exclude" name="gtk-gui/gui.stetic" /> - <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" /> - <File subtype="Code" buildaction="Compile" name="MainWindow.cs" /> - <File subtype="Code" buildaction="Compile" name="Main.cs" /> - <File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" /> - <File subtype="Code" buildaction="Compile" name="GlobalActionGroup.cs" /> - <File subtype="Code" buildaction="Compile" name="gtk-gui/ContactBook.GlobalActionGroup.cs" /> - <File subtype="Code" buildaction="Compile" name="gtk-gui/MainWindow.cs" /> - </Contents> - <References> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference type="Project" localcopy="True" refto="CustomWidgets" /> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Gac" localcopy="True" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> - </References> -</Project> diff --git a/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj b/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj new file mode 100644 index 0000000000..2ec123f371 --- /dev/null +++ b/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{AF8B29A8-B968-4C13-8FFE-D795803BBAB9}</ProjectGuid> + <OutputType>Library</OutputType> + <RootNamespace>CustomWidgets</RootNamespace> + <AssemblyName>CustomWidgets</AssemblyName> + <TargetFrameworkVersion>v1.1</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_1_1" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_1_1" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="gtk-gui\generated.cs" /> + <Compile Include="TextSelector.cs" /> + <Compile Include="gtk-gui\CustomWidgets.TextSelector.cs" /> + </ItemGroup> + <ItemGroup> + <Content Include="gtk-gui\gui.stetic" /> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="gtk-gui\objects.xml"> + <LogicalName>objects.xml</LogicalName> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> + <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="System" /> + <Reference Include="Mono.Posix" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.mdp b/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.mdp deleted file mode 100644 index f9bb4b2e04..0000000000 --- a/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.mdp +++ /dev/null @@ -1,31 +0,0 @@ -<Project name="CustomWidgets" fileversion="2.0" DefaultNamespace="CustomWidgets" language="C#" clr-version="Net_1_1" targetFramework="1.1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="CustomWidgets" /> - <Build debugmode="True" target="Library" /> - <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="CustomWidgets" /> - <Build debugmode="False" target="Library" /> - <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File subtype="Code" buildaction="Compile" name="MyClass.cs" /> - <File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" /> - <File subtype="Code" buildaction="Exclude" name="gtk-gui/gui.stetic" /> - <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" /> - <File subtype="Code" buildaction="Compile" name="TextSelector.cs" /> - <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/objects.xml" /> - <File subtype="Code" buildaction="Compile" name="gtk-gui/CustomWidgets.TextSelector.cs" /> - </Contents> - <References> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference specificVersion="False" type="Gac" localcopy="True" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> - </References> -</Project> diff --git a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp.mds b/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp.mds deleted file mode 100644 index 479fd78b82..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp.mds +++ /dev/null @@ -1,24 +0,0 @@ -<Combine name="console-with-libs-mdp" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="console-with-libs-mdp" configuration="Debug" /> - <Entry build="True" name="library1" configuration="Debug" /> - <Entry build="True" name="library2" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="console-with-libs-mdp" configuration="Release" /> - <Entry build="True" name="library1" configuration="Release" /> - <Entry build="True" name="library2" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="console-with-libs-mdp" single="True"> - <Execute type="None" entry="console-with-libs-mdp" /> - <Execute type="None" entry="library1" /> - <Execute type="None" entry="library2" /> - </StartMode> - <Entries> - <Entry filename="console-with-libs-mdp/console-with-libs-mdp.mdp" /> - <Entry filename="library1/library1.mdp" /> - <Entry filename="library2/library2.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Program.cs b/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Program.cs deleted file mode 100644 index b6b642fd12..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Main.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System; - -namespace consolewithlibsmdp -{ - class MainClass - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -}
\ No newline at end of file diff --git a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Properties/AssemblyInfo.cs b/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Properties/AssemblyInfo.cs deleted file mode 100644 index 738e8b35f5..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("console-with-libs-mdp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/console-with-libs-mdp.mdp b/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/console-with-libs-mdp.mdp deleted file mode 100644 index b2ffb52b11..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/console-with-libs-mdp/console-with-libs-mdp.mdp +++ /dev/null @@ -1,25 +0,0 @@ -<Project name="console-with-libs-mdp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="console-with-libs-mdp" /> - <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="console-with-libs-mdp" /> - <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="Program.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="library1" /> - <ProjectReference type="Project" localcopy="True" refto="library2" /> - </References> -</Project> diff --git a/main/tests/test-projects/console-with-libs-mdp/library1/library1.mdp b/main/tests/test-projects/console-with-libs-mdp/library1/library1.mdp deleted file mode 100644 index 72a55d2598..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/library1/library1.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library1" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library1" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library1" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/console-with-libs-mdp/library2/Properties/AssemblyInfo.cs b/main/tests/test-projects/console-with-libs-mdp/library2/Properties/AssemblyInfo.cs deleted file mode 100644 index addef9fb8a..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/library2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("library2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/console-with-libs-mdp/library2/library2.mdp b/main/tests/test-projects/console-with-libs-mdp/library2/library2.mdp deleted file mode 100644 index e418d9e034..0000000000 --- a/main/tests/test-projects/console-with-libs-mdp/library2/library2.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library2" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library2" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library2" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/console-with-libs/console-with-libs.sln b/main/tests/test-projects/console-with-libs/console-with-libs.sln new file mode 100644 index 0000000000..3a1c54554b --- /dev/null +++ b/main/tests/test-projects/console-with-libs/console-with-libs.sln @@ -0,0 +1,33 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "console-with-libs", "console-with-libs\console-with-libs.csproj", "{EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "library1", "library1\library1.csproj", "{7F63CBE6-2FE7-47A7-8930-EA078DA05062}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "library2", "library2\library2.csproj", "{42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}.Release|Any CPU.Build.0 = Release|Any CPU + {7F63CBE6-2FE7-47A7-8930-EA078DA05062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F63CBE6-2FE7-47A7-8930-EA078DA05062}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F63CBE6-2FE7-47A7-8930-EA078DA05062}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F63CBE6-2FE7-47A7-8930-EA078DA05062}.Release|Any CPU.Build.0 = Release|Any CPU + {EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = console-with-libs\console-with-libs.csproj + name = console-with-libs + EndGlobalSection +EndGlobal diff --git a/main/tests/test-projects/nested-solutions-mdp/console-project/Program.cs b/main/tests/test-projects/console-with-libs/console-with-libs/Program.cs index bf59309046..e6ef050783 100644 --- a/main/tests/test-projects/nested-solutions-mdp/console-project/Program.cs +++ b/main/tests/test-projects/console-with-libs/console-with-libs/Program.cs @@ -26,7 +26,7 @@ // using System; -namespace consoleproject +namespace consolewithlib { class MainClass { @@ -35,4 +35,4 @@ namespace consoleproject Console.WriteLine("Hello World!"); } } -}
\ No newline at end of file +} diff --git a/main/tests/test-projects/nested-solutions-mdp/console-project/Properties/AssemblyInfo.cs b/main/tests/test-projects/console-with-libs/console-with-libs/Properties/AssemblyInfo.cs index 34f0d67fbc..b0f5040c6e 100644 --- a/main/tests/test-projects/nested-solutions-mdp/console-project/Properties/AssemblyInfo.cs +++ b/main/tests/test-projects/console-with-libs/console-with-libs/Properties/AssemblyInfo.cs @@ -27,10 +27,10 @@ using System.Reflection; using System.Runtime.CompilerServices; -// Information about this assembly is defined by the following attributes. +// Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("console-project")] +[assembly: AssemblyTitle("console-with-libs")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] @@ -44,7 +44,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyVersion("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, +// The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. [assembly: AssemblyDelaySign(false)] diff --git a/main/tests/test-projects/console-with-libs/console-with-libs/console-with-libs.csproj b/main/tests/test-projects/console-with-libs/console-with-libs/console-with-libs.csproj new file mode 100644 index 0000000000..dacd4caf48 --- /dev/null +++ b/main/tests/test-projects/console-with-libs/console-with-libs/console-with-libs.csproj @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{EAB80A13-FC3E-4E53-8950-E6B9F19E4C90}</ProjectGuid> + <OutputType>Exe</OutputType> + <AssemblyName>console-with-libs</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\library1\library1.csproj"> + <Project>{7F63CBE6-2FE7-47A7-8930-EA078DA05062}</Project> + <Name>library1</Name> + </ProjectReference> + <ProjectReference Include="..\library2\library2.csproj"> + <Project>{42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}</Project> + <Name>library2</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project> diff --git a/main/tests/test-projects/console-with-libs-mdp/library1/MyClass.cs b/main/tests/test-projects/console-with-libs/library1/MyClass.cs index 892691ccee..789d1b07ae 100644 --- a/main/tests/test-projects/console-with-libs-mdp/library1/MyClass.cs +++ b/main/tests/test-projects/console-with-libs/library1/MyClass.cs @@ -29,11 +29,11 @@ using System; namespace library1 { - - + + public class MyClass { - + public MyClass() { } diff --git a/main/tests/test-projects/console-with-libs-mdp/library1/Properties/AssemblyInfo.cs b/main/tests/test-projects/console-with-libs/library1/Properties/AssemblyInfo.cs index b1831917cf..dbc7743054 100644 --- a/main/tests/test-projects/console-with-libs-mdp/library1/Properties/AssemblyInfo.cs +++ b/main/tests/test-projects/console-with-libs/library1/Properties/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Reflection; using System.Runtime.CompilerServices; -// Information about this assembly is defined by the following attributes. +// Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. [assembly: AssemblyTitle("library1")] @@ -44,7 +44,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyVersion("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, +// The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. [assembly: AssemblyDelaySign(false)] diff --git a/main/tests/test-projects/console-with-libs/library1/library1.csproj b/main/tests/test-projects/console-with-libs/library1/library1.csproj new file mode 100644 index 0000000000..19f2dd2213 --- /dev/null +++ b/main/tests/test-projects/console-with-libs/library1/library1.csproj @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{7F63CBE6-2FE7-47A7-8930-EA078DA05062}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>library1</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/console-with-libs-mdp/library2/MyClass.cs b/main/tests/test-projects/console-with-libs/library2/MyClass.cs index aaa2d5fc23..47ce7c5a20 100644 --- a/main/tests/test-projects/console-with-libs-mdp/library2/MyClass.cs +++ b/main/tests/test-projects/console-with-libs/library2/MyClass.cs @@ -29,11 +29,11 @@ using System; namespace library2 { - - + + public class MyClass { - + public MyClass() { } diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/Properties/AssemblyInfo.cs b/main/tests/test-projects/console-with-libs/library2/Properties/AssemblyInfo.cs index addef9fb8a..6eb8385596 100644 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/Properties/AssemblyInfo.cs +++ b/main/tests/test-projects/console-with-libs/library2/Properties/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Reflection; using System.Runtime.CompilerServices; -// Information about this assembly is defined by the following attributes. +// Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. [assembly: AssemblyTitle("library2")] @@ -44,7 +44,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyVersion("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, +// The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. [assembly: AssemblyDelaySign(false)] diff --git a/main/tests/test-projects/console-with-libs/library2/library2.csproj b/main/tests/test-projects/console-with-libs/library2/library2.csproj new file mode 100644 index 0000000000..9f7ea2b84b --- /dev/null +++ b/main/tests/test-projects/console-with-libs/library2/library2.csproj @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{42A9AAF1-DCB8-4F3F-9B20-5F17D4EAAD20}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>library2</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp.mds b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp.mds deleted file mode 100644 index 6dd5e4365a..0000000000 --- a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp.mds +++ /dev/null @@ -1,16 +0,0 @@ -<Combine name="csharp-console-mdp" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="csharp-console-mdp" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="csharp-console-mdp" configuration="Release2" /> - </Configuration> - </Configurations> - <StartMode startupentry="csharp-console-mdp" single="True"> - <Execute type="None" entry="csharp-console-mdp" /> - </StartMode> - <Entries> - <Entry filename="csharp-console-mdp/csharp-console-mdp.mdp" /> - </Entries> -</Combine> diff --git a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Program.cs b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Program.cs deleted file mode 100644 index 09eae37e01..0000000000 --- a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Main.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System; - -namespace csharpconsolemdp -{ - class MainClass - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -}
\ No newline at end of file diff --git a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Properties/AssemblyInfo.cs b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Properties/AssemblyInfo.cs deleted file mode 100644 index 485d8e4840..0000000000 --- a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("csharp-console-mdp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp deleted file mode 100644 index c6327edecc..0000000000 --- a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="csharp-console-mdp" DefaultNamespace="csharpconsolemdp" fileversion="2.0" language="C#" targetFramework="2.0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="csharp-console-mdp" /> - <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release2" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="csharp-console-mdp" /> - <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="Program.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/csharp-console/csharp-console.sln b/main/tests/test-projects/csharp-console/csharp-console.sln new file mode 100644 index 0000000000..f7ac137a24 --- /dev/null +++ b/main/tests/test-projects/csharp-console/csharp-console.sln @@ -0,0 +1,21 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp-console", "csharp-console\csharp-console.csproj", "{032D1E66-A1E8-4585-AE76-020A22C74101}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {032D1E66-A1E8-4585-AE76-020A22C74101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {032D1E66-A1E8-4585-AE76-020A22C74101}.Debug|Any CPU.Build.0 = Debug|Any CPU + {032D1E66-A1E8-4585-AE76-020A22C74101}.Release|Any CPU.ActiveCfg = Release2|Any CPU + {032D1E66-A1E8-4585-AE76-020A22C74101}.Release|Any CPU.Build.0 = Release2|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = csharp-console\csharp-console.csproj + name = csharp-console + EndGlobalSection +EndGlobal diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/Program.cs b/main/tests/test-projects/csharp-console/csharp-console/Program.cs index 30bd9dd4d0..be56f439a9 100644 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/Program.cs +++ b/main/tests/test-projects/csharp-console/csharp-console/Program.cs @@ -26,7 +26,7 @@ // using System; -namespace consoleproject2 +namespace csharpconsolep { class MainClass { @@ -35,4 +35,4 @@ namespace consoleproject2 Console.WriteLine("Hello World!"); } } -}
\ No newline at end of file +} diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/Properties/AssemblyInfo.cs b/main/tests/test-projects/csharp-console/csharp-console/Properties/AssemblyInfo.cs index b1831917cf..a064a6d1a4 100644 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/Properties/AssemblyInfo.cs +++ b/main/tests/test-projects/csharp-console/csharp-console/Properties/AssemblyInfo.cs @@ -27,10 +27,10 @@ using System.Reflection; using System.Runtime.CompilerServices; -// Information about this assembly is defined by the following attributes. +// Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("library1")] +[assembly: AssemblyTitle("csharp-console")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] @@ -44,7 +44,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyVersion("1.0.*")] -// The following attributes are used to specify the signing key for the assembly, +// The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. [assembly: AssemblyDelaySign(false)] diff --git a/main/tests/test-projects/csharp-console/csharp-console/csharp-console.csproj b/main/tests/test-projects/csharp-console/csharp-console/csharp-console.csproj new file mode 100644 index 0000000000..98ca86af0f --- /dev/null +++ b/main/tests/test-projects/csharp-console/csharp-console/csharp-console.csproj @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{032D1E66-A1E8-4585-AE76-020A22C74101}</ProjectGuid> + <OutputType>Exe</OutputType> + <RootNamespace>csharpconsole</RootNamespace> + <AssemblyName>csharp-consolep</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release2|AnyCPU' "> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + </PropertyGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project> diff --git a/main/tests/test-projects/generated-console-project/TestProject.csproj b/main/tests/test-projects/generated-console-project/TestProject.csproj index 5e74648379..0a7c6fc6fa 100644 --- a/main/tests/test-projects/generated-console-project/TestProject.csproj +++ b/main/tests/test-projects/generated-console-project/TestProject.csproj @@ -1,13 +1,15 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{DC577202-654B-4FDB-95C7-8CC5DDF6D32D}</ProjectGuid> + <ProjectGuid>{969F05E2-0E79-4C5B-982C-8F3DD4D46311}</ProjectGuid> <OutputType>Exe</OutputType> <RootNamespace>TestProject</RootNamespace> <AssemblyName>TestProject</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -40,7 +42,7 @@ <ItemGroup> <Content Include="Excluded.xml" /> <Content Include="Copy.xml"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> <ItemGroup> diff --git a/main/tests/test-projects/generated-console-project/TestProject.mdp b/main/tests/test-projects/generated-console-project/TestProject.mdp deleted file mode 100644 index 2e628baeee..0000000000 --- a/main/tests/test-projects/generated-console-project/TestProject.mdp +++ /dev/null @@ -1,28 +0,0 @@ -<Project name="TestProject" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="TestProject" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="TestProject" /> - <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="TestProject" /> - <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="Program.cs" subtype="Code" buildaction="Compile" /> - <File name="Resource.xml" resource_id="TestProject.Resource.xml" subtype="Code" buildaction="EmbedAsResource" /> - <File name="Excluded.xml" subtype="Code" buildaction="Exclude" /> - <File name="Copy.xml" subtype="Code" buildaction="FileCopy" /> - <File name="Nothing.xml" subtype="Code" buildaction="Nothing" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Package" localcopy="True" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Package" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/generated-console-project/TestSolution.mds b/main/tests/test-projects/generated-console-project/TestSolution.mds deleted file mode 100644 index 2b73c9e88e..0000000000 --- a/main/tests/test-projects/generated-console-project/TestSolution.mds +++ /dev/null @@ -1,16 +0,0 @@ -<Combine fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="TestProject" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="TestProject" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="TestProject" single="True"> - <Execute type="None" entry="TestProject" /> - </StartMode> - <Entries> - <Entry filename="TestProject.mdp" /> - </Entries> -</Combine> diff --git a/main/tests/test-projects/generated-console-project/TestSolution.sln b/main/tests/test-projects/generated-console-project/TestSolution.sln index bda18e537c..3af6b2e2a1 100644 --- a/main/tests/test-projects/generated-console-project/TestSolution.sln +++ b/main/tests/test-projects/generated-console-project/TestSolution.sln @@ -1,7 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject.csproj", "{DC577202-654B-4FDB-95C7-8CC5DDF6D32D}"
+Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject.csproj", "{969F05E2-0E79-4C5B-982C-8F3DD4D46311}" EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +9,10 @@ Global Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {DC577202-654B-4FDB-95C7-8CC5DDF6D32D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC577202-654B-4FDB-95C7-8CC5DDF6D32D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC577202-654B-4FDB-95C7-8CC5DDF6D32D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC577202-654B-4FDB-95C7-8CC5DDF6D32D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {969F05E2-0E79-4C5B-982C-8F3DD4D46311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {969F05E2-0E79-4C5B-982C-8F3DD4D46311}.Debug|Any CPU.Build.0 = Debug|Any CPU + {969F05E2-0E79-4C5B-982C-8F3DD4D46311}.Release|Any CPU.ActiveCfg = Release|Any CPU + {969F05E2-0E79-4C5B-982C-8F3DD4D46311}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = TestProject.csproj
diff --git a/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp b/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp deleted file mode 100644 index 881a0c88b7..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp +++ /dev/null @@ -1,27 +0,0 @@ -<Project name="console-project" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="console-project" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="console-project" /> - <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="console-project" /> - <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="Program.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="library1" /> - <ProjectReference type="Project" localcopy="True" refto="library2" /> - <ProjectReference type="Project" localcopy="True" refto="library3" /> - <ProjectReference type="Project" localcopy="True" refto="library4" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/MyClass.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/MyClass.cs deleted file mode 100644 index 892691ccee..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/MyClass.cs +++ /dev/null @@ -1,41 +0,0 @@ -// MyClass.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; - -namespace library1 -{ - - - public class MyClass - { - - public MyClass() - { - } - } -} diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp deleted file mode 100644 index 000515d02e..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library1" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library1" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library1" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/MyClass.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/MyClass.cs deleted file mode 100644 index aaa2d5fc23..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/MyClass.cs +++ /dev/null @@ -1,41 +0,0 @@ -// MyClass.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; - -namespace library2 -{ - - - public class MyClass - { - - public MyClass() - { - } - } -} diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp deleted file mode 100644 index 5310452395..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library2" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library2" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library2" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library2" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/nested-solution1.mds b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/nested-solution1.mds deleted file mode 100644 index 6e0b7f9895..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/nested-solution1.mds +++ /dev/null @@ -1,20 +0,0 @@ -<Combine name="nested-solution1" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="library1" configuration="Debug" /> - <Entry build="True" name="library2" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="library1" configuration="Release" /> - <Entry build="True" name="library2" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="library1" single="True"> - <Execute type="None" entry="library1" /> - <Execute type="None" entry="library2" /> - </StartMode> - <Entries> - <Entry filename="library1/library1.mdp" /> - <Entry filename="library2/library2.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/Properties/AssemblyInfo.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/Properties/AssemblyInfo.cs deleted file mode 100644 index e03ce1b9ca..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("console-project2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp deleted file mode 100644 index 0eec311cf8..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp +++ /dev/null @@ -1,25 +0,0 @@ -<Project name="console-project2" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="console-project2" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="console-project2" /> - <Build debugmode="True" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="console-project2" /> - <Build debugmode="False" target="Exe" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="Program.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="library3" /> - <ProjectReference type="Project" localcopy="True" refto="library4" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution2.mds b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution2.mds deleted file mode 100644 index 5ef6d472ec..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution2.mds +++ /dev/null @@ -1,20 +0,0 @@ -<Combine name="nested-solution2" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="nested-solution3" configuration="Debug" /> - <Entry build="True" name="console-project2" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="nested-solution3" configuration="Release" /> - <Entry build="True" name="console-project2" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="nested-solution3" single="True"> - <Execute type="None" entry="nested-solution3" /> - <Execute type="None" entry="console-project2" /> - </StartMode> - <Entries> - <Entry filename="nested-solution3/nested-solution3.mds" /> - <Entry filename="console-project2/console-project2.mdp" /> - </Entries> -</Combine> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/MyClass.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/MyClass.cs deleted file mode 100644 index 1007a5405d..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/MyClass.cs +++ /dev/null @@ -1,41 +0,0 @@ -// MyClass.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; - -namespace library3 -{ - - - public class MyClass - { - - public MyClass() - { - } - } -} diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/Properties/AssemblyInfo.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/Properties/AssemblyInfo.cs deleted file mode 100644 index 7cd0a3327b..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("library3")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp deleted file mode 100644 index f1411c5c5b..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library3" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library3" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library3" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library3" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/MyClass.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/MyClass.cs deleted file mode 100644 index 5039fe40c8..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/MyClass.cs +++ /dev/null @@ -1,41 +0,0 @@ -// MyClass.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// - -using System; - -namespace library4 -{ - - - public class MyClass - { - - public MyClass() - { - } - } -} diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/Properties/AssemblyInfo.cs b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/Properties/AssemblyInfo.cs deleted file mode 100644 index 3ea53d634d..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// AssemblyInfo.cs -// -// Author: -// Lluis Sanchez Gual <lluis@novell.com> -// -// Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("library4")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// If the build and revision are set to '*' they will be updated automatically. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp deleted file mode 100644 index e0b90960c9..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="library4" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library4" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="library4" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="library4" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Package" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/nested-solution3.mds b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/nested-solution3.mds deleted file mode 100644 index 40431942bc..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/nested-solution3.mds +++ /dev/null @@ -1,20 +0,0 @@ -<Combine name="nested-solution3" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="library3" configuration="Debug" /> - <Entry build="True" name="library4" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="library3" configuration="Release" /> - <Entry build="True" name="library4" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="library3" single="True"> - <Execute type="None" entry="library3" /> - <Execute type="None" entry="library4" /> - </StartMode> - <Entries> - <Entry filename="library3/library3.mdp" /> - <Entry filename="library4/library4.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solutions-mdp.mds b/main/tests/test-projects/nested-solutions-mdp/nested-solutions-mdp.mds deleted file mode 100644 index 75465b2008..0000000000 --- a/main/tests/test-projects/nested-solutions-mdp/nested-solutions-mdp.mds +++ /dev/null @@ -1,24 +0,0 @@ -<Combine name="nested-solutions-mdp" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="console-project" configuration="Debug" /> - <Entry build="True" name="nested-solution1" configuration="Debug" /> - <Entry build="True" name="nested-solution2" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="console-project" configuration="Release" /> - <Entry build="True" name="nested-solution1" configuration="Release" /> - <Entry build="True" name="nested-solution2" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="console-project" single="True"> - <Execute type="None" entry="console-project" /> - <Execute type="None" entry="nested-solution1" /> - <Execute type="None" entry="nested-solution2" /> - </StartMode> - <Entries> - <Entry filename="console-project/console-project.mdp" /> - <Entry filename="nested-solution1/nested-solution1.mds" /> - <Entry filename="nested-solution2/nested-solution2.mds" /> - </Entries> -</Combine> diff --git a/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.md-nunit b/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.md-nunit deleted file mode 100644 index e8bf3a875e..0000000000 --- a/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.md-nunit +++ /dev/null @@ -1,9 +0,0 @@ -<NUnitAssemblyGroupProject name="nunit-assembly-group" fileversion="2.0"> - <Configurations active="Default"> - <Configuration name="Default" ctype="NUnitAssemblyGroupProjectConfiguration"> - <Assemblies> - <Assembly Path="/home/lluis/work/mdnou/main/build/bin/UnitTests.dll" /> - </Assemblies> - </Configuration> - </Configurations> -</NUnitAssemblyGroupProject>
\ No newline at end of file diff --git a/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.mds b/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.mds deleted file mode 100644 index d15fac9663..0000000000 --- a/main/tests/test-projects/nunit-assembly-group/nunit-assembly-group.mds +++ /dev/null @@ -1,13 +0,0 @@ -<Combine name="nunit-assembly-group" fileversion="2.0"> - <Configurations active="Default"> - <Configuration name="Default" ctype="CombineConfiguration"> - <Entry build="True" name="nunit-assembly-group" configuration="Default" /> - </Configuration> - </Configurations> - <StartMode startupentry="nunit-assembly-group" single="True"> - <Execute type="None" entry="nunit-assembly-group" /> - </StartMode> - <Entries> - <Entry filename="nunit-assembly-group.md-nunit" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/Lib1/Lib1.csproj b/main/tests/test-projects/test-build-configs/Lib1/Lib1.csproj new file mode 100644 index 0000000000..b9ee79e647 --- /dev/null +++ b/main/tests/test-projects/test-build-configs/Lib1/Lib1.csproj @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>Lib1</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>false</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Lib2\Lib2.csproj"> + <Project>{33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}</Project> + <Name>Lib2</Name> + </ProjectReference> + <ProjectReference Include="..\Lib3\Lib3.csproj"> + <Project>{D4A08E68-9AFC-4E6E-912B-7BACE81B586E}</Project> + <Name>Lib3</Name> + </ProjectReference> + <ProjectReference Include="..\Lib4\Lib4.csproj"> + <Project>{ED11EE6A-C2E6-4909-97C0-4C817445D34B}</Project> + <Name>Lib4</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/Lib1/Lib1.mdp b/main/tests/test-projects/test-build-configs/Lib1/Lib1.mdp deleted file mode 100644 index 746b43c2cc..0000000000 --- a/main/tests/test-projects/test-build-configs/Lib1/Lib1.mdp +++ /dev/null @@ -1,26 +0,0 @@ -<Project name="Lib1" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="Lib1" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="Lib1" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="Lib2" /> - <ProjectReference type="Project" localcopy="True" refto="Lib3" /> - <ProjectReference type="Project" localcopy="True" refto="Lib4" /> - </References> -</Project> diff --git a/main/tests/test-projects/test-build-configs/Lib2/Lib2.csproj b/main/tests/test-projects/test-build-configs/Lib2/Lib2.csproj new file mode 100644 index 0000000000..6035f205fd --- /dev/null +++ b/main/tests/test-projects/test-build-configs/Lib2/Lib2.csproj @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>Lib2</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>false</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/Lib2/Lib2.mdp b/main/tests/test-projects/test-build-configs/Lib2/Lib2.mdp deleted file mode 100644 index e9454efb25..0000000000 --- a/main/tests/test-projects/test-build-configs/Lib2/Lib2.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="Lib2" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="Lib2" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="Lib2" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/test-build-configs/Lib3/Lib3.csproj b/main/tests/test-projects/test-build-configs/Lib3/Lib3.csproj new file mode 100644 index 0000000000..694d9bf0f5 --- /dev/null +++ b/main/tests/test-projects/test-build-configs/Lib3/Lib3.csproj @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug+Extra</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{D4A08E68-9AFC-4E6E-912B-7BACE81B586E}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>Lib3</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug+Extra|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>false</Optimize> + <OutputPath>bin\DebugExtra</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release+Extra|AnyCPU' "> + <Optimize>false</Optimize> + <OutputPath>bin\ReleaseExtra</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/Lib3/Lib3.mdp b/main/tests/test-projects/test-build-configs/Lib3/Lib3.mdp deleted file mode 100644 index 5fe9922ee0..0000000000 --- a/main/tests/test-projects/test-build-configs/Lib3/Lib3.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="Lib3" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug+Extra" ctype="DotNetProjectConfiguration"> - <Output directory="bin/DebugExtra" assembly="Lib3" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release+Extra" ctype="DotNetProjectConfiguration"> - <Output directory="bin/ReleaseExtra" assembly="Lib3" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/test-build-configs/Lib4/Lib4.csproj b/main/tests/test-projects/test-build-configs/Lib4/Lib4.csproj new file mode 100644 index 0000000000..ee77f0b07a --- /dev/null +++ b/main/tests/test-projects/test-build-configs/Lib4/Lib4.csproj @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{ED11EE6A-C2E6-4909-97C0-4C817445D34B}</ProjectGuid> + <OutputType>Library</OutputType> + <AssemblyName>Lib4</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <Optimize>false</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <Execution> + <Execution clr-version="Net_2_0" xmlns="" /> + </Execution> + </PropertyGroup> + <ItemGroup> + <Compile Include="MyClass.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/Lib4/Lib4.mdp b/main/tests/test-projects/test-build-configs/Lib4/Lib4.mdp deleted file mode 100644 index 228e384574..0000000000 --- a/main/tests/test-projects/test-build-configs/Lib4/Lib4.mdp +++ /dev/null @@ -1,23 +0,0 @@ -<Project name="Lib4" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Debug" assembly="Lib4" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="bin/Release" assembly="Lib4" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" /> - <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <Contents> - <File name="MyClass.cs" subtype="Code" buildaction="Compile" /> - <File name="Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> diff --git a/main/tests/test-projects/test-build-configs/test-build-configs.mds b/main/tests/test-projects/test-build-configs/test-build-configs.mds deleted file mode 100644 index 65ff412683..0000000000 --- a/main/tests/test-projects/test-build-configs/test-build-configs.mds +++ /dev/null @@ -1,28 +0,0 @@ -<Combine name="test-build-configs" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="Lib1" configuration="Debug" /> - <Entry build="True" name="Lib2" configuration="Release" /> - <Entry build="True" name="Lib3" configuration="Debug+Extra" /> - <Entry build="True" name="Lib4" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="Lib1" configuration="Release" /> - <Entry build="True" name="Lib2" configuration="Debug" /> - <Entry build="True" name="Lib3" configuration="Release+Extra" /> - <Entry build="True" name="Lib4" configuration="Release" /> - </Configuration> - </Configurations> - <StartMode startupentry="Lib1" single="True"> - <Execute type="None" entry="Lib1" /> - <Execute type="None" entry="Lib2" /> - <Execute type="None" entry="Lib3" /> - <Execute type="None" entry="Lib4" /> - </StartMode> - <Entries> - <Entry filename="Lib1/Lib1.mdp" /> - <Entry filename="Lib2/Lib2.mdp" /> - <Entry filename="Lib3/Lib3.mdp" /> - <Entry filename="Lib4/Lib4.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/main/tests/test-projects/test-build-configs/test-build-configs.sln b/main/tests/test-projects/test-build-configs/test-build-configs.sln new file mode 100644 index 0000000000..6cd4c3bf0a --- /dev/null +++ b/main/tests/test-projects/test-build-configs/test-build-configs.sln @@ -0,0 +1,39 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib1", "Lib1\Lib1.csproj", "{DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib2", "Lib2\Lib2.csproj", "{33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib3", "Lib3\Lib3.csproj", "{D4A08E68-9AFC-4E6E-912B-7BACE81B586E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib4", "Lib4\Lib4.csproj", "{ED11EE6A-C2E6-4909-97C0-4C817445D34B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}.Debug|Any CPU.Build.0 = Release|Any CPU + {33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {33FD65CB-FF5C-4B8D-BDBE-1326D2688B16}.Release|Any CPU.Build.0 = Debug|Any CPU + {D4A08E68-9AFC-4E6E-912B-7BACE81B586E}.Debug|Any CPU.ActiveCfg = Debug+Extra|Any CPU + {D4A08E68-9AFC-4E6E-912B-7BACE81B586E}.Debug|Any CPU.Build.0 = Debug+Extra|Any CPU + {D4A08E68-9AFC-4E6E-912B-7BACE81B586E}.Release|Any CPU.ActiveCfg = Release+Extra|Any CPU + {D4A08E68-9AFC-4E6E-912B-7BACE81B586E}.Release|Any CPU.Build.0 = Release+Extra|Any CPU + {DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DAE0F5D0-50B0-4238-8FBA-46DE5F4D6284}.Release|Any CPU.Build.0 = Release|Any CPU + {ED11EE6A-C2E6-4909-97C0-4C817445D34B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED11EE6A-C2E6-4909-97C0-4C817445D34B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED11EE6A-C2E6-4909-97C0-4C817445D34B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED11EE6A-C2E6-4909-97C0-4C817445D34B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = Lib1\Lib1.csproj + name = test-build-configs + EndGlobalSection +EndGlobal |