You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2011/12/06 13:42:49 UTC
svn commit: r1210911 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test:
csharp/ImporterTests/
resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/
resource/WebSiteWithCSProj/WebApplication1/
Author: brett
Date: Tue Dec 6 13:42:48 2011
New Revision: 1210911
URL: http://svn.apache.org/viewvc?rev=1210911&view=rev
Log:
try again to use conditional instead of installation of MVC as a guide - as it actually requires more of Visual Studio installed to access the file
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1210911&r1=1210910&r2=1210911&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs Tue Dec 6 13:42:48 2011
@@ -141,15 +141,15 @@ namespace NPanday.ProjectImporter.Import
public void CheckWebMVC()
{
// check MVC 2 installed
- string name = "System.Web.MVC, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL";
- try
- {
- Assembly.ReflectionOnlyLoad(new System.Reflection.AssemblyName(name).FullName);
- }
- catch
- {
- Assert.Ignore("Test only runs with MVC 2 installed");
- }
+// string name = "System.Web.MVC, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL";
+// try
+// {
+// Assembly.ReflectionOnlyLoad(new System.Reflection.AssemblyName(name).FullName);
+// }
+// catch
+// {
+// Assert.Ignore("Test only runs with MVC 2 installed");
+// }
}
[Test]
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj?rev=1210911&r1=1210910&r2=1210911&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/SubLevelWebApplication.vbproj Tue Dec 6 13:42:48 2011
@@ -130,7 +130,7 @@ under the License.
<WebReferences Include="Web References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets')"/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj?rev=1210911&r1=1210910&r2=1210911&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/WebApplication1.csproj Tue Dec 6 13:42:48 2011
@@ -72,7 +72,7 @@ under the License.
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets"/>
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets')"/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">