Skip to content

1.22 hotfix #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 31, 2015
Merged

1.22 hotfix #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d285cc2
gracefully handle protected projects; fixes #354
rubberduck203 Mar 31, 2015
ce7a73d
Adjusted Version Numbers and Upgrade Path
rubberduck203 Mar 31, 2015
dd359d4
Merge branch 'master'
rubberduck203 Mar 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RetailCoder.VBE/Extensions/VbeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static IEnumerable<CodeModule> FindCodeModules(this VBE vbe, string proje
{
var matches =
vbe.VBProjects.Cast<VBProject>()
.Where(project => project.Name == projectName)
.Where(project => project.Protection != vbext_ProjectProtection.vbext_pp_locked && project.Name == projectName)
.SelectMany(project => project.VBComponents.Cast<VBComponent>()
.Where(component => component.Name == componentName))
.Select(component => component.CodeModule);
Expand Down Expand Up @@ -57,7 +57,7 @@ public static void SetSelection(this VBE vbe, QualifiedSelection selection)
{
//not a very robust method. Breaks if there are multiple projects with the same name.
var project = vbe.VBProjects.Cast<VBProject>()
.FirstOrDefault(p => p.Name == selection.QualifiedName.ProjectName);
.FirstOrDefault(p => p.Protection != vbext_ProjectProtection.vbext_pp_locked && p.Name == selection.QualifiedName.ProjectName);

VBComponent component = null;
if (project != null)
Expand Down
2 changes: 1 addition & 1 deletion RetailCoder.VBE/Inspections/CodeInspectionResultBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public virtual QualifiedSelection QualifiedSelection
public VBComponent FindComponent(VBE vbe)
{
return vbe.VBProjects.Cast<VBProject>()
.Where(project => project.Name == QualifiedName.ProjectName)
.Where(project => project.Protection != vbext_ProjectProtection.vbext_pp_locked && project.Name == QualifiedName.ProjectName)
.SelectMany(project =>
project.VBComponents.Cast<VBComponent>()
.Where(component => component.Name == QualifiedName.ModuleName))
Expand Down
4 changes: 2 additions & 2 deletions RetailCoder.VBE/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.21.*")]
[assembly: AssemblyFileVersion("1.21.1.0")]
[assembly: AssemblyVersion("1.22.*")]
[assembly: AssemblyFileVersion("1.22.0.0")]
9 changes: 5 additions & 4 deletions RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private async Task<IOrderedEnumerable<ToDoItem>> GetItems()
{
await Task.Yield();
var items = new ConcurrentBag<ToDoItem>();
var projects = VBE.VBProjects.Cast<VBProject>();
var projects = VBE.VBProjects.Cast<VBProject>().Where(project => project.Protection != vbext_ProjectProtection.vbext_pp_locked);
Parallel.ForEach(projects,
project =>
{
Expand Down Expand Up @@ -114,9 +114,10 @@ private IEnumerable<ToDoItem> GetToDoMarkers(CommentNode comment)
private void NavigateToDoItem(object sender, ToDoItemClickEventArgs e)
{
var projects = VBE.VBProjects.Cast<VBProject>()
.Where(p => p.Name == e.SelectedItem.ProjectName
&& p.VBComponents.Cast<VBComponent>()
.Any(c => c.Name == e.SelectedItem.ModuleName)
.Where(p => p.Protection != vbext_ProjectProtection.vbext_pp_locked
&& p.Name == e.SelectedItem.ProjectName
&& p.VBComponents.Cast<VBComponent>()
.Any(c => c.Name == e.SelectedItem.ModuleName)
);

if (projects == null)
Expand Down
5 changes: 3 additions & 2 deletions RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void SynchronizeEngineWithIDE()
try
{
_testEngine.AllTests = this.VBE.VBProjects
.Cast<VBProject>()
.Cast<VBProject>().Where(project => project.Protection != vbext_ProjectProtection.vbext_pp_locked)
.SelectMany(project => project.TestMethods())
.ToDictionary(test => test, test => _testEngine.AllTests.ContainsKey(test) ? _testEngine.AllTests[test] : null);

Expand Down Expand Up @@ -162,7 +162,8 @@ private void OnExplorerGoToSelectedTest(object sender, SelectedTestEventArgs e)
var signature = string.Concat("Public Sub ", controlSelection.MethodName, "()");

var projects = this.VBE.VBProjects.Cast<VBProject>()
.Where(project => project.Name == controlSelection.ProjectName
.Where(project => project.Protection != vbext_ProjectProtection.vbext_pp_locked
&& project.Name == controlSelection.ProjectName
&& project.VBComponents
.Cast<VBComponent>()
.Any(c => c.Name == controlSelection.ModuleName)
Expand Down
8 changes: 3 additions & 5 deletions Setup/Rubberduck.Setup32.isl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,8 +1901,6 @@
<col def="S255">ISBuildSourcePath</col>
<col def="I4">ISAttributes</col>
<col def="S72">ISComponentSubFolder_</col>
<row><td>rubberduck.debug_symbols</td><td>Rubberduck.Debug_Symbols1</td><td>Rubberduck.Debug Symbols</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;Rubberduck&gt;|Symbols</td><td>3</td><td/></row>
<row><td>rubberduck.primary_output</td><td>Rubberduck.Primary_output1</td><td>Rubberduck.Primary output</td><td>0</td><td/><td/><td>0</td><td>1</td><td>&lt;Rubberduck&gt;|Built</td><td>3</td><td/></row>
<row><td>rubberduck.tlb</td><td>Rubberduck.tlb</td><td>RUBBER~1.TLB|Rubberduck.tlb</td><td>0</td><td/><td/><td>0</td><td>1</td><td>C:\Users\Christopher\Source\Repos\Rubberduck\RetailCoder.VBE\bin\Release\Rubberduck.tlb</td><td>1</td><td/></row>
</table>

Expand Down Expand Up @@ -4398,9 +4396,9 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA=
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKVROOTS</td><td>##IDS_PROGMSG_IIS_ROLLBACKVROOTS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{5BFA486D-8F83-4F26-8CD5-788B1F64AE25}</td><td/></row>
<row><td>ProductCode</td><td>{5F7101F7-6176-42ED-84E2-E77F4B15E307}</td><td/></row>
<row><td>ProductName</td><td>Rubberduck</td><td/></row>
<row><td>ProductVersion</td><td>1.21.0000</td><td/></row>
<row><td>ProductVersion</td><td>1.22.0000</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
Expand Down Expand Up @@ -4687,7 +4685,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA=
<col def="s72">ActionProperty</col>
<col def="S72">ISDisplayName</col>
<row><td>{00000000-0000-0000-0000-000000000000}</td><td>***ALL_VERSIONS***</td><td></td><td></td><td>2</td><td/><td>ISFOUNDNEWERPRODUCTVERSION</td><td>ISPreventDowngrade</td></row>
<row><td>{43BFBEFB-88F2-4F12-AABC-576581E50AFA}</td><td>1.1.0000</td><td>1.21.0000</td><td>1033</td><td>768</td><td/><td>ISACTIONPROP1</td><td>UpgradeFrom1.1</td></row>
<row><td>{43BFBEFB-88F2-4F12-AABC-576581E50AFA}</td><td>1.1.0000</td><td>1.22.0000</td><td>1033</td><td>768</td><td/><td>ISACTIONPROP1</td><td>UpgradeFrom1.1</td></row>
</table>

<table name="Verb">
Expand Down
7 changes: 1 addition & 6 deletions Setup/Rubberduck.Setup32.isproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,5 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\InstallShield\2013Limited\InstallShield.targets"/>
<ItemGroup/>
<ItemGroup>
<ProjectReference Include="..\RetailCoder.VBE\Rubberduck.csproj">
<Name>Rubberduck</Name>
<Project>{20589DE8-432E-4359-9232-69EB070B7185}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup/>
</Project>