Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r508 - trunk/Source: . MSBuild.Community.Tasks MSBuild.Community.Tasks.Setup MSBuild.Community.Tasks.Tests MSBuild.Community.Tasks.Tests/ILMerge MSBuild.Community.Tasks.Tests/ILMerge/A MSBuild.Community.Tasks.Tests/ILMerge/B MSBuild.Community.Tasks.Tests/Regex MSBuild.Community.Tasks/Properties MSBuild.Community.Tasks/Regex

msbuildtasks
Discussion topic

Back to topic list

svn commit: r508 - trunk/Source: . MSBuild.Community.Tasks MSBuild.Community.Tasks.Setup MSBuild.Community.Tasks.Tests MSBuild.Community.Tasks.Tests/ILMerge MSBuild.Community.Tasks.Tests/ILMerge/A MSBuild.Community.Tasks.Tests/ILMerge/B MSBuild.Community.Tasks.Tests/Regex MSBuild.Community.Tasks/Properties MSBuild.Community.Tasks/Regex

Author pwelter34
Full name Paul Welter
Date 2010-11-29 17:36:54 PST
Message Author: pwelter34 Date: 2010-11-29 17:36:53-0800 New Revision: 508 Added: trunk/Source/MSBuild.Community.Tasks.Setup/MSBuild.png (contents, props changed) trunk/Source/RegularExpressions.xml (contents, props changed) Modified: trunk/Source/MSBuild.Community.Tasks.Setup/ (props changed) trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.sln trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/B/B.csproj trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/ILMergeTest.cs trunk/Source/MSBuild.Community.Tasks.Tests/MSBuild.Community.Tasks.Tests.csproj trunk/Source/MSBuild.Community.Tasks.Tests/Regex/RegexCompilerTest.cs trunk/Source/MSBuild.Community.Tasks.sln trunk/Source/MSBuild.Community.Tasks/MSBuild.Community.Tasks.csproj trunk/Source/MSBuild.Community.Tasks/Properties/AssemblyInfoCommon.cs trunk/Source/MSBuild.Community.Tasks/Properties/Resources.Designer.cs trunk/Source/MSBuild.Community.Tasks/Regex/RegexCompiler.cs trunk/Source/Task.proj Log: - update to vs 2010 Added: trunk/Source/MSBuild.Community.Tasks.Setup/MSBuild.png Url: http://msbuildtasks.tigris.org/source/browse/msbuildtasks/trunk/Source/MSBuild.Community.Tasks.Setup/MSBuild.png?view=markup&pathrev=508 ============================================================================== Binary file. No diff available. Modified: trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.sln Url: http://msbuildtasks.tigris.org/source/browse/msbuildtasks/trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.sln?view=diff&pathrev=508&r1=507&r2=508 ============================================================================== --- trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.sln (original) +++ trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.sln 2010-11-29 17:36:53-0800 @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MSBuildTasks", "MSBuildTasks.wixproj", "{6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}" EndProject Global @@ -9,10 +9,8 @@ Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Release|Any CPU.Build.0 = Release|Any CPU + {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6E293DB7-B1E3-4CEA-AB94-79A979F91AF5}.Release|Any CPU.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj Url: http://msbuildtasks.tigris.org/source/browse/msbuildtasks/trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj?view=diff&pathrev=508&r1=507&r2=508 ============================================================================== --- trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj (original) +++ trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj 2010-11-29 17:36:53-0800 @@ -1,18 +1,20 @@ - + + Debug - 3.0 + x86 + 3.5 {6e293db7-b1e3-4cea-ab94-79a979f91af5} 2.0 MSBuild.Community.Tasks Package - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets - $(ProgramFiles)\Windows Installer XML v3\bin\ + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix2010.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix2010.targets MSBuildTasks - - bin\Debug\ - obj\Debug\ + + bin\$(Configuration)\ + obj\$(Configuration)\ Debug False @@ -53,9 +55,9 @@ False False - - bin\Release - obj\Release\ + + bin\$(Configuration)\ + obj\$(Configuration)\ en-US Debug False @@ -77,17 +79,21 @@ - - C:\Program Files\Windows Installer XML v3\bin\WixNetFxExtension.dll - - - C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll - - C:\Program Files\Windows Installer XML v3\bin\WixUtilExtension.dll + C:\Program Files (x86)\Windows Installer XML v3.5\bin\WixUtilExtension.dll + WixUtilExtension - C:\Program Files\Windows Installer XML v3\bin\WixVSExtension.dll + C:\Program Files (x86)\Windows Installer XML v3.5\bin\WixVSExtension.dll + WixVSExtension + + + C:\Program Files (x86)\Windows Installer XML v3.5\bin\WixUIExtension.dll + WixUIExtension + + + C:\Program Files (x86)\Windows Installer XML v3.5\bin\WixNetFxExtension.dll + WixNetFxExtension Modified: trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs Url: http://msbuildtasks.tigris.org/source/browse/msbuildtasks/trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs?view=diff&pathrev=508&r1=507&r2=508 ============================================================================== --- trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs (original) +++ trunk/Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs 2010-11-29 17:36:53-0800 @@ -52,7 +52,7 @@ + Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS" Name="ProductDir" > @@ -65,7 +65,7 @@ + Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS" Name="ProductDir" > @@ -78,7 +78,7 @@ + Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="ProductDir" > @@ -91,7 +91,7 @@ + Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="ProductDir" > @@ -102,8 +102,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,12 +147,15 @@ + + + @@ -160,6 +190,7 @@ Sequence="1"> + @@ -193,6 +224,40 @@ Sequence="1"> + + + + + + + + + + + + + @@ -240,6 +305,17 @@ VS90DEVENV + + + VS2010DEVENV + + + Modified: trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj Url: http://msbuildtasks.tigris.org/source/browse/msbuildtasks/trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj?view=diff&pathrev=508&r1=507&r2=508 ============================================================================== --- trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj (original) +++ trunk/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj 2010-11-29 17:36:53-0800 @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,9 +12,25 @@ A - 2.0 + 3.5 + v2.0 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -24,6 +41,7 @@ prompt 4 bin\Debug\A.XML + AllRules.ruleset pdbonly @@ -32,6 +50,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -44,6 +63,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +