Author: brett
Date: Mon Mar 11 13:33:47 2013
New Revision: 1455135
URL: http://svn.apache.org/r1455135
Log:
[NPANDAY-452] remove GAC dependencies from Silverlight import
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
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/pom.test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1455135&r1=1455134&r2=1455135&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
Mon Mar 11 13:33:47 2013
@@ -308,7 +308,7 @@ namespace NPanday.ProjectImporter.Digest
// complete name
reference.SetAssemblyInfoValues(buildItem.Include);
}
- else if
(!rsp.IsRspIncluded(buildItem.Include,projectDigest.Language) &&
projectDigest.DependencySearchConfig.SearchGac)
+ else if
(!rsp.IsRspIncluded(buildItem.Include,projectDigest.Language) &&
projectDigest.DependencySearchConfig.SearchGac &&
projectDigest.TargetFrameworkIdentifier != "Silverlight")
{
// simple name needs to be resolved
List<string> refs =
GacUtility.GetInstance().GetAssemblyInfo(buildItem.Include, null, null);
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=1455135&r1=1455134&r2=1455135&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
Mon Mar 11 13:33:47 2013
@@ -27,17 +27,5 @@
<version>1.2.3-SNAPSHOT</version>
<type>dotnet-library</type>
</dependency>
- <dependency>
- <groupId>System.Windows</groupId>
- <artifactId>System.Windows</artifactId>
- <version>4.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- <dependency>
- <groupId>System.Net</groupId>
- <artifactId>System.Net</artifactId>
- <version>3.5.0.0</version>
- <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=1455135&r1=1455134&r2=1455135&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
Mon Mar 11 13:33:47 2013
@@ -20,18 +20,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>System.Windows</groupId>
- <artifactId>System.Windows</artifactId>
- <version>4.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- <dependency>
- <groupId>System.Net</groupId>
- <artifactId>System.Net</artifactId>
- <version>3.5.0.0</version>
- <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=1455135&r1=1455134&r2=1455135&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
Mon Mar 11 13:33:47 2013
@@ -20,18 +20,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>System.Windows</groupId>
- <artifactId>System.Windows</artifactId>
- <version>4.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- <dependency>
- <groupId>System.Net</groupId>
- <artifactId>System.Net</artifactId>
- <version>3.5.0.0</version>
- <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=1455135&r1=1455134&r2=1455135&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
Mon Mar 11 13:33:47 2013
@@ -20,24 +20,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>mscorlib</groupId>
- <artifactId>mscorlib</artifactId>
- <version>2.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- <dependency>
- <groupId>System.Windows</groupId>
- <artifactId>System.Windows</artifactId>
- <version>4.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- <dependency>
- <groupId>System.Net</groupId>
- <artifactId>System.Net</artifactId>
- <version>4.0.0.0</version>
- <type>dotnet-library</type>
- </dependency>
- </dependencies>
</project>
