Commited02c0c

authored and

committed

Fix "Add New" dialog suggesting file names that already exist when adding above/below a file in the project tree. (#2956)

Also fix being able to move folders up/down when a build is in progress.Fixes #2892

1 parent542d754 commited02c0cCopy full SHA for ed02c0c

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5211,6 +5211,9 @@ public virtual int GenerateUniqueItemName(uint itemIdLoc, string ext, string sug`
`5211`	`5211`	`boolfound=false;`
`5212`	`5212`	`boolfFolderCase=false;`
`5213`	`5213`	`HierarchyNodeparent=this.NodeFromItemId(itemIdLoc);`
	`5214`	`+`
	`5215`	`+if(parentisFileNode)`
	`5216`	`+parent=parent.Parent;`
`5214`	`5217`
`5215`	`5218`	`extToUse=ext.Trim();`
`5216`	`5219`	`if(String.Compare(extToUse,".config",StringComparison.OrdinalIgnoreCase)==0\|\|`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@`
`310`	`310`	`</ItemGroup>`
`311`	`311`	`<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />`
`312`	`312`	`<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />`
`313`		`- <ImportProject="$(VsSDKTargets)"/>`
	`313`	`+ <ImportProject="$(VsSDKTargets)"/>`
`314`	`314`	`<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">`
`315`	`315`	`<ItemGroup>`
`316`	`316`	`<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).dll" />`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1995,15 +1995,15 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem`
`1995`	`1995`	`(cmd=(uint32)VSProjectConstants.MoveUpCmd.ID)then`
`1996`	`1996`
`1997`	`1997`	`result<- result\|\|\| QueryStatusResult.SUPPORTED`
`1998`		`-if FSharpFileNode.CanMoveUp(x)then`
	`1998`	`+ifnoBuildInProgress&& root.GetSelectedNodes().Count<2&&FSharpFileNode.CanMoveUp(x)then`
`1999`	`1999`	`result<- result\|\|\| QueryStatusResult.ENABLED`
`2000`	`2000`	`VSConstants.S_OK`
`2001`	`2001`
`2002`	`2002`	`elif(guidCmdGroup= VSProjectConstants.guidFSharpProjectCmdSet)&&`
`2003`	`2003`	`(cmd=(uint32)VSProjectConstants.MoveDownCmd.ID)then`
`2004`	`2004`
`2005`	`2005`	`result<- result\|\|\| QueryStatusResult.SUPPORTED`
`2006`		`-if FSharpFileNode.CanMoveDown(x)then`
	`2006`	`+ifnoBuildInProgress&& root.GetSelectedNodes().Count<2&&FSharpFileNode.CanMoveDown(x)then`
`2007`	`2007`	`result<- result\|\|\| QueryStatusResult.ENABLED`
`2008`	`2008`	`VSConstants.S_OK`
`2009`	`2009`

Comments

(0)