Author: brett
Date: Mon Mar 4 14:03:35 2013
New Revision: 1452311
URL: http://svn.apache.org/r1452311
Log:
[NPANDAY-578] rename AssemblyFoldersEx option
Reference assemblies appears ambiguous now that the framework may find
assemblies there,
therefore changing the name to Extra Assembly Folders.
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/DependencySearchConfiguration.cs
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/main/csharp/NPandayImportProjectForm.resx
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=1452311&r1=1452310&r2=1452311&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
Mon Mar 4 14:03:35 2013
@@ -782,7 +782,7 @@ namespace NPanday.ProjectImporter.Conver
refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkDirectories(), "target framework");
// resolve from registered assembly directories
- if (refDependency == null &&
projectDigest.DependencySearchConfig.SearchReferenceAssemblies)
+ if (refDependency == null &&
projectDigest.DependencySearchConfig.SearchAssemblyFoldersEx)
refDependency = ResolveDependencyFromDirectories(reference,
GetTargetFrameworkAssemblyFoldersEx(), "extra assembly folder");
// resolve from GAC
Modified:
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=1452311&r1=1452310&r2=1452311&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/DependencySearchConfiguration.cs
Mon Mar 4 14:03:35 2013
@@ -30,8 +30,8 @@ namespace NPanday.ProjectImporter
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 searchAssemblyFoldersEx = false;
+ public bool SearchAssemblyFoldersEx { get { return
searchAssemblyFoldersEx; } set { searchAssemblyFoldersEx = value; } }
private bool searchGac = true;
public bool SearchGac { get { return searchGac; } set { searchGac =
value; } }
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=1452311&r1=1452310&r2=1452311&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
Mon Mar 4 14:03:35 2013
@@ -66,7 +66,7 @@ namespace NPanday.VisualStudio.Addin
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.searchAssemblyFoldersExCheckBox = new
System.Windows.Forms.CheckBox();
this.searchFrameworkCheckBox = new System.Windows.Forms.CheckBox();
this.copyToMavenCheckBox = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
@@ -227,7 +227,7 @@ namespace NPanday.VisualStudio.Addin
// groupBox1
//
this.groupBox1.Controls.Add(this.searchGacCheckBox);
- this.groupBox1.Controls.Add(this.searchRefAssembliesCheckBox);
+ this.groupBox1.Controls.Add(this.searchAssemblyFoldersExCheckBox);
this.groupBox1.Controls.Add(this.searchFrameworkCheckBox);
this.groupBox1.Location = new System.Drawing.Point(534, 12);
this.groupBox1.Name = "groupBox1";
@@ -248,15 +248,15 @@ namespace NPanday.VisualStudio.Addin
this.searchGacCheckBox.Text = "Global Assembly Cache";
this.searchGacCheckBox.UseVisualStyleBackColor = true;
//
- // searchRefAssembliesCheckBox
+ // searchAssemblyFoldersExCheckBox
//
- 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;
+ this.searchAssemblyFoldersExCheckBox.AutoSize = true;
+ this.searchAssemblyFoldersExCheckBox.Location = new
System.Drawing.Point(15, 47);
+ this.searchAssemblyFoldersExCheckBox.Name =
"searchAssemblyFoldersExCheckBox";
+ this.searchAssemblyFoldersExCheckBox.Size = new
System.Drawing.Size(134, 17);
+ this.searchAssemblyFoldersExCheckBox.TabIndex = 1;
+ this.searchAssemblyFoldersExCheckBox.Text = "Extra Assembly
Folders";
+ this.searchAssemblyFoldersExCheckBox.UseVisualStyleBackColor =
true;
//
// searchFrameworkCheckBox
//
@@ -334,7 +334,7 @@ namespace NPanday.VisualStudio.Addin
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 searchAssemblyFoldersExCheckBox;
private System.Windows.Forms.CheckBox searchFrameworkCheckBox;
private System.Windows.Forms.CheckBox copyToMavenCheckBox;
}
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=1452311&r1=1452310&r2=1452311&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
Mon Mar 4 14:03:35 2013
@@ -260,7 +260,7 @@ namespace NPanday.VisualStudio.Addin
DependencySearchConfiguration depSearchConfig = new
DependencySearchConfiguration();
depSearchConfig.SearchFramework = searchFrameworkCheckBox.Checked;
- depSearchConfig.SearchReferenceAssemblies =
searchRefAssembliesCheckBox.Checked;
+ depSearchConfig.SearchAssemblyFoldersEx =
searchAssemblyFoldersExCheckBox.Checked;
depSearchConfig.SearchGac = searchGacCheckBox.Checked;
depSearchConfig.CopyToMaven = copyToMavenCheckBox.Checked;
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.resx
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.resx?rev=1452311&r1=1452310&r2=1452311&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.resx
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.resx
Mon Mar 4 14:03:35 2013
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
