Author: brett
Date: Sat Mar 2 01:51:15 2013
New Revision: 1451816
URL: http://svn.apache.org/r1451816
Log:
[NPANDAY-578] don't look in the GAC for Silverlight dependencies
Silverlight provides its own variants of each, so retrieving these would be
incorrect.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication2/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightClassLibrary1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5/pom.test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs
Sat Mar 2 01:51:15 2013
@@ -92,6 +92,8 @@ namespace NPanday.ProjectImporter.Conver
//Add EmbeddedResources maven-resgen-plugin
AddEmbeddedResources();
+ // do not resolve any dependencies from the GAC for silverlight
projects
+ projectDigest.DependencySearchConfig.SearchGac = false;
// Add Project Inter-dependencies
AddInterProjectDependenciesToList();
@@ -104,7 +106,7 @@ namespace NPanday.ProjectImporter.Conver
PomHelperUtility.WriteModelToPom(new
FileInfo(Path.GetDirectoryName(projectDigest.FullFileName) + @"\pom.xml"),
Model);
}
}
-
+
protected override Dictionary<string, string>
GetTargetFrameworkDirectories()
{
if (TargetFrameworkDirectories == null)
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
Sat Mar 2 01:51:15 2013
@@ -61,22 +61,19 @@
<groupId>System.Web.DynamicData</groupId>
<artifactId>System.Web.DynamicData</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>31bf3856ad364e35</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Web.Entity</groupId>
<artifactId>System.Web.Entity</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b77a5c561934e089</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Web.ApplicationServices</groupId>
<artifactId>System.Web.ApplicationServices</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>31bf3856ad364e35</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>test.group</groupId>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test
Sat Mar 2 01:51:15 2013
@@ -31,15 +31,13 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>gac_msil</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication2/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication2/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication2/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication2/pom.test
Sat Mar 2 01:51:15 2013
@@ -25,15 +25,13 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>gac_msil</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightClassLibrary1/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightClassLibrary1/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightClassLibrary1/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightClassLibrary1/pom.test
Sat Mar 2 01:51:15 2013
@@ -25,15 +25,13 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>gac_msil</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
Sat Mar 2 01:51:15 2013
@@ -61,22 +61,19 @@
<groupId>System.Web.DynamicData</groupId>
<artifactId>System.Web.DynamicData</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>31bf3856ad364e35</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Web.Entity</groupId>
<artifactId>System.Web.Entity</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b77a5c561934e089</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Web.ApplicationServices</groupId>
<artifactId>System.Web.ApplicationServices</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>31bf3856ad364e35</classifier>
+ <type>dotnet-library</type>
</dependency>
</dependencies>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5/pom.test?rev=1451816&r1=1451815&r2=1451816&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5/pom.test
Sat Mar 2 01:51:15 2013
@@ -25,22 +25,19 @@
<groupId>mscorlib</groupId>
<artifactId>mscorlib</artifactId>
<version>2.0.0.0</version>
- <type>gac_32_4</type>
- <classifier>b77a5c561934e089</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>4.0.0.0</version>
- <type>gac_msil4</type>
- <classifier>b03f5f7f11d50a3a</classifier>
+ <type>dotnet-library</type>
</dependency>
</dependencies>
</project>
