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 2014/03/03 02:43:55 UTC
svn commit: r1573429 - in /incubator/npanday/trunk:
dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/
dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrow...
Author: brett
Date: Mon Mar 3 02:43:55 2014
New Revision: 1573429
URL: http://svn.apache.org/r1573429
Log:
[NPANDAY-609] remove obsolete files
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/pom.xml
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs?rev=1573429&r1=1573428&r2=1573429&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs Mon Mar 3 02:43:55 2014
@@ -128,7 +128,7 @@ namespace NPanday.ProjectImporter.Conver
// ignore AnyCPU or unknown values
if (projectDigest.Platform == "x64" || projectDigest.Platform == "x86" || projectDigest.Platform == "Itanium")
platform = projectDigest.Platform;
-
+
string configuration = projectDigest.Configuration;
if (msBuildPlugin == null)
@@ -139,20 +139,7 @@ namespace NPanday.ProjectImporter.Conver
AddPluginConfiguration(msBuildPlugin, "platform", platform);
if (configuration != null && configuration != "Debug")
AddPluginConfiguration(msBuildPlugin, "configuration", configuration);
- }
-
- //set the path *.g.cs and *.g.vb files depending on target architecture of WPF projects as this changes path under obj folder
- string gFile = "obj";
- if (platform != null)
- gFile += "\\" + platform;
- gFile += "\\" + configuration + "\\";
-
- if (compilesFile.EndsWith(".cs"))
- gFile += compilesFile.Replace(".xaml.cs", ".g.cs");
- else
- gFile += compilesFile.Replace(".xaml.vb", ".g.vb");
-
- compiles.Add(gFile);
+ }
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest/pom.test?rev=1573429&r1=1573428&r2=1573429&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_580_WpfBrowserTest/NPANDAY_580_WpfBrowserTest/pom.test Mon Mar 3 02:43:55 2014
@@ -22,9 +22,7 @@
<define>DEBUG;TRACE</define>
<includeSources>
<includeSource>App.xaml.cs</includeSource>
- <includeSource>obj\Debug\App.g.cs</includeSource>
<includeSource>Page1.xaml.cs</includeSource>
- <includeSource>obj\Debug\Page1.g.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
<includeSource>Properties\Resources.Designer.cs</includeSource>
<includeSource>Properties\Settings.Designer.cs</includeSource>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test?rev=1573429&r1=1573428&r2=1573429&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test Mon Mar 3 02:43:55 2014
@@ -22,9 +22,7 @@
<define>DEBUG;TRACE</define>
<includeSources>
<includeSource>App.xaml.cs</includeSource>
- <includeSource>obj\x86\Debug\App.g.cs</includeSource>
<includeSource>MainWindow.xaml.cs</includeSource>
- <includeSource>obj\x86\Debug\MainWindow.g.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
<includeSource>Properties\Resources.Designer.cs</includeSource>
<includeSource>Properties\Settings.Designer.cs</includeSource>
Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/pom.xml?rev=1573429&r1=1573428&r2=1573429&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/pom.xml (original)
+++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/it/IT001/WpfApplicationExample/pom.xml Mon Mar 3 02:43:55 2014
@@ -40,9 +40,7 @@
<frameworkVersion>3.5</frameworkVersion>
<includeSources>
<includeSource>App.xaml.cs</includeSource>
- <includeSource>obj\Debug\App.g.cs</includeSource>
<includeSource>Window1.xaml.cs</includeSource>
- <includeSource>obj\Debug\Window1.g.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
<includeSource>Properties\Resources.Designer.cs</includeSource>
<includeSource>Properties\Settings.Designer.cs</includeSource>