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 2012/01/19 06:10:06 UTC

svn commit: r1233192 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test: csharp/ImporterTests/WpfApplicationTest.cs resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj

Author: brett
Date: Thu Jan 19 06:10:06 2012
New Revision: 1233192

URL: http://svn.apache.org/viewvc?rev=1233192&view=rev
Log:
test actually just requires .NET 4.0 SDK

Modified:
    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WpfApplicationTest.cs
    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WpfApplicationTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WpfApplicationTest.cs?rev=1233192&r1=1233191&r2=1233192&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WpfApplicationTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/WpfApplicationTest.cs Thu Jan 19 06:10:06 2012
@@ -26,6 +26,14 @@ namespace NPanday.ProjectImporter.Import
     [TestFixture]
     public class WpfApplicationTest : AbstractProjectImportTest
     {
+        public override void CheckFrameworkVersion()
+        {
+            if (Environment.Version.Major < 4)
+            {
+                Assert.Ignore("Test only runs on .NET 4.0, but is: " + Environment.Version.ToString());
+            }
+        }
+
         public override string SolutionFileRelativePath
         {
             get { return @"WpfApplication1\WpfApplication1.sln"; }

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj?rev=1233192&r1=1233191&r2=1233192&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/WpfApplication1.csproj Thu Jan 19 06:10:06 2012
@@ -95,7 +95,7 @@
   <ItemGroup>
     <WebReferences Include="Web References\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="exists('$(MSBuildToolsPath)\Microsoft.CSharp.targets')"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">