Author: brett Date: Thu Mar 7 13:19:50 2013 New Revision: 1453855 URL: http://svn.apache.org/r1453855 Log: [NPANDAY-452] only actual Silverlight projects skip GAC
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/SilverlightPomConverter.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebPomConverter.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/SilverlightApplication5/SilverlightApplication5.Web/pom.test Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1453855&r1=1453854&r2=1453855&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs Thu Mar 7 13:19:50 2013 @@ -484,9 +484,9 @@ namespace NPanday.ProjectImporter.Conver } } - protected virtual Dependency GetProjectReferenceDependency(Reference reference) + protected virtual Dependency GetProjectReferenceDependency(Reference reference, bool searchGac) { - Dependency refDependency = ResolveDependency(reference); + Dependency refDependency = ResolveDependency(reference, searchGac); if (refDependency == null) { missingReferences.Add(reference); @@ -512,11 +512,11 @@ namespace NPanday.ProjectImporter.Conver return refDependency; } - protected void AddProjectReferenceDependenciesToList() + protected void AddProjectReferenceDependenciesToList(bool searchGac) { foreach (Reference reference in projectDigest.References) { - Dependency dep = GetProjectReferenceDependency(reference); + Dependency dep = GetProjectReferenceDependency(reference, searchGac); if (dep != null) { AddDependency(dep); @@ -758,7 +758,7 @@ namespace NPanday.ProjectImporter.Conver } - protected Dependency ResolveDependency(Reference reference) + protected Dependency ResolveDependency(Reference reference, bool searchGac) { // For MSbuild, the typical order is as follows (from Microsoft.Common.targets): // (1) Files from current project - indicated by {CandidateAssemblyFiles} @@ -797,7 +797,7 @@ namespace NPanday.ProjectImporter.Conver refDependency = ResolveDependencyFromDirectories(reference, GetTargetFrameworkAssemblyFoldersEx(), "extra assembly folder", true); // resolve from GAC - if (refDependency == null && projectDigest.DependencySearchConfig.SearchGac) + if (refDependency == null && searchGac) refDependency = ResolveDependencyFromGAC(reference); if (refDependency == null) Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs?rev=1453855&r1=1453854&r2=1453855&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs Thu Mar 7 13:19:50 2013 @@ -77,7 +77,7 @@ namespace NPanday.ProjectImporter.Conver // Add Project Reference Dependencies // override the one from the parent to add new types for Azure - AddProjectReferenceDependenciesToList(); + AddProjectReferenceDependenciesToList(true); Plugin plugin = AddPlugin("org.apache.npanday.plugins", "azure-maven-plugin"); if (!string.IsNullOrEmpty(projectDigest.TargetFramework)) 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=1453855&r1=1453854&r2=1453855&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 Thu Mar 7 13:19:50 2013 @@ -225,7 +225,7 @@ namespace NPanday.ProjectImporter.Conver // filter the rsp included assemblies FilterReferences(); // Add Project Reference Dependencies - AddProjectReferenceDependenciesToList(); + AddProjectReferenceDependenciesToList(true); if (writePom) { 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=1453855&r1=1453854&r2=1453855&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 Thu Mar 7 13:19:50 2013 @@ -92,14 +92,12 @@ 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(); // Add Project Reference Dependencies - AddProjectReferenceDependenciesToList(); + // do not resolve any dependencies from the GAC for silverlight projects + AddProjectReferenceDependenciesToList(false); if (writePom) { Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebPomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebPomConverter.cs?rev=1453855&r1=1453854&r2=1453855&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebPomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebPomConverter.cs Thu Mar 7 13:19:50 2013 @@ -173,9 +173,9 @@ namespace NPanday.ProjectImporter.Conver // override to insert only an NPanday artifact - protected override Dependency GetProjectReferenceDependency(Reference reference) + protected override Dependency GetProjectReferenceDependency(Reference reference, bool searchGac) { - Dependency dep = base.GetProjectReferenceDependency(reference); + Dependency dep = base.GetProjectReferenceDependency(reference, searchGac); if (dep != null) { if (!("library".Equals(dep.type, StringComparison.OrdinalIgnoreCase) 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=1453855&r1=1453854&r2=1453855&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 Thu Mar 7 13:19:50 2013 @@ -61,19 +61,22 @@ <groupId>System.Web.DynamicData</groupId> <artifactId>System.Web.DynamicData</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>31bf3856ad364e35</classifier> </dependency> <dependency> <groupId>System.Web.Entity</groupId> <artifactId>System.Web.Entity</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>b77a5c561934e089</classifier> </dependency> <dependency> <groupId>System.Web.ApplicationServices</groupId> <artifactId>System.Web.ApplicationServices</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>31bf3856ad364e35</classifier> </dependency> <dependency> <groupId>test.group</groupId> 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=1453855&r1=1453854&r2=1453855&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 Thu Mar 7 13:19:50 2013 @@ -61,19 +61,22 @@ <groupId>System.Web.DynamicData</groupId> <artifactId>System.Web.DynamicData</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>31bf3856ad364e35</classifier> </dependency> <dependency> <groupId>System.Web.Entity</groupId> <artifactId>System.Web.Entity</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>b77a5c561934e089</classifier> </dependency> <dependency> <groupId>System.Web.ApplicationServices</groupId> <artifactId>System.Web.ApplicationServices</artifactId> <version>4.0.0.0</version> - <type>dotnet-library</type> + <type>gac_msil4</type> + <classifier>31bf3856ad364e35</classifier> </dependency> </dependencies> </project>