Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -1,140 +0,0 @@
2010-07-09 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks.dll.sources: Use
UnknownToolsVersionException.cs from Engine.
2010-04-03 Ankit Jain <jankit@novell.com>
* Makefile: Import tools/xbuild/xbuild_targets.make, which copies
the target and tasks file in the correct place, to allow running
tests with different toolsversion. Copy the config file for the
test assembly. Clean the generated test.dll .
Use the correct target assembly name for 4.0 profile
(ms.build.tasks.v4.0.dll), and for Utilities assembly.
* Microsoft.Build.Tasks_test.dll.sources: Use Consts.cs from Engine
instead of maintaining a copy here.
2010-03-02 Ankit Jain <jankit@novell.com>
Fix tests.
* Makefile (EXTRA_DISTFILES): Add Test/resources/junk.txt .
2010-02-06 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks.dll.sources: Add LC.cs
* Microsoft.Build.Tasks_test.dll.sources: Add LCTest.cs
2010-02-04 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
WriteLinesToFileTest.cs
2009-12-22 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks.dll.sources: Add DirectoryScanner.cs
from Build.Engine, required by CreateItem.
2009-10-12 Ankit Jain <jankit@novell.com>
* Makefile: Add reference to Microsoft.Build.Engine .
2009-10-08 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
RemoveDuplicatesTest.cs
2009-09-25 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks.dll.sources: Added
FindAppConfigFile.cs
* Microsoft.Build.Tasks_test.dll.sources: Added
FindAppConfigFileTest.cs
2009-08-14 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
PcFileCache.cs from md.
2009-07-23 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
AssignProjectConfigurationTest.cs .
2009-07-22 Ankit Jain <jankit@novell.com>
* Makefile: Add System.Core .
2009-06-08 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks.dll.sources: Added
ResolvedReference.cs
2009-05-14 Ankit Jain <jankit@novell.com>
Fix tests on monobuild
* Makefile (EXTRA_DISTFILES): Add Test/resources/Sample.vb
2009-04-28 Raja R Harinath <harinath@hurrynot.org>
* Makefile (NAME_SUFFIX): New.
(LIBRARY_NAME): Use it.
(TEST_MCS_FLAGS): Don't mention name of library. Use NAME_SUFFIX
as appropriate when referring to other msbuild dlls.
2009-04-27 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
CreateVisualBasicManifestResourceNameTest.cs .
2009-04-25 Jonathan Chambers <joncham@gmail.com>
* Makefile: Adjust assembly name for 3.5 profile.
2009-02-21 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added CopyTest.cs
2009-01-06 Ankit Jain <jankit@novell.com>
* Makefile (EXTRA_DISTFILES): Add Test/resources/Sample.cs
2008-12-12 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added
CreateCSharpManifestResourceNameTest.cs
2008-11-23 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added AssignCultureTest.cs
2008-11-22 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added AssignTargetPathTest.cs
2008-11-21 Ankit Jain <jankit@novell.com>
* Microsoft.Build.Tasks_test.dll.sources: Added TaskBatchingTest.cs and
TestMessageLogger.cs
2008-11-11 Jonathan Chambers <joncham@gmail.com>
* Microsoft.Build.Tasks_test.dll.sources: Added DeleteTest.cs.
2007-05-11 Raja R Harinath <rharinath@novell.com>
* Makefile (Test/resources/test.dll): Use full name, not just test.dll.
2007-02-18 Marek Sieradzki <marek.sieradzki@gmail.com>
* Makefile: Compile Test/resources/test.cs before test-local.
2006-04-19 Marek Sieradzki <marek.sieradzki@gmail.com>
* Microsoft.Build.Tasks.targets: Removed.
2005-09-09 Marek Sieradzki <marek.sieradzki@gmail.com>
* Microsoft.Build.Tasks.dll.sources: Renamed from
Microsoft.Build.Tasks.sources.
* Makefile: Added reference to System.Windows.Forms.

View File

@@ -9,28 +9,14 @@ LIBRARY = Microsoft.Build.Tasks.dll
LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
LIB_REFS = System System.Core System.Xml System.Windows.Forms
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
/r:System.Core.dll \
/r:System.Xml.dll \
/r:System.Windows.Forms.dll \
/r:$(XBUILD_UTILITIES) \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_ENGINE) \
/r:$(XBUILD_TASKS)
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(PARENT_PROFILE)System.Windows.Forms \
$(XBUILD_UTILITIES) $(XBUILD_FRAMEWORK) $(XBUILD_ENGINE) $(XBUILD_TASKS)
TEST_MCS_FLAGS = \
/r:System.Xml.dll \
/r:$(XBUILD_ENGINE) \
/r:$(XBUILD_FRAMEWORK) \
/r:$(XBUILD_TASKS) \
/r:$(XBUILD_UTILITIES) \
/r:System.Core.dll
TEST_MCS_FLAGS =
TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
TEST_MCS_FLAGS += /r:Microsoft.Build.dll
TEST_LIB_REFS += Microsoft.Build
endif
EXTRA_DISTFILES = \
@@ -41,7 +27,7 @@ EXTRA_DISTFILES = \
Test/test-config-file*
Test/resources/test.dll: Test/resources/test.cs
$(CSCOMPILE) -target:library Test/resources/test.cs
$(CSCOMPILE) -target:library /out:$@ $<
clean-test-resources:
rm -f Test/resources/test.dll

View File

@@ -1,35 +0,0 @@
2007-02-02 Marek Sieradzki <marek.sieradzki@gmail.com>
* BuildResults.cs
* ProductBuilder.cs
* BootstrapperBuilder.cs
* ProductCollection.cs
* ProductBuilderCollection.cs
* BuildMessage.cs: corcompare changes.
2006-10-14 Marek Sieradzki <marek.sieradzki@gmail.com>
* ComponentsLocation.cs: Changed order to match MS.
* BootstrapperBuilder.cs: Added GetOutputFolders ().
* IProductCollection.cs, ProductCollection.cs: Changed indexer to
method.
2006-10-12 Marek Sieradzki <marek.sieradzki@gmail.com>
* IProductBuilderCollection.cs
* IBuildMessage.cs
* ComponentsLocation.cs
* BuildSettings.cs
* BuildResults.cs
* ProductBuilder.cs
* IProduct.cs
* IBuildSettings.cs
* IBuildResults.cs
* BootstrapperBuilder.cs
* ProductCollection.cs
* BuildMessageSeverity.cs
* IProductBuilder.cs
* ProductBuilderCollection.cs
* IBootstrapperBuilder.cs
* BuildMessage.cs
* IProductCollection.cs: Added stubs needed for generating docs.

View File

@@ -1,25 +0,0 @@
2007-02-02 Marek Sieradzki <marek.sieradzki@gmail.com>
* OutputMessageCollection.cs
* OutputMessage.cs
* AssemblyReferenceCollection.cs
* FileReferenceCollection.cs: corcompare changes.
2006-06-15 Marek Sieradzki <marek.sieradzki@gmail.com>
* UpdateUnit.cs, AssemblyReferenceType.cs, OutputMessageType.cs,
AssemblyIdentity.cs: Fixed enums order.
* DeployManifest.cs, Manifest.cs, FileReferenceCollection.cs: Added
missing abstract/sealed.
2006-06-14 Marek Sieradzki <marek.sieradzki@gmail.com>
* ApplicationIdentity.cs, ProxyStub.cs, OutputMessageCollection.cs,
UpdateUnit.cs, DeployManifest.cs, UpdateMode.cs, BaseReference.cs,
ManifestReader.cs, AssemblyIdentity.cs, ApplicationManifest.cs,
TrustInfo.cs, WindowClass.cs, AssemblyReference.cs, FileReference.cs,
AssemblyReferenceType.cs, ManifestWriter.cs, SecurityUtilities.cs,
ComClass.cs, OutputMessage.cs, Manifest.cs, AssemblyManifest.cs,
OutputMessageType.cs, TypeLib.cs, AssemblyReferenceCollection.cs,
FileReferenceCollection.cs: Added stubs.

View File

@@ -1,20 +0,0 @@
2006-02-26 Marek Sieradzki <marek.sieradzki@gmail.com>
* ICscHostObject.cs, IVbcHostObject.cs: Updated for the new API.
2005-09-22 Marek Sieradzki <marek.sieradzki@gmail.com>
* ICscHostObject.cs, IVbcHostObject.cs: Added #if NET_2_0.
2005-08-29 Marek Sieradzki <marek.sieradzki@gmail.com>
* CscHostObject.cs: Removed.
2005-08-12 Marek Sieradzki <marek.sieradzki@gmail.com>
* CscHostObject.cs: Added.
* ICscHostObject.cs: Updated.
2005-07-13 Marek Sieradzki <marek.sieradzki@gmail.com>
* ICscHostObject.cs, IVbcHostObject.cs: initial check-in

View File

@@ -185,7 +185,7 @@ namespace Microsoft.Build.Tasks
var cscParams = new CompilerParameters ();
cscParams.ReferencedAssemblies.Add ("Microsoft.Build.Framework.dll");
cscParams.ReferencedAssemblies.Add ("Microsoft.Build.Utilities.v4.0.dll"); // since we use Task, it depends on this dll.
cscParams.ReferencedAssemblies.AddRange (references.ToArray ());
cscParams.ReferencedAssemblies.AddRange (GetReferences (references, taskFactoryLoggingHost));
cscParams.GenerateInMemory = true;
var results = CodeDomProvider.CreateProvider (language).CompileAssemblyFromDom (cscParams, ccu);
var errors = new CompilerError [results.Errors.Count];
@@ -197,6 +197,36 @@ namespace Microsoft.Build.Tasks
assembly = results.CompiledAssembly;
return true;
}
static string[] GetReferences (List<string> references, IBuildEngine log)
{
var res = new List<string> ();
foreach (var r in references) {
if (File.Exists (r)) {
res.Add (r);
continue;
}
Assembly assembly = null;
try {
if (!r.EndsWith (".dll", StringComparison.OrdinalIgnoreCase) || !r.EndsWith (".exe", StringComparison.OrdinalIgnoreCase)) {
assembly = Assembly.LoadWithPartialName (r);
}
if (assembly != null) {
res.Add (assembly.Location);
continue;
}
} catch {
}
log.LogErrorEvent (new BuildErrorEventArgs ("", "", "", 0, 0, 0, 0, "Assembly reference {r} could not be resolved", "", ""));
}
return res.ToArray ();
}
public string FactoryName {
get { return "Code Task Factory"; }
}

View File

@@ -144,7 +144,11 @@ namespace Microsoft.Build.Tasks {
{
if (!string.IsNullOrEmpty (ToolPath))
return Path.Combine (ToolPath, ToolExe);
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
var possibleToolPath = ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
if (!string.IsNullOrEmpty(possibleToolPath))
return possibleToolPath;
return ToolLocationHelper.GetPathToDotNetFrameworkBinFile(ToolExe);
}
[MonoTODO]
@@ -215,7 +219,7 @@ namespace Microsoft.Build.Tasks {
protected override string ToolName {
get {
return "mcs.exe";
return MSBuildUtils.RunningOnWindows ? "mcs.bat" : "mcs.exe";
}
}

View File

@@ -142,7 +142,9 @@ namespace Microsoft.Build.Tasks
framework_dir = Path.Combine (redistlist_dir, framework_dir);
var directories = new List<string> ();
directories.Add (MSBuildUtils.FromMSBuildPath (framework_dir));
//MSBuild has a trailing slash on this value
directories.Add (MSBuildUtils.FromMSBuildPath (framework_dir) + Path.DirectorySeparatorChar);
string include = xr.GetAttribute ("IncludeFramework");
if (!String.IsNullOrEmpty (include)) {

View File

@@ -1,19 +0,0 @@
2006-10-08 Marek Sieradzki <marek.sieradzki@gmail.com>
* PoResourceWriter.cs: Changed "" to String.Empty.
2006-06-17 Marek Sieradzki <marek.sieradzki@gmail.com>
* PoResourceReader.cs, PoResourceWriter.cs, TxtResourceReader.cs,
TxtResourceWriter.cs: Copied authors from monoresgen.
2005-09-22 Marek Sieradzki <marek.sieradzki@gmail.com>
* PoResourceReader.cs, PoResourceWriter.cs, TxtResourceReader.cs,
TxtResourceWriter: Added #if NET_2_0.
2005-08-12 Marek Sieradzki <marek.sieradzki@gmail.com>
* PoResourceReader.cs, PoResourceWriter.cs, TxtResourceReader.cs,
TxtResourceWriter.cs: First implementation

View File

@@ -1,267 +0,0 @@
2010-07-09 Ankit Jain <jankit@novell.com>
* MessageTest (TestExecution): Additional messages with 'low'
importance get emitted, so don't expect sequential messages.
2010-04-06 Ankit Jain <jankit@novell.com>
* Consts.cs: Remove.
* AssignProjectConfigurationTest.cs:
* CreateCSharpManifestResourceNameTest.cs:
* CreateVisualBasicManifestResourceNameTest.cs:
* CreateItemTest.cs:
* FindAppConfigFileTest.cs:
* RemoveDuplicatesTest.cs:
* TaskBatchingTest.cs:
* WriteLinesToFileTest.cs:
Set the ToolsVersion to match the profile. Use the
full path to the tasks assembly for UsingTasks.
2010-03-04 Ankit Jain <jankit@novell.com>
* AssignTargetPathTest.cs (CreateProjectString): Remove the
unnecessary import of ms.common.targets .
2010-02-06 Ankit Jain <jankit@novell.com>
* LCTest.cs: New.
2010-02-05 Ankit Jain <jankit@novell.com>
* CreateCSharpManifestResourceNameTest.cs:
* CreateVisualBasicManifestResourceNameTest.cs:
Add new tests for TargetPath metadata.
2010-02-04 Ankit Jain <jankit@novell.com>
* WriteLinesToFileTest.cs: New.
2009-12-22 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (TestItemsWithWildcards): New.
2009-11-28 Ankit Jain <jankit@novell.com>
* TaskBatchingTest.cs: Add new tests for batching.
2009-11-28 Ankit Jain <jankit@novell.com>
* TaskBatchingTest.cs: Add new tests for batching, use on unbatched
items in a batching scenario.
2009-10-08 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs (CheckLoggedAny): New.
2009-10-08 Ankit Jain <jankit@novell.com>
* RemoveDuplicatesTest.cs: New.
2009-09-25 Ankit Jain <jankit@novell.com>
* FindAppConfigFileTest.cs: New.
2009-09-01 Ankit Jain <jankit@novell.com>
* TaskBatchingTest.cs: Add new tests for metadata refs found
in places other than task attributes.
2009-08-28 Ankit Jain <jankit@novell.com>
* CopyTest.cs (TestCopy_EmptySources): New.
(TestCopy_EmptyDestFolder): New.
2009-08-26 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (TestVariableExpansion): Update test to
use a transform with a item reference in a property.
2009-08-26 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (TestVariableExpansion): New.
* CreatePropertyTest.cs (TestExecution2): New.
2009-08-24 Ankit Jain <jankit@novell.com>
* CreateCSharpManifestResourceNameTest.cs:
* CreateVisualBasicManifestResourceNameTest.cs: Add tests for
folder name with spaces in it.
2009-07-23 Ankit Jain <jankit@novell.com>
* AssignProjectConfigurationTest.cs: New.
2009-06-08 Ankit Jain <jankit@novell.com>
* CreateCSharpManifestResourceNameTest.cs (TestInvalidCulture): New.
2009-06-07 Ankit Jain <jankit@novell.com>
* CscTest.cs (TestDefineConstants): Update DefineConstants to include
spaces also.
2009-06-07 Ankit Jain <jankit@novell.com>
* AssignTargetPathTest.cs: Update tests to not depend on a fixed
root (C:\) or cur dir.
2009-05-29 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs: Add counts for project/build start/finish
events.
2009-04-27 Ankit Jain <jankit@novell.com>
* CreateVisualBasicManifestResourceNameTest.cs: New.
2009-03-03 Ankit Jain <jankit@novell.com>
* CscTest.cs (DefineConstants): Add some extra semi-colons,
that should get removed on output.
(DefineConstants2): New. Test effectively empty define constants.
2009-02-25 Ankit Jain <jankit@novell.com>
* CreateCSharpManifestResourceNameTest.cs (CheckResourceNames):
Refactor a bit to improve error reporting.
Update to use Path.Combine instead of hardcoding "\".
2009-02-24 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs (CheckLoggedMessageHead): Move here from
* TaskBatchingTest.cs: .. here. Track api change.
2009-02-21 Ankit Jain <jankit@novell.com>
* CopyTest.cs: New.
2009-01-31 Ankit Jain <jankit@novell.com>
* TaskBatchingTest.cs (*): Add tests for target/task events.
(TestTargetBatching*): New tests for target batching.
* TestMessageLogger.cs: Add counts for target/task started/finished
events.
(NormalMessageCount): New.
2008-12-22 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs: Emit debug messages to stderr.
* CreateCSharpManifestResourceNameTest.cs: Likewise.
Revert last patch, don't emit to stderr, monobuild emits
the log contents now.
2008-12-22 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs: Emit debug messages to stderr.
* CreateCSharpManifestResourceNameTest.cs: Likewise.
2008-12-22 Ankit Jain <jankit@novell.com>
* TestMessageLogger.cs: Listen for errors and warnings also.
* CreateCSharpManifestResourceNameTest.cs: Emit helpful info when tests
fail.
2008-12-12 Ankit Jain <jankit@novell.com>
* CreateCSharpManifestResourceNameTest.cs: New.
2008-11-27 Ankit Jain <jankit@novell.com>
* AssignCultureTest.cs: Add tests for "Culture" metadata.
2008-11-23 Ankit Jain <jankit@novell.com>
* AssignCultureTest.cs: New.
2008-11-22 Ankit Jain <jankit@novell.com>
* AssignTargetPathTest.cs: New.
2008-11-21 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (CheckBuildItem): Make public.
* TestMessageLogger.cs:
* TaskBatchingTests.cs: Fix file mode.
2008-11-21 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (TestNullFields): New.
(CheckBuildItem): Make public, used by batching tests.
* MessageTest.cs (TestDefaultValues): New.
(TestMessageLogger): Move to ..
* TestMessageLogger.cs: .. here.
* TaskBatchingTests.cs: New. Tests for batching implementation.
2008-11-11 Jonathan Chambers <joncham@gmail.com>
* DeleteTest.cs: Added tests for Delete task.
2008-10-09 Ankit Jain <jankit@novell.com>
* CreateItemTest.cs (TestExcludeAndCondition): New. NotWorking.
2008-08-06 Ankit Jain <jankit@novell.com>
* CscTest.cs: Alter tests to checking for quoting in various switches.
2008-06-02 Atsushi Enomoto <atsushi@ximian.com>
* ResolveAssemblyReferenceTest.cs: marked some failing tests as
[Ignore]. They will never be successful when mono is not
"installed".
2007-03-19 Marek Sieradzki <marek.sieradzki@gmail.com>
* CombinePathTest.cs: Added.
2007-03-17 Marek Sieradzki <marek.sieradzki@gmail.com>
* Consts.cs: Check for runtime not platform.
* ResolveAssemblyReferenceTest.cs: Pass valid SearchPaths.
2007-02-18 Marek Sieradzki <marek.sieradzki@gmail.com>
* ResolveAssemblyReferenceTest.cs: Added.
2006-12-11 Marek Sieradzki <marek.sieradzki@gmail.com>
* GetFrameworkSdkPath.cs, GetFrameworkPath.cs, CreateItemTest.cs,
CreatePropertyTest.cs, RemoveDirTest.cs: Added.
* MakeDirTest.cs: Added check for task's output.
2006-12-08 Marek Sieradzki <marek.sieradzki@gmail.com>
* MakeDirTest.cs, CscTest.cs: Added.
* ManagedCompilerTest.cs: Enabled some NotWorking tests related to
Csc.
2006-12-05 Marek Sieradzki <marek.sieradzki@gmail.com>
* ManagedCompilerTest (TestSources ()): Enabled.
2006-12-04 Marek Sieradzki <marek.sieradzki@gmail.com>
* ALTest.cs, ManagedCompilerTest.cs: New tests.
* Consts.cs: Added a platform check.
* TestEngine.cs: Class that acts like IBuildEngine implementation from
Microsoft.Build.BuildEngine.
2006-06-17 Marek Sieradzki <marek.sieradzki@gmail.com>
* ErrorTest.cs: Added check for Execute () return value.
2006-05-26 Marek Sieradzki <marek.sieradzki@gmail.com>
* MessageTest.cs: Corrected.
* WarningTest.cs: Added.
* ErrorTest.cs: Added new test.
2006-05-22 Marek Sieradzki <marek.sieradzki@gmail.com>
* Consts.cs: Moved BinPath here.
* MessageTest.cs: Added new test.
2006-05-03 Marek Sieradzki <marek.sieradzki@gmail.com>
* ErrorTest.cs: Added.