Author: brett
Date: Sat Mar 2 01:43:12 2013
New Revision: 1451813
URL: http://svn.apache.org/r1451813
Log:
[NPANDAY-578] add options to enable framework directory search
These are disabled by default to retain previous behaviour, and minimise the
number of the hardcoded paths that are typically exposed. The tests also keep
this mode at the moment to reduce the chance of failures due to a different
environment where they are being run.
Added:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
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/Digest/Model/ProjectDigest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
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
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
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=1451813&r1=1451812&r2=1451813&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
Sat Mar 2 01:43:12 2013
@@ -778,15 +778,15 @@ namespace NPanday.ProjectImporter.Conver
refDependency = ResolveDependencyFromHintPath(reference);
// resolve from target framework directories
- if (refDependency == null)
+ if (refDependency == null &&
projectDigest.DependencySearchConfig.SearchFramework)
refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkDirectories());
// resolve from registered assembly directories
- if (refDependency == null)
+ if (refDependency == null &&
projectDigest.DependencySearchConfig.SearchReferenceAssemblies)
refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkAssemblyFoldersEx());
// resolve from GAC
- if (refDependency == null)
+ if (refDependency == null &&
projectDigest.DependencySearchConfig.SearchGac)
refDependency = ResolveDependencyFromGAC(reference);
if (refDependency == null)
Added:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs?rev=1451813&view=auto
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
(added)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
Sat Mar 2 01:43:12 2013
@@ -0,0 +1,39 @@
+#region Apache License, Version 2.0
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NPanday.ProjectImporter
+{
+ public class DependencySearchConfiguration
+ {
+ private bool searchFramework = false;
+ public bool SearchFramework { get { return searchFramework; } set {
searchFramework = value; } }
+
+ private bool searchReferenceAssemblies = false;
+ public bool SearchReferenceAssemblies { get { return
searchReferenceAssemblies; } set { searchReferenceAssemblies = value; } }
+
+ private bool searchGac = true;
+ public bool SearchGac { get { return searchGac; } set { searchGac =
value; } }
+ }
+}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
Sat Mar 2 01:43:12 2013
@@ -600,5 +600,11 @@ namespace NPanday.ProjectImporter.Digest
set { silverlightVersion = value; }
}
+ private DependencySearchConfiguration dependencySearchConfig;
+ internal DependencySearchConfiguration DependencySearchConfig
+ {
+ get { return dependencySearchConfig; }
+ set { dependencySearchConfig = value; }
+ }
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday.ProjectImporterEngine.csproj
Sat Mar 2 01:43:12 2013
@@ -59,6 +59,7 @@
<Compile Include="Converter\Algorithms\AzureWorkerPomConverter.cs" />
<Compile Include="Converter\Algorithms\SilverlightPomConverter.cs" />
<Compile
Include="Converter\Algorithms\WebWithVbOrCsProjectFilePomConverter.cs" />
+ <Compile Include="DependencySearchConfiguration.cs" />
<Compile Include="Digest\Algorithms\BaseProjectDigestAlgorithm.cs" />
<Compile Include="Digest\Model\ComReference.cs" />
<Compile Include="Digest\Model\SilverlightApplicationReference.cs" />
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
Sat Mar 2 01:43:12 2013
@@ -118,13 +118,13 @@ namespace NPanday.ProjectImporter
/// <returns>An array of generated pom.xml filenames</returns>
public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag, bool verifyTests,
bool useMsDeploy, ref string warningMsg)
{
- return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, verifyTests, useMsDeploy, null, null, ref warningMsg);
+ return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, verifyTests, useMsDeploy, null, null, null, ref warningMsg);
}
- public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag, bool verifyTests,
bool useMsDeploy, string configuration, string cloudConfig, ref string
warningMsg)
+ public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag, bool verifyTests,
bool useMsDeploy, string configuration, string cloudConfig,
DependencySearchConfiguration depSearchConfig, ref string warningMsg)
{
VerifyProjectToImport method = verifyTests ?
VerifyUnitTestsToUser.VerifyTests : (VerifyProjectToImport)null;
- return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, method, useMsDeploy, configuration, cloudConfig, ref warningMsg);
+ return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, method, useMsDeploy, configuration, cloudConfig, depSearchConfig, ref
warningMsg);
}
/// <summary>
@@ -169,7 +169,7 @@ namespace NPanday.ProjectImporter
/// <returns>An array of generated pom.xml filenames</returns>
public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag,
VerifyProjectToImport verifyProjectToImport, ref string warningMsg)
{
- return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, verifyProjectToImport, false, null, null, ref warningMsg);
+ return ImportProject(solutionFile, groupId, artifactId, version,
scmTag, verifyProjectToImport, false, null, null, null, ref warningMsg);
}
/// <summary>
@@ -184,7 +184,7 @@ namespace NPanday.ProjectImporter
/// <param name="verifyProjectToImport">A delegate That will Accept a
method for verifying Projects To Import</param>
/// <param name="scmTag">adds scm tags to parent pom.xml if not
string.empty or null</param>
/// <returns>An array of generated pom.xml filenames</returns>
- public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag,
VerifyProjectToImport verifyProjectToImport, bool useMsDeploy, string
configuration, string cloudConfig, ref string warningMsg)
+ public static string[] ImportProject(string solutionFile, string
groupId, string artifactId, string version, string scmTag,
VerifyProjectToImport verifyProjectToImport, bool useMsDeploy, string
configuration, string cloudConfig, DependencySearchConfiguration
depSearchConfig, ref string warningMsg)
{
string[] result = null;
@@ -221,6 +221,7 @@ namespace NPanday.ProjectImporter
// set the project flag so that converters can look at it
later
pDigest.UseMsDeploy = useMsDeploy;
pDigest.CloudConfig = cloudConfig;
+ pDigest.DependencySearchConfig = depSearchConfig != null ?
depSearchConfig : new DependencySearchConfiguration();
filteredPrjDigests.Add(pDigest);
}
else
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
Sat Mar 2 01:43:12 2013
@@ -22,6 +22,7 @@ using System.IO;
using NUnit.Framework;
+using NPanday.ProjectImporter;
namespace NPanday.ProjectImporter.ImporterTests
{
@@ -60,6 +61,11 @@ namespace NPanday.ProjectImporter.Import
get { return null; }
}
+ public virtual DependencySearchConfiguration DepSearchConfig
+ {
+ get { return null; }
+ }
+
[Test]
[TestFixtureSetUp]
public void ShouldBeAbleImportProject()
@@ -76,7 +82,7 @@ namespace NPanday.ProjectImporter.Import
try
{
string warnMsg = string.Empty;
- generatedPomFiles =
NPandayImporter.ImportProject(solutionFile, "test.group", "test-parent",
"1.2.3-SNAPSHOT", string.Empty, false, UseMsDeploy, SelectedConfiguration,
CloudConfiguration, ref warnMsg);
+ generatedPomFiles =
NPandayImporter.ImportProject(solutionFile, "test.group", "test-parent",
"1.2.3-SNAPSHOT", string.Empty, false, UseMsDeploy, SelectedConfiguration,
CloudConfiguration, DepSearchConfig, ref warnMsg);
}
catch (Exception e)
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test
Sat Mar 2 01:43:12 2013
@@ -62,86 +62,71 @@
<groupId>System.Data.Entity</groupId>
<artifactId>System.Data.Entity</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Data.Entity.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b77a5c561934e089</classifier>
</dependency>
<dependency>
<groupId>System.Web.Mvc</groupId>
<artifactId>System.Web.Mvc</artifactId>
<version>3.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.ASPNETMVC3}/System.Web.Mvc.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.Web.WebPages</groupId>
<artifactId>System.Web.WebPages</artifactId>
<version>1.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.ASPNETWebPages}/System.Web.WebPages.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.Web.Helpers</groupId>
<artifactId>System.Web.Helpers</artifactId>
<version>1.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.ASPNETWebPages}/System.Web.Helpers.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.Web.DynamicData</groupId>
<artifactId>System.Web.DynamicData</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.DynamicData.dll</systemPath>
+ <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>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Web.Entity.dll</systemPath>
+ <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>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.ApplicationServices.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.ComponentModel.DataAnnotations</groupId>
<artifactId>System.ComponentModel.DataAnnotations</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.ComponentModel.DataAnnotations.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.Web.Abstractions</groupId>
<artifactId>System.Web.Abstractions</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.Abstractions.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>System.Web.Routing</groupId>
<artifactId>System.Web.Routing</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Web.Routing.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- <npanday.ASPNETMVC3>c:\Program Files\Microsoft ASP.NET\ASP.NET MVC
3\Assemblies\</npanday.ASPNETMVC3>
- <npanday.ASPNETWebPages>c:\Program Files\Microsoft ASP.NET\ASP.NET Web
Pages\v1.0\Assemblies\</npanday.ASPNETWebPages>
- </properties>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
Sat Mar 2 01:43:12 2013
@@ -33,29 +33,22 @@
<groupId>Microsoft.VisualBasic</groupId>
<artifactId>Microsoft.VisualBasic</artifactId>
<version>10.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/Microsoft.VisualBasic.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>System.IdentityModel</groupId>
<artifactId>System.IdentityModel</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.IdentityModel.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b77a5c561934e089</classifier>
</dependency>
<dependency>
<groupId>System.Web.Mvc</groupId>
<artifactId>System.Web.Mvc</artifactId>
<version>2.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.ASPNETMVC3}/System.Web.Mvc.dll</systemPath>
+ <type>gac_msil</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- <npanday.ASPNETMVC3>c:\Program Files\Microsoft ASP.NET\ASP.NET MVC
3\Assemblies\</npanday.ASPNETMVC3>
- </properties>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
Sat Mar 2 01:43:12 2013
@@ -48,45 +48,34 @@
<artifactId>Microsoft.WindowsAzure.Configuration</artifactId>
<version>1.7.0.0</version>
<type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio}/Microsoft.WindowsAzure.Configuration.dll</systemPath>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure.Diagnostics</groupId>
<artifactId>Microsoft.WindowsAzure.Diagnostics</artifactId>
<version>1.7.0.0</version>
<type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio}/Microsoft.WindowsAzure.Diagnostics.dll</systemPath>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure.ServiceRuntime</groupId>
<artifactId>Microsoft.WindowsAzure.ServiceRuntime</artifactId>
<version>1.7.0.0</version>
<type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio}/Microsoft.WindowsAzure.ServiceRuntime.dll</systemPath>
- </dependency>
+ <type>gac_msil</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>Microsoft.WindowsAzure.StorageClient</groupId>
<artifactId>Microsoft.WindowsAzure.StorageClient</artifactId>
<version>1.7.0.0</version>
<type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio}/Microsoft.WindowsAzure.StorageClient.dll</systemPath>
</dependency>
<dependency>
<groupId>System.Data.Services.Client</groupId>
<artifactId>System.Data.Services.Client</artifactId>
<version>4.0.0.0</version>
<type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Data.Services.Client.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b77a5c561934e089</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio>C:\Program
Files\Microsoft SDKs\Windows Azure\.NET
SDK\2012-06\ref\</npanday.WindowsAzureLibrariesforNETv17NET40CacheclientReferenceAssembliesforVisualStudio>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- </properties>
</project>
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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -61,25 +61,22 @@
<groupId>System.Web.DynamicData</groupId>
<artifactId>System.Web.DynamicData</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.DynamicData.dll</systemPath>
+ <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>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Web.Entity.dll</systemPath>
+ <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>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.ApplicationServices.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
<dependency>
<groupId>test.group</groupId>
@@ -96,7 +93,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- </properties>
</project>
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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -31,20 +31,15 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.SilverlightFramework30}/System.Windows.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.SilverlightFramework30}/System.Net.dll</systemPath>
+ <type>gac_msil</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
- <properties>
- <npanday.SilverlightFramework30>C:\Program Files\Reference
Assemblies\Microsoft\Framework\Silverlight\v3.0\</npanday.SilverlightFramework30>
- </properties>
</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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -25,20 +25,15 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.SilverlightFramework30}/System.Windows.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.SilverlightFramework30}/System.Net.dll</systemPath>
+ <type>gac_msil</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
- <properties>
- <npanday.SilverlightFramework30>C:\Program Files\Reference
Assemblies\Microsoft\Framework\Silverlight\v3.0\</npanday.SilverlightFramework30>
- </properties>
</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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -25,20 +25,15 @@
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.SilverlightFramework30}/System.Windows.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>3.5.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.SilverlightFramework30}/System.Net.dll</systemPath>
+ <type>gac_msil</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
- <properties>
- <npanday.SilverlightFramework30>C:\Program Files\Reference
Assemblies\Microsoft\Framework\Silverlight\v3.0\</npanday.SilverlightFramework30>
- </properties>
</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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -61,28 +61,22 @@
<groupId>System.Web.DynamicData</groupId>
<artifactId>System.Web.DynamicData</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.DynamicData.dll</systemPath>
+ <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>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Web.Entity.dll</systemPath>
+ <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>
- <scope>system</scope>
-
<systemPath>${npanday.Framework40}/System.Web.ApplicationServices.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>31bf3856ad364e35</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- </properties>
</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=1451813&r1=1451812&r2=1451813&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:43:12 2013
@@ -25,28 +25,22 @@
<groupId>mscorlib</groupId>
<artifactId>mscorlib</artifactId>
<version>2.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.SilverlightFramework50}/mscorlib.dll</systemPath>
+ <type>gac_32_4</type>
+ <classifier>b77a5c561934e089</classifier>
</dependency>
<dependency>
<groupId>System.Windows</groupId>
<artifactId>System.Windows</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.SilverlightFramework50}/System.Windows.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>System.Net</groupId>
<artifactId>System.Net</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.SilverlightFramework50}/System.Net.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
- <properties>
- <npanday.SilverlightFramework50>C:\Program Files\Reference
Assemblies\Microsoft\Framework\Silverlight\v5.0\</npanday.SilverlightFramework50>
- </properties>
</project>
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=1451813&r1=1451812&r2=1451813&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
Sat Mar 2 01:43:12 2013
@@ -68,9 +68,8 @@
<groupId>System.Xaml</groupId>
<artifactId>System.Xaml</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${npanday.Framework40}/System.Xaml.dll</systemPath>
+ <type>gac_msil4</type>
+ <classifier>b77a5c561934e089</classifier>
</dependency>
<dependency>
<groupId>WindowsBase</groupId>
@@ -94,7 +93,4 @@
<classifier>31bf3856ad364e35</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework40>C:\Windows\Microsoft.NET\Framework\v4.0.30319</npanday.Framework40>
- </properties>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
Sat Mar 2 01:43:12 2013
@@ -59,12 +59,8 @@
<groupId>Microsoft.Build.Engine</groupId>
<artifactId>Microsoft.Build.Engine</artifactId>
<version>2.0.0.0</version>
- <type>dotnet-library</type>
- <scope>system</scope>
-
<systemPath>${npanday.Framework20}/Microsoft.Build.Engine.dll</systemPath>
+ <type>gac_msil</type>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
- <properties>
-
<npanday.Framework20>C:\Windows\Microsoft.NET\Framework\v2.0.50727</npanday.Framework20>
- </properties>
</project>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
Sat Mar 2 01:43:12 2013
@@ -64,6 +64,11 @@ namespace NPanday.VisualStudio.Addin
this.label4 = new System.Windows.Forms.Label();
this.configComboBox = new System.Windows.Forms.ComboBox();
this.cloudConfigComboBox = new System.Windows.Forms.ComboBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.searchGacCheckBox = new System.Windows.Forms.CheckBox();
+ this.searchRefAssembliesCheckBox = new
System.Windows.Forms.CheckBox();
+ this.searchFrameworkCheckBox = new System.Windows.Forms.CheckBox();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// btnBrowse
@@ -98,7 +103,7 @@ namespace NPanday.VisualStudio.Addin
// btnCancel
//
this.btnCancel.DialogResult =
System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(265, 245);
+ this.btnCancel.Location = new System.Drawing.Point(369, 245);
this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(104, 21);
@@ -109,7 +114,7 @@ namespace NPanday.VisualStudio.Addin
//
// btnGenerate
//
- this.btnGenerate.Location = new System.Drawing.Point(157, 245);
+ this.btnGenerate.Location = new System.Drawing.Point(261, 245);
this.btnGenerate.Margin = new System.Windows.Forms.Padding(2);
this.btnGenerate.Name = "btnGenerate";
this.btnGenerate.Size = new System.Drawing.Size(104, 21);
@@ -218,12 +223,57 @@ namespace NPanday.VisualStudio.Addin
this.cloudConfigComboBox.Size = new System.Drawing.Size(312, 21);
this.cloudConfigComboBox.TabIndex = 20;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.searchGacCheckBox);
+ this.groupBox1.Controls.Add(this.searchRefAssembliesCheckBox);
+ this.groupBox1.Controls.Add(this.searchFrameworkCheckBox);
+ this.groupBox1.Location = new System.Drawing.Point(534, 12);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(186, 100);
+ this.groupBox1.TabIndex = 21;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Dependency Search Locations";
+ //
+ // searchGacCheckBox
+ //
+ this.searchGacCheckBox.AutoSize = true;
+ this.searchGacCheckBox.Checked = true;
+ this.searchGacCheckBox.CheckState =
System.Windows.Forms.CheckState.Checked;
+ this.searchGacCheckBox.Location = new System.Drawing.Point(15, 70);
+ this.searchGacCheckBox.Name = "searchGacCheckBox";
+ this.searchGacCheckBox.Size = new System.Drawing.Size(137, 17);
+ this.searchGacCheckBox.TabIndex = 2;
+ this.searchGacCheckBox.Text = "Global Assembly Cache";
+ this.searchGacCheckBox.UseVisualStyleBackColor = true;
+ //
+ // searchRefAssembliesCheckBox
+ //
+ this.searchRefAssembliesCheckBox.AutoSize = true;
+ this.searchRefAssembliesCheckBox.Location = new
System.Drawing.Point(15, 47);
+ this.searchRefAssembliesCheckBox.Name =
"searchRefAssembliesCheckBox";
+ this.searchRefAssembliesCheckBox.Size = new
System.Drawing.Size(131, 17);
+ this.searchRefAssembliesCheckBox.TabIndex = 1;
+ this.searchRefAssembliesCheckBox.Text = "Reference Assemblies";
+ this.searchRefAssembliesCheckBox.UseVisualStyleBackColor = true;
+ //
+ // searchFrameworkCheckBox
+ //
+ this.searchFrameworkCheckBox.AutoSize = true;
+ this.searchFrameworkCheckBox.Location = new
System.Drawing.Point(15, 24);
+ this.searchFrameworkCheckBox.Name = "searchFrameworkCheckBox";
+ this.searchFrameworkCheckBox.Size = new System.Drawing.Size(78,
17);
+ this.searchFrameworkCheckBox.TabIndex = 0;
+ this.searchFrameworkCheckBox.Text = "Framework";
+ this.searchFrameworkCheckBox.UseVisualStyleBackColor = true;
+ //
// NPandayImportProjectForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(526, 280);
+ this.ClientSize = new System.Drawing.Size(734, 280);
this.ControlBox = false;
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.cloudConfigComboBox);
this.Controls.Add(this.configComboBox);
this.Controls.Add(this.label4);
@@ -245,6 +295,8 @@ namespace NPanday.VisualStudio.Addin
this.ShowInTaskbar = false;
this.StartPosition =
System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "NPanday Import Dot Net Solution";
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -268,5 +320,9 @@ namespace NPanday.VisualStudio.Addin
private System.Windows.Forms.Label label4;
private System.Windows.Forms.ComboBox configComboBox;
private System.Windows.Forms.ComboBox cloudConfigComboBox;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox searchGacCheckBox;
+ private System.Windows.Forms.CheckBox searchRefAssembliesCheckBox;
+ private System.Windows.Forms.CheckBox searchFrameworkCheckBox;
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
Sat Mar 2 01:43:12 2013
@@ -30,6 +30,7 @@ using EnvDTE80;
using log4net;
using Microsoft.Win32;
using System.Net;
+using NPanday.ProjectImporter;
namespace NPanday.VisualStudio.Addin
{
@@ -257,10 +258,15 @@ namespace NPanday.VisualStudio.Addin
cloudConfig = (string)cloudConfigComboBox.SelectedItem;
}
+ DependencySearchConfiguration depSearchConfig = new
DependencySearchConfiguration();
+ depSearchConfig.SearchFramework = searchFrameworkCheckBox.Checked;
+ depSearchConfig.SearchReferenceAssemblies =
searchRefAssembliesCheckBox.Checked;
+ depSearchConfig.SearchGac = searchGacCheckBox.Checked;
+
//Refactored code for easier Unit Testing
try
{
- GeneratePom(txtBrowseDotNetSolutionFile.Text,
txtGroupId.Text.Trim(), txtVersion.Text.Trim(), txtSCMTag.Text,
useMsDeployCheckBox.Checked, configuration, cloudConfig);
+ GeneratePom(txtBrowseDotNetSolutionFile.Text,
txtGroupId.Text.Trim(), txtVersion.Text.Trim(), txtSCMTag.Text,
useMsDeployCheckBox.Checked, configuration, cloudConfig, depSearchConfig);
}
catch (Exception exception)
{
@@ -271,10 +277,10 @@ namespace NPanday.VisualStudio.Addin
protected void GeneratePom(String solutionFile, String groupId, String
version, String scmTag, bool useMsDeploy)
{
- GeneratePom(solutionFile, groupId, version, scmTag, useMsDeploy,
null, null);
+ GeneratePom(solutionFile, groupId, version, scmTag, useMsDeploy,
null, null, null);
}
- protected void GeneratePom(String solutionFile, String groupId, String
version, String scmTag, bool useMsDeploy, string configuration, string
cloudConfig)
+ protected void GeneratePom(String solutionFile, String groupId, String
version, String scmTag, bool useMsDeploy, string configuration, string
cloudConfig, DependencySearchConfiguration depSearchConfig)
{
string warningMsg = string.Empty;
String mavenVerRegex = "^[0-9]+(" + Regex.Escape(".") +
"?[0-9]+){0,3}$";
@@ -354,7 +360,7 @@ namespace NPanday.VisualStudio.Addin
validateSolutionStructure();
resyncAllArtifacts();
// TODO: nicer to have some sort of structure / flags for the
Msdeploy bit, or this dialog will get out of control over time - perhaps a
"project configuration" dialog can replace the test popup
- string[] generatedPoms =
ProjectImporter.NPandayImporter.ImportProject(file.FullName, groupId,
artifactId, version, scmTag, true, useMsDeploy, configuration, cloudConfig, ref
warningMsg);
+ string[] generatedPoms =
ProjectImporter.NPandayImporter.ImportProject(file.FullName, groupId,
artifactId, version, scmTag, true, useMsDeploy, configuration, cloudConfig,
depSearchConfig, ref warningMsg);
string str = string.Format("NPanday Import Project has
Successfully Generated Pom Files!\n");
foreach (string pom in generatedPoms)
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj?rev=1451813&r1=1451812&r2=1451813&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
Sat Mar 2 01:43:12 2013
@@ -82,6 +82,10 @@
<Project>{701803D4-90F5-44D7-919D-4844FEB7F936}</Project>
<Name>NPanday.Artifact</Name>
</ProjectReference>
+ <ProjectReference
Include="..\..\..\..\NPanday.ProjectImporter\Engine\src\main\csharp\NPanday.ProjectImporterEngine.csproj">
+ <Project>{91FC215D-C041-4000-8F71-C04A9EEABE55}</Project>
+ <Name>NPanday.ProjectImporterEngine</Name>
+ </ProjectReference>
<ProjectReference
Include="..\..\..\..\NPanday.Utils\src\main\csharp\NPanday.Utils.csproj">
<Project>{CAA4864F-F4C8-4024-8535-8B8C112307CE}</Project>
<Name>NPanday.Utils</Name>
