diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60741f0390..90beb2e8df 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -84,7 +84,7 @@ function Exec-Process([string]$command, [string]$commandArgs) { return $global:LASTEXITCODE = $process.ExitCode } finally { - # If we didn't finish then an error occured or the user hit ctrl-c. Either + # If we didn't finish then an error occurred or the user hit ctrl-c. Either # way kill the process if (-not $finished) { $process.Kill() diff --git a/src/EFTools/DesignXmlCore/Base/Shell/HeaderBranch.cs b/src/EFTools/DesignXmlCore/Base/Shell/HeaderBranch.cs index 397b8f2757..d484505bb6 100644 --- a/src/EFTools/DesignXmlCore/Base/Shell/HeaderBranch.cs +++ b/src/EFTools/DesignXmlCore/Base/Shell/HeaderBranch.cs @@ -119,7 +119,7 @@ protected virtual VirtualTreeDisplayData GetDisplayData(int row, int column, Vir /// /// Target row /// Target column - /// Populated VirtualTreeAccessibilityData structue, or VirtualTreeAccessibilityData.Empty + /// Populated VirtualTreeAccessibilityData structure, or VirtualTreeAccessibilityData.Empty protected virtual VirtualTreeAccessibilityData GetAccessibilityData(int row, int column) { // initial header column - {display text} {row} {child count} diff --git a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerBranch.cs b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerBranch.cs index c75875d7ad..67436edd85 100644 --- a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerBranch.cs +++ b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerBranch.cs @@ -202,7 +202,7 @@ protected virtual string GetTipText(int row, int column, ToolTipType tipType) } /// - /// Each node in the tree can have an associated tracking object used to indentify it. + /// Each node in the tree can have an associated tracking object used to identify it. /// The branch can override this method to return the row index corresponding to the given /// object. /// @@ -372,7 +372,7 @@ protected virtual VirtualTreeDisplayData GetDisplayData(int row, int column, Vir /// /// Target row /// Target column - /// Populated VirtualTreeAccessibilityData structue, or VirtualTreeAccessibilityData.Empty + /// Populated VirtualTreeAccessibilityData structure, or VirtualTreeAccessibilityData.Empty protected virtual VirtualTreeAccessibilityData GetAccessibilityData(int row, int column) { if (_columns[column].ColumnIsCheckBox) diff --git a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerToolWindow.cs b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerToolWindow.cs index 4fb39bb3e5..0f408fdfa7 100644 --- a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerToolWindow.cs +++ b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerToolWindow.cs @@ -88,7 +88,7 @@ protected override void Dispose(bool disposing) } /// - /// Overriden to create the VirtualTreeControl hosted in the tool window + /// Overridden to create the VirtualTreeControl hosted in the tool window /// /// protected override void OnToolWindowCreate() diff --git a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerTreeControl.cs b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerTreeControl.cs index 9f7e0480f9..d642c6b9ab 100644 --- a/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerTreeControl.cs +++ b/src/EFTools/DesignXmlCore/Base/Shell/TreeGridDesignerTreeControl.cs @@ -260,7 +260,7 @@ internal void AddColumnEventHandlers() } /// - /// Disbles event handlers for all columns in the tree + /// Disables event handlers for all columns in the tree /// internal void RemoveColumnEventHandlers() { @@ -272,7 +272,7 @@ internal void RemoveColumnEventHandlers() } /// - /// Populates the tree via attributes specifed on th root object. This object usually corresponds to + /// Populates the tree via attributes specified on the root object. This object usually corresponds to /// the selection made in a designer. /// /// True if the tree was populated. False if the object passed in doesn't specify any branches. @@ -435,7 +435,7 @@ private TreeGridDesignerColumnDescriptor FindOrCreateColumn(Type columnType) } /// - /// Overriden to preprocess key messages. + /// Overridden to preprocess key messages. /// protected override bool ProcessDialogKey(Keys keyData) { @@ -474,7 +474,7 @@ protected override bool ProcessDialogKey(Keys keyData) } /// - /// Overriden to preprocess key messages. + /// Overridden to preprocess key messages. /// protected override bool ProcessDialogChar(char c) { @@ -527,7 +527,7 @@ protected override void OnKeyDown(KeyEventArgs e) } /// - /// Overriden to run the default action specified by the currently selected branch. + /// Overridden to run the default action specified by the currently selected branch. /// /// protected override void OnDoubleClick(DoubleClickEventArgs e) @@ -785,7 +785,7 @@ private bool ProcessKey(ProcessKeyResult result, ITreeGridDesignerBranch branch, return false; } - // expand branch first, if necesary + // expand branch first, if necessary if (result.ExpandBranch) { // using column = 0 because TreeGrid designer @@ -985,7 +985,7 @@ private bool ProcessKey(ProcessKeyResult result, ITreeGridDesignerBranch branch, /// /// If BatchDrawItem == true, store the index of the item to be drawn, - /// but dont actually do the drawing until BatchDrawItem is set to false. + /// but don't actually do the drawing until BatchDrawItem is set to false. /// protected override void OnDrawItem(DrawItemEventArgs e) { diff --git a/src/EFTools/DesignXmlCore/Common/RdtManager.cs b/src/EFTools/DesignXmlCore/Common/RdtManager.cs index ac1b1e8608..0741959de0 100644 --- a/src/EFTools/DesignXmlCore/Common/RdtManager.cs +++ b/src/EFTools/DesignXmlCore/Common/RdtManager.cs @@ -378,7 +378,7 @@ public string ReadFromFile(string fullPathFileName) } else { - // File is not in RDT, open it in invisble editor. + // File is not in RDT, open it in invisible editor. if (!TryGetTextLinesAndInvisibleEditor(fullPathFileName, out invisibleEditor, out textLines)) { // Failed to get text lines or invisible editor. diff --git a/src/EFTools/DesignXmlCore/Common/VSTextLinesFromFile.cs b/src/EFTools/DesignXmlCore/Common/VSTextLinesFromFile.cs index c31c54ac9f..4e2fabcef2 100644 --- a/src/EFTools/DesignXmlCore/Common/VSTextLinesFromFile.cs +++ b/src/EFTools/DesignXmlCore/Common/VSTextLinesFromFile.cs @@ -36,7 +36,7 @@ public static VsTextLinesFromFile Load(string fileName) } else { - // File is not in RDT, open it in invisble editor. + // File is not in RDT, open it in invisible editor. if (!RdtManager.Instance.TryGetTextLinesAndInvisibleEditor(fileName, out invisibleEditor, out textBuffer)) { // Failed to get text lines or invisible editor. diff --git a/src/EFTools/DesignXmlCore/Common/VsTextBufferFactory.cs b/src/EFTools/DesignXmlCore/Common/VsTextBufferFactory.cs index a745b2e45f..7316b9c96d 100644 --- a/src/EFTools/DesignXmlCore/Common/VsTextBufferFactory.cs +++ b/src/EFTools/DesignXmlCore/Common/VsTextBufferFactory.cs @@ -71,7 +71,7 @@ internal static T CreateInstance(ServiceProviderHelper serviceProvider, ILoca } /// - /// Instanciates a new VsTextBuffer from the local registry + /// Instantiates a new VsTextBuffer from the local registry /// /// /// diff --git a/src/EFTools/DesignXmlCore/Common/WaitCursorHelper.cs b/src/EFTools/DesignXmlCore/Common/WaitCursorHelper.cs index c443ca625c..6b5ce2b34e 100644 --- a/src/EFTools/DesignXmlCore/Common/WaitCursorHelper.cs +++ b/src/EFTools/DesignXmlCore/Common/WaitCursorHelper.cs @@ -34,7 +34,7 @@ public WaitCursor() } /// - /// Finializer. + /// Finalizer. /// ~WaitCursor() { diff --git a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj index c3fb1cae10..96f18fb00b 100644 --- a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj +++ b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj @@ -167,7 +167,7 @@ True True - + diff --git a/src/EFTools/DesignXmlCore/Model/VisualStudio/IXmlDesignePackage.cs b/src/EFTools/DesignXmlCore/Model/VisualStudio/IXmlDesignerPackage.cs similarity index 100% rename from src/EFTools/DesignXmlCore/Model/VisualStudio/IXmlDesignePackage.cs rename to src/EFTools/DesignXmlCore/Model/VisualStudio/IXmlDesignerPackage.cs diff --git a/src/EFTools/DesignXmlCore/Model/VisualStudio/ParentUndoManager.cs b/src/EFTools/DesignXmlCore/Model/VisualStudio/ParentUndoManager.cs index e2a5a48eaf..15d5c8ecff 100644 --- a/src/EFTools/DesignXmlCore/Model/VisualStudio/ParentUndoManager.cs +++ b/src/EFTools/DesignXmlCore/Model/VisualStudio/ParentUndoManager.cs @@ -11,7 +11,7 @@ internal class ParentUndoManager : IOleUndoManager private ParentUndoUnit _parentUndoUnit; /// - /// This class is a decoroator over an IOleUndoManager. It allows a "scope" to be started, and then all subsequent Add() + /// This class is a decorator over an IOleUndoManager. It allows a "scope" to be started, and then all subsequent Add() /// call will attach the undo unit to a single ParentUndoUnit. When the "scope" is closed, the ParentUndoUnit is /// added to the "wrapped" IOleUndoManager. This lets multiple undo/redo units be undone in one action by the user. /// diff --git a/src/EFTools/DesignXmlCore/Refactoring/ApplyChangesEventArgs.cs b/src/EFTools/DesignXmlCore/Refactoring/ApplyChangesEventArgs.cs index 12544d3889..898efdfac6 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/ApplyChangesEventArgs.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/ApplyChangesEventArgs.cs @@ -14,7 +14,7 @@ internal sealed class ApplyChangesEventArgs : CancelEventArgs private readonly IList _changes; /// - /// Contructor of this event, which takes the a list of FileChange. + /// Constructor of this event, which takes the a list of FileChange. /// /// public ApplyChangesEventArgs(IList changes) diff --git a/src/EFTools/DesignXmlCore/Refactoring/ContributorInput.cs b/src/EFTools/DesignXmlCore/Refactoring/ContributorInput.cs index c6aae14403..93d68e5470 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/ContributorInput.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/ContributorInput.cs @@ -8,7 +8,7 @@ namespace Microsoft.Data.Tools.VSXmlDesignerBase.Refactoring /// ex) SymbolChangeContributorInput, SymbolReferenceChangeContributorInput /// We will have RefactorOperation on each ContributorInput. /// The RefactorOperation class will set this property when it creates the initial ContributorInput. - /// Then the RefactoringManager will be reponsible to pass this property to any side effect ContributorInput. + /// Then the RefactoringManager will be responsible to pass this property to any side effect ContributorInput. /// internal abstract class ContributorInput { diff --git a/src/EFTools/DesignXmlCore/Refactoring/PreviewBuffer.cs b/src/EFTools/DesignXmlCore/Refactoring/PreviewBuffer.cs index 91b4d1a8c6..b13a25f7b1 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/PreviewBuffer.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/PreviewBuffer.cs @@ -55,7 +55,7 @@ private static IVsTextLines CreateEmptyEditor(IServiceProvider serviceProvider) /// If the temp file already exists, use that one. Otherwise, create a new one. /// /// The file extension. - /// The preview temp file with file path, invisible editor and text buffer inforamtion. + /// The preview temp file with file path, invisible editor and text buffer information. private PreviewTempFile GetPreviewTempFile(string fileExtension) { ArgumentValidation.CheckForNullReference(fileExtension, "fileExtension"); @@ -173,7 +173,7 @@ public void DisplayPreview(IVsTextView vsTextView, FileChange fileChange, Previe ScrollInView(vsTextView, 0, 0, 0, 1); // If there is ChangeProposal, make sure that change is visible in the text view. - // If ChangeProposal is null, that might be file node, make the first chagne visible. + // If ChangeProposal is null, that might be file node, make the first change visible. // Here we will only work with Text based change proposal. var visibleChange = node.ChangeProposal as TextChangeProposal; if (visibleChange == null) diff --git a/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesList.cs b/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesList.cs index 9deba0af54..feef9ce12d 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesList.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesList.cs @@ -177,7 +177,7 @@ public int OnClose(VSTREECLOSEACTIONS[] ptca) } /// - /// Used to diaplay changes in text view. + /// Used to display changes in text view. /// /// /// diff --git a/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesNode.cs b/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesNode.cs index af0f72589c..ab0a1bb675 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesNode.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/PreviewChangesNode.cs @@ -105,7 +105,7 @@ public string TooltipText public ChangeProposal ChangeProposal { get; internal set; } /// - /// Language service will be used on the text buffter in preview window + /// Language service will be used on the text buffer in preview window /// when clicking this node. /// public Guid LanguageServiceID diff --git a/src/EFTools/DesignXmlCore/Refactoring/PreviewData.cs b/src/EFTools/DesignXmlCore/Refactoring/PreviewData.cs index db032534d3..fd0f57497a 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/PreviewData.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/PreviewData.cs @@ -13,7 +13,7 @@ namespace Microsoft.Data.Tools.VSXmlDesignerBase.Refactoring /// This class contains all preview data for an RefactorOperation. /// Preview dialog will use all information in this class to populate the dialog. /// Information contains the top level preview tree nodes, help context for this - /// RefactorOperaiton, confirm button text, etc. + /// RefactorOperation, confirm button text, etc. /// internal sealed class PreviewData { @@ -64,7 +64,7 @@ public IList FileChanges public string ConfirmButtonText { get; set; } /// - /// Discription of this RefactorOperation. + /// Description of this RefactorOperation. /// public string Description { get; set; } @@ -74,7 +74,7 @@ public IList FileChanges public string HelpContext { get; set; } /// - /// The text view discription, that appears on the header of the + /// The text view description, that appears on the header of the /// text view in preview dialog. /// public string TextViewDescription { get; set; } @@ -90,7 +90,7 @@ public IList FileChanges public string Warning { get; set; } /// - /// Warning level for this RefactorOperaiton. + /// Warning level for this RefactorOperation. /// public __PREVIEWCHANGESWARNINGLEVEL WarningLevel { get; set; } diff --git a/src/EFTools/DesignXmlCore/Refactoring/PreviewWindowInfo.cs b/src/EFTools/DesignXmlCore/Refactoring/PreviewWindowInfo.cs index 37b3702f66..e934e3b9db 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/PreviewWindowInfo.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/PreviewWindowInfo.cs @@ -20,7 +20,7 @@ internal sealed class PreviewWindowInfo public string ConfirmButtonText { get; set; } /// - /// Discription of this RefactorOperation. + /// Description of this RefactorOperation. /// public string Description { get; set; } @@ -30,7 +30,7 @@ internal sealed class PreviewWindowInfo public string HelpContext { get; set; } /// - /// The text view discription, that appears on the header of the + /// The text view description, that appears on the header of the /// text view in preview dialog. /// public string TextViewDescription { get; set; } @@ -46,7 +46,7 @@ internal sealed class PreviewWindowInfo public string Warning { get; set; } /// - /// Warning level for this RefactorOperaiton. + /// Warning level for this RefactorOperation. /// public __PREVIEWCHANGESWARNINGLEVEL WarningLevel { get; set; } } diff --git a/src/EFTools/DesignXmlCore/Refactoring/RefactoringOperationBase.cs b/src/EFTools/DesignXmlCore/Refactoring/RefactoringOperationBase.cs index 66875a6c08..89c742714d 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/RefactoringOperationBase.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/RefactoringOperationBase.cs @@ -397,7 +397,7 @@ protected virtual void OnPostApplyChanges(ApplyChangesEventArgs changes) } /// - /// Apply changes to one file and possiblely create markers + /// Apply changes to one file and possibly create markers /// /// FileChange that contains list of ChangeProposals. /// IVsTextLines of the file content. diff --git a/src/EFTools/DesignXmlCore/Refactoring/RefactoringPreviewGroup.cs b/src/EFTools/DesignXmlCore/Refactoring/RefactoringPreviewGroup.cs index 44c6790acc..b02faacf75 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/RefactoringPreviewGroup.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/RefactoringPreviewGroup.cs @@ -55,7 +55,7 @@ public bool EnableChangeGroupUncheck public string WarningMessage { get; set; } /// - /// If the selection for every single change inside thise preview group is changable or not. + /// If the selection for every single change inside this preview group is changable or not. /// public bool EnableChangeUncheck { @@ -98,10 +98,10 @@ public void RegisterLanguageService(string fileExtension, Guid languageService) } /// - /// Get the language service registed for passed in file extension. + /// Get the language service registered for passed in file extension. /// /// This is the file extension for which you want to get language service for it. - /// Registed language service for this file extension. If nothing is registed, null will be returned. + /// Registered language service for this file extension. If nothing is registered, null will be returned. internal Guid GetLanguageService(string fileExtension) { ArgumentValidation.CheckForEmptyString(fileExtension, "fileExtension"); diff --git a/src/EFTools/DesignXmlCore/Refactoring/TextChangeProposal.cs b/src/EFTools/DesignXmlCore/Refactoring/TextChangeProposal.cs index d177294dbb..209d18e9f0 100644 --- a/src/EFTools/DesignXmlCore/Refactoring/TextChangeProposal.cs +++ b/src/EFTools/DesignXmlCore/Refactoring/TextChangeProposal.cs @@ -11,7 +11,7 @@ namespace Microsoft.Data.Tools.VSXmlDesignerBase.Refactoring internal class TextChangeProposal : ChangeProposal { /// - /// Contructor of ChangeProposal. + /// Constructor of ChangeProposal. /// /// The project name with full path that this file belongs to. /// The file name with full path which file this change is from. diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/DropDownControl.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/DropDownControl.cs index 20d2a0cb71..e625e7ed49 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/DropDownControl.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/DropDownControl.cs @@ -184,7 +184,7 @@ public static TypeEditorHost Create(PropertyDescriptor propertyDescriptor, objec /// /// Factory method for creating the appropriate drop-down control based on the given property descriptor. /// If the property descriptor supports a UITypeEditor, a TypeEditorHost will be created with that editor. - /// If not, and the TypeConverver attached to the PropertyDescriptor supports standard values, a + /// If not, and the TypeConverter attached to the PropertyDescriptor supports standard values, a /// TypeEditorHostListBox will be created with this TypeConverter. /// /// A property descriptor describing the property being set @@ -414,7 +414,7 @@ public object CurrentInstance /// Note that this only applies to cases where the value changes, if the value does not change /// or the user cancels the edit, the edit control will remain active regardless of the value of /// this property. - /// The default value is false, which means that the label edit conrol remains active. + /// The default value is false, which means that the label edit control remains active. /// /// public bool DismissLabelEditOnDropDownClose { get; set; } @@ -2685,7 +2685,7 @@ protected override void WndProc(ref Message m) } /// - /// Edit control displayed in the TypeEditorHost. Just a TextBox with some addtional + /// Edit control displayed in the TypeEditorHost. Just a TextBox with some additional /// key message processing for opening the drop down. /// [SuppressMessage("Whitehorse.CustomRules", "WH03:WinFormControlCatchUnhandledExceptions", @@ -2695,7 +2695,7 @@ internal class TypeEditorHostTextBox : TextBox private readonly TypeEditorHost _dropDownParent; /// - /// Edit control displayed in the TypeEditorHost. Just a TextBox with some addtional + /// Edit control displayed in the TypeEditorHost. Just a TextBox with some additional /// key message processing for opening the drop down. /// public TypeEditorHostTextBox(TypeEditorHost dropDownParent) @@ -3028,7 +3028,7 @@ protected override void OnEditKeyPress(KeyPressEventArgs e) } /// - /// Overriden to set up the list index based on current text + /// Overridden to set up the list index based on current text /// protected override void OnOpeningDropDown(EventArgs e) { @@ -3047,7 +3047,7 @@ protected override void OnOpeningDropDown(EventArgs e) } /// - /// Overriden to set up the list index based on current text + /// Overridden to set up the list index based on current text /// protected override void OnTextChanged(EventArgs e) { diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/IBranch.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/IBranch.cs index 278d236e14..0e7d6eba98 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/IBranch.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/IBranch.cs @@ -108,7 +108,7 @@ internal interface IBranch /// /// Target row /// Target column - /// Populated VirtualTreeAccessibilityData structue, or VirtualTreeAccessibilityData.Empty + /// Populated VirtualTreeAccessibilityData structure, or VirtualTreeAccessibilityData.Empty VirtualTreeAccessibilityData GetAccessibilityData(int row, int column); //Begin a label edit. Return true to continue, false to abort. diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ILevelShiftAdjuster.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ILevelShiftAdjuster.cs index 67a64da2c6..486ccfec4f 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ILevelShiftAdjuster.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ILevelShiftAdjuster.cs @@ -132,7 +132,7 @@ internal enum TestReattachBranchResult /// /// Includes behavior of ReattachChildren. The child branches and - /// tracking objects are detached and the item count of the branch is requeried. + /// tracking objects are detached and the item count of the branch is required. /// This is very similar to a realign on the branch, /// except that the existing child branches can potentially end up /// reattached to other branches, with is not possible with an ITree.Realign call. diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ProviderEvents.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ProviderEvents.cs index fb302b0ad6..3f126de104 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ProviderEvents.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/ProviderEvents.cs @@ -1017,7 +1017,7 @@ public SynchronizeStateEventArgs( /// /// Flag that indicates whether this Synchronization event has been processed. If this is set to true by a handler - /// of the ITree.SynchronizationBeginning event, subsequent calls to IBranch.SynchonizeState will not be made. The + /// of the ITree.SynchronizationBeginning event, subsequent calls to IBranch.SynchronizeState will not be made. The /// ITree.SynchronizationEnding event will still be raised, however. /// public bool Handled { get; set; } @@ -1033,7 +1033,7 @@ public ColumnItemEnumerator ItemsToSynchronize } /// - /// The branch whose state the items in the ItemsToSynchronize enumerator should be syncronized to. + /// The branch whose state the items in the ItemsToSynchronize enumerator should be synchronized to. /// public IBranch MatchBranch { @@ -1041,7 +1041,7 @@ public IBranch MatchBranch } /// - /// The row index (relative to MatchBranch) that indicates the item in MatchBranch that the items in the ItemsToSynchronize enumerator should be syncronized to. + /// The row index (relative to MatchBranch) that indicates the item in MatchBranch that the items in the ItemsToSynchronize enumerator should be synchronized to. /// public int MatchRow { @@ -1049,7 +1049,7 @@ public int MatchRow } /// - /// The column index that indicates the item in MatchBranch that the items in the ItemsToSynchronize enumerator should be syncronized to. + /// The column index that indicates the item in MatchBranch that the items in the ItemsToSynchronize enumerator should be synchronized to. /// public int MatchColumn { diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTree.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTree.cs index d1a0c5fd83..f1a4121524 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTree.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTree.cs @@ -650,7 +650,7 @@ public override string ToString() public TREENODE NextSibling; /// - /// The head of the position tracker list associated with thie node + /// The head of the position tracker list associated with this node /// public NODEPOSITIONTRACKER FirstPositionTracker; @@ -701,7 +701,7 @@ public int ExpandedSubItemGain get { return HasFullSubItemGain ? (StoreFullSubItemGain - ImmedSubItemGain) : 0; } } - // The next set of properties are overriden in by different implementations + // The next set of properties are overridden in by different implementations // of TREENODE to add functionality. /// @@ -6048,7 +6048,7 @@ protected void UpdateCellStyle(IBranch branch, int row, int column, bool makeCom var adjustColumn = absColumn; // TrackCell is currently broken for all values after absRow, but it will work down - // to the row we are curently expanding. We need this call to get the affectedSubItemColumns. + // to the row we are currently expanding. We need this call to get the affectedSubItemColumns. TrackCell( absRow, ref adjustColumn, ref parentRowOffset, ref affectedSubItemColumns, ref singleColumnSubItemAdjust); Debug.Assert(adjustColumn == 0); @@ -6885,7 +6885,7 @@ protected VirtualTreeCoordinate LocateObject(IBranch startingBranch, object targ var adjustColumn = firstUnexpandedColumnOffset; var singleColumnSubItemAdjust = 0; // TrackCell is currently broken for all values after absRow, but it will work down - // to the row we are curently expanding. We need this call to get the affectedSubItemColumns. + // to the row we are currently expanding. We need this call to get the affectedSubItemColumns. // UNDONE: We should be able to calculate affectedSubItemColumns during the course of this // routine instead of rewalking the tree here. TrackCell( @@ -7010,7 +7010,7 @@ private void ShiftBranchLevels( // Get the branch out of the tracked list altogether. Readding the list of // nodes with the replacement branch is deferred until all the work is done because // it is possible to replace with an existing branch, or expand the existing branch - // in a different locaion while reattaching tree nodes. As a simple example, the top + // in a different location while reattaching tree nodes. As a simple example, the top // level branch can be eliminated by calling ShiftBranchLevels(branch, 2, 1, replacement) // where the replacement a child list of the parent (useful if parent has 1 item in it). myNodeTracker.RemoveBranch(branch); @@ -7222,7 +7222,7 @@ private void RealignTreeNodeLevelShift( var adjustResult = branchTester.ValidateAdjustDepth(tnChild.Branch); var depthAdjustment = adjustResult.DepthAdjustment; var keepWalkingBranch = adjustResult.Continue; - // Ignore any negative depth ajustment returned by the branchTester. + // Ignore any negative depth adjustment returned by the branchTester. // We can't do anything with a negative adjustment here because we're // already at 0. Also, it is very likely that this same call in the // depth > 0 block is what put us here in the first place, so we should diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTreeItemInfo.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTreeItemInfo.cs index f4d822000b..41bff089e0 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTreeItemInfo.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/Provider/VirtualTreeItemInfo.cs @@ -68,7 +68,7 @@ public IBranch Branch } /// - /// The indendation level for this branch + /// The indentation level for this branch /// public int Level { diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnHeader.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnHeader.cs index 0e0f3d260a..a8412179fe 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnHeader.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnHeader.cs @@ -1949,7 +1949,7 @@ private void ValidateHeadersAfterTreeChange() /// of items in the header must match the number of columns in the current /// tree or multi-column tree. /// - /// An array of headers, with ascending perctages as specified in the VirtualTreeColumnHeader documentation. + /// An array of headers, with ascending percentages as specified in the VirtualTreeColumnHeader documentation. /// true if the percentages for non-fixed width columns should be divided evenly among all proportional headers. public void SetColumnHeaders(VirtualTreeColumnHeader[] headers, bool calculatePercentage) { diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnSelection.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnSelection.cs index 1a78f7d141..e717033e5c 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnSelection.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/ColumnSelection.cs @@ -142,7 +142,7 @@ private void SetSelectionColumn(int column, bool fireEvents) /// the permutation is being reordered /// /// The new selection column - /// The old column permuation + /// The old column permutation /// True if this routine should fire selection events private void SetSelectionColumn(int column, ColumnPermutation oldPermutation, bool fireEvents) { diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/HeaderControl.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/HeaderControl.cs index 5af26fe053..16b3e069c9 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/HeaderControl.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/HeaderControl.cs @@ -1160,7 +1160,7 @@ internal void WmReflectDrawItem(NativeMethods.DRAWITEMSTRUCT dis, Graphics g) /// /// Start tracking a column. TrackSplitter and FinishTrackingSplitter - /// should also be overriden if an override for this function does + /// should also be overridden if an override for this function does /// not call the base implementation. /// /// The column being adjusted diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeControl.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeControl.cs index 8499767c2c..bc21661f78 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeControl.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeControl.cs @@ -2188,7 +2188,7 @@ private void _WndProc(ref Message m) && HasHorizontalScrollBar && !HasVerticalScrollBar) { - // if there's no vertical scroll bar, mousehweel scrolls horizontally so we need to + // if there's no vertical scroll bar, mousewheel scrolls horizontally so we need to // update the header. myHeaderContainer.UpdateHeaderControlPosition(false); } @@ -2892,7 +2892,7 @@ protected override void OnKeyDown(KeyEventArgs e) // handle Ctrl-Plus to auto-size the current column. // UNDONE: the standard listview handles this to auto-size all columns, but // since we may have percentage-based columns, this is not necessarily a straightforward - // operation. Most important thing here is the accessbility requirement, which is + // operation. Most important thing here is the accessibility requirement, which is // satisfied by allowing resize of the current column from the keyboard. if (mySelectionColumn >= 0) { @@ -4470,7 +4470,7 @@ private void OnToggleExpansion( var invalidatePending = false; var subsequentSubItems = false; - // only perfom the optimization if we arent horizontally scrolled. (bug 38565) + // only perform the optimization if we aren't horizontally scrolled. (bug 38565) if (change != 0 && myXPos == 0) { @@ -7006,7 +7006,7 @@ private void ScrollBarsAfterExpand(int parentIndex, int change) } } //This happens fairly often and I don't know why. Investigate. For now, get by with swapping the two - //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consisent repro."); + //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consistent repro."); if (iLastToCheck + 1 < iFirstToCheck) { // swap the two @@ -7143,7 +7143,7 @@ private void ScrollBarsAfterCollapse(int parentIndex, int change) } //this happens fairly often and I don't know why. Investigate. For now, get by with swapping the two - //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consisent repro."); + //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consistent repro."); if (iLastToCheck + 1 < iFirstToCheck) { // swap the two @@ -7288,7 +7288,7 @@ private bool SetLeft(int x) return false; } - var dismissEdit = GetStateFlag(VTCStateFlags.NoDismissEdit); // enusre we don't dismiss the edit while scrolling into position + var dismissEdit = GetStateFlag(VTCStateFlags.NoDismissEdit); // ensure we don't dismiss the edit while scrolling into position try { SetStateFlag(VTCStateFlags.NoDismissEdit, true); @@ -7389,7 +7389,7 @@ private void VScrollCompleted() } Debug.Assert(iFirstToCheck >= newTopIndexAdjusted && iLastToCheck <= iLastVisible); //Missed a case //This happens fairly often and I don't know why. Investigate. For now, get by with swapping the two - //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consisent repro."); + //VSASSERT(iLastToCheck+1>=iFirstToCheck, "Invalid first to last range of visible items! Please report bug with a consistent repro."); if (iLastToCheck + 1 < iFirstToCheck) { // swap the two @@ -8692,7 +8692,7 @@ private void DoDragOverExpand() { // see if branch is expandable, and if so, set the timer // check to see if we are already dragging over an item, so no need to set the timer again - // Note that a pending bump scroll takes precendence over a drag over expand. This is so that + // Note that a pending bump scroll takes precedence over a drag over expand. This is so that // bump scrolling doesn't get interrupted by expansion. if (!GetStateFlag(VTCStateFlags.InBumpScroll) && (myLastDragExpandRow != myDropRow || myLastDragExpandCol != myDropColumn || !myDragTimer.Enabled)) @@ -8905,7 +8905,7 @@ protected virtual VirtualTreeStartDragData PopulateDragData(int row, int nativeC allowedEffects &= dragData.AllowedEffects; if (allowedEffects == 0) { - // The finaly clause will clear out the data sources gracefully + // The finally clause will clear out the data sources gracefully // if we don't set the finished signal. return VirtualTreeStartDragData.Empty; } @@ -9281,7 +9281,7 @@ protected override void OnQueryContinueDrag(QueryContinueDragEventArgs args) } /// - /// Helper fucntion for OnQueryContinueDrag. Allows us to reprocess + /// Helper function for OnQueryContinueDrag. Allows us to reprocess /// previously processed items if the DragAction changes. /// /// QueryContinueDragEventArgs @@ -9566,7 +9566,7 @@ protected override void WndProc(ref Message m) // tooltip does not end up returning HTTRANSPARENT all the time, so its TTF_TRANSPARENT // behavior does not work, ie. mouse events do not fall thru to controls underneath. This // is due to a combination of old app-specific hacks in comctl32, functional changes between - // v5 and v6, and the specfic way the grid drives its tooltip. Workaround is to just + // v5 and v6, and the specific way the grid drives its tooltip. Workaround is to just // force HTTRANSPARENT all the time. m.Result = (IntPtr)NativeMethods.HTTRANSPARENT; return; @@ -9912,7 +9912,7 @@ private bool UpdateMouseTargets() { //Don't show a custom tiptext over label to reduce interference with clicking, etc //However, make sure that moving from label to icons switches to special text. - //Note that we only make this adjustment if label is aligned near, otherwise ClippedItemRectange + //Note that we only make this adjustment if label is aligned near, otherwise ClippedItemRectangle //will already be aligned away from the indent, glyph, etc. extraInfo.ClippedItemRectangle.X += extraInfo.LabelOffset; rectClipped = true; @@ -10094,7 +10094,7 @@ private void SetEditSize() myEditIndex, selectionColumn, true, sizeToText, sizeToText ? myInPlaceControl.InPlaceControl.Text : null); var stringWidth = rcLabel.Width; - // get exact the text bounds (acount for borders used when drawing) + // get exact the text bounds (account for borders used when drawing) rcLabel.Inflate(-SystemInformation.Border3DSize.Width, -SystemInformation.BorderSize.Height); //UNDONE: deal with this when editing is defined @@ -10863,7 +10863,7 @@ public IList StateImageDescriptions } /// - /// Set the value for the StateImageAcccessibleStates property. + /// Set the value for the StateImageAccessibleStates property. /// /// The new accessible states public void SetStateImageAccessibleStates(IList accessibleStates) diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeEvents.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeEvents.cs index 8b62071478..c2743add5d 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeEvents.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeEvents.cs @@ -96,7 +96,7 @@ public DoubleClickEventArgs(VirtualTreeControl parent, MouseButtons button, int /// /// Property indicating if the double click event was handled. Set this property to true - /// from and event handler to stop the control from taking default action on the doudble click. + /// from and event handler to stop the control from taking default action on the double click. /// public bool Handled { get; set; } diff --git a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeSelection.cs b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeSelection.cs index 89ec100376..a5108a7123 100644 --- a/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeSelection.cs +++ b/src/EFTools/DesignXmlCore/VirtualTreeGrid/UI/VirtualTreeSelection.cs @@ -15,7 +15,7 @@ namespace Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid /// Selection support for the VirtualTreeControl. The motivation for implementing this here, rather than allowing the /// underlying listbox to handle it, is that we need to fire the correct WinEvents for selection/focus. If we let the listbox /// handle it, it will fire WinEvents with it's own child ids that assume a flat list structure. We need to be able to account for - /// hierarhcy in the tree. Also, it gets us a step closer to removing the listbox dependency altogether. + /// hierarchy in the tree. Also, it gets us a step closer to removing the listbox dependency altogether. /// internal partial class VirtualTreeControl { @@ -122,7 +122,7 @@ public void Dispose() /// /// Stores sorted list of selected ranges. Assumption here is that large, contiguous selection ranges will - /// be more common than lange numbers of discontiguous ranges, so this representation is more efficient than storing + /// be more common than large numbers of discontiguous ranges, so this representation is more efficient than storing /// a list of individually selected indices. /// private List mySelectedRanges; diff --git a/src/EFTools/DesignXmlCore/VisualStudio/NativeMethods.cs b/src/EFTools/DesignXmlCore/VisualStudio/NativeMethods.cs index 3a4f3846d6..9a889dfd89 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/NativeMethods.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/NativeMethods.cs @@ -1022,7 +1022,7 @@ internal enum Format public int iImage; // index of bitmap in ImageList public int iOrder; public uint type; // [in] filter type (defined what pvFilter is a pointer to) - public IntPtr pvFilter; // [in] fillter data see above + public IntPtr pvFilter; // [in] filter data see above } [StructLayout(LayoutKind.Sequential)] diff --git a/src/EFTools/DesignXmlCore/VisualStudio/Package/EditingContextManager.cs b/src/EFTools/DesignXmlCore/VisualStudio/Package/EditingContextManager.cs index 7886ec6040..686c5bc635 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/Package/EditingContextManager.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/Package/EditingContextManager.cs @@ -127,7 +127,7 @@ internal void OnCloseFrame(FrameWrapper closingFrame) // we need to refresh all sets that refer to the document // so that they revert to the document that is persisted in the file system - // TODO: add this functinality + // TODO: add this functionality //ModelManager.RefreshModelForLocation(closingFrame.Uri); } } diff --git a/src/EFTools/DesignXmlCore/VisualStudio/Package/ExplorerWindow.cs b/src/EFTools/DesignXmlCore/VisualStudio/Package/ExplorerWindow.cs index 8407b0dda4..8b0d07b8ba 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/Package/ExplorerWindow.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/Package/ExplorerWindow.cs @@ -263,7 +263,7 @@ public override void OnToolWindowCreated() // Set the text that will appear in the title bar of the tool window. // Note that because we need access to the package for localization, // we have to wait to do this here. If we used a constant string, - // we could do this in the consturctor. + // we could do this in the constructor. Caption = _package.GetResourceString("ExplorerWindowTitle"); IServiceProvider serviceProvider = _package; diff --git a/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.Designer.cs b/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.Designer.cs index af42c71c33..40ac0bc35d 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.Designer.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.Designer.cs @@ -33,7 +33,7 @@ private void InitializeComponent() this.backgroundWorker = new System.ComponentModel.BackgroundWorker(); this.descriptionTextBox = new System.Windows.Forms.TextBox(); this.progressBar = new System.Windows.Forms.ProgressBar(); - this.closeInterrruptButton = new System.Windows.Forms.Button(); + this.closeInterruptButton = new System.Windows.Forms.Button(); this.statusTextBox = new System.Windows.Forms.TextBox(); this.statusLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); @@ -68,17 +68,17 @@ private void InitializeComponent() this.progressBar.Size = new System.Drawing.Size(629, 23); this.progressBar.TabIndex = 2; // - // closeInterrruptButton + // closeInterruptButton // - this.closeInterrruptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.closeInterrruptButton.Enabled = false; - this.closeInterrruptButton.Location = new System.Drawing.Point(569, 199); - this.closeInterrruptButton.Name = "closeInterrruptButton"; - this.closeInterrruptButton.Size = new System.Drawing.Size(75, 23); - this.closeInterrruptButton.TabIndex = 0; - this.closeInterrruptButton.Text = string.Empty; // the text changes depending on the mode - this.closeInterrruptButton.UseVisualStyleBackColor = true; - this.closeInterrruptButton.Click += new System.EventHandler(this.closeInterrruptButton_Click); + this.closeInterruptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.closeInterruptButton.Enabled = false; + this.closeInterruptButton.Location = new System.Drawing.Point(569, 199); + this.closeInterruptButton.Name = "closeInterruptButton"; + this.closeInterruptButton.Size = new System.Drawing.Size(75, 23); + this.closeInterruptButton.TabIndex = 0; + this.closeInterruptButton.Text = string.Empty; // the text changes depending on the mode + this.closeInterruptButton.UseVisualStyleBackColor = true; + this.closeInterruptButton.Click += new System.EventHandler(this.closeInterruptButton_Click); // // statusTextBox // @@ -110,7 +110,7 @@ private void InitializeComponent() this.ControlBox = false; this.Controls.Add(this.statusLabel); this.Controls.Add(this.statusTextBox); - this.Controls.Add(this.closeInterrruptButton); + this.Controls.Add(this.closeInterruptButton); this.Controls.Add(this.progressBar); this.Controls.Add(this.descriptionTextBox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; @@ -132,7 +132,7 @@ private void InitializeComponent() private System.ComponentModel.BackgroundWorker backgroundWorker; private System.Windows.Forms.TextBox descriptionTextBox; private System.Windows.Forms.ProgressBar progressBar; - private System.Windows.Forms.Button closeInterrruptButton; + private System.Windows.Forms.Button closeInterruptButton; private System.Windows.Forms.TextBox statusTextBox; private System.Windows.Forms.Label statusLabel; } diff --git a/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.cs b/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.cs index 6812e14bc8..634752871e 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/UI/ProgressDialog.cs @@ -87,8 +87,8 @@ private void ProgressDialog_Load(object sender, EventArgs e) backgroundWorker.IsBusy == false, "Should not attempt to start the background job when the backgroundWorker is already busy"); if (false == backgroundWorker.IsBusy) { - closeInterrruptButton.Text = Resources.ProgressDialogCloseInterruptButtonInterruptText; // set button to interrupt mode - closeInterrruptButton.Enabled = true; + closeInterruptButton.Text = Resources.ProgressDialogCloseInterruptButtonInterruptText; // set button to interrupt mode + closeInterruptButton.Enabled = true; backgroundWorker.RunWorkerAsync(_progressDialogWorkArgument); } } @@ -115,7 +115,7 @@ private void backgroundWorker_ProgressChanged(object sender, ProgressChangedEven // simulate a user clicking the Stop button if (_currentUserState.CurrentIteration >= SimulateStopAfter) { - closeInterrruptButton_Click(this, EventArgs.Empty); + closeInterruptButton_Click(this, EventArgs.Empty); } #endregion @@ -144,8 +144,8 @@ private void backgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet indent += " "; } Status = sb.ToString(); - closeInterrruptButton.Text = Resources.ProgressDialogCloseInterruptButtonCloseText; - closeInterrruptButton.Enabled = true; + closeInterruptButton.Text = Resources.ProgressDialogCloseInterruptButtonCloseText; + closeInterruptButton.Enabled = true; if (BackgroundWorkCompletedEventStorage != null) { BackgroundWorkCompletedEventStorage(this, EventArgs.Empty); @@ -159,8 +159,8 @@ private void backgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet CultureInfo.CurrentCulture, Resources.ProgressDialogBackgroundJobCancellationMessage, _currentUserState.CurrentIteration, _currentUserState.NumberIterations, _currentUserState.CurrentStatusMessage); Status = statusText; - closeInterrruptButton.Text = Resources.ProgressDialogCloseInterruptButtonCloseText; - closeInterrruptButton.Enabled = true; + closeInterruptButton.Text = Resources.ProgressDialogCloseInterruptButtonCloseText; + closeInterruptButton.Enabled = true; if (BackgroundWorkCompletedEventStorage != null) { BackgroundWorkCompletedEventStorage(this, EventArgs.Empty); @@ -170,7 +170,7 @@ private void backgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet { // background job completed successfully - close dialog DialogResult = DialogResult.OK; // set result to OK so that caller knows what happened - closeInterrruptButton.Enabled = false; + closeInterruptButton.Enabled = false; if (BackgroundWorkCompletedEventStorage != null) { BackgroundWorkCompletedEventStorage(this, EventArgs.Empty); @@ -179,13 +179,13 @@ private void backgroundWorker_RunWorkerCompleted(object sender, RunWorkerComplet } } - private void closeInterrruptButton_Click(object sender, EventArgs e) + private void closeInterruptButton_Click(object sender, EventArgs e) { - if (closeInterrruptButton.Text.Equals( + if (closeInterruptButton.Text.Equals( Resources.ProgressDialogCloseInterruptButtonInterruptText, StringComparison.CurrentCulture)) { // user clicked on closeInterruptButton in Interrupt mode - so cancel background job - closeInterrruptButton.Enabled = false; // when cancellation is received button will be re-enabled in Close mode + closeInterruptButton.Enabled = false; // when cancellation is received button will be re-enabled in Close mode backgroundWorker.CancelAsync(); } else diff --git a/src/EFTools/DesignXmlCore/VisualStudio/VSHelpers.cs b/src/EFTools/DesignXmlCore/VisualStudio/VSHelpers.cs index f1cfee5e72..98a8b936ee 100644 --- a/src/EFTools/DesignXmlCore/VisualStudio/VSHelpers.cs +++ b/src/EFTools/DesignXmlCore/VisualStudio/VSHelpers.cs @@ -388,7 +388,7 @@ internal static Project GetProject(IVsHierarchy hierarchy) /// The service provider /// /// - /// A refernce to the IVsProject3 interface for the misceleneous project. + /// A reference to the IVsProject3 interface for the miscellaneous project. /// private static IVsProject3 GetMiscellaneousProject() { @@ -411,7 +411,7 @@ private static IVsProject3 GetMiscellaneousProject() /// The service provider /// /// - /// A refernce to the IVsProject3 interface for the misceleneous project. + /// A reference to the IVsProject3 interface for the miscellaneous project. /// public static IVsProject3 GetMiscellaneousProject(IServiceProvider provider) { diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj index 7f413719d8..76e63b18a0 100644 --- a/src/EFTools/EntityDesign/EntityDesign.csproj +++ b/src/EFTools/EntityDesign/EntityDesign.csproj @@ -455,11 +455,11 @@ ComplexTypePickerDialog.cs - + Form - - DismissableWarningDialog.cs + + DismissibleWarningDialog.cs @@ -812,8 +812,8 @@ ComplexTypePickerDialog.cs Designer - - DismissableWarningDialog.cs + + DismissibleWarningDialog.cs Designer diff --git a/src/EFTools/EntityDesign/Refactoring/VsObjectSearchResults.cs b/src/EFTools/EntityDesign/Refactoring/VsObjectSearchResults.cs index 07f6ddbb3c..904ee8a451 100644 --- a/src/EFTools/EntityDesign/Refactoring/VsObjectSearchResults.cs +++ b/src/EFTools/EntityDesign/Refactoring/VsObjectSearchResults.cs @@ -15,11 +15,11 @@ internal class VsObjectSearchResult { private const string DashWithSpaces = " - "; - internal VsObjectSearchResult(string fileName, string displayText, int lineNumer, int columnNumber) + internal VsObjectSearchResult(string fileName, string displayText, int lineNumber, int columnNumber) { FileName = fileName; DisplayText = displayText; - LineNumber = lineNumer; + LineNumber = lineNumber; ColumnNumber = columnNumber; } @@ -41,7 +41,7 @@ internal static List Search(string name, ObjectSearchLangu criteria.eSrchType = VSOBSEARCHTYPE.SO_ENTIREWORD; criteria.szName = name; - // Need to switch between case sensitive and case insentive searches for C# and VB + // Need to switch between case sensitive and case insensitive searches for C# and VB switch (searchLanguage) { case ObjectSearchLanguage.CSharp: diff --git a/src/EFTools/EntityDesign/Resources.Designer.cs b/src/EFTools/EntityDesign/Resources.Designer.cs index d4e7cc5826..a5b51d10c2 100644 --- a/src/EFTools/EntityDesign/Resources.Designer.cs +++ b/src/EFTools/EntityDesign/Resources.Designer.cs @@ -624,9 +624,9 @@ public static string DatabaseCreation_WorkflowFileNotExists { /// /// Looks up a localized string similar to (User). /// - public static string DbGenExtensibileListConverter_UserDir { + public static string DbGenExtensibleListConverter_UserDir { get { - return ResourceManager.GetString("DbGenExtensibileListConverter_UserDir", resourceCulture); + return ResourceManager.GetString("DbGenExtensibleListConverter_UserDir", resourceCulture); } } @@ -2760,72 +2760,72 @@ public static string PropertyWindow_Description_ValidateOnBuild { /// /// Looks up a localized string similar to The name of the association.. /// - public static string PropertyWindow_Descritpion_AssociationName { + public static string PropertyWindow_Description_AssociationName { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_AssociationName", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_AssociationName", resourceCulture); } } /// /// Looks up a localized string similar to The name of the association set that contains the association.. /// - public static string PropertyWindow_Descritpion_AssociationSetName { + public static string PropertyWindow_Description_AssociationSetName { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_AssociationSetName", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_AssociationSetName", resourceCulture); } } /// /// Looks up a localized string similar to Name of the entity property that returns the value at this end. /// - public static string PropertyWindow_Descritpion_EndNavigationProperty { + public static string PropertyWindow_Description_EndNavigationProperty { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_EndNavigationProperty", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_EndNavigationProperty", resourceCulture); } } /// /// Looks up a localized string similar to Specifies the action to take when an entity on this end is deleted. /// - public static string PropertyWindow_Descritpion_EndOnDelete { + public static string PropertyWindow_Description_EndOnDelete { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_EndOnDelete", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_EndOnDelete", resourceCulture); } } /// /// Looks up a localized string similar to The name of the entity container, which contains all instances of entities for the Entity Data Model.. /// - public static string PropertyWindow_Descritpion_EntityContainerName { + public static string PropertyWindow_Description_EntityContainerName { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_EntityContainerName", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_EntityContainerName", resourceCulture); } } /// /// Looks up a localized string similar to The allowed number of entities at this end of the association. /// - public static string PropertyWindow_Descritpion_Multiplicity { + public static string PropertyWindow_Description_Multiplicity { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_Multiplicity", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_Multiplicity", resourceCulture); } } /// /// Looks up a localized string similar to The namespace for the Entity Data Model.. /// - public static string PropertyWindow_Descritpion_Namespace { + public static string PropertyWindow_Description_Namespace { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_Namespace", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_Namespace", resourceCulture); } } /// /// Looks up a localized string similar to Name of this end. /// - public static string PropertyWindow_Descritpion_Role { + public static string PropertyWindow_Description_Role { get { - return ResourceManager.GetString("PropertyWindow_Descritpion_Role", resourceCulture); + return ResourceManager.GetString("PropertyWindow_Description_Role", resourceCulture); } } diff --git a/src/EFTools/EntityDesign/Resources.resx b/src/EFTools/EntityDesign/Resources.resx index 0e1a1ead60..62fa7e1386 100644 --- a/src/EFTools/EntityDesign/Resources.resx +++ b/src/EFTools/EntityDesign/Resources.resx @@ -362,7 +362,7 @@ End2 Navigation Property - + Name of the entity property that returns the value at this end @@ -371,7 +371,7 @@ End2 OnDelete - + Specifies the action to take when an entity on this end is deleted @@ -589,22 +589,22 @@ The type of the scalar property. - + The name of the association. - + The name of the association set that contains the association. - + The name of the entity container, which contains all instances of entities for the Entity Data Model. - + The allowed number of entities at this end of the association - + The namespace for the Entity Data Model. - + Name of this end @@ -1012,7 +1012,7 @@ The 'TemplatePath' attribute value, '{{0}}', for the template activity '{0}' in this workflow either is not valid or does not exist. - This is a string that is fomatted two times, hence the '{{0}}' + This is a string that is formatted two times, hence the '{{0}}' The ITextTemplating service could not be found to process the template '{0}'. This service is only available within Visual Studio. Please make sure that this workflow is running within Visual Studio. @@ -1034,7 +1034,7 @@ The 'TemplatePath' input file, '{{0}}', for the template activity '{0}' in this workflow is not valid because non-file and UNC paths are not supported. - This is a string that is fomatted two times, hence the '{{0}}' + This is a string that is formatted two times, hence the '{{0}}' The Database Generation Workflow path is not set in the EDMX file. Please make sure this is set before running the Generate Database wizard @@ -1230,7 +1230,7 @@ Click Cancel to stop the process. The TemplatePath argument was not specified for the '{0}' activity. It must either be specified on this activity in the workflow file or passed in at runtime through the 'DDLTemplatePath' parameter in the EdmParameterBag. - + (User) diff --git a/src/EFTools/EntityDesign/Resources/ExplorerContent_11.0.xaml b/src/EFTools/EntityDesign/Resources/ExplorerContent_11.0.xaml index bcc6d7efa5..f934494692 100644 --- a/src/EFTools/EntityDesign/Resources/ExplorerContent_11.0.xaml +++ b/src/EFTools/EntityDesign/Resources/ExplorerContent_11.0.xaml @@ -222,7 +222,7 @@ - + diff --git a/src/EFTools/EntityDesign/Resources/ExplorerContent_12.0.xaml b/src/EFTools/EntityDesign/Resources/ExplorerContent_12.0.xaml index 8371580abe..73a775eaec 100644 --- a/src/EFTools/EntityDesign/Resources/ExplorerContent_12.0.xaml +++ b/src/EFTools/EntityDesign/Resources/ExplorerContent_12.0.xaml @@ -222,7 +222,7 @@ - + diff --git a/src/EFTools/EntityDesign/Resources/ExplorerContent_14.0.xaml b/src/EFTools/EntityDesign/Resources/ExplorerContent_14.0.xaml index c97efc6d28..9b7dcab2b8 100644 --- a/src/EFTools/EntityDesign/Resources/ExplorerContent_14.0.xaml +++ b/src/EFTools/EntityDesign/Resources/ExplorerContent_14.0.xaml @@ -222,7 +222,7 @@ - + diff --git a/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml b/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml index 9910148594..f217b69f57 100644 --- a/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml +++ b/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml @@ -222,7 +222,7 @@ - + diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.CS.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.CS.ttinclude index 4dd7eb1d71..5e9f616567 100644 --- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.CS.ttinclude +++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.CS.ttinclude @@ -377,7 +377,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceAfter(string value) { @@ -386,7 +386,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceBefore(string value) { @@ -395,7 +395,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with append concatenated on the end. + /// otherwise it returns value with append concatenated on the end. /// public string StringAfter(string value, string append) { @@ -409,7 +409,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with prepend concatenated on the front. + /// otherwise it returns value with prepend concatenated on the front. /// public string StringBefore(string prepend, string value) { @@ -472,7 +472,7 @@ public class CodeGenerationTools } /// - /// Retuns as full of a name as possible, if a namespace is provided + /// Returns as full of a name as possible, if a namespace is provided /// the namespace and name are combined with a period, otherwise just /// the name is returned. /// @@ -487,7 +487,7 @@ public class CodeGenerationTools } /// - /// Retuns a literal representing the supplied value. + /// Returns a literal representing the supplied value. /// public string CreateLiteral(object value) { @@ -1775,7 +1775,7 @@ public class CodeRegion } /// - /// Starts the begining of a region + /// Starts the beginning of a region /// public void Begin(string regionName) { @@ -1788,7 +1788,7 @@ public class CodeRegion } /// - /// Start the begining of a region, indented + /// Start the beginning of a region, indented /// the numbers of levels specified /// public void Begin(string regionName, int levelsToIncreaseIndent) @@ -1806,8 +1806,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region. + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region. /// public void End() { @@ -1815,8 +1815,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region, also outdents + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region, also outdents /// the number of levels specified. /// public void End(int levelsToDecrease) @@ -1842,7 +1842,7 @@ public class CodeRegion public int CurrentIndentLevel { get { return _regionIndentLevel; } } /// - /// Get a string of spaces equivelent to the number of indents + /// Get a string of spaces equivalent to the number of indents /// desired. /// public static string GetIndent(int indentLevel) @@ -2261,7 +2261,7 @@ public class DynamicTextTransformation /// /// Creates an instance of the DynamicTextTransformation class around the passed in - /// TextTransformation shapped instance passed in, or if the passed in instance + /// TextTransformation shaped instance passed in, or if the passed in instance /// already is a DynamicTextTransformation, it casts it and sends it back. /// public static DynamicTextTransformation Create(object instance) @@ -2292,17 +2292,17 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + /// Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property /// public StringBuilder GenerationEnvironment { get { return (StringBuilder)_generationEnvironment.GetValue(_instance, null); } } /// - /// Gets the value of the wrapped TextTranformation instance's Errors property + /// Gets the value of the wrapped TextTransformation instance's Errors property /// public System.CodeDom.Compiler.CompilerErrorCollection Errors { get { return (System.CodeDom.Compiler.CompilerErrorCollection)_errors.GetValue(_instance, null); } } /// - /// Calls the wrapped TextTranformation instance's Write method. + /// Calls the wrapped TextTransformation instance's Write method. /// public void Write(string text) { @@ -2310,7 +2310,7 @@ public class DynamicTextTransformation } /// - /// Calls the wrapped TextTranformation instance's WriteLine method. + /// Calls the wrapped TextTransformation instance's WriteLine method. /// public void WriteLine(string text) { @@ -2318,7 +2318,7 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's Host property + /// Gets the value of the wrapped TextTransformation instance's Host property /// if available (shows up when hostspecific is set to true in the template directive) and returns /// the appropriate implementation of IDynamicHost /// @@ -2344,7 +2344,7 @@ public class DynamicTextTransformation /// -/// Reponsible for abstracting the use of Host between times +/// Responsible for abstracting the use of Host between times /// when it is available and not /// public interface IDynamicHost @@ -2371,7 +2371,7 @@ public interface IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost as a dynamic +/// Responsible for implementing the IDynamicHost as a dynamic /// shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface /// rather than type dependent wrapper. We don't use the /// interface type so that the code can be run in preprocessed mode @@ -2386,7 +2386,7 @@ public class DynamicHost : IDynamicHost /// /// Creates an instance of the DynamicHost class around the passed in - /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. /// public DynamicHost(object instance) { @@ -2435,7 +2435,7 @@ public class DynamicHost : IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost when the +/// Responsible for implementing the IDynamicHost when the /// Host property is not available on the TextTemplating type. The Host /// property only exists when the hostspecific attribute of the template /// directive is set to true. @@ -2444,7 +2444,7 @@ public class NullHost : IDynamicHost { /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - /// that simply retuns null. + /// that simply returns null. /// public string ResolveParameterValue(string id, string name, string otherName) { @@ -2453,7 +2453,7 @@ public class NullHost : IDynamicHost /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - /// that simply retuns the path passed in. + /// that simply returns the path passed in. /// public string ResolvePath(string path) { diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.VB.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.VB.ttinclude index 2f659cc401..d48f5a4f2c 100644 --- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.VB.ttinclude +++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF.Utility.VB.ttinclude @@ -348,7 +348,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with a single space concatenated on the end. + ''' otherwise it returns value with a single space concatenated on the end. ''' Public Function SpaceAfter(ByVal value As String) As String Return StringAfter(value, " ") @@ -356,7 +356,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with a single space concatenated on the end. + ''' otherwise it returns value with a single space concatenated on the end. ''' Public Function SpaceBefore(ByVal value As String) As String Return StringBefore(" ", value) @@ -364,7 +364,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with append concatenated on the end. + ''' otherwise it returns value with append concatenated on the end. ''' Public Function StringAfter(ByVal value As String, ByVal append As String) As String If String.IsNullOrEmpty(value) Then @@ -376,7 +376,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with prepend concatenated on the front. + ''' otherwise it returns value with prepend concatenated on the front. ''' Public Function StringBefore(ByVal prepend As String, ByVal value As String) As String If String.IsNullOrEmpty(value) Then @@ -456,9 +456,9 @@ Public Class CodeGenerationTools Dim entity As EntityType = TryCast(edmType, EntityType) If Not entity Is Nothing Then Dim declaredMembers As IEnumerable(Of EdmMember) = entity.Members.Where(Function(m) m.DeclaringType Is entity) - Dim decalredNavigationProperties As IEnumerable(Of NavigationProperty) = entity.NavigationProperties.Where(Function(n) n.DeclaringType Is entity) + Dim declaredNavigationProperties As IEnumerable(Of NavigationProperty) = entity.NavigationProperties.Where(Function(n) n.DeclaringType Is entity) - Return declaredMembers.Union(decalredNavigationProperties.Cast(Of EdmMember)()).Select(Function(m) m.Name) + Return declaredMembers.Union(declaredNavigationProperties.Cast(Of EdmMember)()).Select(Function(m) m.Name) End If Dim structural As StructuralType = TryCast(edmType, StructuralType) @@ -475,7 +475,7 @@ Public Class CodeGenerationTools End Function ''' - ''' Retuns as full of a name as possible, if a namespace is provided + ''' Returns as full of a name as possible, if a namespace is provided ''' the namespace and name are combined with a period, otherwise just ''' the name is returned. ''' @@ -488,7 +488,7 @@ Public Class CodeGenerationTools End Function ''' - ''' Retuns a literal representing the supplied value. + ''' Returns a literal representing the supplied value. ''' Public Function CreateLiteral(ByVal value As Object) As String If value Is Nothing Then @@ -1591,7 +1591,7 @@ Public Class CodeRegion End Sub ''' - ''' Starts the begining of a region + ''' Starts the beginning of a region ''' Public Sub Begin(ByVal regionName As String) If regionName Is Nothing Then @@ -1602,7 +1602,7 @@ Public Class CodeRegion End Sub ''' - ''' Start the begining of a region, indented + ''' Start the beginning of a region, indented ''' the numbers of levels specified ''' Public Sub Begin(ByVal regionName As String, ByVal levelsToIncreaseIndent As Integer) @@ -1618,16 +1618,16 @@ Public Class CodeRegion End Sub ''' - ''' Ends a region, or totaly removes it if nothing - ''' was generted since the begining of the region. + ''' Ends a region, or totally removes it if nothing + ''' was generated since the beginning of the region. ''' Public Sub [End]() [End](1) End Sub ''' - ''' Ends a region, or totaly removes it if nothing - ''' was generted since the begining of the region, also outdents + ''' Ends a region, or totally removes it if nothing + ''' was generated since the beginning of the region, also outdents ''' the number of levels specified. ''' Public Sub [End](ByVal levelsToDecrease As Integer) @@ -1655,7 +1655,7 @@ Public Class CodeRegion End Property ''' - ''' Get a string of spaces equivelent to the number of indents + ''' Get a string of spaces equivalent to the number of indents ''' desired. ''' Public Shared Function GetIndent(ByVal indentLevel As Integer) As String @@ -2095,7 +2095,7 @@ Public Class DynamicTextTransformation ''' ''' Creates an instance of the DynamicTextTransformation class around the passed in - ''' TextTransformation shapped instance passed in, or if the passed in instance + ''' TextTransformation shaped instance passed in, or if the passed in instance ''' already is a DynamicTextTransformation, it casts it and sends it back. ''' Public Shared Function Create(ByVal instance As Object) As DynamicTextTransformation @@ -2122,7 +2122,7 @@ Public Class DynamicTextTransformation End Sub ''' - ''' Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + ''' Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property ''' Public ReadOnly Property GenerationEnvironment() As StringBuilder Get @@ -2131,7 +2131,7 @@ Public Class DynamicTextTransformation End Property ''' - ''' Gets the value of the wrapped TextTranformation instance's Errors property + ''' Gets the value of the wrapped TextTransformation instance's Errors property ''' Public ReadOnly Property Errors() As System.CodeDom.Compiler.CompilerErrorCollection Get @@ -2140,21 +2140,21 @@ Public Class DynamicTextTransformation End Property ''' - ''' Calls the wrapped TextTranformation instance's Write method. + ''' Calls the wrapped TextTransformation instance's Write method. ''' Public Sub Write(ByVal text As String) _write.Invoke(_instance, New Object() {text}) End Sub ''' - ''' Calls the wrapped TextTranformation instance's WriteLine method. + ''' Calls the wrapped TextTransformation instance's WriteLine method. ''' Public Sub WriteLine(ByVal text As String) _writeLine.Invoke(_instance, New Object() {text}) End Sub ''' - ''' Gets the value of the wrapped TextTranformation instance's Host property + ''' Gets the value of the wrapped TextTransformation instance's Host property ''' if available (shows up when hostspecific is set to true in the template directive) and returns ''' the appropriate implementation of IDynamicHost ''' @@ -2174,7 +2174,7 @@ End Class ''' -''' Reponsible for abstracting the use of Host between times +''' Responsible for abstracting the use of Host between times ''' when it is available and not ''' Public Interface IDynamicHost @@ -2200,7 +2200,7 @@ Public Interface IDynamicHost End Interface ''' -''' Reponsible for implementing the IDynamicHost as a dynamic +''' Responsible for implementing the IDynamicHost as a dynamic ''' shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface ''' rather than type dependent wrapper. We don't use the ''' interface type so that the code can be run in preprocessed mode @@ -2215,7 +2215,7 @@ Public Class DynamicHost ''' ''' Creates an instance of the DynamicHost class around the passed in - ''' Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + ''' Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. ''' Public Sub New(ByVal instance As Object) _instance = instance @@ -2258,7 +2258,7 @@ Public Class DynamicHost End Class ''' -''' Reponsible for implementing the IDynamicHost when the +''' Responsible for implementing the IDynamicHost when the ''' Host property is not available on the TextTemplating type. The Host ''' property only exists when the hostspecific attribute of the template ''' directive is set to true. @@ -2267,7 +2267,7 @@ Public Class NullHost Implements IDynamicHost ''' ''' An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - ''' that simply retuns null. + ''' that simply returns null. ''' Public Function ResolveParameterValue(ByVal id As String, ByVal name As String, ByVal otherName As String) As String Implements IDynamicHost.ResolveParameterValue Return Nothing @@ -2275,7 +2275,7 @@ Public Class NullHost ''' ''' An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - ''' that simply retuns the path passed in. + ''' that simply returns the path passed in. ''' Public Function ResolvePath(ByVal path As String) As String Implements IDynamicHost.ResolvePath Return path diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude index 90f0cd1b46..2444ed25f3 100644 --- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude +++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude @@ -374,7 +374,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceAfter(string value) { @@ -383,7 +383,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceBefore(string value) { @@ -392,7 +392,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with append concatenated on the end. + /// otherwise it returns value with append concatenated on the end. /// public string StringAfter(string value, string append) { @@ -406,7 +406,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with prepend concatenated on the front. + /// otherwise it returns value with prepend concatenated on the front. /// public string StringBefore(string prepend, string value) { @@ -469,7 +469,7 @@ public class CodeGenerationTools } /// - /// Retuns as full of a name as possible, if a namespace is provided + /// Returns as full of a name as possible, if a namespace is provided /// the namespace and name are combined with a period, otherwise just /// the name is returned. /// @@ -484,7 +484,7 @@ public class CodeGenerationTools } /// - /// Retuns a literal representing the supplied value. + /// Returns a literal representing the supplied value. /// public string CreateLiteral(object value) { @@ -1292,7 +1292,7 @@ public class CodeRegion } /// - /// Starts the begining of a region + /// Starts the beginning of a region /// public void Begin(string regionName) { @@ -1305,7 +1305,7 @@ public class CodeRegion } /// - /// Start the begining of a region, indented + /// Start the beginning of a region, indented /// the numbers of levels specified /// public void Begin(string regionName, int levelsToIncreaseIndent) @@ -1323,8 +1323,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region. + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region. /// public void End() { @@ -1332,8 +1332,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region, also outdents + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region, also outdents /// the number of levels specified. /// public void End(int levelsToDecrease) @@ -1359,7 +1359,7 @@ public class CodeRegion public int CurrentIndentLevel { get { return _regionIndentLevel; } } /// - /// Get a string of spaces equivelent to the number of indents + /// Get a string of spaces equivalent to the number of indents /// desired. /// public static string GetIndent(int indentLevel) @@ -1893,7 +1893,7 @@ public class DynamicTextTransformation /// /// Creates an instance of the DynamicTextTransformation class around the passed in - /// TextTransformation shapped instance passed in, or if the passed in instance + /// TextTransformation shaped instance passed in, or if the passed in instance /// already is a DynamicTextTransformation, it casts it and sends it back. /// public static DynamicTextTransformation Create(object instance) @@ -1924,17 +1924,17 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + /// Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property /// public StringBuilder GenerationEnvironment { get { return (StringBuilder)_generationEnvironment.GetValue(_instance, null); } } /// - /// Gets the value of the wrapped TextTranformation instance's Errors property + /// Gets the value of the wrapped TextTransformation instance's Errors property /// public System.CodeDom.Compiler.CompilerErrorCollection Errors { get { return (System.CodeDom.Compiler.CompilerErrorCollection)_errors.GetValue(_instance, null); } } /// - /// Calls the wrapped TextTranformation instance's Write method. + /// Calls the wrapped TextTransformation instance's Write method. /// public void Write(string text) { @@ -1942,7 +1942,7 @@ public class DynamicTextTransformation } /// - /// Calls the wrapped TextTranformation instance's WriteLine method. + /// Calls the wrapped TextTransformation instance's WriteLine method. /// public void WriteLine(string text) { @@ -1950,7 +1950,7 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's Host property + /// Gets the value of the wrapped TextTransformation instance's Host property /// if available (shows up when hostspecific is set to true in the template directive) and returns /// the appropriate implementation of IDynamicHost /// @@ -1976,7 +1976,7 @@ public class DynamicTextTransformation /// -/// Reponsible for abstracting the use of Host between times +/// Responsible for abstracting the use of Host between times /// when it is available and not /// public interface IDynamicHost @@ -2003,7 +2003,7 @@ public interface IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost as a dynamic +/// Responsible for implementing the IDynamicHost as a dynamic /// shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface /// rather than type dependent wrapper. We don't use the /// interface type so that the code can be run in preprocessed mode @@ -2018,7 +2018,7 @@ public class DynamicHost : IDynamicHost /// /// Creates an instance of the DynamicHost class around the passed in - /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. /// public DynamicHost(object instance) { @@ -2067,7 +2067,7 @@ public class DynamicHost : IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost when the +/// Responsible for implementing the IDynamicHost when the /// Host property is not available on the TextTemplating type. The Host /// property only exists when the hostspecific attribute of the template /// directive is set to true. @@ -2076,7 +2076,7 @@ public class NullHost : IDynamicHost { /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - /// that simply retuns null. + /// that simply returns null. /// public string ResolveParameterValue(string id, string name, string otherName) { @@ -2085,7 +2085,7 @@ public class NullHost : IDynamicHost /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - /// that simply retuns the path passed in. + /// that simply returns the path passed in. /// public string ResolvePath(string path) { diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude index 9be51f83c2..5aee54d60f 100644 --- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude +++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude @@ -345,7 +345,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with a single space concatenated on the end. + ''' otherwise it returns value with a single space concatenated on the end. ''' Public Function SpaceAfter(ByVal value As String) As String Return StringAfter(value, " ") @@ -353,7 +353,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with a single space concatenated on the end. + ''' otherwise it returns value with a single space concatenated on the end. ''' Public Function SpaceBefore(ByVal value As String) As String Return StringBefore(" ", value) @@ -361,7 +361,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with append concatenated on the end. + ''' otherwise it returns value with append concatenated on the end. ''' Public Function StringAfter(ByVal value As String, ByVal append As String) As String If String.IsNullOrEmpty(value) Then @@ -373,7 +373,7 @@ Public Class CodeGenerationTools ''' ''' If the value parameter is null or empty an empty string is returned, - ''' otherwise it retuns value with prepend concatenated on the front. + ''' otherwise it returns value with prepend concatenated on the front. ''' Public Function StringBefore(ByVal prepend As String, ByVal value As String) As String If String.IsNullOrEmpty(value) Then @@ -453,9 +453,9 @@ Public Class CodeGenerationTools Dim entity As EntityType = TryCast(edmType, EntityType) If Not entity Is Nothing Then Dim declaredMembers As IEnumerable(Of EdmMember) = entity.Members.Where(Function(m) m.DeclaringType Is entity) - Dim decalredNavigationProperties As IEnumerable(Of NavigationProperty) = entity.NavigationProperties.Where(Function(n) n.DeclaringType Is entity) + Dim declaredNavigationProperties As IEnumerable(Of NavigationProperty) = entity.NavigationProperties.Where(Function(n) n.DeclaringType Is entity) - Return declaredMembers.Union(decalredNavigationProperties.Cast(Of EdmMember)()).Select(Function(m) m.Name) + Return declaredMembers.Union(declaredNavigationProperties.Cast(Of EdmMember)()).Select(Function(m) m.Name) End If Dim structural As StructuralType = TryCast(edmType, StructuralType) @@ -472,7 +472,7 @@ Public Class CodeGenerationTools End Function ''' - ''' Retuns as full of a name as possible, if a namespace is provided + ''' Returns as full of a name as possible, if a namespace is provided ''' the namespace and name are combined with a period, otherwise just ''' the name is returned. ''' @@ -485,7 +485,7 @@ Public Class CodeGenerationTools End Function ''' - ''' Retuns a literal representing the supplied value. + ''' Returns a literal representing the supplied value. ''' Public Function CreateLiteral(ByVal value As Object) As String If value Is Nothing Then @@ -1175,7 +1175,7 @@ Public Class CodeRegion End Sub ''' - ''' Starts the begining of a region + ''' Starts the beginning of a region ''' Public Sub Begin(ByVal regionName As String) If regionName Is Nothing Then @@ -1186,7 +1186,7 @@ Public Class CodeRegion End Sub ''' - ''' Start the begining of a region, indented + ''' Start the beginning of a region, indented ''' the numbers of levels specified ''' Public Sub Begin(ByVal regionName As String, ByVal levelsToIncreaseIndent As Integer) @@ -1202,16 +1202,16 @@ Public Class CodeRegion End Sub ''' - ''' Ends a region, or totaly removes it if nothing - ''' was generted since the begining of the region. + ''' Ends a region, or totally removes it if nothing + ''' was generated since the beginning of the region. ''' Public Sub [End]() [End](1) End Sub ''' - ''' Ends a region, or totaly removes it if nothing - ''' was generted since the begining of the region, also outdents + ''' Ends a region, or totally removes it if nothing + ''' was generated since the beginning of the region, also outdents ''' the number of levels specified. ''' Public Sub [End](ByVal levelsToDecrease As Integer) @@ -1239,7 +1239,7 @@ Public Class CodeRegion End Property ''' - ''' Get a string of spaces equivelent to the number of indents + ''' Get a string of spaces equivalent to the number of indents ''' desired. ''' Public Shared Function GetIndent(ByVal indentLevel As Integer) As String @@ -1764,7 +1764,7 @@ Public Class DynamicTextTransformation ''' ''' Creates an instance of the DynamicTextTransformation class around the passed in - ''' TextTransformation shapped instance passed in, or if the passed in instance + ''' TextTransformation shaped instance passed in, or if the passed in instance ''' already is a DynamicTextTransformation, it casts it and sends it back. ''' Public Shared Function Create(ByVal instance As Object) As DynamicTextTransformation @@ -1791,7 +1791,7 @@ Public Class DynamicTextTransformation End Sub ''' - ''' Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + ''' Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property ''' Public ReadOnly Property GenerationEnvironment() As StringBuilder Get @@ -1800,7 +1800,7 @@ Public Class DynamicTextTransformation End Property ''' - ''' Gets the value of the wrapped TextTranformation instance's Errors property + ''' Gets the value of the wrapped TextTransformation instance's Errors property ''' Public ReadOnly Property Errors() As System.CodeDom.Compiler.CompilerErrorCollection Get @@ -1809,21 +1809,21 @@ Public Class DynamicTextTransformation End Property ''' - ''' Calls the wrapped TextTranformation instance's Write method. + ''' Calls the wrapped TextTransformation instance's Write method. ''' Public Sub Write(ByVal text As String) _write.Invoke(_instance, New Object() {text}) End Sub ''' - ''' Calls the wrapped TextTranformation instance's WriteLine method. + ''' Calls the wrapped TextTransformation instance's WriteLine method. ''' Public Sub WriteLine(ByVal text As String) _writeLine.Invoke(_instance, New Object() {text}) End Sub ''' - ''' Gets the value of the wrapped TextTranformation instance's Host property + ''' Gets the value of the wrapped TextTransformation instance's Host property ''' if available (shows up when hostspecific is set to true in the template directive) and returns ''' the appropriate implementation of IDynamicHost ''' @@ -1843,7 +1843,7 @@ End Class ''' -''' Reponsible for abstracting the use of Host between times +''' Responsible for abstracting the use of Host between times ''' when it is available and not ''' Public Interface IDynamicHost @@ -1869,7 +1869,7 @@ Public Interface IDynamicHost End Interface ''' -''' Reponsible for implementing the IDynamicHost as a dynamic +''' Responsible for implementing the IDynamicHost as a dynamic ''' shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface ''' rather than type dependent wrapper. We don't use the ''' interface type so that the code can be run in preprocessed mode @@ -1884,7 +1884,7 @@ Public Class DynamicHost ''' ''' Creates an instance of the DynamicHost class around the passed in - ''' Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + ''' Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. ''' Public Sub New(ByVal instance As Object) _instance = instance @@ -1927,7 +1927,7 @@ Public Class DynamicHost End Class ''' -''' Reponsible for implementing the IDynamicHost when the +''' Responsible for implementing the IDynamicHost when the ''' Host property is not available on the TextTemplating type. The Host ''' property only exists when the hostspecific attribute of the template ''' directive is set to true. @@ -1936,7 +1936,7 @@ Public Class NullHost Implements IDynamicHost ''' ''' An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - ''' that simply retuns null. + ''' that simply returns null. ''' Public Function ResolveParameterValue(ByVal id As String, ByVal name As String, ByVal otherName As String) As String Implements IDynamicHost.ResolveParameterValue Return Nothing @@ -1944,7 +1944,7 @@ Public Class NullHost ''' ''' An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - ''' that simply retuns the path passed in. + ''' that simply returns the path passed in. ''' Public Function ResolvePath(ByVal path As String) As String Implements IDynamicHost.ResolvePath Return path diff --git a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/EntityDesignModelToExplorerModelXRef.cs b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/EntityDesignModelToExplorerModelXRef.cs index 00f0c07a79..03dde88fac 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/EntityDesignModelToExplorerModelXRef.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/EntityDesignModelToExplorerModelXRef.cs @@ -65,7 +65,7 @@ internal static bool IsDisplayedInExplorer(EFElement efElement) } // TODO - make this private, and remove the need to pass in the type to GetNew()/GetNewOrExisting(). - protected override Type GetViewModelTypeForEFlement(EFElement efElement) + protected override Type GetViewModelTypeForEFElement(EFElement efElement) { if (!IsDisplayedInExplorer(efElement)) { diff --git a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerConceptualEntityContainer.cs b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerConceptualEntityContainer.cs index 185b5a3d4c..7303246a1c 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerConceptualEntityContainer.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerConceptualEntityContainer.cs @@ -55,7 +55,7 @@ internal override ExplorerEFElement GetParentNodeForElement(EFElement childEleme } else if (typeof(FunctionImport) == childElementType) { - // if asked what FunctionImport parent node is redirect to the parent (i.e. the ConceptulaEntityModel) + // if asked what FunctionImport parent node is redirect to the parent (i.e. the ConceptualEntityModel) // This is because, for FunctionImports, we are not using the same parent-child relationship in the // View-Model that we are in the Model return Parent.GetParentNodeForElement(childElement); diff --git a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerStorageEntityModel.cs b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerStorageEntityModel.cs index c949ed6bf8..a31381b880 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerStorageEntityModel.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/Explorer/ExplorerStorageEntityModel.cs @@ -99,7 +99,7 @@ internal override ExplorerEFElement GetParentNodeForElement(EFElement childEleme Resources.BadChildForParentException, GetType().FullName, childElementType.FullName)); return null; // TODO: we need to provide a general exception-handling mechanism and replace the above Assert() - // by e.g. the excepiton below + // by e.g. the exception below // throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, // Resources.BadChildForParentException, this.GetType().FullName, childElementType.FullName)); } diff --git a/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/MappingEFElement.cs b/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/MappingEFElement.cs index 1ebad9ae1d..ba7728d236 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/MappingEFElement.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/MappingEFElement.cs @@ -203,14 +203,14 @@ internal void RemoveChild(MappingEFElement child) } // - // This must be implemented by derived clases who have children. + // This must be implemented by derived classes who have children. // protected virtual void LoadChildrenCollection() { } // - // This must be implemented by derived clases who have lists of values. + // This must be implemented by derived classes who have lists of values. // internal virtual Dictionary GetListOfValues(ListOfValuesCollection type) { @@ -367,7 +367,7 @@ internal void SwitchModelItem( // protected virtual MappingEFElement CreateCreatorNodeCopy() { - // by default just create a new one passing typical contructor arguments + // by default just create a new one passing typical constructor arguments return Activator.CreateInstance(GetType(), Context, null, Parent) as MappingEFElement; } diff --git a/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/Table/MappingScalarProperty.cs b/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/Table/MappingScalarProperty.cs index b7fd5a66d5..6ac4da347c 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/Table/MappingScalarProperty.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/MappingDetails/Table/MappingScalarProperty.cs @@ -319,7 +319,7 @@ internal void ChangeScalarProperty(EditingContext context, List newPro cmd2.PostInvokeEvent += (o, eventsArgs) => { var sp = cmd2.ScalarProperty; - Debug.Assert(sp != null, "CreateFragmentScalarPropertyTreeCommand falied to create a ScalarProperty"); + Debug.Assert(sp != null, "CreateFragmentScalarPropertyTreeCommand failed to create a ScalarProperty"); ModelItem = sp; }; diff --git a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Converters/ExtensibleFileListConverter.cs b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Converters/ExtensibleFileListConverter.cs index 60fef844c9..ab9a9d0bfa 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Converters/ExtensibleFileListConverter.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Converters/ExtensibleFileListConverter.cs @@ -46,7 +46,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul return String.Format( CultureInfo.InvariantCulture, "{0} {1}", extFilePath.Substring(indexOfUserMacro + UserPathWithMacro.Length).TrimStart('\\'), - Resources.DbGenExtensibileListConverter_UserDir); + Resources.DbGenExtensibleListConverter_UserDir); } else if (indexOfVSMacro != -1) { @@ -71,7 +71,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c if (lastIndexOfSpace != -1) { var filename = v.Substring(0, lastIndexOfSpace); - if (v.Substring(lastIndexOfSpace + 1).Equals(Resources.DbGenExtensibileListConverter_UserDir)) + if (v.Substring(lastIndexOfSpace + 1).Equals(Resources.DbGenExtensibleListConverter_UserDir)) { return Path.Combine(UserPathWithMacro, filename); } diff --git a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFAssociationDescriptor.cs b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFAssociationDescriptor.cs index 951e7e5472..09918be85d 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFAssociationDescriptor.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFAssociationDescriptor.cs @@ -52,7 +52,7 @@ protected override void OnTypeDescriptorInitialize() } } - [LocDescription("PropertyWindow_Descritpion_AssociationName")] + [LocDescription("PropertyWindow_Description_AssociationName")] [MergableProperty(false)] public override string Name { @@ -62,7 +62,7 @@ public override string Name [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_AssociationSetName")] - [LocDescription("PropertyWindow_Descritpion_AssociationSetName")] + [LocDescription("PropertyWindow_Description_AssociationSetName")] [MergableProperty(false)] public string AssociationSetName { @@ -128,7 +128,7 @@ private bool IsReadOnly [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End1Multiplicity")] - [LocDescription("PropertyWindow_Descritpion_Multiplicity")] + [LocDescription("PropertyWindow_Description_Multiplicity")] [TypeConverter(typeof(End1MultiplicityConverter))] public string End1Multiplicity { @@ -143,7 +143,7 @@ public bool IsReadOnlyEnd1Multiplicity() [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End2Multiplicity")] - [LocDescription("PropertyWindow_Descritpion_Multiplicity")] + [LocDescription("PropertyWindow_Description_Multiplicity")] [TypeConverter(typeof(End2MultiplicityConverter))] public string End2Multiplicity { @@ -175,7 +175,7 @@ private static void SetEndMultiplicity(AssociationEnd end, string value) [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End1Role")] - [LocDescription("PropertyWindow_Descritpion_Role")] + [LocDescription("PropertyWindow_Description_Role")] [MergableProperty(false)] public string End1Role { @@ -190,7 +190,7 @@ public bool IsReadOnlyEnd1Role() [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End2Role")] - [LocDescription("PropertyWindow_Descritpion_Role")] + [LocDescription("PropertyWindow_Description_Role")] [MergableProperty(false)] public string End2Role { @@ -222,7 +222,7 @@ private static void SetEndRole(AssociationEnd end, string value) [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End1NavigationProperty")] - [LocDescription("PropertyWindow_Descritpion_EndNavigationProperty")] + [LocDescription("PropertyWindow_Description_EndNavigationProperty")] [MergableProperty(false)] public string End1NavigationProperty { @@ -237,7 +237,7 @@ public bool IsReadOnlyEnd1NavigationProperty() [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End2NavigationProperty")] - [LocDescription("PropertyWindow_Descritpion_EndNavigationProperty")] + [LocDescription("PropertyWindow_Description_EndNavigationProperty")] [MergableProperty(false)] public string End2NavigationProperty { @@ -269,7 +269,7 @@ private static void SetEndNavigationProperty(NavigationProperty navProp, string [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End1OnDelete")] - [LocDescription("PropertyWindow_Descritpion_EndOnDelete")] + [LocDescription("PropertyWindow_Description_EndOnDelete")] [TypeConverter(typeof(OnDeleteActionConverter))] [MergableProperty(false)] public string End1OnDelete @@ -285,7 +285,7 @@ public bool IsReadOnlyEnd1OnDelete() [LocCategory("PropertyWindow_Category_General")] [LocDisplayName("PropertyWindow_DisplayName_End2OnDelete")] - [LocDescription("PropertyWindow_Descritpion_EndOnDelete")] + [LocDescription("PropertyWindow_Description_EndOnDelete")] [TypeConverter(typeof(OnDeleteActionConverter))] [MergableProperty(false)] public string End2OnDelete diff --git a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFEntityModelDescriptor.cs b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFEntityModelDescriptor.cs index 69975bd956..5d3e2ac5ed 100644 --- a/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFEntityModelDescriptor.cs +++ b/src/EFTools/EntityDesign/UI/ViewModels/PropertyWindow/Descriptors/EFEntityModelDescriptor.cs @@ -97,7 +97,7 @@ private void LoadDesignerInfoAndDescriptors(EditingContext editingContext, EFArt [LocCategory("PropertyWindow_Category_Schema")] [LocDisplayName("PropertyWindow_DisplayName_Namespace")] - [LocDescription("PropertyWindow_Descritpion_Namespace")] + [LocDescription("PropertyWindow_Description_Namespace")] public string Namespace { get { return TypedEFElement.Namespace.Value; } @@ -112,7 +112,7 @@ public string Namespace [LocCategory("PropertyWindow_Category_Schema")] [LocDisplayName("PropertyWindow_DisplayName_EntityContainerName")] - [LocDescription("PropertyWindow_Descritpion_EntityContainerName")] + [LocDescription("PropertyWindow_Description_EntityContainerName")] public string EntityContainerName { get diff --git a/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapCheckBox.cs b/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapCheckBox.cs index 91a97dd071..568f145d7a 100644 --- a/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapCheckBox.cs +++ b/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapCheckBox.cs @@ -56,7 +56,7 @@ public override Size GetPreferredSize(Size proposedSize) { var prefSize = base.GetPreferredSize(proposedSize); - // if the actual control size is greater than the constraining size, recalculate the size because there is a possiblility of wrapping. + // if the actual control size is greater than the constraining size, recalculate the size because there is a possibility of wrapping. if (!String.IsNullOrEmpty(Text) && prefSize.Width > proposedSize.Width) { diff --git a/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapRadioButton.cs b/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapRadioButton.cs index e6ec5ae8bd..4a292bff40 100644 --- a/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapRadioButton.cs +++ b/src/EFTools/EntityDesign/UI/Views/Controls/AutoWrapRadioButton.cs @@ -56,7 +56,7 @@ public override Size GetPreferredSize(Size proposedSize) { var prefSize = base.GetPreferredSize(proposedSize); - // if the actual control size is greater than the constraining size, recalculate the size because there is a possiblility of wrapping. + // if the actual control size is greater than the constraining size, recalculate the size because there is a possibility of wrapping. if (!String.IsNullOrEmpty(Text) && prefSize.Width > proposedSize.Width) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.Designer.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.Designer.cs index b7e02d0cb5..ab1658f545 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.Designer.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.Designer.cs @@ -2,7 +2,7 @@ namespace Microsoft.Data.Entity.Design.UI.Views.Dialogs { - partial class DismissableWarningDialog + partial class DismissibleWarningDialog { /// /// Required designer variable. @@ -30,7 +30,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DismissableWarningDialog)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DismissibleWarningDialog)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.okButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); @@ -87,7 +87,7 @@ private void InitializeComponent() resources.ApplyResources(this.lblWarning, "lblWarning"); this.lblWarning.Name = "lblWarning"; // - // DismissableWarningDialog + // DismissibleWarningDialog // this.AcceptButton = this.okButton; resources.ApplyResources(this, "$this"); @@ -98,7 +98,7 @@ private void InitializeComponent() this.HelpButton = false; this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "DismissableWarningDialog"; + this.Name = "DismissibleWarningDialog"; this.ShowIcon = false; this.ShowInTaskbar = false; this.tableLayoutPanel1.ResumeLayout(false); diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.cs index f11243b54a..61445e1be2 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.cs @@ -11,7 +11,7 @@ namespace Microsoft.Data.Entity.Design.UI.Views.Dialogs // // Displays a dialog that allows the user to choose to never see it again via a checkbox. // - internal partial class DismissableWarningDialog : Form + internal partial class DismissibleWarningDialog : Form { internal enum ButtonMode { @@ -19,7 +19,7 @@ internal enum ButtonMode YesNo } - internal DismissableWarningDialog(string formattedTitle, string formattedMessage, ButtonMode buttonMode) + internal DismissibleWarningDialog(string formattedTitle, string formattedMessage, ButtonMode buttonMode) { InitializeComponent(); @@ -42,7 +42,7 @@ internal DismissableWarningDialog(string formattedTitle, string formattedMessage } // - // Static method to instantiate a DismissableWarningDialog and persist the user setting to dismiss the dialog. + // Static method to instantiate a DismissibleWarningDialog and persist the user setting to dismiss the dialog. // Returns a boolean indicating whether the dialog was cancelled or not. // // Either 'OKCancel' or 'YesNo'. If 'YesNo', 'Yes' will be associated with DialogResult.OK @@ -56,7 +56,7 @@ internal static bool ShowWarningDialogAndSaveDismissOption( Debug.Assert(service != null, "service should not be null"); if (service != null) { - using (var dialog = new DismissableWarningDialog(formattedTitle, formattedMessage, buttonMode)) + using (var dialog = new DismissibleWarningDialog(formattedTitle, formattedMessage, buttonMode)) { if (service.ShowDialog(dialog) == DialogResult.OK) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.resx b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.resx index c4f56f5a1c..dbd44db5b0 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.resx +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/DismissableWarningDialog.resx @@ -346,7 +346,7 @@ CenterParent - DismissableWarningDialog + DismissibleWarningDialog System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml index 4ac2eaa650..13dc62dc7a 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml @@ -238,7 +238,7 @@ + ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}" Click="OnReferenceExternalTypeClick"/> diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml.cs index 0a2886ec8e..be64b4ac59 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_11.0.xaml.cs @@ -100,7 +100,7 @@ private void OnTextBoxLostFocus(object sender, RoutedEventArgs e) ForceTextBoxUpdateSource(sender); } - private void OnRefrenceExternalTypeClick(Object sender, RoutedEventArgs e) + private void OnReferenceExternalTypeClick(Object sender, RoutedEventArgs e) { if (chkReferenceExternalType.IsChecked == true) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml index 6016375147..e0497dbfcc 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml @@ -238,7 +238,7 @@ + ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}" Click="OnReferenceExternalTypeClick"/> diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml.cs index 0a2886ec8e..be64b4ac59 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_12.0.xaml.cs @@ -100,7 +100,7 @@ private void OnTextBoxLostFocus(object sender, RoutedEventArgs e) ForceTextBoxUpdateSource(sender); } - private void OnRefrenceExternalTypeClick(Object sender, RoutedEventArgs e) + private void OnReferenceExternalTypeClick(Object sender, RoutedEventArgs e) { if (chkReferenceExternalType.IsChecked == true) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml index 7ba9fd525c..303cdefc56 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml @@ -238,7 +238,7 @@ + ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}" Click="OnReferenceExternalTypeClick"/> diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml.cs index 0a2886ec8e..be64b4ac59 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_14.0.xaml.cs @@ -100,7 +100,7 @@ private void OnTextBoxLostFocus(object sender, RoutedEventArgs e) ForceTextBoxUpdateSource(sender); } - private void OnRefrenceExternalTypeClick(Object sender, RoutedEventArgs e) + private void OnReferenceExternalTypeClick(Object sender, RoutedEventArgs e) { if (chkReferenceExternalType.IsChecked == true) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml index 7676a4312d..4b9cb5d346 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml @@ -238,7 +238,7 @@ + ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}" Click="OnReferenceExternalTypeClick"/> diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs index 0a2886ec8e..be64b4ac59 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs @@ -100,7 +100,7 @@ private void OnTextBoxLostFocus(object sender, RoutedEventArgs e) ForceTextBoxUpdateSource(sender); } - private void OnRefrenceExternalTypeClick(Object sender, RoutedEventArgs e) + private void OnReferenceExternalTypeClick(Object sender, RoutedEventArgs e) { if (chkReferenceExternalType.IsChecked == true) { diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/NewAssociationDialog.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/NewAssociationDialog.cs index 69581c4b32..bc54473e76 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/NewAssociationDialog.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/NewAssociationDialog.cs @@ -53,7 +53,7 @@ internal NewAssociationDialog(IEnumerable entityTypes, EntityType en { Debug.Assert(entity1 != null && entity2 != null, "both entity1 and entity2 should be non-null"); - // Ensure _foreignKeysSupported is intialized before we initialize UI components. + // Ensure _foreignKeysSupported is initialized before we initialize UI components. _foreignKeysSupported = EdmFeatureManager.GetForeignKeysInModelFeatureState(entity1.Artifact.SchemaVersion) .IsEnabled(); @@ -423,7 +423,7 @@ private static bool AreForeignKeysSupportedByCardinality(string end1, string end var supported = false; #if DEBUG - // verify that values are what we expexct + // verify that values are what we expect string[] values = { Resources.PropertyWindow_Value_MultiplicityMany, Resources.PropertyWindow_Value_MultiplicityOne, diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/NewFunctionImportDialog.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/NewFunctionImportDialog.cs index bfb35a71bd..210ccb57a2 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/NewFunctionImportDialog.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/NewFunctionImportDialog.cs @@ -183,7 +183,7 @@ internal NewFunctionImportDialog( components = new Container(); } // Since Visual Studio has already defined Dispose method in the generated file(designer.cs), - // we instantiates Diposer class that calls our custom dispose method when Form is disposed. + // we instantiates Disposer class that calls our custom dispose method when Form is disposed. components.Add(new Disposer(OnDispose)); cancelButton.BackColor = SystemColors.Control; @@ -211,7 +211,7 @@ private void OnDispose(bool disposing) } } - #region Overriden Methods + #region Overridden Methods protected override void OnClosing(CancelEventArgs e) { @@ -766,7 +766,7 @@ private bool UpdateComplexTypeList(IList columns) // Update complex type mode // Create a sorted list for both schema columns and complex type properties. - var sortedColums = columns.OrderBy(col => col.Name).ToList(); + var sortedColumns = columns.OrderBy(col => col.Name).ToList(); // ad this point, the selected item must not be null. var selectedComplexType = complexTypeReturnComboBox.SelectedItem as ComplexType; Debug.Assert(selectedComplexType != null, "There is no selected complex type."); @@ -783,9 +783,9 @@ private bool UpdateComplexTypeList(IList columns) var propertyName = String.Empty; var storageModel = _container.Artifact.StorageModel(); - for (var i = 0; i < sortedColums.Count; i++) + for (var i = 0; i < sortedColumns.Count; i++) { - var col = sortedColums[i]; + var col = sortedColumns[i]; prop = null; // Add delete rows for all properties whose name less than column name. while (propertyIndex < sortedProperties.Count) @@ -1178,7 +1178,7 @@ private void UpdateStateComboBoxes(object selectedElement, Function baseFunction functionImportNameTextBox.Text = functionImportName; } - // intialize predefined function + // initialize predefined function if (baseFunction != null) { storedProcComboBox.SelectedItem = baseFunction; diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.Designer.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.Designer.cs index a6f28cdde2..4f9e8d5ba5 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.Designer.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.Designer.cs @@ -39,7 +39,7 @@ private void InitializeComponent() this.cmbDependentKey = new System.Windows.Forms.ComboBox(); this.listMappings = new Microsoft.Data.Entity.Design.UI.Views.Dialogs.ReferentialConstraintListView(); this.hdrPrincipal = new System.Windows.Forms.ColumnHeader(); - this.hdrDepedent = new System.Windows.Forms.ColumnHeader(); + this.hdrDependent = new System.Windows.Forms.ColumnHeader(); this.label2 = new System.Windows.Forms.Label(); this.txtDependentRole = new System.Windows.Forms.TextBox(); this.mainTableLayout = new System.Windows.Forms.TableLayoutPanel(); @@ -111,7 +111,7 @@ private void InitializeComponent() resources.ApplyResources(this.listMappings, "listMappings"); this.listMappings.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.hdrPrincipal, - this.hdrDepedent}); + this.hdrDependent}); this.listMappings.FullRowSelect = true; this.listMappings.GridLines = true; this.listMappings.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; @@ -130,10 +130,10 @@ private void InitializeComponent() this.hdrPrincipal.Text = global::Microsoft.Data.Entity.Design.UI.Views.Dialogs.DialogsResource.RefConstraintDialog_PrincipalKeyHeader; resources.ApplyResources(this.hdrPrincipal, "hdrPrincipal"); // - // hdrDepedent + // hdrDependent // - this.hdrDepedent.Text = global::Microsoft.Data.Entity.Design.UI.Views.Dialogs.DialogsResource.RefConstraintDialog_DependentKeyHeader; - resources.ApplyResources(this.hdrDepedent, "hdrDepedent"); + this.hdrDependent.Text = global::Microsoft.Data.Entity.Design.UI.Views.Dialogs.DialogsResource.RefConstraintDialog_DependentKeyHeader; + resources.ApplyResources(this.hdrDependent, "hdrDependent"); // // label2 // @@ -209,7 +209,7 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox cmdPrincipalRole; private System.Windows.Forms.ComboBox cmbDependentKey; private System.Windows.Forms.ColumnHeader hdrPrincipal; - private System.Windows.Forms.ColumnHeader hdrDepedent; + private System.Windows.Forms.ColumnHeader hdrDependent; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtDependentRole; private ReferentialConstraintListView listMappings; diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.cs index 0101fab3d6..7736eb92aa 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.cs +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.cs @@ -160,7 +160,7 @@ internal ReferentialConstraintDialog(Association association) if (EdmFeatureManager.GetForeignKeysInModelFeatureState(association.Artifact.SchemaVersion).IsEnabled()) { - hdrDepedent.Text = DialogsResource.RefConstraintDialog_DependentKeyHeader_SupportFKs; + hdrDependent.Text = DialogsResource.RefConstraintDialog_DependentKeyHeader_SupportFKs; } // Set the default font to VS shell font. @@ -571,7 +571,7 @@ private void ShowDependencyKeyComboBox(ListViewItem lvItem) cmbDependentKey.Bounds = bounds; - // Set dropdown width to the orignial calculated value to make sure + // Set dropdown width to the original calculated value to make sure // we could see all text within the UI bound in the drop-down list if (clickedItemRect.Width > 0) { @@ -931,7 +931,7 @@ private void PopulateListView() if (item.IsValidPrincipalKey == false) { - // principal property isn'at a valid key + // principal property isn't a valid key var propName = String.Format( CultureInfo.CurrentCulture, Resources.RefConstraintDialog_ErrorInRCPrincipalProperty, item.PrincipalKey.GetLocalName()); diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.resx b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.resx index 24011f9f70..b1d32c8374 100644 --- a/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.resx +++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/ReferentialConstraintDialog.resx @@ -333,7 +333,7 @@ 125 - + 125 @@ -531,10 +531,10 @@ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - hdrDepedent + + hdrDependent - + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/ConditionBranch.cs b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/ConditionBranch.cs index 5def2cea8a..df60725f9e 100644 --- a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/ConditionBranch.cs +++ b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/ConditionBranch.cs @@ -132,7 +132,7 @@ protected override VirtualTreeDisplayData GetDisplayData(int row, int column, Vi } if (column == 2) { - // if the value of condition is empty string we want to show gray text "" instead + // if the value of condition is empty string we want to show gray text "" instead var mc = GetElement(row) as MappingCondition; if (mc != null && mc.IsValueEmptyString) diff --git a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/EndScalarPropertyBranch.cs b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/EndScalarPropertyBranch.cs index 15754e352c..a5ebea66db 100644 --- a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/EndScalarPropertyBranch.cs +++ b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/EndScalarPropertyBranch.cs @@ -8,7 +8,7 @@ namespace Microsoft.Data.Entity.Design.UI.Views.MappingDetails.Branches using Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid; // - // This branch shows the scalar property mappings for an assocation set end property. + // This branch shows the scalar property mappings for an association set end property. // internal class EndScalarPropertyBranch : TreeGridDesignerBranch { diff --git a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/TableBranch.cs b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/TableBranch.cs index ccc30af2e0..421286d03d 100644 --- a/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/TableBranch.cs +++ b/src/EFTools/EntityDesign/UI/Views/MappingDetails/Branches/TableBranch.cs @@ -200,7 +200,7 @@ public override void OnColumnValueChanged(TreeGridDesignerBranchChangedArgs args // EditingContext editingContext = _mappingConceptualTypeMapping.Context; // if (editingContext.Services.Contains() == false) // { - // // TODO: For some reason, RemoveEventHanlders() isn't being called; figure out why + // // TODO: For some reason, RemoveEventHandlers() isn't being called; figure out why // RemoveEventHandlers(); // return; // } diff --git a/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindow.cs b/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindow.cs index 1ef9eb5d68..f72746d5ea 100644 --- a/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindow.cs +++ b/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindow.cs @@ -198,7 +198,7 @@ private void OnModelChangesCommitted(object sender, EfiChangedEventArgs e) && selection != null) { - // if the change originated from Property Window we need to restore previuos selection + // if the change originated from Property Window we need to restore previous selection // otherwise the Property Window will become empty Context.Items.SetValue(selection); } @@ -498,7 +498,7 @@ private void ProcessSelectionFromOtherWindows(Selection selection) if (fi != null && fi.FunctionImportMapping != null) { - // only show mappings for FuntionImports that ReturnType is either EntityType or ComplexType + // only show mappings for FunctionImports that ReturnType is either EntityType or ComplexType var isReturnTypeEntityOrComplexType = fi.IsReturnTypeEntityType || fi.IsReturnTypeComplexType; if (isReturnTypeEntityOrComplexType && CanEditMappingsForFunctionImport(fi)) diff --git a/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindowContainer.cs b/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindowContainer.cs index 8bac337e50..a4edca9b5b 100644 --- a/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindowContainer.cs +++ b/src/EFTools/EntityDesign/UI/Views/MappingDetails/MappingDetailsWindowContainer.cs @@ -156,7 +156,7 @@ public bool WatermarkVisible watermarkLabel.Visible = value; _mainControl.Visible = !value; - // Set top child when watermark visibility change to favorite accessbility tool + // Set top child when watermark visibility change to favorite accessibility tool if (value) { contentsPanel.Controls.SetChildIndex(watermarkLabel, 0); diff --git a/src/EFTools/EntityDesign/VisualStudio/EdmUtils.cs b/src/EFTools/EntityDesign/VisualStudio/EdmUtils.cs index 2c0f07573b..f788e24eec 100644 --- a/src/EFTools/EntityDesign/VisualStudio/EdmUtils.cs +++ b/src/EFTools/EntityDesign/VisualStudio/EdmUtils.cs @@ -358,7 +358,7 @@ internal static string GetRuntimeAssemblyPath(Project project, IServiceProvider } } - // if we could not resolve the asembly using global or project design time assembly resolution, return string empty. + // if we could not resolve the assembly using global or project design time assembly resolution, return string empty. return String.Empty; } diff --git a/src/EFTools/EntityDesign/VisualStudio/ErrorListHelper.cs b/src/EFTools/EntityDesign/VisualStudio/ErrorListHelper.cs index 16411d99e9..2302b1865a 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ErrorListHelper.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ErrorListHelper.cs @@ -474,7 +474,7 @@ internal static void LogWizardErrors(IEnumerable errors, Project internal static void RegisterForNotifications() { // The document frame listens for the RunningDocumentTable events, and it will - // clean out errros for a document when it is closed. + // clean out errors for a document when it is closed. // Register to receive solution events var IVsSolution = Services.IVsSolution; diff --git a/src/EFTools/EntityDesign/VisualStudio/Model/StandaloneXmlModelProvider.cs b/src/EFTools/EntityDesign/VisualStudio/Model/StandaloneXmlModelProvider.cs index ace0fb81c9..00327d02b8 100644 --- a/src/EFTools/EntityDesign/VisualStudio/Model/StandaloneXmlModelProvider.cs +++ b/src/EFTools/EntityDesign/VisualStudio/Model/StandaloneXmlModelProvider.cs @@ -147,7 +147,7 @@ internal static bool TryGetBufferViaExtensions( Debug.Assert(targetSchemaVersion != null, "should not get here for a Misc project"); - // get the extension of the file being loaded (might not be EDMX); this API will include the preceeding "." + // get the extension of the file being loaded (might not be EDMX); this API will include the preceding "." var filePath = projectItem.get_FileNames(1); var fileExtension = Path.GetExtension(filePath); XDocument originalDocument = null; diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/ModelObjectItemWizard.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/ModelObjectItemWizard.cs index f89bf45acb..46dc5800fb 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/ModelObjectItemWizard.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/ModelObjectItemWizard.cs @@ -151,7 +151,7 @@ public void RunStarted( modelName = SanitizeModelName(modelName); - PopluateReplacementDictionary(project, replacementsDictionary, modelName); + PopulateReplacementDictionary(project, replacementsDictionary, modelName); _modelBuilderSettings = new ModelBuilderSettings { @@ -259,7 +259,7 @@ private static void EnsureCanStartWizard(Project project, IServiceProvider servi } } - private static void PopluateReplacementDictionary(Project project, Dictionary replacementsDictionary, string modelName) + private static void PopulateReplacementDictionary(Project project, Dictionary replacementsDictionary, string modelName) { // create a "fixed" version that removes non-valid characters and leading underscores var fixedModelName = XmlConvert.EncodeName(modelName).TrimStart('_'); diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/DatabaseGenerationEngine.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/DatabaseGenerationEngine.cs index 8c0a674d38..6e9550e266 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/DatabaseGenerationEngine.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/DatabaseGenerationEngine.cs @@ -230,7 +230,7 @@ internal static bool UpdateEdmxAndEnvironment(ModelBuilderSettings settings) } // When the user had a v2 edmx file (it can happen when creating a new empty model in a project targeting - // .NET Framework 4 and the project does not have refereces to any of EF dlls) and selected EF6 in + // .NET Framework 4 and the project does not have references to any of EF dlls) and selected EF6 in // the "create database from model" wizard we need to update the artifact to use v3 schemas otherwise // there will be a watermark saying that the edmx is not correct for the EF version and needs to be updated. // We only want to run this command if the version really changed to avoid the overhead. diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderEngine.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderEngine.cs index 764c6656ee..fa56554a6a 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderEngine.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderEngine.cs @@ -18,7 +18,7 @@ internal abstract class ModelBuilderEngine { public DbModel Model { get; private set; } - // virutal for testing + // virtual for testing [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] public virtual void GenerateModel(ModelBuilderSettings settings, IVsUtils vsUtils = null, ModelBuilderEngineHostContext hostContext = null) @@ -71,7 +71,7 @@ public virtual void GenerateModel(ModelBuilderSettings settings, IVsUtils vsUtil { generatingModelWatch.Stop(); - hostContext.LogMessage(FormatMessage(Resources.LoadingDBMetadataTimeMsg, settings.LoadingDBMetatdataTime)); + hostContext.LogMessage(FormatMessage(Resources.LoadingDBMetadataTimeMsg, settings.LoadingDBMetadataTime)); hostContext.LogMessage(FormatMessage(Resources.GeneratingModelTimeMsg, generatingModelWatch.Elapsed)); } } diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderSettings.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderSettings.cs index 07e3dba320..abb1194c5e 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderSettings.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/ModelBuilderSettings.cs @@ -202,7 +202,7 @@ internal virtual string DesignTimeProviderInvariantName get { return _designTimeProviderInvariantName; } } - internal TimeSpan LoadingDBMetatdataTime { get; set; } + internal TimeSpan LoadingDBMetadataTime { get; set; } internal EFArtifact Artifact { @@ -262,7 +262,7 @@ public Version TargetSchemaVersion public string ModelName { get; set; } // Path to the file containing model - note that the file may not exist yet (e.g. when reverse - // engineering db we calculate the path at the begining but save the model when the wizard completes) + // engineering db we calculate the path at the beginning but save the model when the wizard completes) public string ModelPath { get; set; } public string VsTemplatePath { get; set; } diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/updatefromdatabaseengine.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/updatefromdatabaseengine.cs index 863a56c12a..5d3045a672 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/updatefromdatabaseengine.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/engine/updatefromdatabaseengine.cs @@ -113,7 +113,7 @@ internal static void UpdateModelFromDatabase(EntityDesignArtifact artifact) // We can reload only after we added EF references to the project otherwise we would get a watermark // saying that the schema version does not match the referenced EF version which would not be true. - // If we reload becuase there was an extension that potentially modified the artifact then it does not matter. + // If we reload because there was an extension that potentially modified the artifact then it does not matter. if (shouldReloadArtifact) { artifact.ReloadArtifact(); @@ -425,7 +425,7 @@ internal DispatchToExtensionsCommand(ModelBuilderSettings settings) _fromDbDocument = ((EdmxModelBuilderEngine)settings.ModelBuilderEngine).Edmx; _projectItem = VsUtils.GetProjectItemForDocument(_artifact.Uri.LocalPath, PackageManager.Package); - // make a copy of the artifact before any chagnes are done to it. This is the "original document" that will be passed to extensions + // make a copy of the artifact before any changes are done to it. This is the "original document" that will be passed to extensions _originalDocument = XDocument.Parse(_artifact.XDocument.ToString(), LoadOptions.PreserveWhitespace); } diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageDbGenSummary.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageDbGenSummary.cs index 8b8ba783b6..e5509b92fb 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageDbGenSummary.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageDbGenSummary.cs @@ -168,12 +168,12 @@ public override void OnActivated() } if (displayCustomWorkflowWarning) { - var cancelledDuringCustomWorkflowWarning = DismissableWarningDialog + var cancelledDuringCustomWorkflowWarning = DismissibleWarningDialog .ShowWarningDialogAndSaveDismissOption( Resources.DatabaseCreation_CustomWorkflowWarningTitle, Resources.DatabaseCreation_WarningCustomWorkflow, RegKeyNameCustomWorkflowWarning, - DismissableWarningDialog.ButtonMode.OkCancel); + DismissibleWarningDialog.ButtonMode.OkCancel); if (cancelledDuringCustomWorkflowWarning) { HandleError( @@ -394,11 +394,11 @@ internal override bool OnWizardFinish() } if (displayDdlOverwriteWarning) { - var cancelledDuringOverwriteDdl = DismissableWarningDialog.ShowWarningDialogAndSaveDismissOption( + var cancelledDuringOverwriteDdl = DismissibleWarningDialog.ShowWarningDialogAndSaveDismissOption( Resources.DatabaseCreation_DDLOverwriteWarningTitle, String.Format(CultureInfo.CurrentCulture, Resources.DatabaseCreation_WarningOverwriteDdl, ddlFilePath), RegKeyNameDdlOverwriteWarning, - DismissableWarningDialog.ButtonMode.YesNo); + DismissibleWarningDialog.ButtonMode.YesNo); if (cancelledDuringOverwriteDdl) { return false; @@ -441,11 +441,11 @@ internal override bool OnWizardFinish() } if (displayEdmxOverwriteWarning) { - var cancelledDuringOverwriteSsdl = DismissableWarningDialog.ShowWarningDialogAndSaveDismissOption( + var cancelledDuringOverwriteSsdl = DismissibleWarningDialog.ShowWarningDialogAndSaveDismissOption( Resources.DatabaseCreation_EdmxOverwriteWarningTitle, Resources.DatabaseCreation_WarningOverwriteMappings, RegKeyNameEdmxOverwriteWarning, - DismissableWarningDialog.ButtonMode.YesNo); + DismissibleWarningDialog.ButtonMode.YesNo); if (cancelledDuringOverwriteSsdl) { return false; diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageSelectTables.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageSelectTables.cs index b152cba63c..e437bc1b68 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageSelectTables.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageSelectTables.cs @@ -243,7 +243,7 @@ private void UpdateSettingsFromGui() { Wizard.ModelBuilderSettings.DatabaseObjectFilters = GetSelectedFilterEntriesFromTreeView(); Wizard.ModelBuilderSettings.ModelNamespace = modelNamespaceTextBox.Text; - Wizard.ModelBuilderSettings.LoadingDBMetatdataTime = _stopwatch.Elapsed; + Wizard.ModelBuilderSettings.LoadingDBMetadataTime = _stopwatch.Elapsed; Wizard.ModelBuilderSettings.UsePluralizationService = chkPluralize.Checked; Wizard.ModelBuilderSettings.IncludeForeignKeysInModel = chkIncludeForeignKeys.Checked; } @@ -398,7 +398,7 @@ private void bgWorkerPopulateTree_DoWork(object sender, DoWorkEventArgs args) // // RunWorkerCompleted event handler: Populate Treeview here. // This method is called by background worker component on the same thread as the UI thread. - // ModelBuilderEngine gaves us table names to display so we add them to the TreeView + // ModelBuilderEngine gives us table names to display so we add them to the TreeView // [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] protected void bgWorkerPopulateTree_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs args) diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageStart.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageStart.cs index 9ec3dcf801..2f1f760fdb 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageStart.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageStart.cs @@ -115,7 +115,7 @@ public override bool OnActivate() // Prevents flickering if the user provides a name of the model that // conflicts with an existing file. If this happens we block activation // of the next page so the wizard will want to re-activate this page. - // Beacuse we close the wizard form anyways we can block activating + // Because we close the wizard form anyways we can block activating // this page which will prevent flickering. return base.OnActivate() && !Wizard.FileAlreadyExistsError; } diff --git a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageUpdateFromDatabase.cs b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageUpdateFromDatabase.cs index 1c4b628603..e0a2310588 100644 --- a/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageUpdateFromDatabase.cs +++ b/src/EFTools/EntityDesign/VisualStudio/ModelWizard/gui/WizardPageUpdateFromDatabase.cs @@ -261,7 +261,7 @@ public override bool OnDeactivate() private void UpdateSettingsFromGui() { Wizard.ModelBuilderSettings.DatabaseObjectFilters = GetSelectedFilterEntriesFromTreeView(); - Wizard.ModelBuilderSettings.LoadingDBMetatdataTime = _stopwatch.Elapsed; + Wizard.ModelBuilderSettings.LoadingDBMetadataTime = _stopwatch.Elapsed; Wizard.ModelBuilderSettings.UsePluralizationService = chkPluralize.Checked; Wizard.ModelBuilderSettings.IncludeForeignKeysInModel = chkIncludeForeignKeys.Checked; } @@ -307,7 +307,7 @@ internal override bool OnWizardFinish() // // DoWork event handler: Get database objects in a background thread. - // This method is called by background worker component on a diffferent thread than the UI thread. + // This method is called by background worker component on a different thread than the UI thread. // We use the ModelBuilderEngine to get database objects to display // private void bgWorkerPopulateTree_DoWork(object sender, DoWorkEventArgs args) diff --git a/src/EFTools/EntityDesign/VisualStudio/Package/ConfigFileUtils.cs b/src/EFTools/EntityDesign/VisualStudio/Package/ConfigFileUtils.cs index 0ba32f2040..bd16fb22d5 100644 --- a/src/EFTools/EntityDesign/VisualStudio/Package/ConfigFileUtils.cs +++ b/src/EFTools/EntityDesign/VisualStudio/Package/ConfigFileUtils.cs @@ -71,7 +71,7 @@ public virtual ProjectItem CreateConfigFile() return configProjectItem; } - _project.ProjectItems.AddFromTemplate(GetConfigItempTemplatePath(), _configFileName); + _project.ProjectItems.AddFromTemplate(GetConfigItemTemplatePath(), _configFileName); return GetConfigProjectItem(); } @@ -164,7 +164,7 @@ public string GetConfigPath() return configProjectItem != null ? configProjectItem.FileNames[1] : null; } - private string GetConfigItempTemplatePath() + private string GetConfigItemTemplatePath() { var projectLanguage = _vsUtils.GetLanguageForProject(_project); diff --git a/src/EFTools/EntityDesign/VisualStudio/SingleFileGenerator/EntityModelCodeGenerator.cs b/src/EFTools/EntityDesign/VisualStudio/SingleFileGenerator/EntityModelCodeGenerator.cs index d01745a263..c62cde4ce1 100644 --- a/src/EFTools/EntityDesign/VisualStudio/SingleFileGenerator/EntityModelCodeGenerator.cs +++ b/src/EFTools/EntityDesign/VisualStudio/SingleFileGenerator/EntityModelCodeGenerator.cs @@ -151,7 +151,7 @@ protected override byte[] GenerateCode(string inputFileName, string inputFileCon catch (Exception) { // It would be nice to add an error in the error list, but you need an IServiceProvider to do this - // We use our package usually for this, but here, our pacakge failed to load. Raise a message box + // We use our package usually for this, but here, our package failed to load. Raise a message box VsUtils.ShowErrorDialog(Resources.LoadOurPackageError); string commentString; diff --git a/src/EFTools/EntityDesign/VisualStudio/VsUtils.cs b/src/EFTools/EntityDesign/VisualStudio/VsUtils.cs index 1263b9dd77..fbe04535bd 100644 --- a/src/EFTools/EntityDesign/VisualStudio/VsUtils.cs +++ b/src/EFTools/EntityDesign/VisualStudio/VsUtils.cs @@ -1055,7 +1055,7 @@ internal static string GetTargetFrameworkMonikerForProject(Project project, ISer } // - // Gets the text from DocData if it's available, otherwise retreives it from disk. + // Gets the text from DocData if it's available, otherwise retrieves it from disk. // internal static string GetFileContentsFromBufferOrDisk(string filePath) { diff --git a/src/EFTools/EntityDesignDataSourceWizardExtension/LaunchModelGenWizardPage.cs b/src/EFTools/EntityDesignDataSourceWizardExtension/LaunchModelGenWizardPage.cs index d4df472c7c..11e16ffd3f 100644 --- a/src/EFTools/EntityDesignDataSourceWizardExtension/LaunchModelGenWizardPage.cs +++ b/src/EFTools/EntityDesignDataSourceWizardExtension/LaunchModelGenWizardPage.cs @@ -57,7 +57,7 @@ protected override bool LaunchEntityDesignerWizard(EdmDataSourceWizardData wizar } wizardData.EDMProjectItem = VsUtils.GetProjectItemForDocument(edmxFileName, WizardForm.ServiceProvider); - // Dismiss Data Source Wizard if a new edmx file is successfuly created. + // Dismiss Data Source Wizard if a new edmx file is successfully created. return (wizardData.EDMProjectItem != null); } diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/CustomSerializer/EntityModelToDslModelTranslatorStrategy.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/CustomSerializer/EntityModelToDslModelTranslatorStrategy.cs index 90824d4de4..9d4583f32d 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/CustomSerializer/EntityModelToDslModelTranslatorStrategy.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/CustomSerializer/EntityModelToDslModelTranslatorStrategy.cs @@ -368,13 +368,13 @@ private static ViewModelAssociation TranslateAssociation( end2.Type.Target != null, "Association End: " + end2.DisplayName + " does not reference a valid entity-type."); if (end2.Type.Target != null) { - var modelTargetNavigatioNProperty = + var modelTargetNavigationProperty = ModelHelper.FindNavigationPropertyForAssociationEnd(end2.Type.Target as ConceptualEntityType, end2); - if (modelTargetNavigatioNProperty != null) + if (modelTargetNavigationProperty != null) { var viewTargetNavigationProperty = ModelToDesignerModelXRef.GetExisting( - viewModel.EditingContext, modelTargetNavigatioNProperty, viewModel.Partition) as + viewModel.EditingContext, modelTargetNavigationProperty, viewModel.Partition) as ViewModelNavigationProperty; if (viewTargetNavigationProperty != null) { diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/AutoArrangeHelper.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/AutoArrangeHelper.cs index 2a0925e873..fc22e0eda5 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/AutoArrangeHelper.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/AutoArrangeHelper.cs @@ -66,7 +66,7 @@ public void TransactionCommit(EntityDesignerDiagram diagram) if (_autoArrangeInfo.Objects.Count > 0 || _autoArrangeInfo.HiddenObjects.Count > 0) { - //Arrange the new elemenst before the transaction finishes: + //Arrange the new elements before the transaction finishes: using (var t = diagram.Store.TransactionManager.BeginTransaction(Resources.Tx_LayoutDiagram)) { //Place single object where the user dropped, and multiple get autoarranged diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/DSLDesignerNavigationHelper.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/DSLDesignerNavigationHelper.cs index 1aa8966052..d3e85ace02 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/DSLDesignerNavigationHelper.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/DSLDesignerNavigationHelper.cs @@ -215,7 +215,7 @@ private static EFObject GetCSpaceEFObjectForMSpaceEFObject(EFObject mspaceEFObje // see if any direct children are bindings bound to something in c-space foreach (var child in container.Children) { - // check every binding to see if it is bound to seomthing in cspace + // check every binding to see if it is bound to something in cspace var b = child as ItemBinding; if (b != null) { diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/EntityDesignerDiagram.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/EntityDesignerDiagram.cs index c00b0cb32d..8a8cb244da 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/EntityDesignerDiagram.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Diagram/EntityDesignerDiagram.cs @@ -171,7 +171,7 @@ public override void OnDragDrop(DiagramDragEventArgs e) } /// - /// The even handler when ojbects are dragged over the designer. + /// The even handler when objects are dragged over the designer. /// /// public override void OnDragEnter(DiagramDragEventArgs e) diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/Association.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/Association.cs index bbbd12ac7b..d529f95765 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/Association.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/Association.cs @@ -35,7 +35,7 @@ public IEnumerable RelatedElementsToEmphasizeOnSelected yield return SourceEntityType; } - // Return TargeEntityType if it is available and not deleted and not same as SourceEntityType (SelfAssociation scenario). + // Return TargetEntityType if it is available and not deleted and not same as SourceEntityType (SelfAssociation scenario). if (TargetEntityType != null && TargetEntityType.IsDeleted == false && SourceEntityType != TargetEntityType) diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/EntityDesignerViewModel.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/EntityDesignerViewModel.cs index 831a2589b7..df8d5185c6 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/EntityDesignerViewModel.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/DomainClasses/EntityDesignerViewModel.cs @@ -779,7 +779,7 @@ protected override int GetVal(EfiChange change) /// changes are packaged up and the ModelController is used to make the changes to the model. /// /// - internal void OnTransactionCommited(TransactionCommitEventArgs e) + internal void OnTransactionCommitted(TransactionCommitEventArgs e) { if (_reloading) { @@ -796,7 +796,7 @@ internal void OnTransactionCommited(TransactionCommitEventArgs e) Debug.Assert( changeContext.ViewModelChanges.Count == viewModelChanges.Count, - "Not all changes from the view model were of type ViewModleChange"); + "Not all changes from the view model were of type ViewModelChange"); try { diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceAdd.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceAdd.cs index 290f9f8093..76646ef1c5 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceAdd.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceAdd.cs @@ -44,7 +44,7 @@ internal override void Invoke(CommandProcessorContext cpc) viewModel.GetDiagram().ActiveDiagramView.Selection.Set((DiagramItem)null); // in this case inheritance was not created in the model, so we need to delete it from the view model - // we don't want any rules to fire for this, so suspend them temporarly + // we don't want any rules to fire for this, so suspend them temporarily _inheritance.Store.RuleManager.SuspendRuleNotification(); using (var t = _inheritance.Store.TransactionManager.BeginTransaction()) { diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceConnectorChange.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceConnectorChange.cs index 4fab4232fa..62a0eadc56 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceConnectorChange.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/ModelChanges/InheritanceConnectorChange.cs @@ -83,8 +83,8 @@ internal static void StaticInvoke(CommandProcessorContext cpc, InheritanceConnec && modelInheritanceConnector.ConnectorPoints.Count > 0) { var points = new List>(); - var setConnectorPointscmd = new SetConnectorPointsCommand(modelInheritanceConnector, points); - CommandProcessor.InvokeSingleCommand(cpc, setConnectorPointscmd); + var setConnectorPointsCmd = new SetConnectorPointsCommand(modelInheritanceConnector, points); + CommandProcessor.InvokeSingleCommand(cpc, setConnectorPointsCmd); } var cmd = new UpdateDefaultableValueCommand( diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Rules/EntityTypeShapeRules.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Rules/EntityTypeShapeRules.cs index ebcf613391..5ff01f5aff 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Rules/EntityTypeShapeRules.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Rules/EntityTypeShapeRules.cs @@ -54,7 +54,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e) // top left corner, it will not change the location of the shape because any point smaller than (0.5,0.5) will be rounded off to (0.5,0.5) // because of the NestedShapeMargin. This means that the old and new value of the absolute bounds will not change after the drop point // is applied to the new ViewModel shape's default location. Normally this would not be a problem, but when we create the EntityTypeShape in - // the model we initally assign it a random (x,y) value (see CreateEntityTypeShapeCommand.cs) and we're relying on the EntityTypeShapeChange + // the model we initially assign it a random (x,y) value (see CreateEntityTypeShapeCommand.cs) and we're relying on the EntityTypeShapeChange // command issued by this rule to update the model x,y values so that the correct co-ords are persisted in the *.diagram file. // Therefore there is an extra check in the IF statement below to catch the case where the user adds their first shape in the diagram at the // top left corner inside the NestedShapeMargin as this is the easiest edge case to hit. Note that this will not protect against edge cases diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Shapes/EntityTypeShape.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Shapes/EntityTypeShape.cs index c794002633..658c04390b 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Shapes/EntityTypeShape.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Shapes/EntityTypeShape.cs @@ -128,7 +128,7 @@ public override void OnPaintEmphasis(DiagramPaintEventArgs e) private void SetColorTheme() { ClassStyleSet.OverridePenColor(DiagramPens.EmphasisOutline, EmphasisShapeOutlineColor); - // We shouldn't need to do this again uless the user changes the theme. + // We shouldn't need to do this again unless the user changes the theme. IsColorThemeSet = true; } @@ -196,7 +196,7 @@ private void AdjustForFillColor() { // If the shape is very dark, we make the title text white, and viceversa. StyleSet.OverrideBrushColor(DiagramBrushes.ShapeText, CachedFillColorAppearance(FillColor).TextColor); - // We draw a thin outline of a sligtly different color to improve distinguishability when shape color looks like background (and because it looks good). + // We draw a thin outline of a slightly different color to improve distinguishability when shape color looks like background (and because it looks good). StyleSet.OverridePenColor(OutlinePenId, CachedFillColorAppearance(FillColor).OutlineColor); // We shouldn't need to do this again unless the user changes the color for this shape. _isAdjustedForFillColor = true; @@ -308,7 +308,7 @@ private static double GetRelativeColorPart(byte colorPart) } /// - /// This method is used to cache the results of a function so the funcion is ever at most invoked + /// This method is used to cache the results of a function so the function is ever at most invoked /// once for each possible value of the argument and only one copy of the result for every value /// of the argument is ever allocated in memory /// diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Utils/NodeShapeExtensions.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Utils/NodeShapeExtensions.cs index 313d20f83b..7f555278fb 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Utils/NodeShapeExtensions.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Utils/NodeShapeExtensions.cs @@ -13,7 +13,7 @@ internal static class NodeShapeExtensions /// Ensures that a has a particular expanded or collapsed state /// /// the on which to ensure the state - /// if true, ensure that nodeShape is expanded, if false esnure that it is collapsed + /// if true, ensure that nodeShape is expanded, if false ensure that it is collapsed public static void EnsureExpandedState(this NodeShape nodeShape, bool expanded) { if (nodeShape.IsExpanded != expanded) diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Association.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Association.cs index 6794eaeef8..68d9f2d0b0 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Association.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Association.cs @@ -15,7 +15,7 @@ internal partial class Association /// Validate Association name /// /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateName(ValidationContext context) { if (!EscherAttributeContentValidator.IsValidCsdlAssociationName(Name)) diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityDesignerViewModel.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityDesignerViewModel.cs index f663a0250b..f4554ef766 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityDesignerViewModel.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityDesignerViewModel.cs @@ -15,7 +15,7 @@ This will get validated by the runtime. /// Validate model Namespace /// /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateNamespace(ValidationContext context) { if (String.IsNullOrEmpty(this.Namespace)) diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityType.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityType.cs index efc4c8aebf..8b985c3c4e 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityType.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/EntityType.cs @@ -15,7 +15,7 @@ internal partial class EntityType /// Validate Entity name /// /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateName(ValidationContext context) { if (!EscherAttributeContentValidator.IsValidCsdlEntityTypeName(Name)) @@ -29,7 +29,7 @@ private void ValidateName(ValidationContext context) /// Validate Entity key /// /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateKey(ValidationContext context) { try @@ -54,7 +54,7 @@ private void ValidateKey(ValidationContext context) /// Validate inheritance (check for circular inheritance) /// /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateInheritance(ValidationContext context) { var circularPath = String.Empty; diff --git a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Property.cs b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Property.cs index 5cffd53b87..68f9199d55 100644 --- a/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Property.cs +++ b/src/EFTools/EntityDesignEntityDesigner/CustomCode/Validation/Property.cs @@ -14,7 +14,7 @@ internal partial class Property /// /// Validate property name /// - [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommited")] + [ValidationMethod(ValidationCategories.Open | ValidationCategories.Save, CustomCategory = "OnTransactionCommitted")] private void ValidateName(ValidationContext context) { if (!EscherAttributeContentValidator.IsValidCsdlPropertyName(Name)) diff --git a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DirectiveProcessor.cs b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DirectiveProcessor.cs index 97993dae1e..831e7c793a 100644 --- a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DirectiveProcessor.cs +++ b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DirectiveProcessor.cs @@ -66,7 +66,7 @@ public class EntityFrameworkDirectiveProcessorBase : VSTextTemplating::RequiresP private const string defaultProvidesModelParameter = providesModelParameter; /// - /// The directive name that is supported by this direcive processor. This defaults + /// The directive name that is supported by this directive processor. This defaults /// to the name of the model. /// private const string supportedDirectiveName = "EntityFramework"; @@ -133,7 +133,7 @@ protected override void InitializeRequiresDictionary(string directiveName, globa } /// - /// Override to initialize provides dictinoary + /// Override to initialize provides dictionary /// /// /// diff --git a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DomainClasses.cs b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DomainClasses.cs index 48314cce2b..a8a8f76318 100644 --- a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DomainClasses.cs +++ b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/DomainClasses.cs @@ -311,7 +311,7 @@ protected override bool CanMerge(DslModeling::ProtoElementBase rootElement, DslM /// The element that is to be related to this model element. /// The group of source ModelElements that have been rehydrated into the target store. /// - /// This method is overriden to create the relationship between the target element and the specified source element. + /// This method is overridden to create the relationship between the target element and the specified source element. /// The base method does nothing. /// protected override void MergeRelate(DslModeling::ModelElement sourceElement, DslModeling::ElementGroup elementGroup) @@ -685,7 +685,7 @@ protected override bool CanMerge(DslModeling::ProtoElementBase rootElement, DslM /// The element that is to be related to this model element. /// The group of source ModelElements that have been rehydrated into the target store. /// - /// This method is overriden to create the relationship between the target element and the specified source element. + /// This method is overridden to create the relationship between the target element and the specified source element. /// The base method does nothing. /// protected override void MergeRelate(DslModeling::ModelElement sourceElement, DslModeling::ElementGroup elementGroup) diff --git a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/SerializationHelper.cs b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/SerializationHelper.cs index 10e768b8c6..0589188460 100644 --- a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/SerializationHelper.cs +++ b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/SerializationHelper.cs @@ -159,7 +159,7 @@ internal protected virtual void ReadAdditionalElementData(DslModeling::Serializa /// XmlWriter to write serialized data to. /// Name of the attribute to be written /// Value of the attribute to be written - /// This is an extension point to allow customisation e.g. to encode the data + /// This is an extension point to allow customization e.g. to encode the data /// being written to the file. internal virtual void WriteAttributeString(DslModeling::SerializationContext serializationContext, DslModeling::ModelElement element, global::System.Xml.XmlWriter writer, string attributeName, string attributeValue) { @@ -174,7 +174,7 @@ internal virtual void WriteAttributeString(DslModeling::SerializationContext ser /// XmlWriter to write serialized data to. /// Name of the element to be written. /// Value of the element to be written. - /// This is an extension point to allow customisation e.g. to encode the data + /// This is an extension point to allow customization e.g. to encode the data /// being written to the file. internal virtual void WriteElementString(DslModeling::SerializationContext serializationContext, DslModeling::ModelElement element, global::System.Xml.XmlWriter writer, string elementName, string elementValue) { @@ -189,7 +189,7 @@ internal virtual void WriteElementString(DslModeling::SerializationContext seria /// XmlReader to read the serialized data from. /// The name of the attribute to be read. /// The value of the attribute. - /// This is an extension point to allow customisation e.g. to decode the data + /// This is an extension point to allow customization e.g. to decode the data /// being written to the file. internal virtual string ReadAttribute(DslModeling::SerializationContext serializationContext, DslModeling::ModelElement element, global::System.Xml.XmlReader reader, string attributeName) { @@ -203,7 +203,7 @@ internal virtual string ReadAttribute(DslModeling::SerializationContext serializ /// The element whose attributes have just been written. /// XmlReader to read the serialized data from. /// The value of the element. - /// This is an extension point to allow customisation e.g. to decode the data + /// This is an extension point to allow customization e.g. to decode the data /// being written to the file. internal virtual string ReadElementContentAsString(DslModeling::SerializationContext serializationContext, DslModeling::ModelElement element, global::System.Xml.XmlReader reader) { diff --git a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/Serializer.cs b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/Serializer.cs index b2e2912753..a4b116dabc 100644 --- a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/Serializer.cs +++ b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/Serializer.cs @@ -5121,7 +5121,7 @@ protected override void ReadElements(DslModeling::SerializationContext serializa /// Serialization context. /// XmlReader to read serialized data from. /// Partition in which new elements should be created. - /// If true, this method will only check derived types, but not the domain class iitself. + /// If true, this method will only check derived types, but not the domain class itself. private DslModeling::ModelElement InternalTryCreateInstance (DslModeling::SerializationContext serializationContext, global::System.Xml.XmlReader reader, DslModeling::Partition partition, bool derivedTypesOnly) { DslModeling::ModelElement result = null; @@ -5817,7 +5817,7 @@ protected override void ReadElements(DslModeling::SerializationContext serializa /// Serialization context. /// XmlReader to read serialized data from. /// Partition in which new elements should be created. - /// If true, this method will only check derived types, but not the domain class iitself. + /// If true, this method will only check derived types, but not the domain class itself. private DslModeling::ModelElement InternalTryCreateInstance (DslModeling::SerializationContext serializationContext, global::System.Xml.XmlReader reader, DslModeling::Partition partition, bool derivedTypesOnly) { DslModeling::ModelElement result = null; @@ -6564,7 +6564,7 @@ protected override void ReadElements(DslModeling::SerializationContext serializa /// Serialization context. /// XmlReader to read serialized data from. /// Partition in which new elements should be created. - /// If true, this method will only check derived types, but not the domain class iitself. + /// If true, this method will only check derived types, but not the domain class itself. private DslModeling::ModelElement InternalTryCreateInstance (DslModeling::SerializationContext serializationContext, global::System.Xml.XmlReader reader, DslModeling::Partition partition, bool derivedTypesOnly) { DslModeling::ModelElement result = null; @@ -7494,7 +7494,7 @@ protected override void ReadElements(DslModeling::SerializationContext serializa /// Serialization context. /// XmlReader to read serialized data from. /// Partition in which new elements should be created. - /// If true, this method will only check derived types, but not the domain class iitself. + /// If true, this method will only check derived types, but not the domain class itself. private DslModeling::ModelElement InternalTryCreateInstance (DslModeling::SerializationContext serializationContext, global::System.Xml.XmlReader reader, DslModeling::Partition partition, bool derivedTypesOnly) { DslModeling::ModelElement result = null; @@ -8188,7 +8188,7 @@ protected override void ReadElements(DslModeling::SerializationContext serializa /// Serialization context. /// XmlReader to read serialized data from. /// Partition in which new elements should be created. - /// If true, this method will only check derived types, but not the domain class iitself. + /// If true, this method will only check derived types, but not the domain class itself. private DslModeling::ModelElement InternalTryCreateInstance (DslModeling::SerializationContext serializationContext, global::System.Xml.XmlReader reader, DslModeling::Partition partition, bool derivedTypesOnly) { DslModeling::ModelElement result = null; diff --git a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/ToolboxHelper.cs b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/ToolboxHelper.cs index 9f3f3fbc7c..505bdea61b 100644 --- a/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/ToolboxHelper.cs +++ b/src/EFTools/EntityDesignEntityDesigner/GeneratedCode/ToolboxHelper.cs @@ -73,7 +73,7 @@ protected MicrosoftDataEntityDesignToolboxHelperBase(global::System.IServiceProv } /// - /// Serivce provider used to access services from the hosting environment. + /// Service provider used to access services from the hosting environment. /// protected global::System.IServiceProvider ServiceProvider { diff --git a/src/EFTools/EntityDesignEntityDesigner/Properties/Resources.resx b/src/EFTools/EntityDesignEntityDesigner/Properties/Resources.resx index 7e01d809ff..36c25a64ca 100644 --- a/src/EFTools/EntityDesignEntityDesigner/Properties/Resources.resx +++ b/src/EFTools/EntityDesignEntityDesigner/Properties/Resources.resx @@ -387,7 +387,7 @@ Add existing entities and relationships to this diagram by dragging them from th Navigation Property - The class name part of the component name in Navigation Windows. For NavigationProperty generated for entity assocations. + The class name part of the component name in Navigation Windows. For NavigationProperty generated for entity associations. Unnamed diff --git a/src/EFTools/EntityDesignModel/Commands/CopyAnnotatableElementCommand.cs b/src/EFTools/EntityDesignModel/Commands/CopyAnnotatableElementCommand.cs index b6f772d77b..17eb13ba9e 100644 --- a/src/EFTools/EntityDesignModel/Commands/CopyAnnotatableElementCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CopyAnnotatableElementCommand.cs @@ -30,7 +30,7 @@ protected virtual void AddAnnotations(AnnotatableElementClipboardFormat clipboar } catch (XmlException) { - // ignore an XmlException. There was probalby a problem parsing. + // ignore an XmlException. There was probably a problem parsing. } } } diff --git a/src/EFTools/EntityDesignModel/Commands/CreateComplexTypeCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateComplexTypeCommand.cs index b4f24360aa..255a7d6ccd 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateComplexTypeCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateComplexTypeCommand.cs @@ -93,7 +93,7 @@ internal ComplexType ComplexType /// /// This helper function will create a complex type using default name. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The new ComplexType diff --git a/src/EFTools/EntityDesignModel/Commands/CreateConceptualAssociationCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateConceptualAssociationCommand.cs index 4d41529fe3..aae7864bf9 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateConceptualAssociationCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateConceptualAssociationCommand.cs @@ -92,7 +92,7 @@ protected override void InvokeInternal(CommandProcessorContext cpc) // the model that we want to add the association to var model = artifact.ConceptualModel(); - // check for uniqueness of the assocation and association set names + // check for uniqueness of the association and association set names // if uniquifyNames is true then make them unique, otherwise throw // an exception if they're not (always uniquify associationSetName // regardless as we get bugs if not) diff --git a/src/EFTools/EntityDesignModel/Commands/CreateDiagramCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateDiagramCommand.cs index 9f391a11de..c0d788fd7b 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateDiagramCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateDiagramCommand.cs @@ -50,7 +50,7 @@ internal Diagram Diagram /// /// This helper function will create a Diagram using default name. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited + /// and the caller of this helper method must commit it to see these changes committed /// otherwise the diagram will never be created. /// /// diff --git a/src/EFTools/EntityDesignModel/Commands/CreateEntityTypeCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateEntityTypeCommand.cs index f7e6cef23a..ea21846350 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateEntityTypeCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateEntityTypeCommand.cs @@ -123,7 +123,7 @@ internal EntityType EntityType /// get an entity called "EntityType2", etc. /// This only creates these in the conceptual model. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The new EntityType @@ -156,7 +156,7 @@ internal static EntityType CreateEntityTypeAndEntitySetWithDefaultNames(CommandP /// This helper function creates a new entity in the conceptual model that is derived from the /// passed in entity. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the new, derived entity @@ -181,7 +181,7 @@ internal static ConceptualEntityType CreateDerivedEntityType( /// This helper function is an easy way to get a new entity type, entity set and key property in the /// new entity type created in the conceptual model. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the new entity @@ -210,7 +210,7 @@ internal static ConceptualEntityType CreateConceptualEntityTypeAndEntitySetAndPr /// This helper function is an easy way to get a new entity type, entity set and key property in the /// new entity type created in the conceptual or storage model. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the new entity diff --git a/src/EFTools/EntityDesignModel/Commands/CreateFragmentComplexPropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateFragmentComplexPropertyCommand.cs index 4ea4fb4c53..da7f1508f3 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateFragmentComplexPropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateFragmentComplexPropertyCommand.cs @@ -190,7 +190,7 @@ internal ComplexProperty ComplexProperty get { // we store the return from the create call in _createdProperty, but there is a chance that - // post-processing in an integry check will have moved this complex property to another ETM, + // post-processing in an integrity check will have moved this complex property to another ETM, // if this is case, go find the new one if (_createdProperty != null && _createdProperty.XObject == null) diff --git a/src/EFTools/EntityDesignModel/Commands/CreateFragmentConditionCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateFragmentConditionCommand.cs index 1ff15cb1a4..4c54904b46 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateFragmentConditionCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateFragmentConditionCommand.cs @@ -137,7 +137,7 @@ internal Condition CreatedCondition get { // we store the return from the create call in _condition, but there is a chance that - // post-processing in an integry check will have moved this condition to another ETM, + // post-processing in an integrity check will have moved this condition to another ETM, // if this is case, go find the new one if (_condition != null && _condition.XObject == null) diff --git a/src/EFTools/EntityDesignModel/Commands/CreateFragmentScalarPropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateFragmentScalarPropertyCommand.cs index 7791f65d8a..87f57b9e4a 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateFragmentScalarPropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateFragmentScalarPropertyCommand.cs @@ -232,7 +232,7 @@ internal ScalarProperty ScalarProperty get { // we store the return from the create call in _sp, but there is a chance that - // post-processing in an integry check will have moved this scalar property to another ETM, + // post-processing in an integrity check will have moved this scalar property to another ETM, // if this is case, go find the new one if (_sp != null && _sp.XObject == null) diff --git a/src/EFTools/EntityDesignModel/Commands/CreateFunctionScalarPropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateFunctionScalarPropertyCommand.cs index 32114753dd..6bffd9271d 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateFunctionScalarPropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateFunctionScalarPropertyCommand.cs @@ -275,7 +275,7 @@ internal static FunctionScalarProperty CreateFunctionScalarPropertyInAssociation XmlModelHelper.NormalizeAndResolve(fae); } - Debug.Assert(fae != null, "Failed to create the AssocationEnd to house this ScalarProperty"); + Debug.Assert(fae != null, "Failed to create the AssociationEnd to house this ScalarProperty"); if (fae == null) { throw new ParentItemCreationFailureException(); diff --git a/src/EFTools/EntityDesignModel/Commands/CreateInheritanceCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateInheritanceCommand.cs index f5b84454d0..f7327e3277 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateInheritanceCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateInheritanceCommand.cs @@ -21,7 +21,7 @@ namespace Microsoft.Data.Entity.Design.Model.Commands /// 1. Only the base-most class in an inheritance hierarchy can have keys, so any keys must be removed from the derived class /// 2. The entity set for the newly derived class is removed since it will now use the base class's entity set /// 3. Due to this change in entity set, we must also change any references to this set in an AssociationSet ends - /// 4. We register to run the EnforceEntitySetMappingRules check so rewrite any MSL as neededo + /// 4. We register to run the EnforceEntitySetMappingRules check so rewrite any MSL as needed /// internal class CreateInheritanceCommand : Command { @@ -205,7 +205,7 @@ protected override void InvokeInternal(CommandProcessorContext cpc) // here, to work around an xml editor bug, we clone the entity type mapping, instead of re-parenting it etm.Clone(entitySetMappingOfBaseType); - // The old EntityTyepMapping will be deleted when we delete the entity set below. + // The old EntityTypeMapping will be deleted when we delete the entity set below. } } } diff --git a/src/EFTools/EntityDesignModel/Commands/CreateNavigationPropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreateNavigationPropertyCommand.cs index 01fea56652..34dea8b07a 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateNavigationPropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateNavigationPropertyCommand.cs @@ -8,7 +8,7 @@ namespace Microsoft.Data.Entity.Design.Model.Commands internal class CreateNavigationPropertyCommand : Command { - internal static readonly string PrereqId = "CreateNagivationPropertyCommand"; + internal static readonly string PrereqId = "CreateNavigationPropertyCommand"; internal string Name { get; set; } internal ConceptualEntityType Entity { get; set; } diff --git a/src/EFTools/EntityDesignModel/Commands/CreateOrUpdateConceptualConstraintOrMapping.cs b/src/EFTools/EntityDesignModel/Commands/CreateOrUpdateConceptualConstraintOrMapping.cs index d495e5e308..9ec2f2c96d 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreateOrUpdateConceptualConstraintOrMapping.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreateOrUpdateConceptualConstraintOrMapping.cs @@ -12,7 +12,7 @@ namespace Microsoft.Data.Entity.Design.Model.Commands using Microsoft.Data.Entity.Design.Model.Mapping; /// - /// This class updates either the ReferencialConstraint or the AssociationSetMapping depending on whether or not we're including + /// This class updates either the ReferentialConstraint or the AssociationSetMapping depending on whether or not we're including /// foreign keys. The reason why we need a command that can pivot between these two behaviors is because the Hydration Translator /// does not have the context of the artifact at the time commands are created. /// diff --git a/src/EFTools/EntityDesignModel/Commands/CreatePropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/CreatePropertyCommand.cs index 9d91474699..01fb3ee82b 100644 --- a/src/EFTools/EntityDesignModel/Commands/CreatePropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/CreatePropertyCommand.cs @@ -197,7 +197,7 @@ private static Property CreateStorageProperty(StorageEntityType parentEntity, st /// /// Creates a property in the passed in entity of the default Type (non-nullable String). /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the new property @@ -219,7 +219,7 @@ internal static Property CreateDefaultProperty(CommandProcessorContext cpc, stri /// Creates a new property in the passed in conceptual entity and optionally sets additional /// facets on the property. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the property @@ -257,7 +257,7 @@ internal static Property CreateConceptualProperty( /// Creates a new property in the passed in storage entity and optionally sets additional /// facets on the property. /// NOTE: If the cpc already has an active transaction, these changes will be in that transaction - /// and the caller of this helper method must commit it to see these changes commited. + /// and the caller of this helper method must commit it to see these changes committed. /// /// /// The name of the property diff --git a/src/EFTools/EntityDesignModel/Commands/DeleteFunctionImportCommand.cs b/src/EFTools/EntityDesignModel/Commands/DeleteFunctionImportCommand.cs index 3907c7bcba..aab83756a8 100644 --- a/src/EFTools/EntityDesignModel/Commands/DeleteFunctionImportCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/DeleteFunctionImportCommand.cs @@ -41,7 +41,7 @@ public DeleteFunctionImportCommand(Func protected override void PreInvoke(CommandProcessorContext cpc) { - // Save off the deleted function mport name + // Save off the deleted function import name DeletedFunctionImportName = FunctionImport.Name.Value; base.PreInvoke(cpc); diff --git a/src/EFTools/EntityDesignModel/Commands/RetargetXmlNamespaceCommand.cs b/src/EFTools/EntityDesignModel/Commands/RetargetXmlNamespaceCommand.cs index 76c9b9a45a..0aecb61f02 100644 --- a/src/EFTools/EntityDesignModel/Commands/RetargetXmlNamespaceCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/RetargetXmlNamespaceCommand.cs @@ -73,7 +73,7 @@ internal static void RetargetWithMetadataConverter(XDocument xdoc, Version targe } // Do not reload artifact here - // Until the transaction is commited, the XLinq representation of the parsed xml tree hasn't been generated yet. + // Until the transaction is committed, the XLinq representation of the parsed xml tree hasn't been generated yet. } } diff --git a/src/EFTools/EntityDesignModel/Commands/SetKeyPropertyCommand.cs b/src/EFTools/EntityDesignModel/Commands/SetKeyPropertyCommand.cs index 1b475be740..224b26009b 100644 --- a/src/EFTools/EntityDesignModel/Commands/SetKeyPropertyCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/SetKeyPropertyCommand.cs @@ -160,7 +160,7 @@ protected override void InvokeInternal(CommandProcessorContext cpc) protected override void PostInvoke(CommandProcessorContext cpc) { - // in the conceptual model, changing key states will inpact MSL generated any + // in the conceptual model, changing key states will impact MSL generated any // inferred ref constraints if (Property.EntityModel.IsCSDL) { diff --git a/src/EFTools/EntityDesignModel/Commands/SetPropertyFacetsCommand.cs b/src/EFTools/EntityDesignModel/Commands/SetPropertyFacetsCommand.cs index 175d4b8229..23844f94a1 100644 --- a/src/EFTools/EntityDesignModel/Commands/SetPropertyFacetsCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/SetPropertyFacetsCommand.cs @@ -151,7 +151,7 @@ protected override void InvokeInternal(CommandProcessorContext cpc) throw new InvalidOperationException("InvokeInternal is called when _property is null."); } - // if values are set to NoneValue then explictly remove the attribute, + // if values are set to NoneValue then explicitly remove the attribute, // if values are set to null then leave the attribute as is if (_theDefault != null) { diff --git a/src/EFTools/EntityDesignModel/Commands/UpdateConceptualAndMappingModelsCommand.cs b/src/EFTools/EntityDesignModel/Commands/UpdateConceptualAndMappingModelsCommand.cs index dcbaf94821..5d3d517e5b 100644 --- a/src/EFTools/EntityDesignModel/Commands/UpdateConceptualAndMappingModelsCommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/UpdateConceptualAndMappingModelsCommand.cs @@ -160,7 +160,7 @@ private void UpdateConceptualPropertiesFromArtifact( } // foreach table/view in entityTypesToBeUpdatedDatabaseObjects find - // the EntityTypes in the ExistingModel which need to be udpated + // the EntityTypes in the ExistingModel which need to be updated foreach (var dbObj in entityTypesToBeUpdatedDatabaseObjects) { // find list of new S-side properties for this DatabaseObject @@ -1531,11 +1531,11 @@ private static void LogWarningMessageForReferentialConstraintProperties( isFirst = false; } - var prinicpalEntityTypeName = principalEntityType.LocalName.Value; + var principalEntityTypeName = principalEntityType.LocalName.Value; var dependentEntityTypeName = dependentEntityType.LocalName.Value; var s = String.Format( CultureInfo.CurrentCulture, Resources.UpdateFromDatabaseUnableToBringRefConstraint, associationName, - prinicpalEntityTypeName, dependentEntityTypeName, propertyList); + principalEntityTypeName, dependentEntityTypeName, propertyList); var errorMessageTarget = unfoundPrincipalProperties.Count > 0 ? principalEntityType : dependentEntityType; var errorInfo = new ErrorInfo( ErrorInfo.Severity.WARNING, s, errorMessageTarget, ErrorCodes.UPDATE_MODEL_FROM_DB_CANT_INCLUDE_REF_CONSTRAINT, @@ -1591,8 +1591,8 @@ private EndProperty CloneEndProperty( sp.ToPrettyString())); } - var spCSideEntityTypeinTempArtifact = sp.Name.Target.EntityType as ConceptualEntityType; - if (null == spCSideEntityTypeinTempArtifact) + var spCSideEntityTypeInTempArtifact = sp.Name.Target.EntityType as ConceptualEntityType; + if (null == spCSideEntityTypeInTempArtifact) { throw new UpdateModelFromDatabaseException( string.Format( @@ -1601,8 +1601,8 @@ private EndProperty CloneEndProperty( sp.Name.Target.ToPrettyString())); } - var spSSideEntityTypeinTempArtifact = sp.ColumnName.Target.EntityType as StorageEntityType; - if (null == spSSideEntityTypeinTempArtifact) + var spSSideEntityTypeInTempArtifact = sp.ColumnName.Target.EntityType as StorageEntityType; + if (null == spSSideEntityTypeInTempArtifact) { throw new UpdateModelFromDatabaseException( string.Format( @@ -1613,7 +1613,7 @@ private EndProperty CloneEndProperty( var csdlEntityTypeInExistingArtifact = FindMatchingConceptualEntityTypeInExistingArtifact( - spCSideEntityTypeinTempArtifact, + spCSideEntityTypeInTempArtifact, tempArtifactCEntityTypeToNewCEntityTypeInExistingArtifact); if (null == csdlEntityTypeInExistingArtifact) { @@ -1622,11 +1622,11 @@ private EndProperty CloneEndProperty( CultureInfo.CurrentCulture, Resources.UpdateFromDatabaseAssociationSetMappingCannotFindMatchingEntityType, sp.ToPrettyString(), - spCSideEntityTypeinTempArtifact.ToPrettyString())); + spCSideEntityTypeInTempArtifact.ToPrettyString())); } var ssdlEntityTypeInExistingArtifact = - FindMatchingStorageEntityTypeInExistingArtifact(spSSideEntityTypeinTempArtifact); + FindMatchingStorageEntityTypeInExistingArtifact(spSSideEntityTypeInTempArtifact); if (null == ssdlEntityTypeInExistingArtifact) { throw new UpdateModelFromDatabaseException( @@ -1634,7 +1634,7 @@ private EndProperty CloneEndProperty( CultureInfo.CurrentCulture, Resources.UpdateFromDatabaseAssociationSetMappingCannotFindMatchingEntityType, sp.ToPrettyString(), - spSSideEntityTypeinTempArtifact.ToPrettyString())); + spSSideEntityTypeInTempArtifact.ToPrettyString())); } var entityProperty = FindMatchingPropertyInExistingArtifactEntityType(sp.Name.Target, csdlEntityTypeInExistingArtifact); diff --git a/src/EFTools/EntityDesignModel/Commands/setfunctionimportsproccommand.cs b/src/EFTools/EntityDesignModel/Commands/setfunctionimportsproccommand.cs index 3fd613a3b4..367da089b6 100644 --- a/src/EFTools/EntityDesignModel/Commands/setfunctionimportsproccommand.cs +++ b/src/EFTools/EntityDesignModel/Commands/setfunctionimportsproccommand.cs @@ -9,7 +9,7 @@ namespace Microsoft.Data.Entity.Design.Model.Commands using Microsoft.Data.Entity.Design.Model.Mapping; /// - /// Use this command to set a function assocated with a function import + /// Use this command to set a function associated with a function import /// Example Function, corresponding FunctionImport, and the FunctionImportMapping: /// <Function Name="GetOrderDetails" Aggregate="false" /// BuiltIn="false" NiladicFunction="false" diff --git a/src/EFTools/EntityDesignModel/Designer/DesignerInfoPropertySet.cs b/src/EFTools/EntityDesignModel/Designer/DesignerInfoPropertySet.cs index a2f83c6f56..762df9e2bb 100644 --- a/src/EFTools/EntityDesignModel/Designer/DesignerInfoPropertySet.cs +++ b/src/EFTools/EntityDesignModel/Designer/DesignerInfoPropertySet.cs @@ -119,7 +119,7 @@ internal override bool ParseSingleElement(ICollection unprocessedElements var propertyName = elem.Attribute(EFNameableItem.AttributeName).Value; // Fix for bug 390580 - only include DesignerProperty if one with that name // does not already exist (otherwise Dictionary throws when you attempt to add - // it which casues VS to crash) + // it which causes VS to crash) if (false == _designerProperties.ContainsKey(propertyName)) { var prop = new DesignerProperty(this, elem); diff --git a/src/EFTools/EntityDesignModel/Designer/Visitor/VerifyDiagramModelIntegrityVisitor.cs b/src/EFTools/EntityDesignModel/Designer/Visitor/VerifyDiagramModelIntegrityVisitor.cs index df1be78fe0..512c7943d0 100644 --- a/src/EFTools/EntityDesignModel/Designer/Visitor/VerifyDiagramModelIntegrityVisitor.cs +++ b/src/EFTools/EntityDesignModel/Designer/Visitor/VerifyDiagramModelIntegrityVisitor.cs @@ -87,7 +87,7 @@ internal override string AllSerializedErrors { var sb = new StringBuilder(base.AllSerializedErrors); - sb.AppendLine("Diagram objects that are orphaneed: "); + sb.AppendLine("Diagram objects that are orphaned: "); sb.AppendLine(SerializeDiagramObject(_orphanedDiagramObjects)); sb.AppendLine("Diagram objects that are duplicated: "); diff --git a/src/EFTools/EntityDesignModel/EFExtensions.cs b/src/EFTools/EntityDesignModel/EFExtensions.cs index 69f53ee9d3..83029d2b3d 100644 --- a/src/EFTools/EntityDesignModel/EFExtensions.cs +++ b/src/EFTools/EntityDesignModel/EFExtensions.cs @@ -63,7 +63,7 @@ internal static bool IsSqlFamilyProvider(this EFArtifact thisArtifact) // This is needed to workaround problems with facet propagation feature. // For Sql Server and Sql Server CE facets on properties in S-Space are by default // the same as facets on corresponding properties in C-Space and therefore it is possible - // to blindly (i.e. wihtout asking the provider) propagate facets from S-Space properties + // to blindly (i.e. without asking the provider) propagate facets from S-Space properties // to C-Space properties. Providers for other databases may use facets to distinguish among // different types in which case the mismatch between facets on C-Space properties and S-Space // properties is intentional and facet propagation breaks this. In general we should always ask diff --git a/src/EFTools/EntityDesignModel/Entity/AnnotatableElement.cs b/src/EFTools/EntityDesignModel/Entity/AnnotatableElement.cs index 02bde0aafc..88399a62b9 100644 --- a/src/EFTools/EntityDesignModel/Entity/AnnotatableElement.cs +++ b/src/EFTools/EntityDesignModel/Entity/AnnotatableElement.cs @@ -58,19 +58,19 @@ private static XElement GetLastSiblingOfMyNamespace(EFElement parent) } var c = parent.XContainer; - XElement predecesor = null; + XElement predecessor = null; foreach (var e in c.Elements()) { if (e.Name.NamespaceName.Equals(expectedNamespace, StringComparison.OrdinalIgnoreCase)) { - predecesor = e; + predecessor = e; } else { break; } } - return predecesor; + return predecessor; } } } diff --git a/src/EFTools/EntityDesignModel/Entity/AnnotatableElementClipboardFormat.cs b/src/EFTools/EntityDesignModel/Entity/AnnotatableElementClipboardFormat.cs index bd2789a4e4..058c1ff785 100644 --- a/src/EFTools/EntityDesignModel/Entity/AnnotatableElementClipboardFormat.cs +++ b/src/EFTools/EntityDesignModel/Entity/AnnotatableElementClipboardFormat.cs @@ -32,7 +32,7 @@ internal AnnotatableElementClipboardFormat(EFElement efElement) } else { - Debug.Fail("unexepected type of XObject returned from GetAnnotationsForElement()"); + Debug.Fail("unexpected type of XObject returned from GetAnnotationsForElement()"); } } } diff --git a/src/EFTools/EntityDesignModel/Entity/AssociationClipboardFormat.cs b/src/EFTools/EntityDesignModel/Entity/AssociationClipboardFormat.cs index 5a85ed0569..6f0f23a3cf 100644 --- a/src/EFTools/EntityDesignModel/Entity/AssociationClipboardFormat.cs +++ b/src/EFTools/EntityDesignModel/Entity/AssociationClipboardFormat.cs @@ -30,7 +30,7 @@ internal AssociationClipboardFormat( var associationEnds = association.AssociationEnds(); Debug.Assert( associationEnds.Count == 2, - String.Format(CultureInfo.CurrentCulture, "Invalid AssocationEnd counts for Assocation {0}", association.DisplayName)); + String.Format(CultureInfo.CurrentCulture, "Invalid AssociationEnd counts for Association {0}", association.DisplayName)); if (associationEnds.Count == 2) { diff --git a/src/EFTools/EntityDesignModel/Entity/AssociationEnd.cs b/src/EFTools/EntityDesignModel/Entity/AssociationEnd.cs index b20138a6d5..c2f0a15ec6 100644 --- a/src/EFTools/EntityDesignModel/Entity/AssociationEnd.cs +++ b/src/EFTools/EntityDesignModel/Entity/AssociationEnd.cs @@ -19,7 +19,7 @@ internal class AssociationEnd : EFNormalizableItem private SingleItemBinding _typeBinding; private DefaultableValue _multiplicityAttr; private DefaultableValue _roleAttr; - private OnDeleteAction _onDeteleAction; + private OnDeleteAction _onDeleteAction; internal AssociationEnd(EFElement parent, XElement element) : base(parent, element) @@ -127,8 +127,8 @@ internal override string AttributeName internal OnDeleteAction OnDeleteAction { - get { return _onDeteleAction; } - set { _onDeteleAction = value; } + get { return _onDeleteAction; } + set { _onDeleteAction = value; } } // we unfortunately get a warning from the compiler when we use the "base" keyword in "iterator" types generated by using the @@ -148,9 +148,9 @@ internal override IEnumerable Children { yield return efobj; } - if (_onDeteleAction != null) + if (_onDeleteAction != null) { - yield return _onDeteleAction; + yield return _onDeleteAction; } yield return Type; @@ -161,9 +161,9 @@ internal override IEnumerable Children protected override void OnChildDeleted(EFContainer efContainer) { - if (efContainer == _onDeteleAction) + if (efContainer == _onDeleteAction) { - _onDeteleAction = null; + _onDeleteAction = null; return; } @@ -201,8 +201,8 @@ protected override void PreParse() _typeBinding = null; ClearEFObject(_roleAttr); _roleAttr = null; - ClearEFObject(_onDeteleAction); - _onDeteleAction = null; + ClearEFObject(_onDeleteAction); + _onDeleteAction = null; base.PreParse(); } @@ -211,10 +211,10 @@ internal override bool ParseSingleElement(ICollection unprocessedElements { if (elem.Name.LocalName == OnDeleteAction.ElementName) { - if (_onDeteleAction == null) + if (_onDeleteAction == null) { - _onDeteleAction = new OnDeleteAction(this, elem); - _onDeteleAction.Parse(unprocessedElements); + _onDeleteAction = new OnDeleteAction(this, elem); + _onDeleteAction.Parse(unprocessedElements); } else { diff --git a/src/EFTools/EntityDesignModel/Entity/AssociationSetEndEntitySetNormalizer.cs b/src/EFTools/EntityDesignModel/Entity/AssociationSetEndEntitySetNormalizer.cs index ed2ff34328..347fa1121d 100644 --- a/src/EFTools/EntityDesignModel/Entity/AssociationSetEndEntitySetNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Entity/AssociationSetEndEntitySetNormalizer.cs @@ -6,7 +6,7 @@ namespace Microsoft.Data.Entity.Design.Model.Entity /// /// The refName for these ends cannot be already normalized. The Role attribute points to - /// an End of the Assocation from the AssociationSet, so it already has its scope set in stone. + /// an End of the Association from the AssociationSet, so it already has its scope set in stone. /// The EntitySet attribute points to an EntitySet that must be in the current EntityContainer /// and EntitySet names don't use the schema alias or namespace. /// @@ -39,7 +39,7 @@ internal static NormalizedName NameNormalizer(EFElement parent, string refName) Debug.Assert(ec != null, "AssociationSet parent should be a subclass of BaseEntityContainer"); - // the normalized name for an EnitySet is 'EntityContainerName + # + EntitySetName' + // the normalized name for an EntitySet is 'EntityContainerName + # + EntitySetName' var symbol = new Symbol(entityContainerName, refName); var normalizedName = new NormalizedName(symbol, null, null, refName); diff --git a/src/EFTools/EntityDesignModel/Entity/AssociationSetEndRoleNormalizer.cs b/src/EFTools/EntityDesignModel/Entity/AssociationSetEndRoleNormalizer.cs index fd7fbb950c..12d00a74a1 100644 --- a/src/EFTools/EntityDesignModel/Entity/AssociationSetEndRoleNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Entity/AssociationSetEndRoleNormalizer.cs @@ -6,7 +6,7 @@ namespace Microsoft.Data.Entity.Design.Model.Entity /// /// The refName for these ends cannot be already normalized. The Role attribute points to - /// an End of the Assocation from the AssociationSet, so it already has its scope set in stone. + /// an End of the Association from the AssociationSet, so it already has its scope set in stone. /// The EntitySet attribute points to an EntitySet that must be in the current EntityContainer /// and EntitySet names don't use the schema alias or namespace. /// @@ -34,7 +34,7 @@ internal static NormalizedName NameNormalizer(EFElement parent, string refName) // the "Role" attribute points to a "Role" attribute in an Association End. The trick // is that this attribute is optional and defaults to the raw name of the Entity pointed // to by the "Type" attribute of the Association End, and that might not be fully resolved - // yet. So, lets just get the Normalized Name for the assocation from the assocation set + // yet. So, lets just get the Normalized Name for the association from the association set //and tack on the Role name. if (set.Association.Status == BindingStatus.Known) { diff --git a/src/EFTools/EntityDesignModel/Entity/ConceptualEntityType.cs b/src/EFTools/EntityDesignModel/Entity/ConceptualEntityType.cs index 9017328b68..195e7d4618 100644 --- a/src/EFTools/EntityDesignModel/Entity/ConceptualEntityType.cs +++ b/src/EFTools/EntityDesignModel/Entity/ConceptualEntityType.cs @@ -287,7 +287,7 @@ internal bool IsConcrete } /// - /// A bindable reference to the EntityType that is this type's base type (will be null if no inheritence) + /// A bindable reference to the EntityType that is this type's base type (will be null if no inheritance) /// internal EntityTypeBaseType BaseType { @@ -359,7 +359,7 @@ internal ConceptualEntityType SafeBaseType return null; default: var etbt = BaseType; - Debug.Assert(etbt != null, "BaseType is not an EntiytTypeBaseType"); + Debug.Assert(etbt != null, "BaseType is not an EntityTypeBaseType"); ModelHelper.InvalidSchemaError(Resources.UnresolvedBaseType_1, etbt.RefName, NormalizedNameExternal); return null; } diff --git a/src/EFTools/EntityDesignModel/Entity/EntityType.cs b/src/EFTools/EntityDesignModel/Entity/EntityType.cs index 6ef8e1af7c..4c849bd2e8 100644 --- a/src/EFTools/EntityDesignModel/Entity/EntityType.cs +++ b/src/EFTools/EntityDesignModel/Entity/EntityType.cs @@ -283,7 +283,7 @@ internal override DeleteEFElementCommand GetDeleteCommand() /// Normally we will just the general implementation for this. The exception is when we /// are trying to bind to this from the TypeName attribute of an EntityTypeMapping. In this /// case, we need to return IsTypeOf(typeName) if the ETM needs it that way. - /// Simillary we need to return "Collection(typeName)" string for the ReturnType attribute of a FunctionImport. + /// Similarly, we need to return "Collection(typeName)" string for the ReturnType attribute of a FunctionImport. /// /// /// diff --git a/src/EFTools/EntityDesignModel/Entity/Function.cs b/src/EFTools/EntityDesignModel/Entity/Function.cs index cc3b2bb3c8..01b3309934 100644 --- a/src/EFTools/EntityDesignModel/Entity/Function.cs +++ b/src/EFTools/EntityDesignModel/Entity/Function.cs @@ -94,15 +94,15 @@ internal DefaultableValue Aggregate { if (_aggregateAttr == null) { - _aggregateAttr = new AggregrateDefaultableValue(this); + _aggregateAttr = new AggregateDefaultableValue(this); } return _aggregateAttr; } } - private class AggregrateDefaultableValue : DefaultableValue + private class AggregateDefaultableValue : DefaultableValue { - internal AggregrateDefaultableValue(EFElement parent) + internal AggregateDefaultableValue(EFElement parent) : base(parent, AttributeAggregate) { } diff --git a/src/EFTools/EntityDesignModel/Entity/PropertyBase.cs b/src/EFTools/EntityDesignModel/Entity/PropertyBase.cs index e3d99de001..a53a3b1db9 100644 --- a/src/EFTools/EntityDesignModel/Entity/PropertyBase.cs +++ b/src/EFTools/EntityDesignModel/Entity/PropertyBase.cs @@ -279,12 +279,12 @@ internal void MoveTo(InsertPropertyPosition position) // Delete both old XElement and the preceding whitespace. // Preceding whitespace is preferred over trailing whitespace because we don't want to remove the last property's trailing white-space since // it has different indent level than the rest (see EFElement's EnsureFirstNodeWhitespaceSeparation method). - var preceedingNewLine = toBeDeleteElement.PreviousNode as XText; - while (preceedingNewLine != null - && String.IsNullOrWhiteSpace(preceedingNewLine.Value)) + var precedingNewLine = toBeDeleteElement.PreviousNode as XText; + while (precedingNewLine != null + && String.IsNullOrWhiteSpace(precedingNewLine.Value)) { - var toBeDeletedWhiteSpace = preceedingNewLine; - preceedingNewLine = preceedingNewLine.PreviousNode as XText; + var toBeDeletedWhiteSpace = precedingNewLine; + precedingNewLine = precedingNewLine.PreviousNode as XText; toBeDeletedWhiteSpace.Remove(); } toBeDeleteElement.Remove(); diff --git a/src/EFTools/EntityDesignModel/EntityDesignArtifact.cs b/src/EFTools/EntityDesignModel/EntityDesignArtifact.cs index b469b3f002..269fa7c45e 100644 --- a/src/EFTools/EntityDesignModel/EntityDesignArtifact.cs +++ b/src/EFTools/EntityDesignModel/EntityDesignArtifact.cs @@ -44,7 +44,7 @@ internal class EntityDesignArtifact : EFArtifact private bool _isStructurallySafe; /// - /// True if this artifact's XMLNS values are consistent with the desireed EDMX version. + /// True if this artifact's XMLNS values are consistent with the desired EDMX version. /// private bool _isVersionSafe; @@ -836,7 +836,7 @@ internal virtual void DetermineIfArtifactIsVersionSafe() internal virtual bool IsXmlValid() { // since the xml editor will fix-up parser errors, we can't detect if the xml will parse. This method is - // overriden in VSArtifact to see if the xml will parse. + // overridden in VSArtifact to see if the xml will parse. return true; } @@ -849,7 +849,7 @@ private static bool CompareNamespaces(EFRuntimeModelRoot rootNode, XNamespace xn } /// - /// Retrives the namespace of the root elemnt of the document. This should be either an EDMX, CSDL, SSDL or MSL namespace URI. + /// Retrives the namespace of the root element of the document. This should be either an EDMX, CSDL, SSDL or MSL namespace URI. /// /// The namespace of the Edmx document or NULL if the XDocument for edmx is null. internal XNamespace GetRootNamespace() @@ -877,7 +877,7 @@ protected internal override bool ExpectEFObjectForXObject(XObject xobject) { foreach (var n in SchemaManager.GetEDMXNamespaceNames()) { - // see if this element is the "Edmx" element. We don't exepct a EFObject for this element + // see if this element is the "Edmx" element. We don't expect a EFObject for this element if (xe.Name.NamespaceName.Equals(n, StringComparison.OrdinalIgnoreCase)) { if (xe.Name.LocalName.Equals("Edmx", StringComparison.OrdinalIgnoreCase)) diff --git a/src/EFTools/EntityDesignModel/EntityDesignModel.csproj b/src/EFTools/EntityDesignModel/EntityDesignModel.csproj index 13945394cc..899d17d1ee 100644 --- a/src/EFTools/EntityDesignModel/EntityDesignModel.csproj +++ b/src/EFTools/EntityDesignModel/EntityDesignModel.csproj @@ -141,7 +141,7 @@ - + @@ -350,7 +350,7 @@ - + diff --git a/src/EFTools/EntityDesignModel/Integrity/InferReferentialContraints.cs b/src/EFTools/EntityDesignModel/Integrity/InferReferentialConstraints.cs similarity index 99% rename from src/EFTools/EntityDesignModel/Integrity/InferReferentialContraints.cs rename to src/EFTools/EntityDesignModel/Integrity/InferReferentialConstraints.cs index 6785afad5d..1390baa55a 100644 --- a/src/EFTools/EntityDesignModel/Integrity/InferReferentialContraints.cs +++ b/src/EFTools/EntityDesignModel/Integrity/InferReferentialConstraints.cs @@ -198,7 +198,7 @@ internal static void AddRule(CommandProcessorContext cpc, EntityType entityType) } /// - /// This method will add an InferReferentialContraints IntegrityCheck for the passed in + /// This method will add an InferReferentialConstraints IntegrityCheck for the passed in /// association. /// /// diff --git a/src/EFTools/EntityDesignModel/Integrity/PropagateStoragePropertyFacetsToConceptualModel.cs b/src/EFTools/EntityDesignModel/Integrity/PropagateStoragePropertyFacetsToConceptualModel.cs index fef3dcbf64..01b81593b5 100644 --- a/src/EFTools/EntityDesignModel/Integrity/PropagateStoragePropertyFacetsToConceptualModel.cs +++ b/src/EFTools/EntityDesignModel/Integrity/PropagateStoragePropertyFacetsToConceptualModel.cs @@ -362,7 +362,7 @@ private void SynchronizeFacet( else { // default value for C-side facet is different from the default value for the S-side facet - // so need to explictly set the C-side. Only reason for not updating is if the value is + // so need to explicitly set the C-side. Only reason for not updating is if the value is // already what we would set it to. if (false == cSideDefaultableValue.IsDefaulted && sSideDefaultableValueDefaultValue.Equals(preExistingCSideValue)) diff --git a/src/EFTools/EntityDesignModel/LegacyCodeGenerationDriver.cs b/src/EFTools/EntityDesignModel/LegacyCodeGenerationDriver.cs index 544f1052e0..d4c959924a 100644 --- a/src/EFTools/EntityDesignModel/LegacyCodeGenerationDriver.cs +++ b/src/EFTools/EntityDesignModel/LegacyCodeGenerationDriver.cs @@ -39,7 +39,7 @@ public IList GenerateCode(EFArtifact artifact, string defaultNam { var codeGenerator = CreateCodeGenerator(_language, _targetEntityFrameworkVersion); - Debug.Assert(artifact.ConceptualModel() != null, "Artifact ConceptuaModel is null"); + Debug.Assert(artifact.ConceptualModel() != null, "Artifact ConceptualModel is null"); if (defaultNamespace != null && artifact.ConceptualModel() != null) { diff --git a/src/EFTools/EntityDesignModel/Mapping/ComplexProperty.cs b/src/EFTools/EntityDesignModel/Mapping/ComplexProperty.cs index ed5e33f6e6..eadb9a4c49 100644 --- a/src/EFTools/EntityDesignModel/Mapping/ComplexProperty.cs +++ b/src/EFTools/EntityDesignModel/Mapping/ComplexProperty.cs @@ -38,7 +38,7 @@ internal SingleItemBinding Name _name = new SingleItemBinding( this, AttributeName, - ProperyMappingNameNormalizer.NameNormalizer + PropertyMappingNameNormalizer.NameNormalizer ); } return _name; diff --git a/src/EFTools/EntityDesignModel/Mapping/EntityContainerMapping.cs b/src/EFTools/EntityDesignModel/Mapping/EntityContainerMapping.cs index 7dd66dffde..72bd4601ab 100644 --- a/src/EFTools/EntityDesignModel/Mapping/EntityContainerMapping.cs +++ b/src/EFTools/EntityDesignModel/Mapping/EntityContainerMapping.cs @@ -15,9 +15,9 @@ internal class EntityContainerMapping : EFElement internal static readonly string AttributeStorageEntityContainer = "StorageEntityContainer"; internal static readonly string AttributeGenerateUpdateViews = "GenerateUpdateViews"; - private readonly List _entitySetMapppings = new List(); - private readonly List _associationSetMapppings = new List(); - private readonly List _functionImportMapppings = new List(); + private readonly List _entitySetMappings = new List(); + private readonly List _associationSetMappings = new List(); + private readonly List _functionImportMappings = new List(); private SingleItemBinding _cdmEntityContainer; private SingleItemBinding _storageEntityContainer; private DefaultableValue _generateUpdateViewsAttr; @@ -99,32 +99,32 @@ public override bool DefaultValue internal void AddEntitySetMapping(EntitySetMapping esm) { - _entitySetMapppings.Add(esm); + _entitySetMappings.Add(esm); } internal IList EntitySetMappings() { - return _entitySetMapppings.AsReadOnly(); + return _entitySetMappings.AsReadOnly(); } internal void AddAssociationSetMapping(AssociationSetMapping asm) { - _associationSetMapppings.Add(asm); + _associationSetMappings.Add(asm); } internal IList AssociationSetMappings() { - return _associationSetMapppings.AsReadOnly(); + return _associationSetMappings.AsReadOnly(); } internal void AddFunctionImportMapping(FunctionImportMapping fim) { - _functionImportMapppings.Add(fim); + _functionImportMappings.Add(fim); } internal IList FunctionImportMappings() { - return _functionImportMapppings.AsReadOnly(); + return _functionImportMappings.AsReadOnly(); } // we unfortunately get a warning from the compiler when we use the "base" keyword in "iterator" types generated by using the @@ -171,21 +171,21 @@ protected override void OnChildDeleted(EFContainer efContainer) var child1 = efContainer as EntitySetMapping; if (child1 != null) { - _entitySetMapppings.Remove(child1); + _entitySetMappings.Remove(child1); return; } var child2 = efContainer as AssociationSetMapping; if (child2 != null) { - _associationSetMapppings.Remove(child2); + _associationSetMappings.Remove(child2); return; } var child3 = efContainer as FunctionImportMapping; if (child3 != null) { - _functionImportMapppings.Remove(child3); + _functionImportMappings.Remove(child3); return; } @@ -227,9 +227,9 @@ protected override void PreParse() ClearEFObject(_generateUpdateViewsAttr); _generateUpdateViewsAttr = null; - ClearEFObjectCollection(_entitySetMapppings); - ClearEFObjectCollection(_associationSetMapppings); - ClearEFObjectCollection(_functionImportMapppings); + ClearEFObjectCollection(_entitySetMappings); + ClearEFObjectCollection(_associationSetMappings); + ClearEFObjectCollection(_functionImportMappings); base.PreParse(); } @@ -267,19 +267,19 @@ internal override bool ParseSingleElement(ICollection unprocessedElements if (elem.Name.LocalName == EntitySetMapping.ElementName) { var esm = new EntitySetMapping(this, elem); - _entitySetMapppings.Add(esm); + _entitySetMappings.Add(esm); esm.Parse(unprocessedElements); } else if (elem.Name.LocalName == AssociationSetMapping.ElementName) { var asm = new AssociationSetMapping(this, elem); - _associationSetMapppings.Add(asm); + _associationSetMappings.Add(asm); asm.Parse(unprocessedElements); } else if (elem.Name.LocalName == FunctionImportMapping.ElementName) { var fim = new FunctionImportMapping(this, elem); - _functionImportMapppings.Add(fim); + _functionImportMappings.Add(fim); fim.Parse(unprocessedElements); } else diff --git a/src/EFTools/EntityDesignModel/Mapping/FunctionImportPropertyMappingNameNormalizer.cs b/src/EFTools/EntityDesignModel/Mapping/FunctionImportPropertyMappingNameNormalizer.cs index 1839b6c77a..2c579172e5 100644 --- a/src/EFTools/EntityDesignModel/Mapping/FunctionImportPropertyMappingNameNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Mapping/FunctionImportPropertyMappingNameNormalizer.cs @@ -4,7 +4,7 @@ namespace Microsoft.Data.Entity.Design.Model.Mapping { using System.Diagnostics; - internal static class FunctionImportProperyMappingNameNormalizer + internal static class FunctionImportPropertyMappingNameNormalizer { internal static NormalizedName NameNormalizer(EFElement parent, string refName) { diff --git a/src/EFTools/EntityDesignModel/Mapping/FunctionImportScalarProperty.cs b/src/EFTools/EntityDesignModel/Mapping/FunctionImportScalarProperty.cs index a088da9f37..19471403d8 100644 --- a/src/EFTools/EntityDesignModel/Mapping/FunctionImportScalarProperty.cs +++ b/src/EFTools/EntityDesignModel/Mapping/FunctionImportScalarProperty.cs @@ -43,7 +43,7 @@ internal SingleItemBinding Name _property = new SingleItemBinding( this, AttributeName, - FunctionImportProperyMappingNameNormalizer.NameNormalizer + FunctionImportPropertyMappingNameNormalizer.NameNormalizer ); } return _property; diff --git a/src/EFTools/EntityDesignModel/Mapping/FunctionPropertyMappingNameNormalizer.cs b/src/EFTools/EntityDesignModel/Mapping/FunctionPropertyMappingNameNormalizer.cs index 34eecd3597..cf4b04f992 100644 --- a/src/EFTools/EntityDesignModel/Mapping/FunctionPropertyMappingNameNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Mapping/FunctionPropertyMappingNameNormalizer.cs @@ -49,13 +49,13 @@ internal static NormalizedName NameNormalizer(EFElement parent, string refName) } // - // try to normalize for an EntityTyepMapping with no FunctionAssociationEnd + // try to normalize for an EntityTypeMapping with no FunctionAssociationEnd // var etm = parentItem.GetParentOfType(typeof(EntityTypeMapping)) as EntityTypeMapping; var fae = parentItem.GetParentOfType(typeof(FunctionAssociationEnd)) as FunctionAssociationEnd; if (fae == null) { - normalizedName = ProperyMappingNameNormalizer.NormalizePropertyNameRelativeToEntityTypeMapping(etm, parent, refName); + normalizedName = PropertyMappingNameNormalizer.NormalizePropertyNameRelativeToEntityTypeMapping(etm, parent, refName); if (normalizedName != null) { return normalizedName; @@ -119,7 +119,7 @@ private static NormalizedName NormalizePropertyNameRelativeToFunctionAssociation { if (fae.To.Status == BindingStatus.Known) { - nn = ProperyMappingNameNormalizer.NormalizeNameFromAssociationSetEnd(fae.To.Target, parent, refName); + nn = PropertyMappingNameNormalizer.NormalizeNameFromAssociationSetEnd(fae.To.Target, parent, refName); } } return nn; diff --git a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingBase.cs b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingBase.cs index b7a4a6f726..08d644a096 100644 --- a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingBase.cs +++ b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingBase.cs @@ -44,7 +44,7 @@ internal SingleItemBinding Name _property = new SingleItemBinding( this, AttributeName, - ProperyMappingNameNormalizer.NameNormalizer + PropertyMappingNameNormalizer.NameNormalizer ); } return _property; diff --git a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingColumnNameNormalizer.cs b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingColumnNameNormalizer.cs index 9245874364..b19f16e98b 100644 --- a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingColumnNameNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingColumnNameNormalizer.cs @@ -47,7 +47,7 @@ internal static NormalizedName NameNormalizer(EFElement parent, string refName) } else if (asm != null) { - // this is a condition under an AssocationSetMapping or a ScalarProperty under an EndProperty + // this is a condition under an AssociationSetMapping or a ScalarProperty under an EndProperty // regardless, use the reference to our S-Space from the asm if (asm.StoreEntitySet.Status == BindingStatus.Known) { diff --git a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingNameNormalizer.cs b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingNameNormalizer.cs index e7246fe15d..b30d483750 100644 --- a/src/EFTools/EntityDesignModel/Mapping/PropertyMappingNameNormalizer.cs +++ b/src/EFTools/EntityDesignModel/Mapping/PropertyMappingNameNormalizer.cs @@ -6,7 +6,7 @@ namespace Microsoft.Data.Entity.Design.Model.Mapping using System.Diagnostics; using Microsoft.Data.Entity.Design.Model.Entity; - internal static class ProperyMappingNameNormalizer + internal static class PropertyMappingNameNormalizer { internal static NormalizedName NameNormalizer(EFElement parent, string refName) { @@ -45,7 +45,7 @@ internal static NormalizedName NameNormalizer(EFElement parent, string refName) } // - // try to normalize for an EntityTyepMapping with no FunctionAssociationEnd + // try to normalize for an EntityTypeMapping with no FunctionAssociationEnd // var etm = parentItem.GetParentOfType(typeof(EntityTypeMapping)) as EntityTypeMapping; normalizedName = NormalizePropertyNameRelativeToEntityTypeMapping(etm, parent, refName); @@ -100,7 +100,7 @@ internal static NormalizedName NormalizeNameFromAssociationSetEnd(AssociationSet var cet = type as ConceptualEntityType; if (cet != null) { - // thie is a c-side entity type + // this is a c-side entity type while (cet != null) { var nn = GetNormalizedNameRelativeToEntityType(cet, refName, parent.Artifact.ArtifactSet); diff --git a/src/EFTools/EntityDesignModel/Mapping/ResultBinding.cs b/src/EFTools/EntityDesignModel/Mapping/ResultBinding.cs index a9f54e2f14..cc4b000717 100644 --- a/src/EFTools/EntityDesignModel/Mapping/ResultBinding.cs +++ b/src/EFTools/EntityDesignModel/Mapping/ResultBinding.cs @@ -46,7 +46,7 @@ internal SingleItemBinding Name _property = new SingleItemBinding( this, AttributeName, - ProperyMappingNameNormalizer.NameNormalizer + PropertyMappingNameNormalizer.NameNormalizer ); } return _property; diff --git a/src/EFTools/EntityDesignModel/ModelHelper.cs b/src/EFTools/EntityDesignModel/ModelHelper.cs index edf5b12475..b739d589ea 100644 --- a/src/EFTools/EntityDesignModel/ModelHelper.cs +++ b/src/EFTools/EntityDesignModel/ModelHelper.cs @@ -1831,7 +1831,7 @@ internal static object FindComplexTypeEntityTypeOrPrimitiveTypeForFunctionImport } // this will remove the 'Collection' around the return type. It will now either be 'None', - // the primitive type name, complec type name, or entity name. + // the primitive type name, complex type name, or entity name. var desanitizedReturnType = UnwrapCollectionAroundFunctionImportReturnType(returnTypeAsString, true); // if this is a complex type name, attempt to get the complex type object @@ -1860,7 +1860,7 @@ internal static object FindComplexTypeEntityTypeOrPrimitiveTypeForFunctionImport /// /// Given the runtime format for the return type: "Collection([namespace-qualified return type])", return back either: /// 1. The namespace-(Un)qualified EntityType name. - /// 2. The namespace-(Un)qualified ComplexType namme. + /// 2. The namespace-(Un)qualified ComplexType name. /// 3. The primitive type name /// 4. "(None)" if the passed in string is null. /// @@ -2274,7 +2274,7 @@ internal static IEnumerable GetStructuredAnnotationsForElement(EFElemen /// /// Return the list of entity-types that are related (through association or direct inheritance) to the passed in entity-type. - /// TODO: there are common functionality between this method and EntiyTypeShape's CreateEntityTypeShapeAndConnectorsInDiagram, + /// TODO: there are common functionality between this method and EntityTypeShape's CreateEntityTypeShapeAndConnectorsInDiagram, /// We should be able to extract common functionality that can be shared between 2 methods. /// internal static IEnumerable GetRelatedEntityTypes(EntityType entityType) diff --git a/src/EFTools/EntityDesignModel/Resources.Designer.cs b/src/EFTools/EntityDesignModel/Resources.Designer.cs index 63ef07fcaa..6e0524d02a 100644 --- a/src/EFTools/EntityDesignModel/Resources.Designer.cs +++ b/src/EFTools/EntityDesignModel/Resources.Designer.cs @@ -297,27 +297,27 @@ internal static string ErrorValidatingArtifact_StorageModelMissing { /// /// Looks up a localized string similar to Association '{0}' has no association set.. /// - internal static string EscherValidation_AssociationWithtouAssociationSet { + internal static string EscherValidation_AssociationWithoutAssociationSet { get { - return ResourceManager.GetString("EscherValidation_AssociationWithtouAssociationSet", resourceCulture); + return ResourceManager.GetString("EscherValidation_AssociationWithoutAssociationSet", resourceCulture); } } /// /// Looks up a localized string similar to A circular complex type definition has been found for {0} complex type.. /// - internal static string EscherValidation_CiricularComplexTypeDefinition { + internal static string EscherValidation_CircularComplexTypeDefinition { get { - return ResourceManager.GetString("EscherValidation_CiricularComplexTypeDefinition", resourceCulture); + return ResourceManager.GetString("EscherValidation_CircularComplexTypeDefinition", resourceCulture); } } /// /// Looks up a localized string similar to A circular inheritance chain has been found involving entity types {0}.. /// - internal static string EscherValidation_CiricularInheritance { + internal static string EscherValidation_CircularInheritance { get { - return ResourceManager.GetString("EscherValidation_CiricularInheritance", resourceCulture); + return ResourceManager.GetString("EscherValidation_CircularInheritance", resourceCulture); } } diff --git a/src/EFTools/EntityDesignModel/Resources.resx b/src/EFTools/EntityDesignModel/Resources.resx index f2f7285dbf..4d57f06dea 100644 --- a/src/EFTools/EntityDesignModel/Resources.resx +++ b/src/EFTools/EntityDesignModel/Resources.resx @@ -163,10 +163,10 @@ Could not find the storage model to validate. - + Association '{0}' has no association set. - + A circular inheritance chain has been found involving entity types {0}. @@ -408,7 +408,7 @@ Cannot change this property type to {0} – this would cause circular loop for the enclosing type definition. - + A circular complex type definition has been found for {0} complex type. diff --git a/src/EFTools/EntityDesignModel/SchemaValidatioErrorCollector.cs b/src/EFTools/EntityDesignModel/SchemaValidationErrorCollector.cs similarity index 100% rename from src/EFTools/EntityDesignModel/SchemaValidatioErrorCollector.cs rename to src/EFTools/EntityDesignModel/SchemaValidationErrorCollector.cs diff --git a/src/EFTools/EntityDesignModel/SingleItemBinding.cs b/src/EFTools/EntityDesignModel/SingleItemBinding.cs index 2b86460c7f..a78359e855 100644 --- a/src/EFTools/EntityDesignModel/SingleItemBinding.cs +++ b/src/EFTools/EntityDesignModel/SingleItemBinding.cs @@ -329,9 +329,9 @@ private void UpdateRefNameUsingReplacement(string toBeReplaced, string replaceme // For most scenarios, RefName should be equal to refNameAsNameRef.ToBindingString() // But in FunctionImport's Return, the values are as follow: - // RefName : "Collection([Old Fully-qualifed EntityType/ComplexType])" - // refNameasNameRef.ToBindingString(): [Old Fully-qualifed EntityType/ComplexType] - // replacementRefName: [New Fully-qualifed EntityType/ComplexType] + // RefName : "Collection([Old Fully-qualified EntityType/ComplexType])" + // refNameAsNameRef.ToBindingString(): [Old Fully-qualified EntityType/ComplexType] + // replacementRefName: [New Fully-qualified EntityType/ComplexType] if (String.Compare(RefName, refNameAsNameRef.ToBindingString(), StringComparison.CurrentCulture) != 0) { replacementRefName = RefName.Replace(refNameAsNameRef.ToBindingString(), replacementRefName); diff --git a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentity.cs b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentity.cs index b4c42ef6bb..1b6c81555c 100644 --- a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentity.cs +++ b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentity.cs @@ -16,7 +16,7 @@ internal abstract class AssociationIdentity /// /// For an association mapped with an AssociationSetMapping, this will return the table that the ASM is mapped to - /// For an association mapped with a ReferentialConstraing, this will return the Dependent end tables of the RC. + /// For an association mapped with a ReferentialConstraining, this will return the Dependent end tables of the RC. /// internal abstract IEnumerable AssociationTables { get; } diff --git a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentityForReferentialConstraint.cs b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentityForReferentialConstraint.cs index 647ad80ce8..b8001544f3 100644 --- a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentityForReferentialConstraint.cs +++ b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationIdentityForReferentialConstraint.cs @@ -28,7 +28,7 @@ internal ReferentialConstraintIdentity ReferentialConstraintIdentity } /// - /// returns all the tables mapped to columns on the "Dependent" end of the referential constraing + /// returns all the tables mapped to columns on the "Dependent" end of the referential constraining /// internal override IEnumerable AssociationTables { diff --git a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationPropertyIdentity.cs b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationPropertyIdentity.cs index 4c56c30d47..9c111bfbb1 100644 --- a/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationPropertyIdentity.cs +++ b/src/EFTools/EntityDesignModel/UpdateFromDatabase/AssociationPropertyIdentity.cs @@ -12,7 +12,7 @@ namespace Microsoft.Data.Entity.Design.Model.UpdateFromDatabase /// /// This class defines the "Identity" of a property that participates in an association. - /// This can be either through an AssociationSetMapping, or through a C-side ReferentialConstratint. + /// This can be either through an AssociationSetMapping, or through a C-side ReferentialConstraint. /// Since a ReferentialConstraint on the c-side can be defined over properties that are mapped to multiple /// columns in the database (eg, in TPC scenarios), we define the "principal" & "dependent" ends of the /// Association property via a list of columns. @@ -236,7 +236,7 @@ public int Compare(AssociationPropertyIdentity x, AssociationPropertyIdentity y) var compVal = SortedListAllowDupes.CompareListContents(x.PrincipalColumns, y.PrincipalColumns); if (compVal == 0) { - // left columns are equal, compare right columsn + // left columns are equal, compare right columns compVal = SortedListAllowDupes.CompareListContents(x.DependentColumns, y.DependentColumns); } return compVal; diff --git a/src/EFTools/EntityDesignModel/Validation/EscherModelValidator.cs b/src/EFTools/EntityDesignModel/Validation/EscherModelValidator.cs index 6c2b826e23..bf964cd98c 100644 --- a/src/EFTools/EntityDesignModel/Validation/EscherModelValidator.cs +++ b/src/EFTools/EntityDesignModel/Validation/EscherModelValidator.cs @@ -46,7 +46,7 @@ internal static bool IsOpenInEditorError(ErrorInfo ei) if (ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_CIRCULAR_INHERITANCE || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_CIRCULAR_COMPLEX_TYPE_DEFINITION || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_ENTITY_TYPE_WITHOUT_ENTITY_SET - || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_MULTIPE_ENTITY_SETS_PER_TYPE + || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_MULTIPLE_ENTITY_SETS_PER_TYPE || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_ASSOCIATION_WITHOUT_ASSOCIATION_SET || ei.ErrorCode == ErrorCodes.ESCHER_VALIDATOR_INCLUDES_USING || ei.ErrorCode == ErrorCodes.NON_QUALIFIED_ELEMENT) @@ -182,7 +182,7 @@ internal void CheckForCircularInheritance(ConceptualEntityType t) if (baseTypes.Contains(t)) { var msg = String.Format( - CultureInfo.CurrentCulture, Resources.EscherValidation_CiricularInheritance, + CultureInfo.CurrentCulture, Resources.EscherValidation_CircularInheritance, NameableItemsToCommaSeparatedString(baseTypes)); ArtifactSet.AddError( new ErrorInfo( @@ -201,7 +201,7 @@ internal void CheckForCircularComplexTypeDefinition(ComplexType complexType) if (ModelHelper.ContainsCircularComplexTypeDefinition(complexType)) { var msg = String.Format( - CultureInfo.CurrentCulture, Resources.EscherValidation_CiricularComplexTypeDefinition, complexType.LocalName.Value); + CultureInfo.CurrentCulture, Resources.EscherValidation_CircularComplexTypeDefinition, complexType.LocalName.Value); ArtifactSet.AddError( new ErrorInfo( ErrorInfo.Severity.ERROR, msg, complexType, ErrorCodes.ESCHER_VALIDATOR_CIRCULAR_COMPLEX_TYPE_DEFINITION, @@ -231,7 +231,7 @@ internal void CheckForMultipleEntitySetsPerType(EntityType t) } ArtifactSet.AddError( new ErrorInfo( - ErrorInfo.Severity.WARNING, msg, t, ErrorCodes.ESCHER_VALIDATOR_MULTIPE_ENTITY_SETS_PER_TYPE, errorClass)); + ErrorInfo.Severity.WARNING, msg, t, ErrorCodes.ESCHER_VALIDATOR_MULTIPLE_ENTITY_SETS_PER_TYPE, errorClass)); } } } @@ -265,7 +265,7 @@ internal void CheckForAssociationWithoutAssociationSet(Association a) if (a.AssociationSet == null) { var msg = String.Format( - CultureInfo.CurrentCulture, Resources.EscherValidation_AssociationWithtouAssociationSet, a.LocalName.Value); + CultureInfo.CurrentCulture, Resources.EscherValidation_AssociationWithoutAssociationSet, a.LocalName.Value); ArtifactSet.AddError( new ErrorInfo( ErrorInfo.Severity.WARNING, msg, a, ErrorCodes.ESCHER_VALIDATOR_ASSOCIATION_WITHOUT_ASSOCIATION_SET, diff --git a/src/EFTools/EntityDesignModel/Validation/UnrecoverableRuntimeErrors.cs b/src/EFTools/EntityDesignModel/Validation/UnrecoverableRuntimeErrors.cs index b711fd988c..bbc466a558 100644 --- a/src/EFTools/EntityDesignModel/Validation/UnrecoverableRuntimeErrors.cs +++ b/src/EFTools/EntityDesignModel/Validation/UnrecoverableRuntimeErrors.cs @@ -78,7 +78,7 @@ public static readonly ErrorCode[] SchemaObjectModelErrorCodes ErrorCode.InvalidMultiplicity, // The value for the Action attribute is not valid or not allowed in the current context ErrorCode.InvalidAction, - // An error occured processing the On<Operation> elements + // An error occurred processing the On<Operation> elements // Designer -- ErrorCode.InvalidOperation, // Ends were given for the Property element of a EntityContainer that is not a RelationshipSet ErrorCode.InvalidContainerTypeForEnd, @@ -86,7 +86,7 @@ public static readonly ErrorCode[] SchemaObjectModelErrorCodes ErrorCode.InvalidEndEntitySet, // An end element was not given, and cannot be inferred because too many EntityContainerEntitySet elements that are good possibilities. ErrorCode.AmbiguousEntityContainerEnd, - // An end element was not given, and cannot be infered because there is no EntityContainerEntitySets that are the correct type to be used as an EntitySet. + // An end element was not given, and cannot be inferred because there is no EntityContainerEntitySets that are the correct type to be used as an EntitySet. ErrorCode.MissingExtentEntityContainerEnd, // Not a valid parameter direction for the parameter in a function ErrorCode.BadParameterDirection, @@ -134,7 +134,7 @@ public static readonly ErrorCode[] SchemaObjectModelErrorCodes // Binary type properties which are part of entity key are currently not supported // Designer -- ErrorCode.BinaryEntityKeyCurrentlyNotSupported, - // The primitive type kind does not have a prefered mapping + // The primitive type kind does not have a preferred mapping // Designer -- ErrorCode.NoPreferredMappingForPrimitiveTypeKind, // More than one PreferredMapping for a PrimitiveTypeKind @@ -174,7 +174,7 @@ public static readonly ErrorCode[] SchemaObjectModelErrorCodes // Empty DefiningQuery text ErrorCode.EmptyDefiningQuery, - // Schema, Table and DefiningQuery are all specified, and are mutualy exlusive + // Schema, Table and DefiningQuery are all specified, and are mutually exclusive ErrorCode.TableAndSchemaAreMutuallyExclusiveWithDefiningQuery, // Provider manifest does not allow a type to explicitly promote to itself, this is an implicit assumption. diff --git a/src/EFTools/EntityDesignPackage/Commands_VS15.vsct b/src/EFTools/EntityDesignPackage/Commands_VS15.vsct index d5af9da23f..198dbfebb6 100644 --- a/src/EFTools/EntityDesignPackage/Commands_VS15.vsct +++ b/src/EFTools/EntityDesignPackage/Commands_VS15.vsct @@ -1098,7 +1098,7 @@ + diff --git a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_1.xsd b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_1.xsd index df5c4c9c0f..c5b2bbba90 100644 --- a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_1.xsd +++ b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_1.xsd @@ -352,7 +352,7 @@ - + diff --git a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_2.xsd b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_2.xsd index 086125a85e..6f55f10e8f 100644 --- a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_2.xsd +++ b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_2.xsd @@ -365,7 +365,7 @@ - + diff --git a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_3.xsd b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_3.xsd index 6f6ec4b4c5..151d2ffe5b 100644 --- a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_3.xsd +++ b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.CSMSL_3.xsd @@ -355,7 +355,7 @@ - + diff --git a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.ProviderServices.ProviderManifest.xsd b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.ProviderServices.ProviderManifest.xsd index a0cf8fdccc..73aa3be1e6 100644 --- a/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.ProviderServices.ProviderManifest.xsd +++ b/src/EFTools/setup/EFToolsMsi/XmlSchemas/System.Data.Resources.ProviderServices.ProviderManifest.xsd @@ -119,7 +119,7 @@ - + diff --git a/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs b/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs index 7bff3deb8f..6909294f45 100644 --- a/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs +++ b/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs @@ -109,7 +109,7 @@ public static bool ShouldRetryOn(Exception ex) // The instance of SQL Server you attempted to connect to does not support encryption. case 20: return true; - // This exception can be thrown even if the operation completed succesfully, so it's safer to let the application fail. + // This exception can be thrown even if the operation completed successfully, so it's safer to let the application fail. // DBNETLIB Error Code: -2 // Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding. The statement has been terminated. //case -2: diff --git a/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs b/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs index 020271a79f..0e737a1595 100644 --- a/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs +++ b/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs @@ -16,7 +16,7 @@ namespace System.Data.Entity.SqlServer.SqlGen using System.Text; // - // Enacapsulates the logic required to translate function calls represented as instances of DbFunctionExpression into SQL. + // Encapsulates the logic required to translate function calls represented as instances of DbFunctionExpression into SQL. // There are several special cases that modify how the translation should proceed. These include: // - 'Special' canonical functions, for which the function name or arguments differ between the EDM canonical function and the SQL function // - 'Special' server functions, which are similar to the 'special' canonical functions but sourced by the SQL Server provider manifest @@ -292,7 +292,7 @@ private static Dictionary InitializeCanonicalFunctionHa } // - // Initalizes the mapping from functions to TSql operators + // Initializes the mapping from functions to TSql operators // for all functions that translate to TSql operators // private static Dictionary InitializeFunctionNameToOperatorDictionary() @@ -308,7 +308,7 @@ private static Dictionary InitializeFunctionNameToOperatorDictio } // - // Initalizes the mapping from names of canonical function for date/time addition + // Initializes the mapping from names of canonical function for date/time addition // to corresponding dateparts // private static Dictionary InitializeDateAddFunctionNameToDatepartDictionary() @@ -327,7 +327,7 @@ private static Dictionary InitializeDateAddFunctionNameToDatepar } // - // Initalizes the mapping from names of canonical function for date/time difference + // Initializes the mapping from names of canonical function for date/time difference // to corresponding dateparts // private static Dictionary InitializeDateDiffFunctionNameToDatepartDictionary() @@ -346,7 +346,7 @@ private static Dictionary InitializeDateDiffFunctionNameToDatepa } // - // Initalizes the mapping from names of canonical function that represent static hierarchyid methods to their corresponding + // Initializes the mapping from names of canonical function that represent static hierarchyid methods to their corresponding // static method name, qualified with the 'hierarchyid::' prefix. // [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -365,7 +365,7 @@ private static Dictionary InitializeHierarchyIdStaticMe } // - // Initalizes the mapping from names of canonical function that represent static geography methods to their corresponding + // Initializes the mapping from names of canonical function that represent static geography methods to their corresponding // static method name, qualified with the 'geography::' prefix. // [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -428,7 +428,7 @@ private static Dictionary InitializeGeographyStaticMeth } // - // Initalizes the mapping from names of canonical function that represent geography instance properties to their corresponding + // Initializes the mapping from names of canonical function that represent geography instance properties to their corresponding // store property name. // private static Dictionary InitializeGeographyInstancePropertyFunctionsDictionary() @@ -445,7 +445,7 @@ private static Dictionary InitializeGeographyInstancePropertyFun } // - // Initalizes the mapping of canonical function name to instance method name for geography instance functions that differ in name from the sql server equivalent. + // Initializes the mapping of canonical function name to instance method name for geography instance functions that differ in name from the sql server equivalent. // private static Dictionary InitializeRenamedGeographyInstanceMethodFunctions() { @@ -479,7 +479,7 @@ private static Dictionary InitializeRenamedGeographyInstanceMeth } // - // Initalizes the mapping from names of canonical function that represent static geometry methods to their corresponding + // Initializes the mapping from names of canonical function that represent static geometry methods to their corresponding // static method name, qualified with the 'geometry::' prefix. // [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -542,7 +542,7 @@ private static Dictionary InitializeGeometryStaticMetho } // - // Initalizes the mapping from names of canonical function that represent geometry instance properties to their corresponding + // Initializes the mapping from names of canonical function that represent geometry instance properties to their corresponding // store property name. // private static Dictionary InitializeGeometryInstancePropertyFunctionsDictionary() @@ -559,7 +559,7 @@ private static Dictionary InitializeGeometryInstancePropertyFunc } // - // Initalizes the mapping of canonical function name to instance method name for geometry instance functions that differ in name from the sql server equivalent. + // Initializes the mapping of canonical function name to instance method name for geometry instance functions that differ in name from the sql server equivalent. // private static Dictionary InitializeRenamedGeometryInstanceMethodFunctions() { @@ -1064,26 +1064,26 @@ private static ISqlFragment WriteInstanceFunctionCall( // // Handles functions that are translated into TSQL operators. // The given function should have one or two arguments. - // Functions with one arguemnt are translated into + // Functions with one argument are translated into // op arg // Functions with two arguments are translated into // arg0 op arg1 - // Also, the arguments can be optionaly enclosed in parethesis + // Also, the arguments can be optionally enclosed in parethesis // - // Whether the arguments should be enclosed in parethesis - private static ISqlFragment HandleSpecialFunctionToOperator(SqlGenerator sqlgen, DbFunctionExpression e, bool parenthesiseArguments) + // Whether the arguments should be enclosed in parethesis + private static ISqlFragment HandleSpecialFunctionToOperator(SqlGenerator sqlgen, DbFunctionExpression e, bool parenthesizeArguments) { var result = new SqlBuilder(); Debug.Assert(e.Arguments.Count > 0 && e.Arguments.Count <= 2, "There should be 1 or 2 arguments for operator"); if (e.Arguments.Count > 1) { - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append("("); } result.Append(e.Arguments[0].Accept(sqlgen)); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append(")"); } @@ -1093,12 +1093,12 @@ private static ISqlFragment HandleSpecialFunctionToOperator(SqlGenerator sqlgen, result.Append(_functionNameToOperatorDictionary[e.Function.Name]); result.Append(" "); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append("("); } result.Append(e.Arguments[e.Arguments.Count - 1].Accept(sqlgen)); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append(")"); } @@ -1156,7 +1156,7 @@ internal static ISqlFragment HandleDatepartDateFunction(SqlGenerator sqlgen, DbF var result = new SqlBuilder(); // - // finaly, expand the function name + // finally, expand the function name // WriteFunctionName(result, e.Function); result.Append("("); @@ -1188,7 +1188,7 @@ private static ISqlFragment HandleCanonicalFunctionDatepart(SqlGenerator sqlgen, } // - // Handler for canonical funcitons for GetTotalOffsetMinutes. + // Handler for canonical functions for GetTotalOffsetMinutes. // GetTotalOffsetMinutes(e) --> Datepart(tzoffset, e) // private static ISqlFragment HandleCanonicalFunctionGetTotalOffsetMinutes(SqlGenerator sqlgen, DbFunctionExpression e) @@ -1197,7 +1197,7 @@ private static ISqlFragment HandleCanonicalFunctionGetTotalOffsetMinutes(SqlGene } // - // Handler for canonical funcitons for LocalDateTime. + // Handler for canonical functions for LocalDateTime. // LocalDateTime(e) --> CAST(e AS DATETIME2) // private static ISqlFragment HandleCanonicalFunctionLocalDateTime(SqlGenerator sqlgen, DbFunctionExpression e) @@ -1215,7 +1215,7 @@ private static ISqlFragment HandleCanonicalFunctionLocalDateTime(SqlGenerator sq } // - // Handler for canonical funcitons for UtcDateTime. + // Handler for canonical functions for UtcDateTime. // UtcDateTime(e) --> CONVERT(DATETIME2, e, 1) // private static ISqlFragment HandleCanonicalFunctionUtcDateTime(SqlGenerator sqlgen, DbFunctionExpression e) @@ -1398,7 +1398,7 @@ private static ISqlFragment HandleCanonicalFunctionDateTimeTypeCreation( } // - // Helper method that wrapps the given expession with a conver to varchar(255) + // Helper method that wraps the given expession with a convert to varchar(255) // private static void AppendConvertToVarchar(SqlGenerator sqlgen, SqlBuilder result, DbExpression e) { @@ -1488,7 +1488,7 @@ private static ISqlFragment HandleCanonicalFunctionDateAdd(SqlGenerator sqlgen, } // - // Hanndler for date differencing functions supported only starting from Katmai + // Handler for date differencing functions supported only starting from Katmai // private static ISqlFragment HandleCanonicalFunctionDateDiffKatmaiOrNewer(SqlGenerator sqlgen, DbFunctionExpression e) { @@ -1886,7 +1886,7 @@ internal static bool IsStoreFunction(EdmFunction function) } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // internal static bool CastReturnTypeToInt64(DbFunctionExpression e) { @@ -1894,7 +1894,7 @@ internal static bool CastReturnTypeToInt64(DbFunctionExpression e) } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // internal static bool CastReturnTypeToInt32(SqlGenerator sqlgen, DbFunctionExpression e) { @@ -1908,7 +1908,7 @@ internal static bool CastReturnTypeToInt32(SqlGenerator sqlgen, DbFunctionExpres } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // internal static bool CastReturnTypeToInt16(DbFunctionExpression e) { @@ -1916,7 +1916,7 @@ internal static bool CastReturnTypeToInt16(DbFunctionExpression e) } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // internal static bool CastReturnTypeToSingle(DbFunctionExpression e) { diff --git a/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs b/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs index 34775622cd..b294d95ede 100644 --- a/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs +++ b/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs @@ -274,7 +274,7 @@ public List Targets get { return _targets; } } - // Define lists of functions that take string arugments and return strings. + // Define lists of functions that take string arguments and return strings. private static readonly ISet _canonicalAndStoreStringFunctionsOneArg = new HashSet(StringComparer.Ordinal) { @@ -473,7 +473,7 @@ internal string GenerateSql(DbQueryCommandTree tree, out HashSet paramsT { var sqlStatement = VisitExpressionEnsureSqlStatement(targetTree.Query); - Debug.Assert(sqlStatement != null, "The outer most sql statment is null"); + Debug.Assert(sqlStatement != null, "The outer most sql statement is null"); sqlStatement.IsTopMost = true; result = sqlStatement; @@ -1403,7 +1403,7 @@ public override ISqlFragment Visit(DbRefKeyExpression e) // an aggregate or a subquery. (SQLBUDT #504600) // // - // Sql Server requries each GROUP BY expression (key) to contain at least one column + // Sql Server requires each GROUP BY expression (key) to contain at least one column // that is not an outer reference. (SQLBUDT #616523) // // @@ -1417,7 +1417,7 @@ public override ISqlFragment Visit(DbRefKeyExpression e) // aggf1(aexpr1) AS agg1, .. aggfn(aexprn) AS aggn // FROM input AS a // GROUP BY kexp1, kexp2, .. kexpn - // When we inject an innner query, the equivalent translation is: + // When we inject an inner query, the equivalent translation is: // SELECT // key1 AS key1, key2 AS key2, .. keyn AS keys, // aggf1(agg1) AS agg1, aggfn(aggn) AS aggn @@ -3467,7 +3467,7 @@ private ISqlFragment VisitSetOpExpression(DbBinaryExpression setOpExpression, st // This is case only for SQL 8.0 when the left child has order by in it // If the output columns of the left child got renamed, // then the output of the union all is renamed - // All this currenlty only happens for UNION ALL, because INTERSECT and + // All this currently only happens for UNION ALL, because INTERSECT and // EXCEPT get translated for SQL 8.0 before SqlGen. var selectStatement = new SqlSelectStatement(); selectStatement.From.Append("( "); @@ -3886,7 +3886,7 @@ private SqlSelectStatement CreateNewSelectStatement( { var columns = AddDefaultColumns(oldStatement); - // Thid could not have been called from a join node. + // This could not have been called from a join node. Debug.Assert(oldStatement.FromExtents.Count == 1); // if the oldStatement has a join as its input, ... @@ -4024,7 +4024,7 @@ private ISqlFragment HandleCountExpression(DbExpression e) == DbExpressionKind.Constant) { //For constant expression we should not cast the value, - // thus we don't go throught the default DbConstantExpression handling + // thus we don't go through the default DbConstantExpression handling var sqlBuilder = new SqlBuilder(); sqlBuilder.Append(((DbConstantExpression)e).Value.ToString()); result = sqlBuilder; @@ -4343,7 +4343,7 @@ private static string ByteArrayToBinaryString(Byte[] binaryArray) // an aggregate or a subquery. (SQLBUDT #504600) // // - // Potentially, we could furhter optimize this. + // Potentially, we could further optimize this. // private static bool GroupByAggregatesNeedInnerQuery(IList aggregates, string inputVarRefName) { diff --git a/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs b/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs index e5f9c8a6d3..0b477c1fc7 100644 --- a/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs +++ b/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs @@ -143,8 +143,8 @@ public override void WriteSql(SqlWriter writer, SqlGenerator sqlGenerator) // // Writes the optional columns that are used. - // If this is the topmost statement or distict is specifed as part of the same statement - // all optoinal columns are written. + // If this is the topmost statement or distinct is specified as part of the same statement + // all optional columns are written. // // Whether at least one column got written private bool WriteOptionalColumns(SqlWriter writer, SqlGenerator sqlGenerator) diff --git a/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs b/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs index ed15a49f1d..146a9a1ecb 100644 --- a/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs +++ b/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs @@ -39,7 +39,7 @@ namespace System.Data.Entity.SqlServer.SqlGen internal sealed class SqlSelectStatement : ISqlFragment { // - // Whether the columns ouput by this sql statement were renamed from what given in the command tree. + // Whether the columns output by this sql statement were renamed from what given in the command tree. // internal bool OutputColumnsRenamed { get; set; } diff --git a/src/EntityFramework.SqlServer/SqlProviderManifest.cs b/src/EntityFramework.SqlServer/SqlProviderManifest.cs index 47152247c0..b8cf96ebb9 100644 --- a/src/EntityFramework.SqlServer/SqlProviderManifest.cs +++ b/src/EntityFramework.SqlServer/SqlProviderManifest.cs @@ -198,7 +198,7 @@ internal static string EscapeLikeText(string text, bool alwaysEscapeEscapeChar, // This method should never return null. // // The name of the information to be retrieved. - // An XmlReader at the begining of the information requested. + // An XmlReader at the beginning of the information requested. protected override XmlReader GetDbInformation(string informationType) { if (informationType == StoreSchemaDefinitionVersion3 diff --git a/src/EntityFramework.SqlServerCompact/SqlCeProviderManifest.cs b/src/EntityFramework.SqlServerCompact/SqlCeProviderManifest.cs index ef322a2890..2a35e47bfe 100644 --- a/src/EntityFramework.SqlServerCompact/SqlCeProviderManifest.cs +++ b/src/EntityFramework.SqlServerCompact/SqlCeProviderManifest.cs @@ -93,7 +93,7 @@ private static XmlReader GetProviderManifest() // This method should never return null. // // The name of the information to be retrieved. - // An XmlReader at the begining of the information requested. + // An XmlReader at the beginning of the information requested. protected override XmlReader GetDbInformation(string informationType) { if (informationType == ProviderManifest.StoreSchemaDefinition) diff --git a/src/EntityFramework.SqlServerCompact/SqlCeProviderServices.cs b/src/EntityFramework.SqlServerCompact/SqlCeProviderServices.cs index aff45f624f..9dc17282bd 100644 --- a/src/EntityFramework.SqlServerCompact/SqlCeProviderServices.cs +++ b/src/EntityFramework.SqlServerCompact/SqlCeProviderServices.cs @@ -161,7 +161,7 @@ protected override void DbDeleteDatabase(DbConnection connection, int? timeOut, // Throw an exception if connection is open. // We should not close the connection because user could have result sets/data readers associated with this connection. - // Thus, it is users responsiblity to close the connection before calling delete database. + // Thus, it is users responsibility to close the connection before calling delete database. if (DbInterception.Dispatch.Connection.GetState(connection, new DbInterceptionContext()) == ConnectionState.Open) { @@ -200,7 +200,7 @@ protected override void DbDeleteDatabase(DbConnection connection, int? timeOut, } /// - /// API for creating the databse and schema objects given a StoreItemCollection. + /// API for creating the database and schema objects given a StoreItemCollection. /// This will do following things: /// 1. Create a new database using SqlCeEngine.CreateDatabase(). /// 2. Generate scripts for creating schema objects. @@ -315,7 +315,7 @@ protected override void DbCreateDatabase(DbConnection connection, int? timeOut, #region Private Helpers - // Private helper for validatingn the SqlCeConnection. + // Private helper for validating the SqlCeConnection. private void ValidateConnection(DbConnection connection) { // Check whether it is a valid SqlCeConnection. diff --git a/src/EntityFramework.SqlServerCompact/SqlGen/SqlGenerator.cs b/src/EntityFramework.SqlServerCompact/SqlGen/SqlGenerator.cs index c2b9b8cb57..3680e72bbe 100644 --- a/src/EntityFramework.SqlServerCompact/SqlGen/SqlGenerator.cs +++ b/src/EntityFramework.SqlServerCompact/SqlGen/SqlGenerator.cs @@ -276,7 +276,7 @@ internal Dictionary AllColumnNames "Edm.Ceiling" }; - // topElementExpression is used to detect the any occurance of element expression which + // topElementExpression is used to detect the any occurrence of element expression which // is not a child of the top level projectExpression private bool topElementExpression; // stores the list of all the scalar subquery tables names @@ -308,7 +308,7 @@ private static Dictionary InitializeStoreFunctionHandle } // - // Initalizes the mapping from names of canonical function for date/time addition + // Initializes the mapping from names of canonical function for date/time addition // to corresponding dateparts // private static Dictionary InitializeDateAddFunctionNameToDatepartDictionary() @@ -325,7 +325,7 @@ private static Dictionary InitializeDateAddFunctionNameToDatepar } // - // Initalizes the mapping from names of canonical function for date/time difference + // Initializes the mapping from names of canonical function for date/time difference // to corresponding dateparts // private static Dictionary InitializeDateDiffFunctionNameToDatepartDictionary() @@ -454,7 +454,7 @@ private static Dictionary InitializeDatepartKeywords() } // - // Initalizes the mapping from functions to TSql operators + // Initializes the mapping from functions to TSql operators // for all functions that translate to TSql operators // private static Dictionary InitializeFunctionNameToOperatorDictionary() @@ -559,7 +559,7 @@ private string[] GenerateSql(DbQueryCommandTree tree) if (TypeSemantics.IsCollectionType(targetTree.Query.ResultType)) { var sqlStatement = VisitExpressionEnsureSqlStatement(targetTree.Query); - Debug.Assert(sqlStatement != null, "The outer most sql statment is null"); + Debug.Assert(sqlStatement != null, "The outer most sql statement is null"); sqlStatement.IsTopMost = true; result = sqlStatement; } @@ -1192,7 +1192,7 @@ public override ISqlFragment Visit(DbRefKeyExpression e) // aggf1(aexpr1) AS agg1, .. aggfn(aexprn) AS aggn // FROM input AS a // GROUP BY kexp1, kexp2, .. kexpn - // When we inject an innner query, the equivalent translation is: + // When we inject an inner query, the equivalent translation is: // SELECT // key1 AS key1, key2 AS key2, .. keyn AS keys, // aggf1(agg1) AS agg1, aggfn(aggn) AS aggn @@ -1990,7 +1990,7 @@ public override ISqlFragment Visit(DbSkipExpression e) Symbol fromSymbol; var result = VisitInputExpression(e.Input.Expression, e.Input.VariableName, e.Input.VariableType, out fromSymbol); - // Check compatiblity. + // Check compatibility. // If the operators are not compatible, a new sql statement must be generated. // if (!IsCompatible(result, e.ExpressionKind)) @@ -2164,7 +2164,7 @@ private static SqlBuilder VisitAggregate(DbAggregate aggregate, IList ag // // Dump out an expression - optionally wrap it with parantheses if possible // - private void ParanthesizeExpressionIfNeeded(DbExpression e, SqlBuilder result) + private void ParenthesizeExpressionIfNeeded(DbExpression e, SqlBuilder result) { if (IsComplexExpression(e)) { @@ -2199,7 +2199,7 @@ private SqlBuilder VisitBinaryExpression(string op, DbExpressionKind expressionK { result.Append(op); } - ParanthesizeExpressionIfNeeded(argument, result); + ParenthesizeExpressionIfNeeded(argument, result); } return result; } @@ -2223,7 +2223,7 @@ private SqlBuilder VisitComparisonExpression(string op, DbExpression left, DbExp } else { - ParanthesizeExpressionIfNeeded(left, result); + ParenthesizeExpressionIfNeeded(left, result); } result.Append(op); @@ -2235,7 +2235,7 @@ private SqlBuilder VisitComparisonExpression(string op, DbExpression left, DbExp } else { - ParanthesizeExpressionIfNeeded(right, result); + ParenthesizeExpressionIfNeeded(right, result); } return result; @@ -2381,7 +2381,7 @@ private SqlBuilder VisitIsNullExpression(DbIsNullExpression e, bool negate) { // Codeplex workitem #287: SqlCeProviderServices.CreateSqlCeParameter does not supply // the parameter type for strings and blobs if the parameter size is not available, - // thus letting the QP to infer the type at execution time. That happpens because the + // thus letting the QP to infer the type at execution time. That happens because the // default types, ntext and image, are not comparable, so a simple predicate like // WHERE table.Column = @parameter would fail. However the inference is not possible // when there is an IS NULL comparison, in which case we explicitly cast to ntext @@ -2865,7 +2865,7 @@ private ISqlFragment HandleFunctionDefaultGivenName(DbFunctionExpression e, stri // // Default handling on function arguments. - // Appends the list of arguemnts to the given result + // Appends the list of arguments to the given result // If the function is niladic it does not append anything, // otherwise it appends (arg1, arg2, .., argn) // @@ -2936,26 +2936,26 @@ private ISqlFragment HandleSpecialFunction(Dictionary h // // Handles functions that are translated into TSQL operators. // The given function should have one or two arguments. - // Functions with one arguemnt are translated into + // Functions with one argument are translated into // op arg // Functions with two arguments are translated into // arg0 op arg1 - // Also, the arguments can be optionaly enclosed in parethesis + // Also, the arguments can be optionally enclosed in parethesis // - // Whether the arguments should be enclosed in parethesis - private ISqlFragment HandleSpecialFunctionToOperator(DbFunctionExpression e, bool parenthesiseArguments) + // Whether the arguments should be enclosed in parethesis + private ISqlFragment HandleSpecialFunctionToOperator(DbFunctionExpression e, bool parenthesizeArguments) { var result = new SqlBuilder(); Debug.Assert(e.Arguments.Count > 0 && e.Arguments.Count <= 2, "There should be 1 or 2 arguments for operator"); if (e.Arguments.Count > 1) { - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append("("); } result.Append(e.Arguments[0].Accept(this)); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append(")"); } @@ -2965,12 +2965,12 @@ private ISqlFragment HandleSpecialFunctionToOperator(DbFunctionExpression e, boo result.Append(_functionNameToOperatorDictionary[e.Function.Name]); result.Append(" "); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append("("); } result.Append(e.Arguments[e.Arguments.Count - 1].Accept(this)); - if (parenthesiseArguments) + if (parenthesizeArguments) { result.Append(")"); } @@ -3036,7 +3036,7 @@ private static ISqlFragment HandleDatepartDateFunction(SqlGenerator sqlgen, DbFu } // - // finaly, expand the function name + // finally, expand the function name // WriteFunctionName(result, e.Function); result.Append("("); @@ -3058,7 +3058,7 @@ private static ISqlFragment HandleDatepartDateFunction(SqlGenerator sqlgen, DbFu } // - // Handler for canonical funcitons for extracting date parts. + // Handler for canonical functions for extracting date parts. // For example: // Year(date) -> DATEPART( year, date) // @@ -3966,7 +3966,7 @@ private SqlSelectStatement CreateNewSelectStatement( { var columns = AddDefaultColumns(oldStatement); - // Thid could not have been called from a join node. + // This could not have been called from a join node. Debug.Assert(oldStatement.FromExtents.Count == 1); // if the oldStatement has a join as its input, ... @@ -4104,7 +4104,7 @@ private ISqlFragment HandleCountExpression(DbExpression e) == DbExpressionKind.Constant) { //For constant expression we should not cast the value, - // thus we don't go throught the default DbConstantExpression handling + // thus we don't go through the default DbConstantExpression handling var sqlBuilder = new SqlBuilder(); sqlBuilder.Append(((DbConstantExpression)e).Value.ToString()); result = sqlBuilder; @@ -4517,7 +4517,7 @@ private static string ByteArrayToBinaryString(Byte[] binaryArray) // an aggregate or a subquery. (SQLBUDT #504600) // // - // Potentially, we could furhter optimize this. + // Potentially, we could further optimize this. // private static bool GroupByAggregatesNeedInnerQuery(IList aggregates, string inputVarRefName) { @@ -4619,7 +4619,7 @@ private static bool GroupByExpressionNeedsInnerQuery(DbExpression expression, st } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // private static bool CastReturnTypeToInt32(DbFunctionExpression e) { @@ -4640,7 +4640,7 @@ private static bool CastReturnTypeToInt32(DbFunctionExpression e) } // - // determines if the function requires the return type be enforeced by use of a cast expression + // determines if the function requires the return type be enforced by use of a cast expression // internal static bool CastReturnTypeToSingle(DbFunctionExpression e) { diff --git a/src/EntityFramework.SqlServerCompact/SqlGen/SqlSelectStatement.cs b/src/EntityFramework.SqlServerCompact/SqlGen/SqlSelectStatement.cs index 856bac534f..ee299bd40e 100644 --- a/src/EntityFramework.SqlServerCompact/SqlGen/SqlSelectStatement.cs +++ b/src/EntityFramework.SqlServerCompact/SqlGen/SqlSelectStatement.cs @@ -22,7 +22,7 @@ namespace System.Data.Entity.SqlServerCompact.SqlGen // We do not have HAVING, since the CQT does not have such a node. // Each of the fields is a SqlBuilder, so we can keep appending SQL strings // or other fragments to build up the clause. - // We have a IsDistinct property to indicate that we want distict columns. + // We have a IsDistinct property to indicate that we want distinct columns. // This is given out of band, since the input expression to the select clause // may already have some columns projected out, and we use append-only SqlBuilders. // The DISTINCT is inserted when we finally write the object into a string. @@ -47,7 +47,7 @@ namespace System.Data.Entity.SqlServerCompact.SqlGen internal sealed class SqlSelectStatement : ISqlFragment { // - // Whether the columns ouput by this sql statement were renamed from what given in the command tree. + // Whether the columns output by this sql statement were renamed from what given in the command tree. // internal bool OutputColumnsRenamed { get; set; } diff --git a/src/EntityFramework/Core/Common/CommandTrees/DbExpression.cs b/src/EntityFramework/Core/Common/CommandTrees/DbExpression.cs index a36a75d414..7a3d0f5059 100644 --- a/src/EntityFramework/Core/Common/CommandTrees/DbExpression.cs +++ b/src/EntityFramework/Core/Common/CommandTrees/DbExpression.cs @@ -72,7 +72,7 @@ public virtual DbExpressionKind ExpressionKind #region Equals / GetHashCode // Dev10#547254: Easy to confuse DbExpressionBuilder.Equal with object.Equals method - // The object.Equals method is overriden on DbExpression and marked so that it does + // The object.Equals method is overridden on DbExpression and marked so that it does // not appear in IntelliSense to avoid confusion with the DbExpressionBuilder.Equal // expression construction method. Overriding Equals also requires that GetHashCode // is overridden, however in both cases we defer to the System.Object implementation. diff --git a/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs b/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs index 68fd43b293..860da51635 100644 --- a/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs +++ b/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs @@ -1570,7 +1570,7 @@ public static DbDerefExpression Deref(this DbExpression argument) } /// - /// Creates a new that retrieves the ref of the specifed entity in structural form. + /// Creates a new that retrieves the ref of the specified entity in structural form. /// /// A new DbEntityRefExpression that retrieves a reference to the specified entity. /// The expression that provides the entity. This expression must have an entity result type. @@ -1726,7 +1726,7 @@ public static DbRefExpression RefFromKey(this EntitySet entitySet, DbExpression } /// - /// Creates a new that retrieves the key values of the specifed reference in structural form. + /// Creates a new that retrieves the key values of the specified reference in structural form. /// /// A new DbRefKeyExpression that retrieves the key values of the specified reference. /// The expression that provides the reference. This expression must have a reference Type with an Entity element type. @@ -1803,7 +1803,7 @@ public static DbRelationshipNavigationExpression Navigate( /// Creates a new that removes duplicates from the given set argument. /// /// A new DbDistinctExpression that represents the distinct operation applied to the specified set argument. - /// An expression that defines the set over which to perfom the distinct operation. + /// An expression that defines the set over which to perform the distinct operation. /// argument is null. /// argument does not have a collection result type. public static DbDistinctExpression Distinct(this DbExpression argument) diff --git a/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs b/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs index 5d22c980d1..b1b9f6b004 100644 --- a/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs +++ b/src/EntityFramework/Core/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs @@ -197,7 +197,7 @@ public static DbFunctionExpression Concat(this DbExpression string1, DbExpressio /// Creates a that invokes the canonical 'Contains' function with the specified arguments, which must each have a string result type. The result type of the expression is Boolean. /// /// A new DbFunctionExpression that returns a Boolean value indicating whether or not searchedForString occurs within searchedString. - /// An expression that specifies the string to search for any occurence of searchedForString. + /// An expression that specifies the string to search for any occurrence of searchedForString. /// An expression that specifies the string to search for in searchedString. public static DbExpression Contains(this DbExpression searchedString, DbExpression searchedForString) { @@ -259,7 +259,7 @@ public static DbFunctionExpression Length(this DbExpression stringArgument) /// /// Creates a that invokes the canonical 'Replace' function with the specified arguments, which must each have a string result type. The result type of the expression is also string. /// - /// A new DbFunctionExpression than returns a new string based on stringArgument where every occurence of toReplace is replaced by replacement. + /// A new DbFunctionExpression than returns a new string based on stringArgument where every occurrence of toReplace is replaced by replacement. /// An expression that specifies the string in which to perform the replacement operation. /// An expression that specifies the string that is replaced. /// An expression that specifies the replacement string. diff --git a/src/EntityFramework/Core/Common/CommandTrees/Internal/DbExpressionRule.cs b/src/EntityFramework/Core/Common/CommandTrees/Internal/DbExpressionRule.cs index 1ffd5b07a2..6abab33006 100644 --- a/src/EntityFramework/Core/Common/CommandTrees/Internal/DbExpressionRule.cs +++ b/src/EntityFramework/Core/Common/CommandTrees/Internal/DbExpressionRule.cs @@ -3,7 +3,7 @@ namespace System.Data.Entity.Core.Common.CommandTrees.Internal { // - // Enacapsulates the logic that defines an expression 'rule' which is capable of transforming a candidate + // Encapsulates the logic that defines an expression 'rule' which is capable of transforming a candidate // // into a result DbExpression, and indicating what action should be taken on that result expression by the rule application logic. diff --git a/src/EntityFramework/Core/Common/CommandTrees/Internal/ExpressionDumper.cs b/src/EntityFramework/Core/Common/CommandTrees/Internal/ExpressionDumper.cs index f6350043a7..1f9d31f50b 100644 --- a/src/EntityFramework/Core/Common/CommandTrees/Internal/ExpressionDumper.cs +++ b/src/EntityFramework/Core/Common/CommandTrees/Internal/ExpressionDumper.cs @@ -55,7 +55,7 @@ internal void Dump(DbExpression target) } // - // Dumps a DbExpression with the specified block name preceeding and succeeding (decorating) it. + // Dumps a DbExpression with the specified block name preceding and succeeding (decorating) it. // // The DbExpression to dump // The decorating block name diff --git a/src/EntityFramework/Core/Common/EntitySql/AST/MethodExpr.cs b/src/EntityFramework/Core/Common/EntitySql/AST/MethodExpr.cs index 375199db47..4d86f1a3e7 100644 --- a/src/EntityFramework/Core/Common/EntitySql/AST/MethodExpr.cs +++ b/src/EntityFramework/Core/Common/EntitySql/AST/MethodExpr.cs @@ -26,7 +26,7 @@ internal MethodExpr( } // - // Intializes a method ast node with relationships. + // Initializes a method ast node with relationships. // internal MethodExpr( Node expr, diff --git a/src/EntityFramework/Core/Common/EntitySql/AST/RowConstructorExpr.cs b/src/EntityFramework/Core/Common/EntitySql/AST/RowConstructorExpr.cs index 4db921d4f6..c72c312ce9 100644 --- a/src/EntityFramework/Core/Common/EntitySql/AST/RowConstructorExpr.cs +++ b/src/EntityFramework/Core/Common/EntitySql/AST/RowConstructorExpr.cs @@ -3,7 +3,7 @@ namespace System.Data.Entity.Core.Common.EntitySql.AST { // - // Represents Row contructor expression. + // Represents Row constructor expression. // internal sealed class RowConstructorExpr : Node { diff --git a/src/EntityFramework/Core/Common/EntitySql/CqlLexerHelpers.cs b/src/EntityFramework/Core/Common/EntitySql/CqlLexerHelpers.cs index 630d44a68a..a1f5ccdba5 100644 --- a/src/EntityFramework/Core/Common/EntitySql/CqlLexerHelpers.cs +++ b/src/EntityFramework/Core/Common/EntitySql/CqlLexerHelpers.cs @@ -56,12 +56,12 @@ internal sealed partial class CqlLexer // Defines the set of characters to be interpreted as mandatory line breaks // according to UNICODE 5.0, section 5.8 Newline Guidelines.These are 'mandatory' - // line breaks. We do not handle other 'line breaking opportunities'as defined by + // line breaks. We do not handle other 'line breaking opportunities' as defined by // UNICODE 5.0 since they are intended for presentation. The mandatory line break // defines breaking opportunities that must not be ignored. For all practical purposes // the interpretation of mandatory breaks determines the end of one line and consequently // the start of the next line of query text. - // NOTE that CR and CRLF is treated as a composite 'character' and was obviously and intentionaly + // NOTE that CR and CRLF is treated as a composite 'character' and was obviously and intentionally // omitted in the character set bellow. private static readonly Char[] _newLineCharacters = { @@ -73,7 +73,7 @@ internal sealed partial class CqlLexer }; // - // Intializes scanner + // Initializes scanner // // input query // parser options @@ -269,7 +269,7 @@ invalid aliases (identifiers), making invalid identifiers a subset of keywords. that may be defined in the query or in the model (such as Key in Customer.Key). Although it adds usability for common cases, it does not solve the general problem: select c.id as Key from Customers as c -- works - select Key from (select c.id from Customers as c) as Key -- does not work for the first occurence of Key + select Key from (select c.id from Customers as c) as Key -- does not work for the first occurrence of Key -- it is mapped to a keyword which results in -- invalid syntax select [Key] from (select c.id from Customers as c) as Key -- works again @@ -389,8 +389,8 @@ private bool IsKeyword(string symbol, out Token terminalToken) } // - // Returns true when current symbol looks like a caninical function name in a function call. - // Method only treats canonical functions with names ovelapping eSQL keywords. + // Returns true when current symbol looks like a canonical function name in a function call. + // Method only treats canonical functions with names overlapping eSQL keywords. // This check allows calling these canonical functions without escaping their names. // Check lookAheadChar for a left paren to see if looks like a function call, check symbol against the list of // canonical functions with names overlapping keywords. @@ -510,7 +510,7 @@ internal Token MapPunctuator(string punct) } // - // Maps double quoted string to a literal or an idendifier + // Maps double quoted string to a literal or an identifier // // Token internal Token MapDoubleQuotedString(string symbol) @@ -665,7 +665,7 @@ private static bool isHexDigit(char c) // Returns true if given char is a new line character defined by // UNICODE 5.0, section 5.8 Newline Guidelines. // These are 'mandatory' line breaks. NOTE that CRLF is treated as a - // composite 'character' and was intentionaly omitted in the character set bellow. + // composite 'character' and was intentionally omitted in the character set bellow. // internal static bool IsNewLine(Char c) { diff --git a/src/EntityFramework/Core/Common/EntitySql/CqlParserHelpers.cs b/src/EntityFramework/Core/Common/EntitySql/CqlParserHelpers.cs index 17e512878b..9f06beeb3f 100644 --- a/src/EntityFramework/Core/Common/EntitySql/CqlParserHelpers.cs +++ b/src/EntityFramework/Core/Common/EntitySql/CqlParserHelpers.cs @@ -41,7 +41,7 @@ internal CqlParser(ParserOptions parserOptions, bool debug) // Main entry point for parsing cql. // // query text - // Thrown when Syntatic rules are violated and the query cannot be accepted + // Thrown when Syntactic rules are violated and the query cannot be accepted // Abstract Syntax Tree internal Node Parse(string query) { diff --git a/src/EntityFramework/Core/Common/EntitySql/CqlQuery.cs b/src/EntityFramework/Core/Common/EntitySql/CqlQuery.cs index 9752af746f..6a4c7668a8 100644 --- a/src/EntityFramework/Core/Common/EntitySql/CqlQuery.cs +++ b/src/EntityFramework/Core/Common/EntitySql/CqlQuery.cs @@ -30,10 +30,10 @@ namespace System.Data.Entity.Core.Common.EntitySql // s // // - // Queries can be formulated in O-Space, C-Space and S-Space and the services exposed by this class are agnostic of the especific typespace or + // Queries can be formulated in O-Space, C-Space and S-Space and the services exposed by this class are agnostic of the specific typespace or // metadata instance passed as required parameter in the semantic analysis by the perspective parameter. It is assumed that the perspective and // metadata was properly initialized. - // Provided that the command is syntacticaly correct and meaningful within the given typespace, the result will be a valid + // Provided that the command is syntactically correct and meaningful within the given typespace, the result will be a valid // // or @@ -63,7 +63,7 @@ internal static class CqlQuery // // ordinary parameters // A parse result with the command tree produced by parsing the given command. - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted // Thrown when metadata related service requests fail // Thrown when mapping related service requests fail // @@ -106,7 +106,7 @@ internal static ParseResult Compile( // ordinary command parameters // command free variables // The query expression tree produced by parsing the given query command. - // Thrown when Syntatic or Semantic rules are violated and the query expression cannot be accepted + // Thrown when Syntactic or Semantic rules are violated and the query expression cannot be accepted // Thrown when metadata related service requests fail // Thrown when mapping related service requests fail // @@ -149,7 +149,7 @@ internal static DbLambda CompileQueryCommandLambda( // parser options // // Ast - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted // // This method is not thread safe. // @@ -211,7 +211,7 @@ private static TResult CompileCommon( // // Parameters name/types must be bound before invoking this method // - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted. + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted. // Thrown as inner exception of a EntityException when metadata related service requests fail. // Thrown as inner exception of a EntityException when mapping related service requests fail. // @@ -254,7 +254,7 @@ private static ParseResult AnalyzeCommandSemantics( // // Parameters name/types must be bound before invoking this method // - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted. + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted. // Thrown as inner exception of a EntityException when metadata related service requests fail. // Thrown as inner exception of a EntityException when mapping related service requests fail. // diff --git a/src/EntityFramework/Core/Common/EntitySql/SemanticAnalyzer.cs b/src/EntityFramework/Core/Common/EntitySql/SemanticAnalyzer.cs index 532fa33219..b0dc52148a 100644 --- a/src/EntityFramework/Core/Common/EntitySql/SemanticAnalyzer.cs +++ b/src/EntityFramework/Core/Common/EntitySql/SemanticAnalyzer.cs @@ -44,7 +44,7 @@ internal SemanticAnalyzer(SemanticResolver sr) // // ast command tree // - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted // Thrown when metadata related service requests fail // Thrown when mapping related service requests fail // @@ -77,7 +77,7 @@ internal ParseResult AnalyzeCommand(Node astExpr) // // ast command tree // - // Thrown when Syntatic or Semantic rules are violated and the query cannot be accepted + // Thrown when Syntactic or Semantic rules are violated and the query cannot be accepted // Thrown when metadata related service requests fail // Thrown when mapping related service requests fail // @@ -212,7 +212,7 @@ private static void ConvertAndRegisterNamespaceImports( // // Dispatches/Converts statement expressions. // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static ParseResult ConvertStatement(Statement astStatement, SemanticResolver sr) { DebugCheck.NotNull(astStatement); @@ -240,7 +240,7 @@ private static ParseResult ConvertStatement(Statement astStatement, SemanticReso // // Converts query statement AST to a // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static ParseResult ConvertQueryStatementToDbCommandTree(Statement astStatement, SemanticResolver sr) { DebugCheck.NotNull(astStatement); @@ -802,7 +802,7 @@ private static ExpressionResolution ConvertGroupPartitionExpr(Node astExpr, Sema } // - // Add aggregate to aggreate list. + // Add aggregate to aggregate list. // aggregateInfo.AttachToAstNode(sr.GenerateInternalName("groupPartition"), definition); aggregateInfo.EvaluatingScopeRegion.GroupAggregateInfos.Add(aggregateInfo); @@ -1024,7 +1024,7 @@ private static bool TryConvertInlineFunctionCall( private static ValueExpression ConvertTypeConstructorCall(MetadataType metadataType, MethodExpr methodExpr, SemanticResolver sr) { // - // Ensure edmType has a contructor. + // Ensure edmType has a constructor. // if (!TypeSemantics.IsComplexType(metadataType.TypeUsage) && @@ -1130,7 +1130,7 @@ private static ValueExpression ConvertModelFunctionCall( && sr.IsInAnyGroupScope()) { // - // If it is an aggreagate function inside a group scope, dispatch to the expensive ConvertAggregateFunctionInGroupScope()... + // If it is an aggregate function inside a group scope, dispatch to the expensive ConvertAggregateFunctionInGroupScope()... // return new ValueExpression(ConvertAggregateFunctionInGroupScope(methodExpr, metadataFunctionGroup, sr)); } @@ -1150,7 +1150,7 @@ private static ValueExpression ConvertModelFunctionCall( // // // This method converts group aggregates in two phases: - // Phase 1 - it will resolve the actual inner (argument) expression and then anotate the ast node and add the resolved aggregate + // Phase 1 - it will resolve the actual inner (argument) expression and then annotate the ast node and add the resolved aggregate // to the scope // Phase 2 - if ast node was annotated, just extract the precomputed expression from the scope. // @@ -1402,7 +1402,7 @@ private static bool TryConvertAsFunctionAggregate( } // - // Add aggregate to aggreate list. + // Add aggregate to aggregate list. // aggregateInfo.AttachToAstNode(sr.GenerateInternalName("groupAgg" + functionType.Name), functionAggregate); aggregateInfo.EvaluatingScopeRegion.GroupAggregateInfos.Add(aggregateInfo); @@ -2192,7 +2192,7 @@ private static ExpressionResolution ConvertBuiltIn(Node astExpr, SemanticResolve // // Converts Arithmetic Expressions Args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertArithmeticArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { var operands = ConvertValueExpressionsWithUntypedNulls( @@ -2233,7 +2233,7 @@ private static Pair ConvertArithmeticArgs(BuiltInExp // // Converts Plus Args - specific case since string edmType is an allowed edmType for '+' // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertPlusOperands(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { var operands = ConvertValueExpressionsWithUntypedNulls( @@ -2273,7 +2273,7 @@ private static Pair ConvertPlusOperands(BuiltInExpr // // Converts Logical Expression Args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertLogicalArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { var leftExpr = ConvertValueExpressionAllowUntypedNulls(astBuiltInExpr.Arg1, sr); @@ -2319,7 +2319,7 @@ private static Pair ConvertLogicalArgs(BuiltInExpr a // // Converts Equal Comparison Expression Args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertEqualCompArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { // @@ -2349,7 +2349,7 @@ private static Pair ConvertEqualCompArgs(BuiltInExpr // // Converts Order Comparison Expression Args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertOrderCompArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { var compArgs = ConvertValueExpressionsWithUntypedNulls( @@ -2376,7 +2376,7 @@ private static Pair ConvertOrderCompArgs(BuiltInExpr // // Converts Set Expression Args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertSetArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { // @@ -2507,7 +2507,7 @@ private static Pair ConvertSetArgs(BuiltInExpr astBu // // Converts Set 'IN' expression args // - // SemanticResolver instance relative to a especif typespace/system + // SemanticResolver instance relative to a specific typespace/system private static Pair ConvertInExprArgs(BuiltInExpr astBuiltInExpr, SemanticResolver sr) { var rightExpr = ConvertValueExpression(astBuiltInExpr.Arg2, sr); @@ -5384,7 +5384,7 @@ private static Dictionary CreateBuiltInExprCo #endregion //////////////////////////// - // Nullabity Expressions + // Nullability Expressions //////////////////////////// // diff --git a/src/EntityFramework/Core/Common/Utils/MetadataHelper.cs b/src/EntityFramework/Core/Common/Utils/MetadataHelper.cs index 00762776b5..1a69b9d020 100644 --- a/src/EntityFramework/Core/Common/Utils/MetadataHelper.cs +++ b/src/EntityFramework/Core/Common/Utils/MetadataHelper.cs @@ -228,7 +228,7 @@ internal static AssociationEndMember GetOtherAssociationEnd(AssociationEndMember return (AssociationEndMember)members[1]; } - // effects: Returns true iff every end other than "endPropery" has a lower + // effects: Returns true iff every end other than "endProperty" has a lower // multiplicity of at least one internal static bool IsEveryOtherEndAtLeastOne( AssociationSet associationSet, diff --git a/src/EntityFramework/Core/Common/Utils/TreePrinter.cs b/src/EntityFramework/Core/Common/Utils/TreePrinter.cs index 60dbb939d2..8c8ad9595d 100644 --- a/src/EntityFramework/Core/Common/Utils/TreePrinter.cs +++ b/src/EntityFramework/Core/Common/Utils/TreePrinter.cs @@ -113,7 +113,7 @@ internal virtual string Print(TreeNode node) // 'protected' constructor - // 'protected' API that may be overriden to customize printing + // 'protected' API that may be overridden to customize printing // // Called once on the root of the tree before printing begins diff --git a/src/EntityFramework/Core/EntityClient/Internal/EntityCommandDefinition.cs b/src/EntityFramework/Core/EntityClient/Internal/EntityCommandDefinition.cs index c1d29015ae..31f2423b22 100644 --- a/src/EntityFramework/Core/EntityClient/Internal/EntityCommandDefinition.cs +++ b/src/EntityFramework/Core/EntityClient/Internal/EntityCommandDefinition.cs @@ -191,7 +191,7 @@ internal EntityCommandDefinition( // we should not be wrapping all exceptions if (e.IsCatchableExceptionType()) { - // we don't wan't folks to have to know all the various types of exceptions that can + // we don't want folks to have to know all the various types of exceptions that can // occur, so we just rethrow a CommandDefinitionException and make whatever we caught // the inner exception of it. throw new EntityCommandCompilationException(Strings.EntityClient_CommandDefinitionPreparationFailed, e); @@ -334,7 +334,7 @@ private static FunctionImportMappingNonComposable GetTargetFunctionMapping(DbFun // // Property to expose the known parameters for the query, so the Command objects - // constructor can poplulate it's parameter collection from. + // constructor can populate it's parameter collection from. // internal virtual IEnumerable Parameters { @@ -548,7 +548,7 @@ internal virtual DbDataReader ExecuteStoreCommands(EntityCommand entityCommand, // we should not be wrapping all exceptions if (e.IsCatchableExceptionType()) { - // we don't wan't folks to have to know all the various types of exceptions that can + // we don't want folks to have to know all the various types of exceptions that can // occur, so we just rethrow a CommandDefinitionException and make whatever we caught // the inner exception of it. throw new EntityCommandExecutionException(Strings.EntityClient_CommandDefinitionExecutionFailed, e); @@ -584,7 +584,7 @@ internal virtual async Task ExecuteStoreCommandsAsync( // we should not be wrapping all exceptions if (e.IsCatchableExceptionType()) { - // we don't wan't folks to have to know all the various types of exceptions that can + // we don't want folks to have to know all the various types of exceptions that can // occur, so we just rethrow a CommandDefinitionException and make whatever we caught // the inner exception of it. throw new EntityCommandExecutionException(Strings.EntityClient_CommandDefinitionExecutionFailed, e); @@ -621,7 +621,7 @@ private DbCommand PrepareEntityCommandBeforeExecution(EntityCommand entityComman // by the store provider, but it might work if we don't reorder/reuse // parameters. // - // Note also that the store provider may choose to add parameters to thier + // Note also that the store provider may choose to add parameters to their // command object for some things; we'll only copy over the values for // parameters that we find in the EntityCommands parameters collection, so // we won't damage anything the store provider did. @@ -633,7 +633,7 @@ private DbCommand PrepareEntityCommandBeforeExecution(EntityCommand entityComman foreach (DbParameter storeParameter in storeProviderCommand.Parameters) { // I could just use the string indexer, but then if I didn't find it the - // consumer would get some ParameterNotFound exeception message and that + // consumer would get some ParameterNotFound exception message and that // wouldn't be very meaningful. Instead, I use the IndexOf method and // if I don't find it, it's not a big deal (The store provider must // have added it). diff --git a/src/EntityFramework/Core/Mapping/AssociationSetModificationFunctionMapping.cs b/src/EntityFramework/Core/Mapping/AssociationSetModificationFunctionMapping.cs index a32d2e210e..dc1824b976 100644 --- a/src/EntityFramework/Core/Mapping/AssociationSetModificationFunctionMapping.cs +++ b/src/EntityFramework/Core/Mapping/AssociationSetModificationFunctionMapping.cs @@ -16,7 +16,7 @@ public sealed class AssociationSetModificationFunctionMapping : MappingItem private readonly ModificationFunctionMapping _insertFunctionMapping; /// - /// Initalizes a new AssociationSetModificationFunctionMapping instance. + /// Initializes a new AssociationSetModificationFunctionMapping instance. /// /// An association set. /// A delete function mapping. diff --git a/src/EntityFramework/Core/Mapping/AssociationTypeMapping.cs b/src/EntityFramework/Core/Mapping/AssociationTypeMapping.cs index dd6e21d3cd..94719c600e 100644 --- a/src/EntityFramework/Core/Mapping/AssociationTypeMapping.cs +++ b/src/EntityFramework/Core/Mapping/AssociationTypeMapping.cs @@ -28,14 +28,14 @@ namespace System.Data.Entity.Core.Mapping /// --ComplexPropertyMap /// --ComplexTypeMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --ScalarPropertyMap /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --EndPropertyMap /// --ScalarPropertyMap /// This class represents the metadata for all association Type map elements in the @@ -127,7 +127,7 @@ internal override ReadOnlyCollection MappingFragments // // a list of TypeMetadata that this mapping holds true for. - // Since Association types dont participate in Inheritance, This can only + // Since Association types don't participate in Inheritance, This can only // be one type. // internal override ReadOnlyCollection Types @@ -138,7 +138,7 @@ internal override ReadOnlyCollection Types // // a list of TypeMetadatas for which the mapping holds true for // not only the type specified but the sub-types of that type as well. - // Since Association types dont participate in Inheritance, an Empty list + // Since Association types don't participate in Inheritance, an Empty list // is returned here. // internal override ReadOnlyCollection IsOfTypes diff --git a/src/EntityFramework/Core/Mapping/ComplexPropertyMapping.cs b/src/EntityFramework/Core/Mapping/ComplexPropertyMapping.cs index 97c4bbfed1..45e3552575 100644 --- a/src/EntityFramework/Core/Mapping/ComplexPropertyMapping.cs +++ b/src/EntityFramework/Core/Mapping/ComplexPropertyMapping.cs @@ -28,19 +28,19 @@ namespace System.Data.Entity.Core.Mapping /// --ComplexPropertyMap /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// This class represents the metadata for all the complex property map elements in the diff --git a/src/EntityFramework/Core/Mapping/ConditionPropertyMapping.cs b/src/EntityFramework/Core/Mapping/ConditionPropertyMapping.cs index 4976b62eb4..b3d3755fb5 100644 --- a/src/EntityFramework/Core/Mapping/ConditionPropertyMapping.cs +++ b/src/EntityFramework/Core/Mapping/ConditionPropertyMapping.cs @@ -21,7 +21,7 @@ namespace System.Data.Entity.Core.Mapping /// --EntityKey /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ConditionProperyMap ( constant value-->SMemberMetadata ) + /// --ConditionPropertyMap ( constant value-->SMemberMetadata ) /// --EntityTypeMapping /// --MappingFragment /// --EntityKey @@ -29,14 +29,14 @@ namespace System.Data.Entity.Core.Mapping /// --ComplexPropertyMap /// --ComplexTypeMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ConditionProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ConditionPropertyMap ( constant value-->SMemberMetadata ) /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// This class represents the metadata for all the condition property map elements in the diff --git a/src/EntityFramework/Core/Mapping/EndPropertyMapping.cs b/src/EntityFramework/Core/Mapping/EndPropertyMapping.cs index 96514a7c19..66e9fabed1 100644 --- a/src/EntityFramework/Core/Mapping/EndPropertyMapping.cs +++ b/src/EntityFramework/Core/Mapping/EndPropertyMapping.cs @@ -29,19 +29,19 @@ namespace System.Data.Entity.Core.Mapping /// --ComplexPropertyMap /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// This class represents the metadata for all the end property map elements in the diff --git a/src/EntityFramework/Core/Mapping/EntityContainerMapping.cs b/src/EntityFramework/Core/Mapping/EntityContainerMapping.cs index f369631230..a2cb52e9a7 100644 --- a/src/EntityFramework/Core/Mapping/EntityContainerMapping.cs +++ b/src/EntityFramework/Core/Mapping/EntityContainerMapping.cs @@ -60,8 +60,8 @@ public EntityContainerMapping( // passing in the C-space EntityContainer and // the s-space Entity container metadata objects. // - // Entity Continer type that is being mapped on the C-side - // Entity Continer type that is being mapped on the S-side + // Entity Container type that is being mapped on the C-side + // Entity Container type that is being mapped on the S-side internal EntityContainerMapping( EntityContainer entityContainer, EntityContainer storageEntityContainer, StorageMappingItemCollection storageMappingItemCollection, bool validate, bool generateUpdateViews) @@ -92,8 +92,8 @@ internal EntityContainerMapping() private readonly string identity; private readonly bool m_validate; private readonly bool m_generateUpdateViews; - private readonly EntityContainer m_entityContainer; //Entity Continer type that is being mapped on the C-side - private readonly EntityContainer m_storageEntityContainer; //Entity Continer type that the C-space container is being mapped to + private readonly EntityContainer m_entityContainer; //Entity Container type that is being mapped on the C-side + private readonly EntityContainer m_storageEntityContainer; //Entity Container type that the C-space container is being mapped to private readonly Dictionary m_entitySetMappings = new Dictionary(StringComparer.Ordinal); @@ -293,7 +293,7 @@ public bool GenerateUpdateViews internal EntitySetBaseMapping GetEntitySetMapping(String setName) { DebugCheck.NotNull(setName); - //Key for EntitySetMapping should be EntitySet name and Entoty type name + //Key for EntitySetMapping should be EntitySet name and Entity type name EntitySetBaseMapping setMapping = null; m_entitySetMappings.TryGetValue(setName, out setMapping); return setMapping; @@ -503,8 +503,8 @@ private OutputFromComputeCellGroups ComputeCellGroups(InputForComputingCellGroup var partitioner = new CellPartitioner(result.Cells, result.ForeignKeyConstraints); var cellGroups = partitioner.GroupRelatedCells(); - //Clone cell groups- i.e, List> - upto cell before storing it in the cache because viewgen modified the Cell structure - result.CellGroups = cellGroups.Select(setOfcells => new CellGroup(setOfcells.Select(cell => new Cell(cell)))).ToList(); + //Clone cell groups- i.e, List> - up to cell before storing it in the cache because viewgen modified the Cell structure + result.CellGroups = cellGroups.Select(setOfCells => new CellGroup(setOfCells.Select(cell => new Cell(cell)))).ToList(); return result; } diff --git a/src/EntityFramework/Core/Mapping/EntitySetMapping.cs b/src/EntityFramework/Core/Mapping/EntitySetMapping.cs index ddb614e9be..e3c13fae9b 100644 --- a/src/EntityFramework/Core/Mapping/EntitySetMapping.cs +++ b/src/EntityFramework/Core/Mapping/EntitySetMapping.cs @@ -10,7 +10,7 @@ namespace System.Data.Entity.Core.Mapping using System.Linq; /// - /// Represents the Mapping metadata for an EnitytSet in CS space. + /// Represents the Mapping metadata for an EntitySet in CS space. /// /// /// For Example if conceptually you could represent the CS MSL file as following @@ -35,7 +35,7 @@ public class EntitySetMapping : EntitySetBaseMapping private Lazy> _implicitlyMappedAssociationSetEnds; /// - /// Initialiazes a new EntitySetMapping instance. + /// Initializes a new EntitySetMapping instance. /// /// The entity set to be mapped. /// The parent container mapping. diff --git a/src/EntityFramework/Core/Mapping/EntityTypeMapping.cs b/src/EntityFramework/Core/Mapping/EntityTypeMapping.cs index 5b338991b8..c64878d3be 100644 --- a/src/EntityFramework/Core/Mapping/EntityTypeMapping.cs +++ b/src/EntityFramework/Core/Mapping/EntityTypeMapping.cs @@ -32,14 +32,14 @@ namespace System.Data.Entity.Core.Mapping /// --ScalarPropertyMap /// --ComplexPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --ScalarPropertyMap /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --EndPropertyMap /// --ScalarPropertyMap /// This class represents the metadata for all entity Type map elements in the diff --git a/src/EntityFramework/Core/Mapping/FunctionImportMappingComposable.cs b/src/EntityFramework/Core/Mapping/FunctionImportMappingComposable.cs index cad9748942..3e000463c2 100644 --- a/src/EntityFramework/Core/Mapping/FunctionImportMappingComposable.cs +++ b/src/EntityFramework/Core/Mapping/FunctionImportMappingComposable.cs @@ -154,7 +154,7 @@ internal FunctionImportMappingComposable( if (!TypeSemantics.IsScalarType(resultType) && (structuralTypeMappings == null || structuralTypeMappings.Count == 0)) { - throw new ArgumentException(Strings.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues); + throw new ArgumentException(Strings.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues); } m_structuralTypeMappings = structuralTypeMappings; diff --git a/src/EntityFramework/Core/Mapping/MappingFragment.cs b/src/EntityFramework/Core/Mapping/MappingFragment.cs index ba4b64f4f3..56703245dd 100644 --- a/src/EntityFramework/Core/Mapping/MappingFragment.cs +++ b/src/EntityFramework/Core/Mapping/MappingFragment.cs @@ -32,19 +32,19 @@ namespace System.Data.Entity.Core.Mapping /// --ComplexPropertyMap /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ComplexTypeMapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - /// --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + /// --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// This class represents the metadata for all the mapping fragment elements in the diff --git a/src/EntityFramework/Core/Mapping/MappingItemLoader.cs b/src/EntityFramework/Core/Mapping/MappingItemLoader.cs index b01d6fc4ef..66167f6f8d 100644 --- a/src/EntityFramework/Core/Mapping/MappingItemLoader.cs +++ b/src/EntityFramework/Core/Mapping/MappingItemLoader.cs @@ -37,7 +37,7 @@ namespace System.Data.Entity.Core.Mapping // --EntityKey // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - // --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + // --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) // --EntityTypeMapping // --TableMappingFragment // --EntityKey @@ -45,14 +45,14 @@ namespace System.Data.Entity.Core.Mapping // --ComplexPropertyMap // --ComplexTypeMap // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - // --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) - // --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) + // --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) // --AssociationSetMapping // --AssociationTypeMapping // --TableMappingFragment // --EndPropertyMap // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - // --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) // --EndPropertyMap // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) // --EntityContainerMapping ( CMyDatabase-->SMyDatabase ) @@ -68,11 +68,11 @@ namespace System.Data.Entity.Core.Mapping // --ComplexPropertyMap // --ComplexTypeMap // --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - // --DiscriminatorProperyMap ( constant value-->SMemberMetadata ) + // --DiscriminatorPropertyMap ( constant value-->SMemberMetadata ) // --ScalarPropertyMap ( CMemberMetadata-->Constant value ) // The CCMappingSchemaLoader loads an Xml file that has a conceptual structure // equivalent to the above example into in-memory data structure in a - // top-dwon approach. + // top-down approach. // // // The loader uses XPathNavigator to parse the XML. The advantage of using XPathNavigator @@ -188,7 +188,7 @@ private EntityContainerMapping LoadMappingItems(XmlReader innerReader) try { var doc = new XPathDocument(reader); - // If there were any xsd validation errors, we would have caught these while creatring xpath document. + // If there were any xsd validation errors, we would have caught these while creating xpath document. if (m_parsingErrors.Count != 0) { // If the errors were only warnings continue, otherwise return the errors without loading the mapping. @@ -199,7 +199,7 @@ private EntityContainerMapping LoadMappingItems(XmlReader innerReader) } // Create an XPathNavigator to navigate the document in a forward only manner. - // The XPathNavigator can also be used to run quries through the document while still maintaining + // The XPathNavigator can also be used to run queries through the document while still maintaining // the current position. This will be helpful in running validation rules that are not part of Schema. var nav = doc.CreateNavigator(); return LoadMappingItems(nav.Clone()); @@ -313,7 +313,7 @@ private EntityContainerMapping LoadEntityContainerMapping(XPathNavigator nav) { var navLineInfo = (IXmlLineInfo)nav; - // The element name can only be EntityContainerMapping element name since XSD validation should have guarneteed this. + // The element name can only be EntityContainerMapping element name since XSD validation should have guaranteed this. Debug.Assert(nav.LocalName == MslConstructs.EntityContainerMappingElement); var entityContainerName = GetAttributeValue(nav.Clone(), MslConstructs.CdmEntityContainerAttribute); var storageEntityContainerName = GetAttributeValue(nav.Clone(), MslConstructs.StorageEntityContainerAttribute); @@ -708,7 +708,7 @@ private static void ValidateClosureAmongSets( foreach (var entitySetBase in additionalSetsInClosure) { var associationSet = entitySetBase as AssociationSet; - //Foreign Key Associations do not add to the dependancies + //Foreign Key Associations do not add to the dependencies if (associationSet != null && !associationSet.ElementType.IsForeignKey) { @@ -727,7 +727,7 @@ private static void ValidateClosureAmongSets( foreach (var entitySetBase in entityContainerMapping.EdmEntityContainer.BaseEntitySets) { var associationSet = entitySetBase as AssociationSet; - //Foreign Key Associations do not add to the dependancies + //Foreign Key Associations do not add to the dependencies if (associationSet != null && !associationSet.ElementType.IsForeignKey) { @@ -838,7 +838,7 @@ private void LoadEntitySetMapping( AddToSchemaErrorsWithMemberInfo( Strings.Mapping_InvalidContent_Entity_Set, entitySetName, MappingErrorCode.InvalidEntitySet, m_sourceLocation, navLineInfo, m_parsingErrors); - //There is no point in continuing the loding of this EntitySetMapping if the EntitySet is not found + //There is no point in continuing the loading of this EntitySetMapping if the EntitySet is not found return; } //Create the EntitySet Mapping which contains the mapping information for EntitySetMap. @@ -1253,7 +1253,7 @@ private void LoadEntityTypeModificationFunctionMapping( while (nav.MoveToNext(XPathNodeType.Element)); } - // Ensure that assocation set end mappings bind to the same end (e.g., in Person Manages Person + // Ensure that association set end mappings bind to the same end (e.g., in Person Manages Person // self-association, ensure that the manager end or the report end is mapped but not both) IEnumerable parameterList = new List(); if (null != deleteFunctionMapping) @@ -2209,7 +2209,7 @@ private void LoadFunctionImportEntityTypeMappingCondition( var value = GetAliasResolvedAttributeValue(nav.Clone(), MslConstructs.ConditionValueAttribute); var isNull = GetAliasResolvedAttributeValue(nav.Clone(), MslConstructs.ConditionIsNullAttribute); - //Either Value or NotNull need to be specifid on the condition mapping but not both + //Either Value or NotNull need to be specified on the condition mapping but not both if ((isNull != null) && (value != null)) { @@ -2452,7 +2452,7 @@ private MappingFragment LoadAssociationMappingFragment( MappingFragment fragment = null; EntityType tableType = null; - //If there is a query view, Dont create a mapping fragment since there should n't be one + //If there is a query view, don't create a mapping fragment since there should n't be one if (setMapping.QueryView == null) { //Get the table type that represents this table @@ -2634,8 +2634,8 @@ private ComplexPropertyMapping LoadComplexPropertyMapping( var collectionType = containerType as CollectionType; //Get the property name from MSL var propertyName = GetAliasResolvedAttributeValue(nav.Clone(), MslConstructs.ComplexPropertyNameAttribute); - //Get the member metadata from the contianer type passed in. - //But if the continer type is collection type, there would n't be any member to represent the member. + //Get the member metadata from the container type passed in. + //But if the container type is collection type, there would n't be any member to represent the member. EdmProperty member = null; EdmType memberType = null; //If member specified the type name, it takes precedence @@ -2741,7 +2741,7 @@ private ComplexTypeMapping LoadComplexTypeMapping( var partialAttribute = GetAttributeValue(nav.Clone(), MslConstructs.ComplexPropertyIsPartialAttribute); if (!String.IsNullOrEmpty(partialAttribute)) { - //XSD validation should have guarenteed that the attribute value can only be true or false + //XSD validation should have guaranteed that the attribute value can only be true or false Debug.Assert(partialAttribute == "true" || partialAttribute == "false"); isPartial = Convert.ToBoolean(partialAttribute, CultureInfo.InvariantCulture); } @@ -2942,7 +2942,7 @@ private ConditionPropertyMapping LoadConditionPropertyMapping( } EdmProperty member = null; - //Get the CDM EdmMember reprsented by the name specified. + //Get the CDM EdmMember represented by the name specified. if (propertyName != null) { EdmMember tempMember; @@ -3039,7 +3039,7 @@ private ConditionPropertyMapping LoadConditionPropertyMapping( MappingErrorCode.ConditionError, m_sourceLocation, navLineInfo, m_parsingErrors); return null; } - //Either Value or NotNull need to be specifid on the condition mapping but not both + //Either Value or NotNull need to be specified on the condition mapping but not both if ((isNullAttribute != null) && (value != null)) { @@ -3059,7 +3059,7 @@ private ConditionPropertyMapping LoadConditionPropertyMapping( if (isNullAttribute != null) { - //XSD validation should have guarenteed that the attribute value can only be true or false + //XSD validation should have guaranteed that the attribute value can only be true or false Debug.Assert(isNullAttribute == "true" || isNullAttribute == "false"); isNullValue = Convert.ToBoolean(isNullAttribute, CultureInfo.InvariantCulture); } diff --git a/src/EntityFramework/Core/Mapping/ModificationFunctionMapping.cs b/src/EntityFramework/Core/Mapping/ModificationFunctionMapping.cs index ac158c706d..967c686633 100644 --- a/src/EntityFramework/Core/Mapping/ModificationFunctionMapping.cs +++ b/src/EntityFramework/Core/Mapping/ModificationFunctionMapping.cs @@ -160,18 +160,18 @@ private static IEnumerable GetReferencedAssociationSetEnds( // If there is a referential constraint, it counts as an implicit mapping of // the association set - foreach (var assocationSet in entitySet.AssociationSets) + foreach (var associationSet in entitySet.AssociationSets) { - var constraints = assocationSet.ElementType.ReferentialConstraints; + var constraints = associationSet.ElementType.ReferentialConstraints; if (null != constraints) { foreach (var constraint in constraints) { - if ((assocationSet.AssociationSetEnds[constraint.ToRole.Name].EntitySet == entitySet) + if ((associationSet.AssociationSetEnds[constraint.ToRole.Name].EntitySet == entitySet) && (constraint.ToRole.GetEntityType().IsAssignableFrom(entityType))) { - ends.Add(assocationSet.AssociationSetEnds[constraint.FromRole.Name]); + ends.Add(associationSet.AssociationSetEnds[constraint.FromRole.Name]); } } } diff --git a/src/EntityFramework/Core/Mapping/ObjectTypeMapping.cs b/src/EntityFramework/Core/Mapping/ObjectTypeMapping.cs index 643766a24b..f5f447b992 100644 --- a/src/EntityFramework/Core/Mapping/ObjectTypeMapping.cs +++ b/src/EntityFramework/Core/Mapping/ObjectTypeMapping.cs @@ -81,7 +81,7 @@ internal EdmType EdmType // // Returns the Identity of ObjectTypeMapping. // The identity for an Object Type Map is the concatenation of - // CLR Type Idntity + ':' + CDM Type Identity + // CLR Type Identity + ':' + CDM Type Identity // internal override string Identity { @@ -124,7 +124,7 @@ internal void AddMemberMap(ObjectMemberMapping memberMapping) Debug.Assert(!m_memberMapping.ContainsKey(memberMapping.EdmMember.Name)); Debug.Assert( !ReferenceEquals(m_memberMapping, EmptyMemberMapping), - "Make sure you don't add anything to the static emtpy member mapping"); + "Make sure you don't add anything to the static empty member mapping"); m_memberMapping.Add(memberMapping.EdmMember.Name, memberMapping); } @@ -146,7 +146,7 @@ private ObjectMemberMapping GetMemberMap(string propertyName, bool ignoreCase) if (!ignoreCase) { - //First get the index of the member map from the clr indexs + //First get the index of the member map from the clr indexes m_memberMapping.TryGetValue(propertyName, out memberMapping); } else diff --git a/src/EntityFramework/Core/Mapping/PropertyMapping.cs b/src/EntityFramework/Core/Mapping/PropertyMapping.cs index 62d42e4e4a..4d9121bbf1 100644 --- a/src/EntityFramework/Core/Mapping/PropertyMapping.cs +++ b/src/EntityFramework/Core/Mapping/PropertyMapping.cs @@ -26,14 +26,14 @@ namespace System.Data.Entity.Core.Mapping /// --ScalarPropertyMap /// --ComplexPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --ScalarPropertyMap /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --EndPropertyMap /// --ScalarPropertyMap /// This class represents the metadata for all property map elements in the diff --git a/src/EntityFramework/Core/Mapping/ScalarPropertyMapping.cs b/src/EntityFramework/Core/Mapping/ScalarPropertyMapping.cs index b38ef0fd6d..91ccc0bb45 100644 --- a/src/EntityFramework/Core/Mapping/ScalarPropertyMapping.cs +++ b/src/EntityFramework/Core/Mapping/ScalarPropertyMapping.cs @@ -26,14 +26,14 @@ namespace System.Data.Entity.Core.Mapping /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --ComplexPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) - /// --ScalarProperyMap ( CMemberMetadata-->SMemberMetadata ) + /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// --EndPropertyMap /// --ScalarPropertyMap ( CMemberMetadata-->SMemberMetadata ) /// This class represents the metadata for all the scalar property map elements in the diff --git a/src/EntityFramework/Core/Mapping/StorageMappingItemCollection.cs b/src/EntityFramework/Core/Mapping/StorageMappingItemCollection.cs index d1126646ba..e446a2b2a7 100644 --- a/src/EntityFramework/Core/Mapping/StorageMappingItemCollection.cs +++ b/src/EntityFramework/Core/Mapping/StorageMappingItemCollection.cs @@ -269,7 +269,7 @@ internal GeneratedView GetGeneratedView( EntitySetBase extent, MetadataWorkspace workspace, StorageMappingItemCollection storageMappingItemCollection) { //First check if we have collected a view from user-defined query views - //Dont need to worry whether to generate Query view or update viw, because that is relative to the extent. + //Don't need to worry whether to generate Query view or update viw, because that is relative to the extent. GeneratedView view; if (_tryGetUserDefinedQueryView(extent, out view)) diff --git a/src/EntityFramework/Core/Mapping/TypeMapping.cs b/src/EntityFramework/Core/Mapping/TypeMapping.cs index 0fc48db305..d9945a7b74 100644 --- a/src/EntityFramework/Core/Mapping/TypeMapping.cs +++ b/src/EntityFramework/Core/Mapping/TypeMapping.cs @@ -26,14 +26,14 @@ namespace System.Data.Entity.Core.Mapping /// --ScalarPropertyMap /// --ComplexPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --ScalarPropertyMap /// --AssociationSetMapping /// --AssociationTypeMapping /// --MappingFragment /// --EndPropertyMap /// --ScalarPropertyMap - /// --ScalarProperyMap + /// --ScalarPropertyMap /// --EndPropertyMap /// --ScalarPropertyMap /// This class represents the metadata for all the Type map elements in the diff --git a/src/EntityFramework/Core/Mapping/Update/Internal/Propagator.JoinPropagator.cs b/src/EntityFramework/Core/Mapping/Update/Internal/Propagator.JoinPropagator.cs index 243367449b..5110467c16 100644 --- a/src/EntityFramework/Core/Mapping/Update/Internal/Propagator.JoinPropagator.cs +++ b/src/EntityFramework/Core/Mapping/Update/Internal/Propagator.JoinPropagator.cs @@ -336,7 +336,7 @@ private void Propagate( // If no propagation rules are defined, it suggests an invalid workload (e.g. // a required entity or relationship is missing). In general, such exceptions // should be caught by the RelationshipConstraintValidator, but we defensively - // check for problems here regardless. For instance, a 0..1:1..1 self-assocation + // check for problems here regardless. For instance, a 0..1:1..1 self-association // implied a stronger constraint that cannot be checked by RelationshipConstraintValidator. // First gather state entries contributing to the problem diff --git a/src/EntityFramework/Core/Mapping/Update/Internal/UpdateTranslator.cs b/src/EntityFramework/Core/Mapping/Update/Internal/UpdateTranslator.cs index aa64b616ae..07c7d5cc73 100644 --- a/src/EntityFramework/Core/Mapping/Update/Internal/UpdateTranslator.cs +++ b/src/EntityFramework/Core/Mapping/Update/Internal/UpdateTranslator.cs @@ -608,7 +608,7 @@ private IEnumerable GetDynamicModifiedExtents() // Gets extents for which this translator has identified changes to be handled // by function mappings. // - // Enumreation of modified C-Space extents. + // Enumeration of modified C-Space extents. private IEnumerable GetFunctionModifiedExtents() { return _functionChanges.Keys; @@ -631,7 +631,7 @@ private IEnumerable ProduceDynamicCommands() var affectedTables = ViewLoader.GetAffectedTables(extent, MetadataWorkspace); //Since these extents don't have Functions defined for update operations, //the affected tables should be provided via MSL. - //If we dont find any throw an exception + //If we don't find any throw an exception if (affectedTables.Count == 0) { throw EntityUtil.Update(Strings.Update_MappingNotFound(extent.Name), null /*stateEntries*/); @@ -689,7 +689,7 @@ internal DbCommandDefinition GenerateCommandDefinition(ModificationFunctionMappi var functionParams = functionMapping.Function.Parameters.Select( paramInfo => new KeyValuePair(paramInfo.Name, paramInfo.TypeUsage)); - // construct DbFunctionCommandTree including implict return type + // construct DbFunctionCommandTree including implicit return type var tree = new DbFunctionCommandTree( MetadataWorkspace, DataSpace.SSpace, functionMapping.Function, resultType, functionParams); @@ -782,7 +782,7 @@ internal DbCommand CreateCommand(DbModificationCommandTree commandTree) // we should not be wrapping all exceptions if (e.RequiresContext()) { - // we don't wan't folks to have to know all the various types of exceptions that can + // we don't want folks to have to know all the various types of exceptions that can // occur, so we just rethrow a CommandDefinitionException and make whatever we caught // the inner exception of it. throw new EntityCommandCompilationException(Strings.EntityClient_CommandDefinitionPreparationFailed, e); @@ -1189,7 +1189,7 @@ internal void RegisterEntity(IEntityStateEntry stateEntry) : GetEntityType(stateEntry.OriginalValues); // figure out relationship set ends that are associated with this entity set - foreach (var associationSet in GetReferencingAssocationSets(entitySet)) + foreach (var associationSet in GetReferencingAssociationSets(entitySet)) { // describe unidirectional relationships in which the added entity is the "destination" var ends = associationSet.AssociationSetEnds; @@ -1440,7 +1440,7 @@ private void AddExistingRelationship(DirectionalRelationship relationship) // // Entity set for which to identify relationships // Relationship sets referencing the given entity set - private IEnumerable GetReferencingAssocationSets(EntitySet entitySet) + private IEnumerable GetReferencingAssociationSets(EntitySet entitySet) { List relationshipSets; diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/CellQuery.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/CellQuery.cs index 4707b91f05..3714fa815c 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/CellQuery.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/CellQuery.cs @@ -712,7 +712,7 @@ internal BoolExpression GetBoolVar(int varNum) return m_boolExprs[varNum]; } - // effects: Initalizes the booleans of this cell query to be + // effects: Initializes the booleans of this cell query to be // true. Creates numBoolVars booleans and sets the cellNum boolean to true internal void InitializeBoolExpressions(int numBoolVars, int cellNum) { diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/Domain.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/Domain.cs index 4d8f32429f..4bdbd3d175 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/Domain.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/Domain.cs @@ -233,7 +233,7 @@ internal bool Contains(Constant constant) } // effects: Given a set of values in domain, "normalizes" it, i.e., - // all positive constants are seperated out and any negative constant + // all positive constants are separated out and any negative constant // is changed s.t. it is the negative of all positive values // extraValues indicates more constants that domain could take, e.g., // domain could be "1, 2, NOT(1, 2)", extraValues could be "3". In diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/MemberPath.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/MemberPath.cs index 433da40635..93182ae019 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/MemberPath.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/MemberPath.cs @@ -255,7 +255,7 @@ internal bool IsAlwaysDefined(Dictionary> inheritanc var member = m_path.Last(); - //Dont check last member, thats the property we are testing + //Don't check last member, thats the property we are testing for (var i = 0; i < m_path.Count - 1; i++) { var current = m_path[i]; @@ -280,7 +280,7 @@ internal bool IsAlwaysDefined(Dictionary> inheritanc return true; } - //well, we handle the first case because we don't knwo how to get to subtype (i.e. the edge to avoid) + //well, we handle the first case because we don't know how to get to subtype (i.e. the edge to avoid) var memberDeclaringType = m_path[0].DeclaringType as EntityType; var parentType = memberDeclaringType.BaseType as EntityType; @@ -310,7 +310,7 @@ private static bool RecurseToFindMemberAbsentInConcreteType( // navigate depth-first foreach (var edge in edges.Where(type => !type.EdmEquals(avoidEdge))) { - //Dont traverse above the EntitySet's Element type + //Don't traverse above the EntitySet's Element type if (entitySetType.BaseType != null && entitySetType.BaseType.EdmEquals(edge)) { @@ -399,7 +399,7 @@ internal static string PropertiesToUserString(IEnumerable members, b } // - // Given a member path and an alias, returns an eSQL string correspondng to the fully-qualified name + // Given a member path and an alias, returns an eSQL string corresponding to the fully-qualified name // // .path, e.g., T1.Address.Phone.Zip. @@ -645,7 +645,7 @@ internal bool IsEquivalentViaRefConstraint(MemberPath path1) { return false; } - result = AreAssocationEndPathsEquivalentViaRefConstraint(path0, path1, assocSet0); + result = AreAssociationEndPathsEquivalentViaRefConstraint(path0, path1, assocSet0); } else if (entitySet0 != null && entitySet1 != null) @@ -660,7 +660,7 @@ internal bool IsEquivalentViaRefConstraint(MemberPath path1) // For Person.pid, get PersonAddress.Person.pid or var assocEndPath0 = path0.GetCorrespondingAssociationPath(assocSet); var assocEndPath1 = path1.GetCorrespondingAssociationPath(assocSet); - if (AreAssocationEndPathsEquivalentViaRefConstraint(assocEndPath0, assocEndPath1, assocSet)) + if (AreAssociationEndPathsEquivalentViaRefConstraint(assocEndPath0, assocEndPath1, assocSet)) { result = true; break; @@ -689,7 +689,7 @@ internal bool IsEquivalentViaRefConstraint(MemberPath path1) } else { - result = AreAssocationEndPathsEquivalentViaRefConstraint(assocEndPathA, assocEndPathB, assocSet); + result = AreAssociationEndPathsEquivalentViaRefConstraint(assocEndPathA, assocEndPathB, assocSet); } } @@ -706,7 +706,7 @@ internal bool IsEquivalentViaRefConstraint(MemberPath path1) // name="assocSet" /> // . // - private static bool AreAssocationEndPathsEquivalentViaRefConstraint( + private static bool AreAssociationEndPathsEquivalentViaRefConstraint( MemberPath assocPath0, MemberPath assocPath1, AssociationSet assocSet) diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs index bdf927219e..2cb3c857b9 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs @@ -143,7 +143,7 @@ internal override TOutput Accept(CellTreeVisitor in SAddress is // a foreign key into of the SPerson table, make // sure that this order is preserved through the mappings in m_cellGroup @@ -251,7 +251,7 @@ private void GuaranteeMappedRelationshipForForeignKey( var primaryKeyFields = primaryKey.KeyFields; var foundCell = false; - var foundValidParentColumnsForForeignKey = false; //we need to find only one, dont error on any one check being false + var foundValidParentColumnsForForeignKey = false; //we need to find only one, don't error on any one check being false List errorListForInvalidParentColumnsForForeignKey = null; foreach (var cell in cells) { @@ -373,7 +373,7 @@ private bool CheckIfConstraintMappedToForeignKeyAssociation( //We need to check to see if the dependent properties that were mapped from S side are present as //dependant properties of this ref constraint on the Edm side. We need to do the same for principal side but //we can not enforce equality since the order of the properties participating in the constraint on the S side and - //C side could be different. This is OK as long as they are mapped appropriately. We also can not use Existance as a sufficient + //C side could be different. This is OK as long as they are mapped appropriately. We also can not use Existence as a sufficient //condition since it will allow invalid mapping where FK columns could have been flipped when mapping to the Edm side. So //we make sure that the index of the properties in the principal and dependant are same on the Edm side even if they are in //different order for ref constraints for Edm and store side. diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/Validation/errorpatternmatcher.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/Validation/errorpatternmatcher.cs index d66555248d..b6cef27e82 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/Validation/errorpatternmatcher.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/Validation/errorpatternmatcher.cs @@ -55,7 +55,7 @@ public static bool FindMappingErrors(ViewgenContext context, MemberDomainMap dom == matcher.m_originalErrorCount) { //this will generate redundant errors if one of the above routine finds an error - // so execute it only when we dont have any other errors + // so execute it only when we don't have any other errors matcher.MatchPartitionErrors(); } @@ -181,7 +181,7 @@ private void MatchConditionErrors() { var leftCellWrappers = m_viewgenContext.AllWrappersForExtent; - //Stores violating Discriminator (condition member) so that we dont repeat the same error + //Stores violating Discriminator (condition member) so that we don't repeat the same error var mappedConditionMembers = new Set(); //Both of these data-structs help in finding duplicate conditions diff --git a/src/EntityFramework/Core/Mapping/ViewGeneration/ViewgenGatekeeper.cs b/src/EntityFramework/Core/Mapping/ViewGeneration/ViewgenGatekeeper.cs index 2dcd4aa765..bc586b083d 100644 --- a/src/EntityFramework/Core/Mapping/ViewGeneration/ViewgenGatekeeper.cs +++ b/src/EntityFramework/Core/Mapping/ViewGeneration/ViewgenGatekeeper.cs @@ -80,8 +80,8 @@ internal static ViewGenResults GenerateTypeSpecificQueryView( } var foreignKeyConstraints = result.ForeignKeyConstraints; - // Get a Clone of cell groups from cache since cells are modified during viewgen, and we dont want the cached copy to change - var cellGroups = result.CellGroups.Select(setOfcells => new CellGroup(setOfcells.Select(cell => new Cell(cell)))).ToList(); + // Get a Clone of cell groups from cache since cells are modified during viewgen, and we don't want the cached copy to change + var cellGroups = result.CellGroups.Select(setOfCells => new CellGroup(setOfCells.Select(cell => new Cell(cell)))).ToList(); var cells = result.Cells; var identifiers = result.Identifiers; diff --git a/src/EntityFramework/Core/Metadata/Edm/AssociationSet.cs b/src/EntityFramework/Core/Metadata/Edm/AssociationSet.cs index 9cc60a9355..0c08f455a5 100644 --- a/src/EntityFramework/Core/Metadata/Edm/AssociationSet.cs +++ b/src/EntityFramework/Core/Metadata/Edm/AssociationSet.cs @@ -14,9 +14,9 @@ namespace System.Data.Entity.Core.Metadata.Edm public sealed class AssociationSet : RelationshipSet { // - // Initializes a new instance of AssocationSet with the given name and the association type + // Initializes a new instance of AssociationSet with the given name and the association type // - // The name of the Assocation set + // The name of the Association set // The association type of the entities that this associationship set type contains internal AssociationSet(string name, AssociationType associationType) : base(name, null, null, null, associationType) diff --git a/src/EntityFramework/Core/Metadata/Edm/AssociationSetEnd.cs b/src/EntityFramework/Core/Metadata/Edm/AssociationSetEnd.cs index 20b4a91f8f..3a3222d0ae 100644 --- a/src/EntityFramework/Core/Metadata/Edm/AssociationSetEnd.cs +++ b/src/EntityFramework/Core/Metadata/Edm/AssociationSetEnd.cs @@ -10,7 +10,7 @@ namespace System.Data.Entity.Core.Metadata.Edm public sealed class AssociationSetEnd : MetadataItem { // - // Initializes a new instance of AssocationSetEnd + // Initializes a new instance of AssociationSetEnd // // Entity set that this end refers to // The association set which this belongs to diff --git a/src/EntityFramework/Core/Metadata/Edm/ClrEntityType.cs b/src/EntityFramework/Core/Metadata/Edm/ClrEntityType.cs index 661aceb2e9..87e1e2de6a 100644 --- a/src/EntityFramework/Core/Metadata/Edm/ClrEntityType.cs +++ b/src/EntityFramework/Core/Metadata/Edm/ClrEntityType.cs @@ -77,7 +77,7 @@ internal string CSpaceNamespaceName // Gets a collision resistent (SHA256) hash of the information used to build // a proxy for this type. This hash is very, very unlikely to be the same for two // proxies generated from the same CLR type but with different metadata, and is - // guarenteed to be the same for proxies generated from the same metadata. This + // guaranteed to be the same for proxies generated from the same metadata. This // means that when EntityType comparison fails because of metadata eviction, // the hash can be used to determine whether or not a proxy is of the correct type. // diff --git a/src/EntityFramework/Core/Metadata/Edm/CustomAssemblyResolver.cs b/src/EntityFramework/Core/Metadata/Edm/CustomAssemblyResolver.cs index 90856c991f..4b1e7604f9 100644 --- a/src/EntityFramework/Core/Metadata/Edm/CustomAssemblyResolver.cs +++ b/src/EntityFramework/Core/Metadata/Edm/CustomAssemblyResolver.cs @@ -21,9 +21,9 @@ internal CustomAssemblyResolver( _referenceResolver = referenceResolver; } - internal override bool TryResolveAssemblyReference(AssemblyName refernceName, out Assembly assembly) + internal override bool TryResolveAssemblyReference(AssemblyName referenceName, out Assembly assembly) { - assembly = _referenceResolver(refernceName); + assembly = _referenceResolver(referenceName); return assembly != null; } diff --git a/src/EntityFramework/Core/Metadata/Edm/DefaultAssemblyResolver.cs b/src/EntityFramework/Core/Metadata/Edm/DefaultAssemblyResolver.cs index 9d3b1c9404..facbff06cb 100644 --- a/src/EntityFramework/Core/Metadata/Edm/DefaultAssemblyResolver.cs +++ b/src/EntityFramework/Core/Metadata/Edm/DefaultAssemblyResolver.cs @@ -9,9 +9,9 @@ namespace System.Data.Entity.Core.Metadata.Edm internal class DefaultAssemblyResolver : MetadataArtifactAssemblyResolver { - internal override bool TryResolveAssemblyReference(AssemblyName refernceName, out Assembly assembly) + internal override bool TryResolveAssemblyReference(AssemblyName referenceName, out Assembly assembly) { - assembly = ResolveAssembly(refernceName); + assembly = ResolveAssembly(referenceName); return assembly != null; } @@ -153,7 +153,7 @@ public static AssemblyComparer Instance // if two assemblies have the same full name, we will consider them as the same. // for example, // both of x and y have the full name as "{RES, Version=3.5.0.0, Culture=neutral, PublicKeyToken=null}", - // although they are different instances since the ReflectionOnly field in them are different, we sitll + // although they are different instances since the ReflectionOnly field in them are different, we still // consider them as the same. // public bool Equals(Assembly x, Assembly y) diff --git a/src/EntityFramework/Core/Metadata/Edm/EdmConstants.cs b/src/EntityFramework/Core/Metadata/Edm/EdmConstants.cs index 60cf9004f8..53f3279a13 100644 --- a/src/EntityFramework/Core/Metadata/Edm/EdmConstants.cs +++ b/src/EntityFramework/Core/Metadata/Edm/EdmConstants.cs @@ -21,7 +21,7 @@ internal static class EdmConstants // Name of the built in types internal const string AssociationEnd = "AssociationEnd"; - internal const string AssociationSetType = "AssocationSetType"; + internal const string AssociationSetType = "AssociationSetType"; internal const string AssociationSetEndType = "AssociationSetEndType"; internal const string AssociationType = "AssociationType"; internal const string BaseEntitySetType = "BaseEntitySetType"; @@ -191,7 +191,7 @@ internal static class EdmConstants internal const string ParameterTypeSemantics = "ParameterTypeSemantics"; internal const string NiladicFunctionAttribute = "NiladicFunctionAttribute"; internal const string IsComposableFunctionAttribute = "IsComposable"; - internal const string CommandTextFunctionAttribyte = "CommandText"; + internal const string CommandTextFunctionAttribute = "CommandText"; internal const string StoreFunctionNameAttribute = "StoreFunctionNameAttribute"; // diff --git a/src/EntityFramework/Core/Metadata/Edm/EdmItemCollection.cs b/src/EntityFramework/Core/Metadata/Edm/EdmItemCollection.cs index 179984f054..11b7b16dc4 100644 --- a/src/EntityFramework/Core/Metadata/Edm/EdmItemCollection.cs +++ b/src/EntityFramework/Core/Metadata/Edm/EdmItemCollection.cs @@ -195,7 +195,7 @@ public Double EdmVersion } // - // conventional oc mapping cache, the locking mechanism is provided by AsssemblyCache + // conventional oc mapping cache, the locking mechanism is provided by AssemblyCache // internal OcAssemblyCache ConventionalOcCache { @@ -426,7 +426,7 @@ private void LoadEdmPrimitiveTypesAndFunctions() // Guarantees type match of declaration and generated parameters. // Guarantees return type match. // Throws internal error for functions without definition. - // Passes thru exceptions occured during definition generation. + // Passes thru exceptions occurred during definition generation. // internal DbLambda GetGeneratedFunctionDefinition(EdmFunction function) { @@ -446,7 +446,7 @@ internal DbLambda GetGeneratedFunctionDefinition(EdmFunction function) // Guarantees type match of declaration and generated parameters. // Guarantees return type match. // Throws internal error for functions without definition. - // Passes thru exceptions occured during definition generation. + // Passes thru exceptions occurred during definition generation. // internal DbLambda GenerateFunctionDefinition(EdmFunction function) { diff --git a/src/EntityFramework/Core/Metadata/Edm/EdmModelRuleSet.cs b/src/EntityFramework/Core/Metadata/Edm/EdmModelRuleSet.cs index bce525a317..9d1ec0e5cf 100644 --- a/src/EntityFramework/Core/Metadata/Edm/EdmModelRuleSet.cs +++ b/src/EntityFramework/Core/Metadata/Edm/EdmModelRuleSet.cs @@ -43,12 +43,12 @@ private EdmModelRuleSet(bool validateSyntax) AddRule(EdmModelSyntacticValidationRules.EdmAssociationSet_ElementTypeMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmAssociationSet_SourceSetMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmAssociationSet_TargetSetMustNotBeNull); - AddRule(EdmModelSyntacticValidationRules.EdmAssociationType_AssocationEndMustNotBeNull); + AddRule(EdmModelSyntacticValidationRules.EdmAssociationType_AssociationEndMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmEntitySet_ElementTypeMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmModel_NameMustNotBeEmptyOrWhiteSpace); AddRule(EdmModelSyntacticValidationRules.EdmModel_NameIsTooLong); AddRule(EdmModelSyntacticValidationRules.EdmModel_NameIsNotAllowed); - AddRule(EdmModelSyntacticValidationRules.EdmNavigationProperty_AssocationMustNotBeNull); + AddRule(EdmModelSyntacticValidationRules.EdmNavigationProperty_AssociationMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmNavigationProperty_ResultEndMustNotBeNull); AddRule(EdmModelSyntacticValidationRules.EdmTypeReference_TypeNotValid); } diff --git a/src/EntityFramework/Core/Metadata/Edm/EdmModelSemanticValidationRules.cs b/src/EntityFramework/Core/Metadata/Edm/EdmModelSemanticValidationRules.cs index 06a89fe0af..c7a13079a3 100644 --- a/src/EntityFramework/Core/Metadata/Edm/EdmModelSemanticValidationRules.cs +++ b/src/EntityFramework/Core/Metadata/Edm/EdmModelSemanticValidationRules.cs @@ -670,10 +670,10 @@ internal static readonly EdmModelValidationRule var dependentRoleEnd = constraint.ToRole; bool isPrincipalRoleKeyProperty, isDependentRoleKeyProperty; - bool areAllPrinicipalRolePropertiesNullable, areAllDependentRolePropertiesNullable; + bool areAllPrincipalRolePropertiesNullable, areAllDependentRolePropertiesNullable; bool isDependentRolePropertiesSubsetofKeyProperties, - isPrinicipalRolePropertiesSubsetofKeyProperties; - bool isAnyPrinicipalRolePropertyNullable, isAnyDependentRolePropertyNullable; + isPrincipalRolePropertiesSubsetofKeyProperties; + bool isAnyPrincipalRolePropertyNullable, isAnyDependentRolePropertyNullable; // Resolve all the property in the dependent end attribute. Also checks whether this is nullable or not and // whether the properties are the keys for the type in the dependent end @@ -691,9 +691,9 @@ internal static readonly EdmModelValidationRule constraint.FromRole.GetEntityType().GetValidKey().ToList(), principalRoleEnd, out isDependentRoleKeyProperty, - out areAllPrinicipalRolePropertiesNullable, - out isAnyPrinicipalRolePropertyNullable, - out isPrinicipalRolePropertiesSubsetofKeyProperties); + out areAllPrincipalRolePropertiesNullable, + out isAnyPrincipalRolePropertyNullable, + out isPrincipalRolePropertiesSubsetofKeyProperties); Debug.Assert( constraint.FromRole.GetEntityType().GetValidKey().Any(), @@ -785,7 +785,7 @@ internal static readonly EdmModelValidationRule } } // if the principal role property is not the key, then the upper bound must be many i.e every parent (from property) can - // be related to many childs + // be related to many children else if (dependentRoleEnd.RelationshipMultiplicity != RelationshipMultiplicity.Many) { diff --git a/src/EntityFramework/Core/Metadata/Edm/EdmModelSyntacticValidationRules.cs b/src/EntityFramework/Core/Metadata/Edm/EdmModelSyntacticValidationRules.cs index 7016c71f77..189283ba53 100644 --- a/src/EntityFramework/Core/Metadata/Edm/EdmModelSyntacticValidationRules.cs +++ b/src/EntityFramework/Core/Metadata/Edm/EdmModelSyntacticValidationRules.cs @@ -62,7 +62,7 @@ internal static class EdmModelSyntacticValidationRules ); internal static readonly EdmModelValidationRule - EdmAssociationType_AssocationEndMustNotBeNull = + EdmAssociationType_AssociationEndMustNotBeNull = new EdmModelValidationRule( (context, edmAssociationType) => { @@ -72,7 +72,7 @@ internal static readonly EdmModelValidationRule context.AddError( edmAssociationType, XmlConstants.End, - Strings.EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull); + Strings.EdmModel_Validator_Syntactic_EdmAssociationType_AssociationEndMustNotBeNull); } } ); @@ -111,7 +111,7 @@ internal static readonly EdmModelValidationRule ); internal static readonly EdmModelValidationRule - EdmNavigationProperty_AssocationMustNotBeNull = + EdmNavigationProperty_AssociationMustNotBeNull = new EdmModelValidationRule( (context, edmNavigationProperty) => { @@ -120,7 +120,7 @@ internal static readonly EdmModelValidationRule context.AddError( edmNavigationProperty, XmlConstants.Relationship, - Strings.EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull); + Strings.EdmModel_Validator_Syntactic_EdmNavigationProperty_AssociationMustNotBeNull); } } ); diff --git a/src/EntityFramework/Core/Metadata/Edm/MappingMetadataHelper.cs b/src/EntityFramework/Core/Metadata/Edm/MappingMetadataHelper.cs index 849b2c6a65..9f0c699a6b 100644 --- a/src/EntityFramework/Core/Metadata/Edm/MappingMetadataHelper.cs +++ b/src/EntityFramework/Core/Metadata/Edm/MappingMetadataHelper.cs @@ -52,7 +52,7 @@ internal static IEnumerable GetMappingsForEntitySetAndSuperTypes( } // - // Returns mappings for the given set/type only if the mapping applies also to childEntittyType either via IsTypeOf or explicitly specifying multiple types in mapping fragments. + // Returns mappings for the given set/type only if the mapping applies also to childEntityType either via IsTypeOf or explicitly specifying multiple types in mapping fragments. // private static IEnumerable GetIsTypeOfMappingsForEntitySetAndType( StorageMappingItemCollection mappingCollection, EntityContainer container, EntitySetBase entitySet, EntityTypeBase entityType, diff --git a/src/EntityFramework/Core/Metadata/Edm/MetadataArtifactAssemblyResolver.cs b/src/EntityFramework/Core/Metadata/Edm/MetadataArtifactAssemblyResolver.cs index 2d1c597f6c..0e0d81f2a0 100644 --- a/src/EntityFramework/Core/Metadata/Edm/MetadataArtifactAssemblyResolver.cs +++ b/src/EntityFramework/Core/Metadata/Edm/MetadataArtifactAssemblyResolver.cs @@ -7,7 +7,7 @@ namespace System.Data.Entity.Core.Metadata.Edm internal abstract class MetadataArtifactAssemblyResolver { - internal abstract bool TryResolveAssemblyReference(AssemblyName refernceName, out Assembly assembly); + internal abstract bool TryResolveAssemblyReference(AssemblyName referenceName, out Assembly assembly); internal abstract IEnumerable GetWildcardAssemblies(); } } diff --git a/src/EntityFramework/Core/Metadata/Edm/MetadataCollection.cs b/src/EntityFramework/Core/Metadata/Edm/MetadataCollection.cs index 198c7df31c..b11c1a2adb 100644 --- a/src/EntityFramework/Core/Metadata/Edm/MetadataCollection.cs +++ b/src/EntityFramework/Core/Metadata/Edm/MetadataCollection.cs @@ -93,7 +93,7 @@ public virtual int Count } // - // Gets or sets the item at the specifed index. + // Gets or sets the item at the specified index. // // The zero-based index of the item to get or set. // The item at the specified index. diff --git a/src/EntityFramework/Core/Metadata/Edm/MetadataWorkspace.cs b/src/EntityFramework/Core/Metadata/Edm/MetadataWorkspace.cs index f4b5ea5b5b..521db9b5d8 100644 --- a/src/EntityFramework/Core/Metadata/Edm/MetadataWorkspace.cs +++ b/src/EntityFramework/Core/Metadata/Edm/MetadataWorkspace.cs @@ -457,7 +457,7 @@ private void ImplicitLoadFromAssembly(Assembly assembly, ObjectItemCollection co // loaded, but the callingAssembly and its referenced assemblies are loaded. // // The type's assembly is loaded into the OSpace ItemCollection - // The assembly and its referenced assemblies to load when type is insuffiecent + // The assembly and its referenced assemblies to load when type is insufficient internal virtual void ImplicitLoadAssemblyForType(Type type, Assembly callingAssembly) { // this exists separately from LoadFromAssembly so that we can handle generics, like IEnumerable @@ -483,7 +483,7 @@ internal virtual void ImplicitLoadAssemblyForType(Type type, Assembly callingAss // If the schema attribute is presented on the assembly or any referenced assemblies, then it is a V1 scenario that we should // strictly follow the Get all referenced assemblies rules. - // If the attribute is not presented on the assembly, then we won't load the referenced asssembly + // If the attribute is not presented on the assembly, then we won't load the referenced assembly // for this callingAssembly if (ObjectItemAttributeAssemblyLoader.IsSchemaAttributePresent(callingAssembly) || (_foundAssemblyWithAttribute @@ -491,7 +491,7 @@ internal virtual void ImplicitLoadAssemblyForType(Type type, Assembly callingAss ObjectItemAttributeAssemblyLoader.IsSchemaAttributePresent))) { // cache the knowledge that we found an attribute - // because it can be expesive to figure out + // because it can be expensive to figure out _foundAssemblyWithAttribute = true; objItemCollection.ImplicitLoadAllReferencedAssemblies(callingAssembly, edmItemCollection); } @@ -508,7 +508,7 @@ internal virtual void ImplicitLoadAssemblyForType(Type type, Assembly callingAss // the load metadata from the callingAssembly and its referenced assemblies. // // The CSPace type to verify its OSpace counterpart is loaded - // The assembly and its referenced assemblies to load when type is insuffiecent + // The assembly and its referenced assemblies to load when type is insufficient internal virtual void ImplicitLoadFromEntityType(EntityType type, Assembly callingAssembly) { // used by ObjectContext.*GetObjectByKey when the clr type is not available @@ -1140,7 +1140,7 @@ public virtual bool TryGetEdmSpaceType(StructuralType objectSpaceType, out Struc /// . If there is no matched type, this method returns null. /// /// - /// A that supplies the type in the object space. + /// A that supplies the type in the object space. /// public virtual EnumType GetEdmSpaceType(EnumType objectSpaceType) { @@ -1266,7 +1266,7 @@ internal virtual bool TryGetGeneratedViewOfType( // Guarantees type match of declaration and generated parameters. // Guarantees return type match. // Throws internal error for functions without definition. - // Passes thru exception occured during definition generation. + // Passes thru exception occurred during definition generation. // internal virtual DbLambda GetGeneratedFunctionDefinition(EdmFunction function) { @@ -1386,7 +1386,7 @@ internal virtual bool IsMetadataWorkspaceCSCompatible(MetadataWorkspace other) public static void ClearCache() { MetadataCache.Instance.Clear(); - using (var cache = AssemblyCache.AquireLockedAssemblyCache()) + using (var cache = AssemblyCache.AcquireLockedAssemblyCache()) { cache.Clear(); } diff --git a/src/EntityFramework/Core/Metadata/Edm/MslXmlSchemaWriter.cs b/src/EntityFramework/Core/Metadata/Edm/MslXmlSchemaWriter.cs index a2e1b8313e..f35897c024 100644 --- a/src/EntityFramework/Core/Metadata/Edm/MslXmlSchemaWriter.cs +++ b/src/EntityFramework/Core/Metadata/Edm/MslXmlSchemaWriter.cs @@ -507,13 +507,13 @@ var propertyGroups { _xmlWriter.WriteStartElement(MslConstructs.AssociationEndElement); - var assocationSet = group.Key.ParentAssociationSet; + var associationSet = group.Key.ParentAssociationSet; - _xmlWriter.WriteAttributeString(MslConstructs.AssociationSetAttribute, assocationSet.Name); + _xmlWriter.WriteAttributeString(MslConstructs.AssociationSetAttribute, associationSet.Name); _xmlWriter.WriteAttributeString(MslConstructs.FromAttribute, group.Key.Name); _xmlWriter.WriteAttributeString( MslConstructs.ToAttribute, - assocationSet.AssociationSetEnds.Single(ae => ae != group.Key).Name); + associationSet.AssociationSetEnds.Single(ae => ae != group.Key).Name); foreach (var functionParameterBinding in group) { diff --git a/src/EntityFramework/Core/Metadata/Edm/ObjectHelper.cs b/src/EntityFramework/Core/Metadata/Edm/ObjectHelper.cs index 214956ed64..4508070990 100644 --- a/src/EntityFramework/Core/Metadata/Edm/ObjectHelper.cs +++ b/src/EntityFramework/Core/Metadata/Edm/ObjectHelper.cs @@ -148,7 +148,7 @@ internal static TypeUsage ValidateAndConvertTypeUsage( TypeUsage cspaceType, TypeUsage sspaceType) { - // if we are already C-Space, dont call the provider. this can happen for functions. + // if we are already C-Space, don't call the provider. this can happen for functions. var modelEquivalentSspace = sspaceType; if (sspaceType.EdmType.DataSpace == DataSpace.SSpace) diff --git a/src/EntityFramework/Core/Metadata/Edm/Provider/ClrProviderManifest.cs b/src/EntityFramework/Core/Metadata/Edm/Provider/ClrProviderManifest.cs index 494f07ec48..daeef352ae 100644 --- a/src/EntityFramework/Core/Metadata/Edm/Provider/ClrProviderManifest.cs +++ b/src/EntityFramework/Core/Metadata/Edm/Provider/ClrProviderManifest.cs @@ -267,7 +267,7 @@ public override TypeUsage GetStoreType(TypeUsage edmType) // This method should never return null. // // The name of the information to be retrieved. - // An XmlReader at the begining of the information requested. + // An XmlReader at the beginning of the information requested. protected override XmlReader GetDbInformation(string informationType) { throw new NotImplementedException(); diff --git a/src/EntityFramework/Core/Metadata/Edm/Provider/EdmProviderManifest.cs b/src/EntityFramework/Core/Metadata/Edm/Provider/EdmProviderManifest.cs index b127cbe23d..b287bb92c8 100644 --- a/src/EntityFramework/Core/Metadata/Edm/Provider/EdmProviderManifest.cs +++ b/src/EntityFramework/Core/Metadata/Edm/Provider/EdmProviderManifest.cs @@ -1116,7 +1116,7 @@ internal TypeUsage ForgetScalarConstraints(TypeUsage type) // This method should never return null. // // The name of the information to be retrieved. - // An XmlReader at the begining of the information requested. + // An XmlReader at the beginning of the information requested. protected override XmlReader GetDbInformation(string informationType) { throw new NotImplementedException(); diff --git a/src/EntityFramework/Core/Metadata/Edm/StoreItemCollection.Loader.cs b/src/EntityFramework/Core/Metadata/Edm/StoreItemCollection.Loader.cs index e3b6667274..f97338aed8 100644 --- a/src/EntityFramework/Core/Metadata/Edm/StoreItemCollection.Loader.cs +++ b/src/EntityFramework/Core/Metadata/Edm/StoreItemCollection.Loader.cs @@ -120,7 +120,7 @@ private void OnProviderNotification(string provider, Action _errors; - // keep the list of new assemblies that got loaded in this load assembly call. The reason why we need to keep a seperate + // keep the list of new assemblies that got loaded in this load assembly call. The reason why we need to keep a separate // list of assemblies is that we keep track of errors, and if there are no errors, only then do we add the list of assemblies // to the global cache. Hence global cache is never polluted with invalid assemblies private readonly Dictionary _listOfAssembliesLoaded = diff --git a/src/EntityFramework/Core/Objects/DataClasses/RelationshipManager.cs b/src/EntityFramework/Core/Objects/DataClasses/RelationshipManager.cs index d470345fce..5796f98733 100644 --- a/src/EntityFramework/Core/Objects/DataClasses/RelationshipManager.cs +++ b/src/EntityFramework/Core/Objects/DataClasses/RelationshipManager.cs @@ -280,7 +280,7 @@ internal EntityCollection GetRelatedCollection( var relatedEntityCount = 0; - // We will be modifing the collection's enumerator, so we need to make a copy of it + // We will be modifying the collection's enumerator, so we need to make a copy of it var tempEntities = new List(collection.CountInternal); foreach (var wrappedEntity in collection.GetWrappedEntities()) { @@ -672,7 +672,7 @@ public void InitializeRelatedCollection( // source and adds that namespace to the front of the relationship name. If the namespace // can't be found, then the relationshipName is returned untouched and the expectation is that // other validations will fail later in the code paths that use this. - // This method should only be used at the imediate top-level public surface since all internal + // This method should only be used at the immediate top-level public surface since all internal // calls are expected to use fully qualified names already. // internal string PrependNamespaceToRelationshipName(string relationshipName) @@ -1322,7 +1322,7 @@ internal static void RemoveRelatedEntitiesFromObjectStateManager(IEntityWrapper // Remove entity from its relationships and do cascade delete if required. // All removed relationships are marked for deletion and all cascade deleted - // entitites are also marked for deletion. + // entities are also marked for deletion. internal void RemoveEntityFromRelationships() { if (null != _relationships) @@ -1344,7 +1344,7 @@ internal void NullAllFKsInDependentsForWhichThisIsThePrincipal() if (_relationships != null) { // Build a list of the dependent RelatedEnds because with overlapping FKs we could - // end up removing a relationship before we have suceeded in nulling all the FK values + // end up removing a relationship before we have succeeded in nulling all the FK values // for that relationship. var dependentEndsToProcess = new List(); foreach (var relatedEnd in Relationships) @@ -1409,7 +1409,7 @@ internal void ClearRelatedEndWrappers() // Method used to retrieve properties from principal entities. // Parameter includeOwnValues means that values from current entity should be also added to "properties" // includeOwnValues is false only when this method is called from ObjectStateEntry.AcceptChanges() - // Parmeter "visited" is a set containig entities which were already visited during traversing the graph. + // Parmeter "visited" is a set containing entities which were already visited during traversing the graph. // If _owner already exists in the set, it means that there is a cycle in the graph of relationships with RI Constraints. internal void RetrieveReferentialConstraintProperties( out Dictionary> properties, HashSet visited, bool includeOwnValues) @@ -1461,7 +1461,7 @@ internal void RetrieveReferentialConstraintProperties( if (!CheckIfAllPropertiesWereRetrieved(properties, propertiesToRetrieve)) { - // Properties couldn't be found in entities in collections or refrences. + // Properties couldn't be found in entities in collections or references. // Try to find missing properties in related key entries. // This process is slow but it is not a common case. var entry = wrappedOwner.Context.ObjectStateManager.FindEntityEntry(ownerKey); @@ -1491,7 +1491,7 @@ internal void RetrieveReferentialConstraintProperties( } } - // properties dictionary contains name of property, its value and coutner saying how many times this property was retrieved from principal entities + // properties dictionary contains name of property, its value and counter saying how many times this property was retrieved from principal entities private static bool CheckIfAllPropertiesWereRetrieved( Dictionary> properties, List propertiesToRetrieve) { @@ -1526,7 +1526,7 @@ private static bool CheckIfAllPropertiesWereRetrieved( } } - // Check if all the coutners equal 0 + // Check if all the counters equal 0 if (isSuccess) { foreach (var valueCounterPair in values) @@ -1787,7 +1787,7 @@ internal void AttachContextToRelatedEnds(ObjectContext context, EntitySet entity } // - // Calls AttachContext on each RelatedEnd referenced by this manager and also on all the enties + // Calls AttachContext on each RelatedEnd referenced by this manager and also on all the entities // referenced by that related end. // internal void ResetContextOnRelatedEnds(ObjectContext context, EntitySet entitySet, MergeOption mergeOption) diff --git a/src/EntityFramework/Core/Objects/DelegateFactory.cs b/src/EntityFramework/Core/Objects/DelegateFactory.cs index c7d0bae93e..0f4e7150ab 100644 --- a/src/EntityFramework/Core/Objects/DelegateFactory.cs +++ b/src/EntityFramework/Core/Objects/DelegateFactory.cs @@ -69,7 +69,7 @@ internal static Func GetGetterDelegateForProperty(EdmProperty pr // // to property type. // - // From generated enties via StructuralObject.SetValidValue. + // From generated entities via StructuralObject.SetValidValue. internal static void SetValue(EdmProperty property, object target, object value) { var setter = GetSetterDelegateForProperty(property); diff --git a/src/EntityFramework/Core/Objects/ELinq/ExpressionConverter.cs b/src/EntityFramework/Core/Objects/ELinq/ExpressionConverter.cs index e6ef5b1ffa..c440b5a76b 100644 --- a/src/EntityFramework/Core/Objects/ELinq/ExpressionConverter.cs +++ b/src/EntityFramework/Core/Objects/ELinq/ExpressionConverter.cs @@ -1493,12 +1493,12 @@ private DbExpression TranslateLike(MethodCallExpression call) // String.Contains is translated into: // 1) If argument is a constant or parameter and the provider supports escaping: // object like ("%") + argument1 + ("%"), where argument1 is argument escaped by the provider - // and ("%") are appended on the begining/end depending on whether + // and ("%") are appended on the beginning/end depending on whether // insertPercentAtStart/insertPercentAtEnd are specified // 2) Otherwise: // object.Method(argument) -> defaultTranslator // - // Should '%' be inserted at the begining of the pattern + // Should '%' be inserted at the beginning of the pattern // Should '%' be inserted at the end of the pattern // The delegate that provides the default translation // The translation diff --git a/src/EntityFramework/Core/Objects/ELinq/Translator.cs b/src/EntityFramework/Core/Objects/ELinq/Translator.cs index 60d0f73292..f02dd8a669 100644 --- a/src/EntityFramework/Core/Objects/ELinq/Translator.cs +++ b/src/EntityFramework/Core/Objects/ELinq/Translator.cs @@ -32,7 +32,7 @@ protected Translator(params ExpressionType[] nodeTypes) _nodeTypes = nodeTypes; } - // Gets LINQ node types this translator should be registed to process. + // Gets LINQ node types this translator should be registered to process. internal IEnumerable NodeTypes { get { return _nodeTypes; } @@ -124,7 +124,7 @@ protected override DbExpression TypedTranslate(ExpressionConverter parent, Const //unwrap System.Enum if (linqType == typeof(Enum)) { - Debug.Assert(linq.Value != null, "null enum constants should have alredy been taken care of"); + Debug.Assert(linq.Value != null, "null enum constants should have already been taken care of"); linqType = linq.Value.GetType(); } diff --git a/src/EntityFramework/Core/Objects/EntityEntry.cs b/src/EntityFramework/Core/Objects/EntityEntry.cs index ad92fc25ed..7040e4633f 100644 --- a/src/EntityFramework/Core/Objects/EntityEntry.cs +++ b/src/EntityFramework/Core/Objects/EntityEntry.cs @@ -2416,7 +2416,7 @@ private void AddRelationshipDetectedByGraph( && ObjectStateManager.FindEntityEntry(relatedObject) == null) { // If the relatedObject is not tracked by the context, let's detect it before OSM.PerformAdd to avoid - // making RelatedEnd.Add() more complicated (it would have to know when the values in relatedEndTo can be overriden, and when not + // making RelatedEnd.Add() more complicated (it would have to know when the values in relatedEndTo can be overridden, and when not relatedEndTo.VerifyNavigationPropertyForAdd(_wrappedEntity); } diff --git a/src/EntityFramework/Core/Objects/Internal/BufferedDataReader.cs b/src/EntityFramework/Core/Objects/Internal/BufferedDataReader.cs index b317116708..65fe76c59e 100644 --- a/src/EntityFramework/Core/Objects/Internal/BufferedDataReader.cs +++ b/src/EntityFramework/Core/Objects/Internal/BufferedDataReader.cs @@ -176,7 +176,7 @@ internal void Initialize( [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "nullableColumns")] [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "columnTypes")] internal async Task InitializeAsync( - string providerManifestToken, DbProviderServices providerSerivces, Type[] columnTypes, bool[] nullableColumns, + string providerManifestToken, DbProviderServices providerServices, Type[] columnTypes, bool[] nullableColumns, CancellationToken cancellationToken) { if (_underlyingReader == null) @@ -195,20 +195,20 @@ internal async Task InitializeAsync( { _bufferedDataRecords.Add(await ShapedBufferedDataRecord.InitializeAsync( - providerManifestToken, providerSerivces, reader, columnTypes, nullableColumns, cancellationToken) + providerManifestToken, providerServices, reader, columnTypes, nullableColumns, cancellationToken) .WithCurrentCulture()); } else { _bufferedDataRecords.Add(await - ShapelessBufferedDataRecord.InitializeAsync(providerManifestToken, providerSerivces, reader, cancellationToken) + ShapelessBufferedDataRecord.InitializeAsync(providerManifestToken, providerServices, reader, cancellationToken) .WithCurrentCulture()); } while (await reader.NextResultAsync(cancellationToken).WithCurrentCulture()) { _bufferedDataRecords.Add(await - ShapelessBufferedDataRecord.InitializeAsync(providerManifestToken, providerSerivces, reader, cancellationToken) + ShapelessBufferedDataRecord.InitializeAsync(providerManifestToken, providerServices, reader, cancellationToken) .WithCurrentCulture()); } diff --git a/src/EntityFramework/Core/Objects/Internal/ObjectQueryExecutionPlanFactory.cs b/src/EntityFramework/Core/Objects/Internal/ObjectQueryExecutionPlanFactory.cs index c10dd0ced1..9f8021d0eb 100644 --- a/src/EntityFramework/Core/Objects/Internal/ObjectQueryExecutionPlanFactory.cs +++ b/src/EntityFramework/Core/Objects/Internal/ObjectQueryExecutionPlanFactory.cs @@ -109,7 +109,7 @@ private static EntityCommandDefinition CreateCommandDefinition(ObjectContext con // we should not be wrapping all exceptions if (e.IsCatchableExceptionType()) { - // we don't wan't folks to have to know all the various types of exceptions that can + // we don't want folks to have to know all the various types of exceptions that can // occur, so we just rethrow a CommandDefinitionException and make whatever we caught // the inner exception of it. throw new EntityCommandCompilationException(Strings.EntityClient_CommandDefinitionPreparationFailed, e); diff --git a/src/EntityFramework/Core/Objects/Internal/ShapelessBufferedDataRecord.cs b/src/EntityFramework/Core/Objects/Internal/ShapelessBufferedDataRecord.cs index 52f4c1c15e..2a9c0cdd61 100644 --- a/src/EntityFramework/Core/Objects/Internal/ShapelessBufferedDataRecord.cs +++ b/src/EntityFramework/Core/Objects/Internal/ShapelessBufferedDataRecord.cs @@ -27,10 +27,10 @@ protected ShapelessBufferedDataRecord() } internal static ShapelessBufferedDataRecord Initialize( - string providerManifestToken, DbProviderServices providerSerivces, DbDataReader reader) + string providerManifestToken, DbProviderServices providerServices, DbDataReader reader) { var record = new ShapelessBufferedDataRecord(); - record.ReadMetadata(providerManifestToken, providerSerivces, reader); + record.ReadMetadata(providerManifestToken, providerServices, reader); var fieldCount = record.FieldCount; var resultSet = new List(); @@ -79,10 +79,10 @@ internal static ShapelessBufferedDataRecord Initialize( #if !NET40 internal static async Task InitializeAsync( - string providerManifestToken, DbProviderServices providerSerivces, DbDataReader reader, CancellationToken cancellationToken) + string providerManifestToken, DbProviderServices providerServices, DbDataReader reader, CancellationToken cancellationToken) { var record = new ShapelessBufferedDataRecord(); - record.ReadMetadata(providerManifestToken, providerSerivces, reader); + record.ReadMetadata(providerManifestToken, providerServices, reader); var fieldCount = record.FieldCount; var resultSet = new List(); diff --git a/src/EntityFramework/Core/Objects/Internal/TransactionManager.cs b/src/EntityFramework/Core/Objects/Internal/TransactionManager.cs index e7746279a1..6ba4769402 100644 --- a/src/EntityFramework/Core/Objects/Internal/TransactionManager.cs +++ b/src/EntityFramework/Core/Objects/Internal/TransactionManager.cs @@ -102,8 +102,8 @@ internal bool IsGraphUpdate internal void BeginAddTracking() { Debug.Assert(!IsAddTracking); - Debug.Assert(PopulatedEntityReferences == null, "Expected promotion index to be null when begining tracking."); - Debug.Assert(AlignedEntityReferences == null, "Expected promotion index to be null when begining tracking."); + Debug.Assert(PopulatedEntityReferences == null, "Expected promotion index to be null when beginning tracking."); + Debug.Assert(AlignedEntityReferences == null, "Expected promotion index to be null when beginning tracking."); IsAddTracking = true; PopulatedEntityReferences = new HashSet(); AlignedEntityReferences = new HashSet(); diff --git a/src/EntityFramework/Core/Objects/ObjectContext.cs b/src/EntityFramework/Core/Objects/ObjectContext.cs index 97cd25fcf7..01b2c0ca85 100644 --- a/src/EntityFramework/Core/Objects/ObjectContext.cs +++ b/src/EntityFramework/Core/Objects/ObjectContext.cs @@ -63,7 +63,7 @@ public class ObjectContext : IDisposable, IObjectContextAdapter // but rather the disposal of the underlying connection object if the ObjectContext owns the connection, // or the separation of the underlying connection object from the ObjectContext if the ObjectContext does not own the connection. // - // Operations that require a connection should throw an ObjectDiposedException if the connection is null. + // Operations that require a connection should throw an ObjectDisposedException if the connection is null. // Other operations that do not need a connection should continue to work after disposal. private EntityConnection _connection; @@ -163,7 +163,7 @@ public ObjectContext(string connectionString) [ResourceExposure(ResourceScope.Machine)] //Exposes the file names as part of ConnectionString which are a Machine resource [ResourceConsumption(ResourceScope.Machine)] //For ObjectContext method. But the paths are not created in this method. [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", - Justification = "Class is internal and methods are made virtual for testing purposes only. They cannot be overrided by user.")] + Justification = "Class is internal and methods are made virtual for testing purposes only. They cannot be overridden by the user.")] protected ObjectContext(string connectionString, string defaultContainerName) : this(connectionString) { @@ -184,7 +184,7 @@ protected ObjectContext(string connectionString, string defaultContainerName) /// The connection is null. /// The connection , defaultContainerName , or metadata workspace is not valid. [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", - Justification = "Class is internal and methods are made virtual for testing purposes only. They cannot be overrided by user.")] + Justification = "Class is internal and methods are made virtual for testing purposes only. They cannot be overridden by the user.")] protected ObjectContext(EntityConnection connection, string defaultContainerName) : this(connection) { @@ -643,9 +643,9 @@ private void VerifyRootForAdd( } else { - var exptectedState = doAttach ? EntityState.Unchanged : EntityState.Added; + var expectedState = doAttach ? EntityState.Unchanged : EntityState.Added; - if (existingEntry.State != exptectedState) + if (existingEntry.State != expectedState) { throw doAttach ? new InvalidOperationException(Strings.ObjectContext_EntityAlreadyExistsInObjectStateManager) @@ -788,7 +788,7 @@ internal void AddSingleObject(EntitySet entitySet, IEntityWrapper wrappedEntity, // AppendOnly (if adding a new object to a context, set // the relationships up to cache by default -- load option // is only set to other values when AttachContext is - // called by the materializer). Also add all related entitites to + // called by the materializer). Also add all related entities to // cache. // // NOTE: AttachContext must be called after adding the object to @@ -1687,7 +1687,7 @@ internal virtual void EnsureConnection(bool shouldMonitorTransactions) } catch (Exception) { - // when the connection is unable to enlist properly or another error occured, be sure to release this connection + // when the connection is unable to enlist properly or another error occurred, be sure to release this connection ReleaseConnection(); throw; } @@ -1748,7 +1748,7 @@ await EnsureContextIsEnlistedInCurrentTransaction( } catch (Exception) { - // when the connection is unable to enlist properly or another error occured, be sure to release this connection + // when the connection is unable to enlist properly or another error occurred, be sure to release this connection ReleaseConnection(); throw; } @@ -1797,7 +1797,7 @@ private T EnsureContextIsEnlistedInCurrentTransaction(Transaction currentTran // 6 non-null null Closed Yes no-op; implicit transaction will be created and used N/A - cannot enlist in transaction on a closed connection // 7 non-null tx1 non-null tx2 Open No connection.Enlist(currentTransaction); currentTransaction enlisted and used N/A - it is not possible to EnlistTransaction if another transaction has already enlisted // 8 non-null tx1 non-null tx2 Open Yes connection.Close(); connection.Open(); Re-opening connection will automatically enlist into Transaction.Current N/A - only applies to TransactionScope - requires two transactions and CommitableTransaction and TransactionScope cannot be mixed - // 9 non-null tx1 non-null tx2 Closed Yes connection.Open(); Opening connection will automatcially enlist into Transaction.Current N/A - cannot enlist in transaction on a closed connection + // 9 non-null tx1 non-null tx2 Closed Yes connection.Open(); Opening connection will automatically enlist into Transaction.Current N/A - cannot enlist in transaction on a closed connection var transactionHasChanged = (null != currentTransaction && !currentTransaction.Equals(_lastTransaction)) || (null != _lastTransaction && !_lastTransaction.Equals(currentTransaction)); @@ -2557,7 +2557,7 @@ private void RefreshEntities(RefreshMode refreshMode, IEnumerable collection) if (RefreshMode.StoreWins == refreshMode) { - // remove all entites that have been removed from the store, not added by client + // remove all entities that have been removed from the store, not added by client foreach (var item in entities) { Debug.Assert(EntityState.Added != item.Value.State, "should not be possible"); @@ -2705,7 +2705,7 @@ private async Task RefreshEntitiesAsync(RefreshMode refreshMode, IEnumerable col if (RefreshMode.StoreWins == refreshMode) { - // remove all entites that have been removed from the store, not added by client + // remove all entities that have been removed from the store, not added by client foreach (var item in entities) { Debug.Assert(EntityState.Added != item.Value.State, "should not be possible"); @@ -3878,9 +3878,9 @@ private void PopulateFunctionImportEntityCommandParameters( Debug.Assert(objectParameter.MappableType != null, "MappableType must not be null"); Debug.Assert(Nullable.GetUnderlyingType(objectParameter.MappableType) == null, "Nullable types not expected here."); - // since ObjectParameters do not allow users to especify 'facets', make + // since ObjectParameters do not allow users to specify 'facets', make // sure that the parameter typeusage is not populated with the provider - // dafault facet values. + // default facet values. // Try getting the type from the workspace. This may fail however for one of the following reasons: // - the type is not a model type // - the types were not loaded into the workspace yet diff --git a/src/EntityFramework/Core/Objects/RelationshipWrapper.cs b/src/EntityFramework/Core/Objects/RelationshipWrapper.cs index 6ac87b477c..7f1f26b84b 100644 --- a/src/EntityFramework/Core/Objects/RelationshipWrapper.cs +++ b/src/EntityFramework/Core/Objects/RelationshipWrapper.cs @@ -56,7 +56,7 @@ internal RelationshipWrapper( AssociationSet = extent; Debug.Assert(extent.ElementType.AssociationEndMembers.Count == 2, "only 2 ends are supported"); - // this assert is explictly commented out to show that the two are similar but different + // this assert is explicitly commented out to show that the two are similar but different // we should always use AssociationEndMembers, never CorrespondingAssociationEndMember //Debug.Assert(AssociationSet.AssociationSetEnds.Count == 2, "only 2 set ends supported"); //Debug.Assert(extent.ElementType.AssociationEndMembers[0] == AssociationSet.AssociationSetEnds[0].CorrespondingAssociationEndMember, "should be same end member"); diff --git a/src/EntityFramework/Core/Query/InternalTrees/SimpleRule.cs b/src/EntityFramework/Core/Query/InternalTrees/SimpleRule.cs index 23c1ada679..4aa64df624 100644 --- a/src/EntityFramework/Core/Query/InternalTrees/SimpleRule.cs +++ b/src/EntityFramework/Core/Query/InternalTrees/SimpleRule.cs @@ -26,7 +26,7 @@ internal SimpleRule(OpType opType, ProcessNodeDelegate processDelegate) #endregion - #region overriden methods + #region Overridden methods internal override bool Match(Node node) { diff --git a/src/EntityFramework/Core/Query/PlanCompiler/AggregatePushdown.cs b/src/EntityFramework/Core/Query/PlanCompiler/AggregatePushdown.cs index fdf89eb627..fe386bc47d 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/AggregatePushdown.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/AggregatePushdown.cs @@ -126,7 +126,7 @@ private void TryProcessCandidate( var groupByOp = (GroupByIntoOp)definingGroupNode.Op; groupByOp.Outputs.Set(newFunctionVar); - //Propagate the new var throught the ancestors of the GroupByInto + //Propagate the new var through the ancestors of the GroupByInto for (var i = 0; i < groupByAncestors.Count; i++) { var groupByAncestor = groupByAncestors[i]; diff --git a/src/EntityFramework/Core/Query/PlanCompiler/ApplyOpRules.cs b/src/EntityFramework/Core/Query/PlanCompiler/ApplyOpRules.cs index 085578785b..310e7bbb9f 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/ApplyOpRules.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/ApplyOpRules.cs @@ -382,7 +382,7 @@ private static bool ProcessOuterApplyOverProject(RuleProcessingContext context, // // Dev10 #480443: If any of the definitions changes we need to recompute the node info. - var anyVarDefChagned = false; + var anyVarDefChanged = false; foreach (var varDefNode in varDefListNode.Children) { PlanCompiler.Assert(varDefNode.Op.OpType == OpType.VarDef, "Expected VarDefOp. Found " + varDefNode.Op.OpType + " instead"); @@ -419,12 +419,12 @@ private static bool ProcessOuterApplyOverProject(RuleProcessingContext context, } varDefNode.Child0 = currentDefinition; command.RecomputeNodeInfo(varDefNode); - anyVarDefChagned = true; + anyVarDefChanged = true; } } // Recompute node info if needed - if (anyVarDefChagned) + if (anyVarDefChanged) { command.RecomputeNodeInfo(varDefListNode); } diff --git a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateRefComputingVisitor.cs b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateRefComputingVisitor.cs index d7f0368adc..504ac20af1 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateRefComputingVisitor.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateRefComputingVisitor.cs @@ -141,7 +141,7 @@ public override void Visit(UnnestOp op, Node n) #region ScalarOps Visitors // - // If the op is a collection aggregate function it checks whether its arguement can be translated over + // If the op is a collection aggregate function it checks whether its argument can be translated over // a single group aggregate var. If so, it is tracked as a candidate to be pushed into that // group by into node. // diff --git a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarComputationTranslator.cs b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarComputationTranslator.cs index 5ebcf61d01..a5df1b690f 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarComputationTranslator.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarComputationTranslator.cs @@ -154,7 +154,7 @@ public override Node Visit(PropertyOp op, Node n) // Unnest // where the unnest is over the group aggregate var and the output var // is either a reference to the group aggregate var or to a constant, it returns the - // translation of the ouput var. + // translation of the output var. // [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Data.Entity.Core.Query.PlanCompiler.PlanCompiler.Assert(System.Boolean,System.String)")] diff --git a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarInfoManager.cs b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarInfoManager.cs index d21769db3e..044211bc9e 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarInfoManager.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/GroupAggregateVarInfoManager.cs @@ -7,7 +7,7 @@ namespace System.Data.Entity.Core.Query.PlanCompiler using System.Data.Entity.Core.Query.InternalTrees; // - // Manages refereces to groupAggregate variables. + // Manages references to groupAggregate variables. // internal class GroupAggregateVarInfoManager { diff --git a/src/EntityFramework/Core/Query/PlanCompiler/GroupByOpRules.cs b/src/EntityFramework/Core/Query/PlanCompiler/GroupByOpRules.cs index 13594942c1..c542a58f20 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/GroupByOpRules.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/GroupByOpRules.cs @@ -245,7 +245,7 @@ private static bool ProcessGroupByOpOnAllInputColumnsWithAggregateOperation(Rule // where agg1', agg2', .. aggm' are the "mapped" versions // of agg1, agg2, .. aggm, such that the references to c1, ... ck are // replaced by their definitions. - // We only do this if each c1, ..ck is refereneced (in aggregates) at most once or it is a constant. + // We only do this if each c1, ..ck is referenced (in aggregates) at most once or it is a constant. // // Rule processing context // Current ProjectOp node @@ -321,7 +321,7 @@ private static bool ProcessGroupByOverProject(RuleProcessingContext context, Nod } // - // Replaces each occurance of the given vars with their definitions. + // Replaces each occurrence of the given vars with their definitions. // internal class VarRefReplacer : BasicOpVisitorOfNode { @@ -336,7 +336,7 @@ private VarRefReplacer(Dictionary varReplacementTable, Command comman // // "Public" entry point. In the subtree rooted at the given root, - // replace each occurance of the given vars with their definitions, + // replace each occurrence of the given vars with their definitions, // where each key-value pair in the dictionary is a var-definition pair. // internal static Node Replace(Dictionary varReplacementTable, Node root, Command command) diff --git a/src/EntityFramework/Core/Query/PlanCompiler/JoinGraph.cs b/src/EntityFramework/Core/Query/PlanCompiler/JoinGraph.cs index ad8781f3c0..924a2a364d 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/JoinGraph.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/JoinGraph.cs @@ -767,7 +767,7 @@ private static bool ContainsJoinEdgeForTable(IEnumerable joinEdges, Ta // // Determines whether each of the given joinEdges can be turned into an inner join - // NOTE: Due to how we create join edges, currenlty there can only be one join edge in this group + // NOTE: Due to how we create join edges, currently there can only be one join edge in this group // See for details. // private bool CanAllJoinEdgesBeTurnedIntoInnerJoins(AugmentedNode rightNode, IEnumerable joinEdges) @@ -936,7 +936,7 @@ private static bool CanGetFileredByJoins(JoinEdge joinEdge, AugmentedNode leastC while (currentParent != null && currentNode != leastCommonAncestor) { - //If the current node is a rigth child of a left outer join return or participates in a inner join + //If the current node is a right child of a left outer join return or participates in a inner join if (currentParent.Node != joinEdge.JoinNode.Node && (disallowAnyJoin || currentParent.Node.Op.OpType != OpType.LeftOuterJoin || currentParent.Children[0] != currentNode) @@ -988,22 +988,22 @@ private static AugmentedNode GetLeastCommonAncestor(AugmentedNode node1, Augment } AugmentedNode currentParent; - AugmentedNode rigthNode; + AugmentedNode rightNode; if (node1.Id < node2.Id) { currentParent = node1; - rigthNode = node2; + rightNode = node2; } else { currentParent = node2; - rigthNode = node1; + rightNode = node1; } while (currentParent.Id - < rigthNode.Id) + < rightNode.Id) { currentParent = currentParent.Parent; } @@ -1172,7 +1172,7 @@ private void EliminateStarSelfJoin(List joinEdges) } // If the join edge could not be part of any of the existing groups, - // see whether it quailifes for leading a new group + // see whether it qualifies for leading a new group if (!matched && QualifiesForStarSelfJoinGroup(joinEdge)) { @@ -1217,7 +1217,7 @@ private void EliminateStarSelfJoin(List joinEdges) // private static bool AreMatchingForStarSelfJoinElimination(JoinEdge edge1, JoinEdge edge2) { - // In order for the join edges to be compatible thay have to + // In order for the join edges to be compatible they have to // represent joins on the same number of columns and of the same join kinds. if (edge2.LeftVars.Count != edge1.LeftVars.Count || @@ -2038,7 +2038,7 @@ private Node BuildFilterNode(Node inputNode, Node predicateNode) } // - // Rebuilds the predicate for a join node and caculates the minimum location id at which it can be specified. + // Rebuilds the predicate for a join node and calculates the minimum location id at which it can be specified. // The predicate is an AND of the equijoin conditions and the "otherPredicate". // We first remap all columns in the equijoin predicates - if a column pair // resolves to the same column, then we skip that pair. @@ -2053,7 +2053,7 @@ private Node BuildFilterNode(Node inputNode, Node predicateNode) private Node RebuildPredicate(AugmentedJoinNode joinNode, out int minLocationId) { // - // It is safe to initilaze the output location id to the location id of the joinNode. The nodes at lower + // It is safe to initialize the output location id to the location id of the joinNode. The nodes at lower // location ids have already been processed, thus even if the least common ancestor of all participating // vars is lower than the location id of the joinNode, the rebuilt predicate would not be propagated // to nodes at lower location ids. @@ -2337,7 +2337,7 @@ private Node RebuildNodeTree(AugmentedNode augmentedNode, out Dictionary A dictionary of predicates and the minimum location id at which they can be specified // A dictionary of predicates and the minimum location id at which they can be specified // An output dictionary of predicates and the minimum location id at which they can be specified that includes all input predicates with minimum location id greater then targetNodeId - // A single predicate "AND"-ing all input predicates with a minimum location id that is less or equal to the tiven targetNodeId. + // A single predicate "AND"-ing all input predicates with a minimum location id that is less or equal to the given targetNodeId. private Node CombinePredicateNodes( int targetNodeId, Node localPredicateNode, int localPredicateMinLocationId, Dictionary leftPredicates, Dictionary rightPredicates, out Dictionary outPredicates) @@ -2371,7 +2371,7 @@ private Node CombinePredicateNodes( // // Helper method for - // If the predicateMinimuLocationId is less or equal to the target location id of the current result, it is AND-ed with the + // If the predicateMinimumLocationId is less or equal to the target location id of the current result, it is AND-ed with the // current result, otherwise it is included in the list of predicates that need to be propagated up (outPredicates) // private Node ClassifyPredicate( @@ -2454,7 +2454,7 @@ private int GetLeastCommonAncestor(int nodeId1, int nodeId2) // // Helper method for - // Given a root node pick its immediate child to which the node identifed with the given nodeId bellongs. + // Given a root node pick its immediate child to which the node identified with the given nodeId bellongs. // // The immediate child of the given root that is root of the subree that contains the node with the given nodeId. private static AugmentedNode PickSubtree(int nodeId, AugmentedNode root) diff --git a/src/EntityFramework/Core/Query/PlanCompiler/NestPullup.cs b/src/EntityFramework/Core/Query/PlanCompiler/NestPullup.cs index fe57a982de..a877c98a9b 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/NestPullup.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/NestPullup.cs @@ -1733,11 +1733,11 @@ public override Node Visit(UnnestOp op, Node n) // vars into m_definingNodeMap. // The dictionary collectionVarDefinitions (below) contains the copied definitions of such collection vars. // but without the wrapping PhysicalProjectOp. - // Example: m_definingNodeMap contains (var1, definition1) and (var2, definintion2). + // Example: m_definingNodeMap contains (var1, definition1) and (var2, definition2). // var2 is defined inside the definition of var1. - // Here we copy definition1 -> definintion1'. + // Here we copy definition1 -> definition1'. // We need to add to m_definitionNodeMap (var2', definition2'). - // definition2' should be a copy of definiton2 in the context of to definition1', + // definition2' should be a copy of definition2 in the context of to definition1', // i.e. definition2' should relate to definition1' in same way that definition2 relates to definition1 // private Node CopyCollectionVarDefinition(Node refVarDefiningNode) @@ -1813,7 +1813,7 @@ protected override Node VisitNestOp(NestBaseOp op, Node n) // PhysicalProjectOp // // - // Tranformation: + // Transformation: // PhysicalProjectOp(MultiStreamNestOp(...)) => PhysicalProjectOp(SortOp(...)) // Strategy: // (1) Convert MultiStreamNestOp(...) => SingleStreamNestOp(...) @@ -2252,7 +2252,7 @@ private void NormalizeNestOpInputs( { discriminatorVarList = Command.CreateVarList(); - // We insert a dummy var and value at poistion 0 for the deriving node, which + // We insert a dummy var and value at position 0 for the deriving node, which // we should never reference; discriminatorVarList.Add(null); @@ -2333,7 +2333,7 @@ private Node AugmentNodeWithInternalIntegerConstant(Node input, int value, out V // N ==> Project(N,{definitions-from-N, constant}) // // the input node to augment - // The fucntion to create the constant op + // The function to create the constant op // the computed Var for the internal constant // the augmented node private Node AugmentNodeWithConstant(Node input, Func createOp, out Var constantVar) diff --git a/src/EntityFramework/Core/Query/PlanCompiler/NominalTypeEliminator.cs b/src/EntityFramework/Core/Query/PlanCompiler/NominalTypeEliminator.cs index 5b065c5361..59edf13cc9 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/NominalTypeEliminator.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/NominalTypeEliminator.cs @@ -596,7 +596,7 @@ private IEnumerable GetPropertyRefs(TypeInfo typeInfo, OperationKin // The input expression tree // Should we ignore missing properties // Output: list of properties - // Output: correspondng list of values + // Output: corresponding list of values private void GetPropertyValues( TypeInfo typeInfo, OperationKind opKind, Node input, bool ignoreMissingProperties, out List properties, out List values) @@ -1123,7 +1123,7 @@ public override Node Visit(ProjectOp op, Node n) if (op.Outputs != newVars) { - // If the set of vars is empty, that means we didn;t need any of the Vars + // If the set of vars is empty, that means we didn't need any of the Vars if (newVars.IsEmpty) { return n.Child0; @@ -1166,7 +1166,7 @@ public override Node Visit(ScanTableOp op, Node n) } // - // Create a flattened table definition, and a table with that definiton; + // Create a flattened table definition, and a table with that definition; // var newTableMD = m_command.CreateFlatTableDefinition(properties, keyProperties, op.Table.TableMetadata.Extent); var newTable = m_command.CreateTableInstance(newTableMD); @@ -1330,7 +1330,7 @@ public override Node Visit(UnnestOp op, Node n) // For a TVF function call use the original non-flattened variable: // the function will not return properties described in the flattened type, there would be no null sentinel and // row prop names will be as declared in the function signature. - // The mismatch between the flattened type and the orignial type is fixed by wrapping into a ProjectOp produced by CreateTVFProjection(...). + // The mismatch between the flattened type and the original type is fixed by wrapping into a ProjectOp produced by CreateTVFProjection(...). newUnnestVar = computedVar; processingTVF = ((FunctionOp)chi.Child0.Op).Function; } @@ -1402,7 +1402,7 @@ public override Node Visit(UnnestOp op, Node n) // 3. If processingTVF, create a ProjectOp and wrap the new UnnestOp into it. // The new ProjectOp projects fields of the typeInfo.FlattenedType. The values of the projected fields // are taken from the corresponding variables of the new UnnestOp. - // The new ProjectOp also projects a null sentinenel if the flattened type has one. + // The new ProjectOp also projects a null sentinel if the flattened type has one. // // 4. Update m_varInfoMap with the new entry that maps the old unnestTableColumnVar to the list of new flattened vars: // If processingTVF, the new flattended vars are the outputs of the ProjectOp, @@ -1939,7 +1939,7 @@ public override Node Visit(ConstantOp op, Node n) // new subtree public override Node Visit(CaseOp op, Node n) { - // Before visiting the children, check whether the case statment can be optimized + // Before visiting the children, check whether the case statement can be optimized bool thenClauseIsNull; var canSimplifyPrecheck = PlanCompilerUtil.IsRowTypeCaseOpWithNullability(op, n, out thenClauseIsNull); @@ -1995,7 +1995,7 @@ public override Node Visit(CaseOp op, Node n) // (1) case when X then NULL else Y, or // (2) case when X then Y else NULL, // where Y is of row type and the types of the input CaseOp, the NULL and Y are the same, - // it rewrittes into: Y', where Y's null sentinel N' is: + // it rewrites into: Y', where Y's null sentinel N' is: // (1) case when X then NULL else N, or // where N is Y's null sentinel. // The rewrite only happens if: @@ -2208,7 +2208,7 @@ public override Node Visit(ConditionalOp op, Node n) // IS NULL predicates, one for each property. There are a couple of // optimizations that we perform. // - // For entity types, we simply perfom the IS NULL operations on the + // For entity types, we simply perform the IS NULL operations on the // key attributes alone. // // Complex types must have a typeid property - the isnull is pushed to the diff --git a/src/EntityFramework/Core/Query/PlanCompiler/PlanCompiler.cs b/src/EntityFramework/Core/Query/PlanCompiler/PlanCompiler.cs index 35cb38767b..d30bbc32c8 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/PlanCompiler.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/PlanCompiler.cs @@ -344,9 +344,9 @@ private void Compile( // Run transformations on the tree if (IsPhaseNeeded(PlanCompilerPhase.Transformations)) { - var projectionPrunningNeeded = ApplyTransformations(ref beforeTransformationRules1, TransformationRulesGroup.All); + var projectionPruningNeeded = ApplyTransformations(ref beforeTransformationRules1, TransformationRulesGroup.All); - if (projectionPrunningNeeded) + if (projectionPruningNeeded) { beforeProjectionPruning3 = SwitchToPhase(PlanCompilerPhase.ProjectionPruning); ProjectionPruner.Process(this); diff --git a/src/EntityFramework/Core/Query/PlanCompiler/ProjectOpRules.cs b/src/EntityFramework/Core/Query/PlanCompiler/ProjectOpRules.cs index 1e267c6c3c..d06f11f92f 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/ProjectOpRules.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/ProjectOpRules.cs @@ -118,7 +118,7 @@ private static bool ProcessProjectWithNoLocalDefinitions(RuleProcessingContext c var nodeInfo = context.Command.GetNodeInfo(n); // We cannot eliminate this node because it can break other rules, - // e.g. ProcessApplyOverAnything which relies on existance of external refs to substitute + // e.g. ProcessApplyOverAnything which relies on existence of external refs to substitute // CrossApply(x, y) => CrossJoin(x, y). See SQLBU #481719. if (!nodeInfo.ExternalReferences.IsEmpty) { @@ -216,7 +216,7 @@ private static bool ProcessProjectWithSimpleVarRedefinitions(RuleProcessingConte // Note: Even if we don't have any local var definitions left, we should not remove // this project yet because: - // (1) this project node may be prunning out some outputs; + // (1) this project node may be pruning out some outputs; // (2) the rule Rule_ProjectWithNoLocalDefs, would do that later anyway. // Create a new vardeflist node, and set that as Child1 for the projectOp diff --git a/src/EntityFramework/Core/Query/PlanCompiler/ProjectionPruner.cs b/src/EntityFramework/Core/Query/PlanCompiler/ProjectionPruner.cs index 2688469219..1dec698fed 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/ProjectionPruner.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/ProjectionPruner.cs @@ -382,7 +382,7 @@ public override Node Visit(DistinctOp op, Node n) // // ElementOp - // An ElementOp that is still present when Projection Prunning is invoked can only get introduced + // An ElementOp that is still present when Projection Pruning is invoked can only get introduced // in the TransformationRules phase by transforming an apply operation into a scalar subquery. // Such ElementOp serves as root of a defining expression of a VarDefinitionOp node and // thus what it produces is useful. @@ -467,7 +467,7 @@ protected override Node VisitGroupByOp(GroupByBaseOp op, Node n) } // - // Helper method for removing redundant constant keys from GroupByOp and DistictOp. + // Helper method for removing redundant constant keys from GroupByOp and DistinctOp. // It only examines the keys defined in the given varDefListNode. // It removes all constant and null keys that are not referenced elsewhere, // but ensuring that at least one key is left. @@ -507,13 +507,13 @@ private void RemoveRedundantConstantKeys(VarVec keyVec, VarVec outputVec, Node v // // First defer to default handling for groupby nodes - // If all group aggregate vars are prunned out turn it into a GroupBy. + // If all group aggregate vars are pruned out turn it into a GroupBy. // public override Node Visit(GroupByIntoOp op, Node n) { var result = VisitGroupByOp(op, n); - //Transform the GroupByInto into a GroupBy if all group aggregate vars were prunned out + //Transform the GroupByInto into a GroupBy if all group aggregate vars were pruned out if (result.Op.OpType == OpType.GroupByInto && n.Child3.Children.Count == 0) { @@ -717,7 +717,7 @@ public override Node Visit(ExistsOp op, Node n) // that var as referenced always var projectOp = (ProjectOp)n.Child0.Op; - //It is enougth to reference the first output, this usually is a simple constant + //It is enough to reference the first output, this usually is a simple constant AddReference(projectOp.Outputs.First); VisitChildren(n); diff --git a/src/EntityFramework/Core/Query/PlanCompiler/PropertyRefList.cs b/src/EntityFramework/Core/Query/PlanCompiler/PropertyRefList.cs index ded2f18f58..549e218c3f 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/PropertyRefList.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/PropertyRefList.cs @@ -101,7 +101,7 @@ internal PropertyRefList Clone() } // - // Do I contain the specifed property? + // Do I contain the specified property? // // The property // true, if I do diff --git a/src/EntityFramework/Core/Query/PlanCompiler/TransformationRules.cs b/src/EntityFramework/Core/Query/PlanCompiler/TransformationRules.cs index 81d7df38b7..e04c86fa1c 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/TransformationRules.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/TransformationRules.cs @@ -238,14 +238,14 @@ internal static bool Process(PlanCompiler compilerState, TransformationRulesGrou // If any rule has been applied after which reapplying nullability rules may be useful, // reapply nullability rules. - bool projectionPrunningRequired; - if (Process(compilerState, rulesTable, out projectionPrunningRequired)) + bool projectionPruningRequired; + if (Process(compilerState, rulesTable, out projectionPruningRequired)) { - bool projectionPrunningRequired2; - Process(compilerState, NullabilityRulesTable, out projectionPrunningRequired2); - projectionPrunningRequired = projectionPrunningRequired || projectionPrunningRequired2; + bool projectionPruningRequired2; + Process(compilerState, NullabilityRulesTable, out projectionPruningRequired2); + projectionPruningRequired = projectionPruningRequired || projectionPruningRequired2; } - return projectionPrunningRequired; + return projectionPruningRequired; } // @@ -259,7 +259,7 @@ private static bool Process( var ruleProcessor = new RuleProcessor(); var context = new TransformationRulesContext(compilerState); compilerState.Command.Root = ruleProcessor.ApplyRulesToSubtree(context, rulesTable, compilerState.Command.Root); - projectionPruningRequired = context.ProjectionPrunningRequired; + projectionPruningRequired = context.ProjectionPruningRequired; return context.ReapplyNullabilityRules; } } diff --git a/src/EntityFramework/Core/Query/PlanCompiler/TransformationRulesContext.cs b/src/EntityFramework/Core/Query/PlanCompiler/TransformationRulesContext.cs index 9a5b5e52ca..febd8a7ac0 100644 --- a/src/EntityFramework/Core/Query/PlanCompiler/TransformationRulesContext.cs +++ b/src/EntityFramework/Core/Query/PlanCompiler/TransformationRulesContext.cs @@ -23,9 +23,9 @@ internal PlanCompiler PlanCompiler // Whether any rule was applied that may have caused modifications such that projection pruning // may be useful // - internal bool ProjectionPrunningRequired + internal bool ProjectionPruningRequired { - get { return m_projectionPrunningRequired; } + get { return m_projectionPruningRequired; } } // @@ -264,7 +264,7 @@ internal bool IsScalarOpTree(Node node, Dictionary varRefMap) /// /// Is this tree uses user-defined functions - /// Simplifing query with UDFs could caused to suboptimal plans + /// Simplifying query with UDFs could caused to suboptimal plans /// /// Current subtree to process /// Mapped variables @@ -320,7 +320,7 @@ internal bool IncludeCustomFunctionOp(Node node, Dictionary varMap) // // The varDefListOp subtree // ref counts for each referenced var - // mapping from Var->replacement xpressions + // mapping from Var->replacement expressions [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "varDefListOp", Justification = "Ensures will throw exception if varDefListNode.Op is of wrong type.")] [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "varDef")] [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", @@ -416,7 +416,7 @@ internal static bool TryGetInt32Var(IEnumerable varList, out Var int32Var) { foreach (var v in varList) { - // Any Int32 var regardless of the fasets will do + // Any Int32 var regardless of the facets will do PrimitiveTypeKind typeKind; if (TypeHelpers.TryGetPrimitiveTypeKind(v.Type, out typeKind) && typeKind == PrimitiveTypeKind.Int32) @@ -452,7 +452,7 @@ internal TransformationRulesContext(PlanCompiler compilerState) private readonly VarRemapper m_remapper; private readonly Dictionary m_suppressions; private readonly VarVec m_remappedVars; - private bool m_projectionPrunningRequired; + private bool m_projectionPruningRequired; private bool m_reapplyNullabilityRules; private readonly Stack m_relOpAncestors = new Stack(); #if DEBUG @@ -530,7 +530,7 @@ internal override void PostProcessSubTree(Node subtree) // Callback function to invoke *after* rules are applied // Recomputes the node info, if this node has changed // If the rule is among the rules after which projection pruning may be beneficial, - // m_projectionPrunningRequired is set to true. + // m_projectionPruningRequired is set to true. // If the rule is among the rules after which reapplying the nullability rules may be beneficial, // m_reapplyNullabilityRules is set to true. // @@ -543,10 +543,10 @@ internal override void PostProcess(Node n, Rule rule) appliedRules.Append(rule.MethodName); appliedRules.AppendLine(); #endif - if (!m_projectionPrunningRequired + if (!m_projectionPruningRequired && TransformationRules.RulesRequiringProjectionPruning.Contains(rule)) { - m_projectionPrunningRequired = true; + m_projectionPruningRequired = true; } if (!m_reapplyNullabilityRules && TransformationRules.RulesRequiringNullabilityRulesToBeReapplied.Contains(rule)) diff --git a/src/EntityFramework/Core/Query/ResultAssembly/BridgeDataRecord.cs b/src/EntityFramework/Core/Query/ResultAssembly/BridgeDataRecord.cs index c2ae9bfd8c..8cbf9c0a94 100644 --- a/src/EntityFramework/Core/Query/ResultAssembly/BridgeDataRecord.cs +++ b/src/EntityFramework/Core/Query/ResultAssembly/BridgeDataRecord.cs @@ -345,7 +345,7 @@ internal bool HasData } // - // True so long as we haven't been closed either implicity or explictly + // True so long as we haven't been closed either implicitly or explicitly // internal bool IsClosed { diff --git a/src/EntityFramework/Core/SchemaObjectModel/CollectionTypeElement.cs b/src/EntityFramework/Core/SchemaObjectModel/CollectionTypeElement.cs index 371d838ad8..4d2c3e4f81 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/CollectionTypeElement.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/CollectionTypeElement.cs @@ -195,7 +195,7 @@ internal override bool ResolveNameAndSetTypeUsage( (EdmType)Converter.LoadSchemaElement(_type, _type.Schema.ProviderManifest, convertedItemCache, newGlobalItems); if (edmType != null) { - _typeUsageBuilder.ValidateAndSetTypeUsage(edmType, false); //use typeusagebuilder so dont lose facet information + _typeUsageBuilder.ValidateAndSetTypeUsage(edmType, false); //use typeusagebuilder so don't lose facet information _typeUsage = TypeUsage.Create(new CollectionType(_typeUsageBuilder.TypeUsage)); } diff --git a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSet.cs b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSet.cs index 2931f61e1b..9ee1f50e5a 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSet.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSet.cs @@ -32,7 +32,7 @@ public EntityContainerAssociationSet(EntityContainer parentElement) } // - // The ends defined and infered for this AssociationSet + // The ends defined and inferred for this AssociationSet // internal override IEnumerable Ends { diff --git a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSetEnd.cs b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSetEnd.cs index 508507fb64..9dda0dfa4a 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSetEnd.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerAssociationSetEnd.cs @@ -66,7 +66,7 @@ internal override void ResolveTopLevelNames() { base.ResolveTopLevelNames(); - // resolve end name to the corosponding relationship end + // resolve end name to the corresponding relationship end var relationship = ParentElement.Relationship; if (relationship == null) { @@ -137,7 +137,7 @@ private IRelationshipEnd InferRelationshipEnd(EntityContainerEntitySet set) } else if (possibleEnds.Count == 0) { - // no matchs + // no matches AddError( ErrorCode.FailedInference, EdmSchemaErrorSeverity.Error, Strings.InferRelationshipEndFailedNoEntitySetMatch( diff --git a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerRelationshipSet.cs b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerRelationshipSet.cs index e6f1adfafa..700e87120a 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/EntityContainerRelationshipSet.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/EntityContainerRelationshipSet.cs @@ -134,14 +134,14 @@ internal override void Validate() // Validate Number of ends is correct // What we know: - // No ends are missing, becuase we infered all missing ends + // No ends are missing, because we inferred all missing ends // No extra ends are there because the names have been matched, and an extra name will have caused an error // // looks like no count validation needs to be done } // - // Adds any ends that need to be infered + // Adds any ends that need to be inferred // private void InferEnds() { @@ -185,14 +185,14 @@ private EntityContainerEntitySet InferEntitySet(IRelationshipEnd relationshipEnd } else if (possibleExtents.Count == 0) { - // no matchs + // no matches AddError( ErrorCode.MissingExtentEntityContainerEnd, EdmSchemaErrorSeverity.Error, Strings.MissingEntityContainerEnd(relationshipEnd.Name, FQName)); } else { - // abmigous + // ambigous AddError( ErrorCode.AmbiguousEntityContainerEnd, EdmSchemaErrorSeverity.Error, Strings.AmbiguousEntityContainerEnd(relationshipEnd.Name, FQName)); diff --git a/src/EntityFramework/Core/SchemaObjectModel/ErrorCode.cs b/src/EntityFramework/Core/SchemaObjectModel/ErrorCode.cs index 9fa09888ab..c33e44428f 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/ErrorCode.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/ErrorCode.cs @@ -157,7 +157,7 @@ internal enum ErrorCode InvalidAction = 96, // - // An error occured processing the On<Operation> elements + // An error occurred processing the On<Operation> elements // InvalidOperation = 97, @@ -169,7 +169,7 @@ internal enum ErrorCode InvalidContainerTypeForEnd = 99, // - // The extent name used in the EntittyContainerType End does not match the name of any of the EntityContainerProperties in the containing EntityContainer + // The extent name used in the EntityContainerType End does not match the name of any of the EntityContainerProperties in the containing EntityContainer // InvalidEndEntitySet = 100, @@ -179,7 +179,7 @@ internal enum ErrorCode AmbiguousEntityContainerEnd = 101, // - // An end element was not given, and cannot be infered because there is no EntityContainerEntitySets that are the correct type to be used as an EntitySet. + // An end element was not given, and cannot be inferred because there is no EntityContainerEntitySets that are the correct type to be used as an EntitySet. // MissingExtentEntityContainerEnd = 102, @@ -220,7 +220,7 @@ internal enum ErrorCode TypeMismatchRelationshipConstraint = 112, // - // Invalid multiplicty in FromRole in the relationship constraint + // Invalid multiplicity in FromRole in the relationship constraint // InvalidMultiplicityInRoleInRelationshipConstraint = 113, @@ -295,7 +295,7 @@ internal enum ErrorCode EntityKeyTypeCurrentlyNotSupported = 129, // - // The primitive type kind does not have a prefered mapping + // The primitive type kind does not have a preferred mapping // NoPreferredMappingForPrimitiveTypeKind = 130, @@ -361,14 +361,14 @@ internal enum ErrorCode EmptyDefiningQuery = 142, // - // Schema, Table and DefiningQuery are all specified, and are mutualy exlusive + // Schema, Table and DefiningQuery are all specified, and are mutually exclusive // TableAndSchemaAreMutuallyExclusiveWithDefiningQuery = 143, // unused 144, // - // Conurency can't change for any sub types of an EntitySet type. + // Concurrency can't change for any sub types of an EntitySet type. // ConcurrencyRedefinedOnSubTypeOfEntitySetType = 145, diff --git a/src/EntityFramework/Core/SchemaObjectModel/ReferentialConstraint.cs b/src/EntityFramework/Core/SchemaObjectModel/ReferentialConstraint.cs index 6a2e66664f..f232077c4a 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/ReferentialConstraint.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/ReferentialConstraint.cs @@ -42,10 +42,10 @@ internal override void Validate() var principalRoleEnd = _principalRole.End; var dependentRoleEnd = _dependentRole.End; - bool isPrinicipalRoleKeyProperty, isDependentRoleKeyProperty; - bool areAllPrinicipalRolePropertiesNullable, areAllDependentRolePropertiesNullable; - bool isDependentRolePropertiesSubsetofKeyProperties, isPrinicipalRolePropertiesSubsetofKeyProperties; - bool isAnyPrinicipalRolePropertyNullable, isAnyDependentRolePropertyNullable; + bool isPrincipalRoleKeyProperty, isDependentRoleKeyProperty; + bool areAllPrincipalRolePropertiesNullable, areAllDependentRolePropertiesNullable; + bool isDependentRolePropertiesSubsetofKeyProperties, isPrincipalRolePropertiesSubsetofKeyProperties; + bool isAnyPrincipalRolePropertyNullable, isAnyDependentRolePropertyNullable; // Validate the role name to be different if (_principalRole.Name @@ -61,7 +61,7 @@ internal override void Validate() // whether the properties are the keys for the type in the ToRole IsKeyProperty( _dependentRole, dependentRoleEnd.Type, - out isPrinicipalRoleKeyProperty, + out isPrincipalRoleKeyProperty, out areAllDependentRolePropertiesNullable, out isAnyDependentRolePropertyNullable, out isDependentRolePropertiesSubsetofKeyProperties); @@ -71,9 +71,9 @@ internal override void Validate() IsKeyProperty( _principalRole, principalRoleEnd.Type, out isDependentRoleKeyProperty, - out areAllPrinicipalRolePropertiesNullable, - out isAnyPrinicipalRolePropertyNullable, - out isPrinicipalRolePropertiesSubsetofKeyProperties); + out areAllPrincipalRolePropertiesNullable, + out isAnyPrincipalRolePropertyNullable, + out isPrincipalRolePropertiesSubsetofKeyProperties); Debug.Assert(_principalRole.RoleProperties.Count != 0, "There should be some ref properties in Principal Role"); Debug.Assert(_dependentRole.RoleProperties.Count != 0, "There should be some ref properties in Dependent Role"); @@ -93,8 +93,8 @@ internal override void Validate() // Determine expected multiplicities var expectedPrincipalMultiplicity = (v1Behavior - ? areAllPrinicipalRolePropertiesNullable - : isAnyPrinicipalRolePropertyNullable) + ? areAllPrincipalRolePropertiesNullable + : isAnyPrincipalRolePropertyNullable) ? RelationshipMultiplicity.ZeroOrOne : RelationshipMultiplicity.One; var expectedDependentMultiplicity = (v1Behavior @@ -176,7 +176,7 @@ internal override void Validate() // If the ToProperty is a key property, then the upper bound must be 1 i.e. every parent (from property) can // have exactly one child - if (isPrinicipalRoleKeyProperty) + if (isPrincipalRoleKeyProperty) { if (dependentRoleEnd.Multiplicity == RelationshipMultiplicity.Many) @@ -188,7 +188,7 @@ internal override void Validate() } } // if the ToProperty is not the key, then the upper bound must be many i.e every parent (from property) can - // be related to many childs + // be related to many children else if (dependentRoleEnd.Multiplicity != RelationshipMultiplicity.Many) { diff --git a/src/EntityFramework/Core/SchemaObjectModel/RowTypePropertyElement.cs b/src/EntityFramework/Core/SchemaObjectModel/RowTypePropertyElement.cs index 49c9af922b..04e5f34d2c 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/RowTypePropertyElement.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/RowTypePropertyElement.cs @@ -221,7 +221,7 @@ internal override bool ResolveNameAndSetTypeUsage( else { _typeUsageBuilder.ValidateAndSetTypeUsage(edmType, false); - //use typeusagebuilder so dont lose facet information + //use typeusagebuilder so don't lose facet information _typeUsage = _typeUsageBuilder.TypeUsage; } } diff --git a/src/EntityFramework/Core/SchemaObjectModel/Schema.cs b/src/EntityFramework/Core/SchemaObjectModel/Schema.cs index 69eeeda715..d3a50e35c0 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/Schema.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/Schema.cs @@ -30,8 +30,8 @@ internal class Schema : SchemaElement private const int RootDepth = 2; // if adding properties also add to InitializeObject()! private List _errors = new List(); - // We need to keep track of functions seperately, since we can't deduce the strong name of the function, - // until we have resolved the parameter names. Hence we keep track of functions seperately and add them + // We need to keep track of functions separately, since we can't deduce the strong name of the function, + // until we have resolved the parameter names. Hence we keep track of functions separately and add them // to the schema types list, in the validate phase private List _functions; @@ -302,7 +302,7 @@ internal void OnSchemaValidationEvent(object sender, ValidationEventArgs e) && !IsValidateableXmlNamespace(reader.NamespaceURI, reader.NodeType == XmlNodeType.Attribute)) { //For V1 Schemas, we never returned errors for elements in custom namespaces. - //But the behavior is not totally correct since the error might have occured inside a known namespace + //But the behavior is not totally correct since the error might have occurred inside a known namespace //even though the element that the reader pointing to is in a custom namespace. But if we fix that, it would //cause lot of breaking changes for V1 customers since we can not change the xsd for them. //For attributes, we can ignore the errors always since attributes are unordered and custom attributes should always be allowed. @@ -434,7 +434,7 @@ internal override void ResolveSecondLevelNames() } // - // Vaidate the schema. + // Validate the schema. // internal override void Validate() { diff --git a/src/EntityFramework/Core/SchemaObjectModel/SchemaElement.cs b/src/EntityFramework/Core/SchemaObjectModel/SchemaElement.cs index 139b5338c9..29073dc2f0 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/SchemaElement.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/SchemaElement.cs @@ -335,7 +335,7 @@ protected ReturnValue HandleDottedNameAttribute(XmlReader reader, string // // the reader positioned at the int attribute // The int field to be given the value found - // true if an int value was successfuly extracted from the attribute, false otherwise. + // true if an int value was successfully extracted from the attribute, false otherwise. internal bool HandleIntAttribute(XmlReader reader, ref int field) { int value; @@ -353,7 +353,7 @@ internal bool HandleIntAttribute(XmlReader reader, ref int field) // // the reader positioned at the int attribute // The int field to be given the value found - // true if an int value was successfuly extracted from the attribute, false otherwise. + // true if an int value was successfully extracted from the attribute, false otherwise. internal bool HandleByteAttribute(XmlReader reader, ref byte field) { byte value; diff --git a/src/EntityFramework/Core/SchemaObjectModel/SchemaLookupTable.cs b/src/EntityFramework/Core/SchemaObjectModel/SchemaLookupTable.cs index 6b24fab425..607ec83e94 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/SchemaLookupTable.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/SchemaLookupTable.cs @@ -9,7 +9,7 @@ namespace System.Data.Entity.Core.SchemaObjectModel using System.Diagnostics; // - // Reponsible for keep map from alias to namespace for a given schema. + // Responsible for keep map from alias to namespace for a given schema. // internal sealed class AliasResolver { diff --git a/src/EntityFramework/Core/SchemaObjectModel/StructuredProperty.cs b/src/EntityFramework/Core/SchemaObjectModel/StructuredProperty.cs index 2fe452a902..1eb358abf0 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/StructuredProperty.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/StructuredProperty.cs @@ -113,7 +113,7 @@ internal void EnsureEnumTypeFacets( { Debug.Assert(Type is SchemaEnumType); var propertyType = (EdmType)Converter.LoadSchemaElement(Type, Type.Schema.ProviderManifest, convertedItemCache, newGlobalItems); - _typeUsageBuilder.ValidateAndSetTypeUsage(propertyType, false); //use typeusagebuilder so dont lose facet information + _typeUsageBuilder.ValidateAndSetTypeUsage(propertyType, false); //use typeusagebuilder so don't lose facet information } // diff --git a/src/EntityFramework/Core/SchemaObjectModel/TypeRefElement.cs b/src/EntityFramework/Core/SchemaObjectModel/TypeRefElement.cs index 653c17d375..bcc66ea2f9 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/TypeRefElement.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/TypeRefElement.cs @@ -67,7 +67,7 @@ internal override bool ResolveNameAndSetTypeUsage( var edmType = (EdmType)Converter.LoadSchemaElement(_type, _type.Schema.ProviderManifest, convertedItemCache, newGlobalItems); if (edmType != null) { - _typeUsageBuilder.ValidateAndSetTypeUsage(edmType, false); //use typeusagebuilder so dont lose facet information + _typeUsageBuilder.ValidateAndSetTypeUsage(edmType, false); //use typeusagebuilder so don't lose facet information _typeUsage = _typeUsageBuilder.TypeUsage; } diff --git a/src/EntityFramework/Core/SchemaObjectModel/TypeUsageBuilder.cs b/src/EntityFramework/Core/SchemaObjectModel/TypeUsageBuilder.cs index 35f2442154..e948f030c6 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/TypeUsageBuilder.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/TypeUsageBuilder.cs @@ -200,7 +200,7 @@ internal void ValidateAndSetTypeUsage(ScalarType scalar, bool complainOnMissingF // Forward compat FUTURE SYSTEM.SPATIAL // for now we treat all Geographic types the same, and likewise for geometry. - // to allow us to later introduce the full heirarchy without breaking back compat + // to allow us to later introduce the full hierarchy without breaking back compat // we require spatial types to have the IsStrict facet with a false value. // Set this facet to false if the schema has the UseStrongSpatialTypes attribute with the a false. if (Helper.IsSpatialType(scalar.Type) @@ -214,7 +214,7 @@ internal void ValidateAndSetTypeUsage(ScalarType scalar, bool complainOnMissingF if (noErrors) { - // Only validate the values if there are no errros encountered in the above functions. + // Only validate the values if there are no errors encountered in the above functions. // If there are errors encountered (like for e.g. precision switch (scalar.TypeKind) { diff --git a/src/EntityFramework/Core/SchemaObjectModel/XmlSchemaResource.cs b/src/EntityFramework/Core/SchemaObjectModel/XmlSchemaResource.cs index de762670db..6aa83fb300 100644 --- a/src/EntityFramework/Core/SchemaObjectModel/XmlSchemaResource.cs +++ b/src/EntityFramework/Core/SchemaObjectModel/XmlSchemaResource.cs @@ -48,7 +48,7 @@ internal static Dictionary GetMetadataSchemaResourceM } // - // Adds Store schema resource entries to the given XmlNamespace to XmlSchemaResoure map + // Adds Store schema resource entries to the given XmlNamespace to XmlSchemaResource map // // The XmlNamespace to XmlSchemaResource map to add entries to. internal static void AddStoreSchemaResourceMapEntries(Dictionary schemaResourceMap, double schemaVersion) @@ -85,7 +85,7 @@ internal static void AddStoreSchemaResourceMapEntries(Dictionary - // Adds Mapping schema resource entries to the given XmlNamespace to XmlSchemaResoure map + // Adds Mapping schema resource entries to the given XmlNamespace to XmlSchemaResource map // // The XmlNamespace to XmlSchemaResource map to add entries to. internal static void AddMappingSchemaResourceMapEntries( @@ -109,7 +109,7 @@ internal static void AddMappingSchemaResourceMapEntries( } // - // Adds Edm schema resource entries to the given XmlNamespace to XmlSchemaResoure map, + // Adds Edm schema resource entries to the given XmlNamespace to XmlSchemaResource map, // when calling from SomSchemaSetHelper.ComputeSchemaSet(), all the imported xsd will be included // // The XmlNamespace to XmlSchemaResource map to add entries to. diff --git a/src/EntityFramework/Infrastructure/DbConnectionStringOrigin.cs b/src/EntityFramework/Infrastructure/DbConnectionStringOrigin.cs index b9d246cc99..9414fad3a0 100644 --- a/src/EntityFramework/Infrastructure/DbConnectionStringOrigin.cs +++ b/src/EntityFramework/Infrastructure/DbConnectionStringOrigin.cs @@ -23,7 +23,7 @@ public enum DbConnectionStringOrigin UserCode, /// - /// The connection string was overriden by connection information supplied to DbContextInfo. + /// The connection string was overridden by connection information supplied to DbContextInfo. /// DbContextInfo } diff --git a/src/EntityFramework/Infrastructure/DbContextConfiguration.cs b/src/EntityFramework/Infrastructure/DbContextConfiguration.cs index ac93e11b5c..3bc72d7c0d 100644 --- a/src/EntityFramework/Infrastructure/DbContextConfiguration.cs +++ b/src/EntityFramework/Infrastructure/DbContextConfiguration.cs @@ -141,7 +141,7 @@ public bool UseDatabaseNullSemantics /// By default expression like /// .Select(x => NewProperty = func(x.Property)).Where(x => x.NewProperty == ...) /// are simplified to avoid nested SELECT - /// In some cases, simplifing query with UDFs could caused to suboptimal plans due to calling UDF twice. + /// In some cases, simplifying query with UDFs could caused to suboptimal plans due to calling UDF twice. /// Also some SQL functions aren't allow in WHERE clause. /// Disabling that behavior /// diff --git a/src/EntityFramework/Infrastructure/Interception/DatabaseLogFormatter.cs b/src/EntityFramework/Infrastructure/Interception/DatabaseLogFormatter.cs index 7f42d69a00..8cb8c5d68e 100644 --- a/src/EntityFramework/Infrastructure/Interception/DatabaseLogFormatter.cs +++ b/src/EntityFramework/Infrastructure/Interception/DatabaseLogFormatter.cs @@ -778,7 +778,7 @@ public virtual void IsolationLevelGot( /// /// Does not write to log unless overridden. /// - /// The transaction being commited. + /// The transaction being committed. /// Contextual information associated with the call. public virtual void Committing(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext) { @@ -789,7 +789,7 @@ public virtual void Committing(DbTransaction transaction, DbTransactionIntercept /// The default implementation of this method filters by set into /// , if any, and then logs the event. /// - /// The transaction that was commited. + /// The transaction that was committed. /// Contextual information associated with the call. public virtual void Committed(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext) { diff --git a/src/EntityFramework/Infrastructure/Interception/IDbTransactionInterceptor.cs b/src/EntityFramework/Infrastructure/Interception/IDbTransactionInterceptor.cs index eb2fba0d15..d01950546f 100644 --- a/src/EntityFramework/Infrastructure/Interception/IDbTransactionInterceptor.cs +++ b/src/EntityFramework/Infrastructure/Interception/IDbTransactionInterceptor.cs @@ -45,14 +45,14 @@ public interface IDbTransactionInterceptor : IDbInterceptor /// /// This method is called before is invoked. /// - /// The transaction being commited. + /// The transaction being committed. /// Contextual information associated with the call. void Committing(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext); /// /// This method is called after is invoked. /// - /// The transaction that was commited. + /// The transaction that was committed. /// Contextual information associated with the call. void Committed(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext); diff --git a/src/EntityFramework/Infrastructure/Transactions/CommitFailureHandler.cs b/src/EntityFramework/Infrastructure/Transactions/CommitFailureHandler.cs index e351daa7b8..bd3f6e452b 100644 --- a/src/EntityFramework/Infrastructure/Transactions/CommitFailureHandler.cs +++ b/src/EntityFramework/Infrastructure/Transactions/CommitFailureHandler.cs @@ -189,11 +189,11 @@ public override void BeganTransaction(DbConnection connection, BeginTransactionI } var transactionId = Guid.NewGuid(); - var savedSuccesfully = false; + var savedSuccessfully = false; var reinitializedDatabase = false; var objectContext = ((IObjectContextAdapter)TransactionContext).ObjectContext; ((EntityConnection)objectContext.Connection).UseStoreTransaction(interceptionContext.Result); - while (!savedSuccesfully) + while (!savedSuccessfully) { Debug.Assert(!Transactions.ContainsKey(interceptionContext.Result), "The transaction has already been registered"); var transactionRow = new TransactionRow { Id = transactionId, CreationTime = DateTime.Now }; @@ -203,7 +203,7 @@ public override void BeganTransaction(DbConnection connection, BeginTransactionI try { objectContext.SaveChangesInternal(SaveOptions.AcceptAllChangesAfterSave, executeInExistingTransaction: true); - savedSuccesfully = true; + savedSuccessfully = true; } catch (UpdateException) { @@ -250,7 +250,7 @@ public override void BeganTransaction(DbConnection connection, BeginTransactionI /// If there was an exception thrown checks the database for this transaction and rethrows it if not found. /// Otherwise marks the commit as succeeded and queues the transaction information to be deleted. /// - /// The transaction that was commited. + /// The transaction that was committed. /// Contextual information associated with the call. /// public override void Committed(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext) diff --git a/src/EntityFramework/Infrastructure/Transactions/TransactionHandler.cs b/src/EntityFramework/Infrastructure/Transactions/TransactionHandler.cs index b16a04cbc8..7228ba484d 100644 --- a/src/EntityFramework/Infrastructure/Transactions/TransactionHandler.cs +++ b/src/EntityFramework/Infrastructure/Transactions/TransactionHandler.cs @@ -507,7 +507,7 @@ public virtual void IsolationLevelGot( /// /// Can be implemented in a derived class. /// - /// The transaction being commited. + /// The transaction being committed. /// Contextual information associated with the call. /// public virtual void Committing(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext) @@ -517,7 +517,7 @@ public virtual void Committing(DbTransaction transaction, DbTransactionIntercept /// /// Can be implemented in a derived class. /// - /// The transaction that was commited. + /// The transaction that was committed. /// Contextual information associated with the call. /// public virtual void Committed(DbTransaction transaction, DbTransactionInterceptionContext interceptionContext) diff --git a/src/EntityFramework/Internal/InternalContext.cs b/src/EntityFramework/Internal/InternalContext.cs index e8649ef9ec..6a4a884286 100644 --- a/src/EntityFramework/Internal/InternalContext.cs +++ b/src/EntityFramework/Internal/InternalContext.cs @@ -614,7 +614,7 @@ private Action CreateInitializationAction(IDatabaseInitializer NewProperty = func(x.Property)).Where(x => x.NewProperty == ...) /// are simplified to avoid nested SELECT - /// In some cases, simplifing query with UDFs could caused to suboptimal plans due to calling UDF twice. + /// In some cases, simplifying query with UDFs could caused to suboptimal plans due to calling UDF twice. /// Also some SQL functions aren't allow in WHERE clause. /// Disabling that behavior /// @@ -1199,7 +1199,7 @@ private object CreateObjectAsObject() where TEntity : class // // Gets or sets an object representing a config file used for looking for DefaultConnectionFactory entries, - // database intializers and connection strings. + // database initializers and connection strings. // public virtual AppConfig AppConfig { diff --git a/src/EntityFramework/Internal/Linq/DbQueryVisitor.cs b/src/EntityFramework/Internal/Linq/DbQueryVisitor.cs index b9d0d5f8e2..7f74ab887e 100644 --- a/src/EntityFramework/Internal/Linq/DbQueryVisitor.cs +++ b/src/EntityFramework/Internal/Linq/DbQueryVisitor.cs @@ -26,7 +26,7 @@ internal class DbQueryVisitor : ExpressionVisitor #endregion - #region Overriden visitors + #region Overridden visitors // // Replaces calls to DbContext.Set() with an expression for the equivalent . diff --git a/src/EntityFramework/Internal/Linq/InternalSet`.cs b/src/EntityFramework/Internal/Linq/InternalSet`.cs index ea61dec397..d4ffb662ac 100644 --- a/src/EntityFramework/Internal/Linq/InternalSet`.cs +++ b/src/EntityFramework/Internal/Linq/InternalSet`.cs @@ -399,7 +399,7 @@ public virtual void RemoveRange(IEnumerable entities) DebugCheck.NotNull(entities); // prevent "enumerator was changed" exception - // if entities is syncronized with other elements + // if entities is synchronized with other elements // (e.g: local view from DbSet.Local.) var copyOfEntities = entities.Cast().ToList(); diff --git a/src/EntityFramework/Migrations/Infrastructure/EdmModelDiffer.cs b/src/EntityFramework/Migrations/Infrastructure/EdmModelDiffer.cs index 6b3f3f7503..91f4f7f6d9 100644 --- a/src/EntityFramework/Migrations/Infrastructure/EdmModelDiffer.cs +++ b/src/EntityFramework/Migrations/Infrastructure/EdmModelDiffer.cs @@ -1661,32 +1661,32 @@ var targetReferencedForeignKeys } private IEnumerable FindAddedForeignKeys( - ICollection> assocationTypePairs, + ICollection> associationTypePairs, ICollection renamedColumns) { - DebugCheck.NotNull(assocationTypePairs); + DebugCheck.NotNull(associationTypePairs); DebugCheck.NotNull(renamedColumns); return _target.StoreItemCollection.GetItems() - .Except(assocationTypePairs.Select(p => p.Item2)) + .Except(associationTypePairs.Select(p => p.Item2)) .Concat( - assocationTypePairs + associationTypePairs .Where(at => !DiffAssociations(at.Item1.Constraint, at.Item2.Constraint, renamedColumns)) .Select(at => at.Item2)) .Select(at => BuildAddForeignKeyOperation(at.Constraint, _target)); } private IEnumerable FindDroppedForeignKeys( - ICollection> assocationTypePairs, + ICollection> associationTypePairs, ICollection renamedColumns) { - DebugCheck.NotNull(assocationTypePairs); + DebugCheck.NotNull(associationTypePairs); DebugCheck.NotNull(renamedColumns); return _source.StoreItemCollection.GetItems() - .Except(assocationTypePairs.Select(p => p.Item1)) + .Except(associationTypePairs.Select(p => p.Item1)) .Concat( - assocationTypePairs + associationTypePairs .Where(at => !DiffAssociations(at.Item1.Constraint, at.Item2.Constraint, renamedColumns)) .Select(at => at.Item1)) .Select(at => BuildDropForeignKeyOperation(at.Constraint, _source)); diff --git a/src/EntityFramework/ModelConfiguration/Configuration/Mapping/EntityMappingConfiguration.cs b/src/EntityFramework/ModelConfiguration/Configuration/Mapping/EntityMappingConfiguration.cs index 2d7b0a7dec..a1bee32f1e 100644 --- a/src/EntityFramework/ModelConfiguration/Configuration/Mapping/EntityMappingConfiguration.cs +++ b/src/EntityFramework/ModelConfiguration/Configuration/Mapping/EntityMappingConfiguration.cs @@ -1068,17 +1068,17 @@ private static bool UpdateColumnNamesForTableSharing( continue; } - var oneToOneAssocations = FindAllOneToOneFKAssociationTypes( + var oneToOneAssociations = FindAllOneToOneFKAssociationTypes( databaseMapping.Model, entityType, candidateType); var rootType = candidateType.GetRootType(); if (!associationsToSharedTable.ContainsKey(rootType)) { - associationsToSharedTable.Add(rootType, oneToOneAssocations.ToList()); + associationsToSharedTable.Add(rootType, oneToOneAssociations.ToList()); } else { - associationsToSharedTable[rootType].AddRange(oneToOneAssocations); + associationsToSharedTable[rootType].AddRange(oneToOneAssociations); } } diff --git a/src/EntityFramework/ModelConfiguration/Conventions/Edm/ForeignKeyDiscoveryConvention.cs b/src/EntityFramework/ModelConfiguration/Conventions/Edm/ForeignKeyDiscoveryConvention.cs index a18ea44f4f..74c672c498 100644 --- a/src/EntityFramework/ModelConfiguration/Conventions/Edm/ForeignKeyDiscoveryConvention.cs +++ b/src/EntityFramework/ModelConfiguration/Conventions/Edm/ForeignKeyDiscoveryConvention.cs @@ -24,7 +24,7 @@ protected virtual bool SupportsMultipleAssociations } /// - /// When overriden returns true if should be part of the foreign key. + /// When overridden returns true if should be part of the foreign key. /// /// The association type being configured. /// The dependent end. diff --git a/src/EntityFramework/ModelConfiguration/Conventions/Edm/KeyDiscoveryConvention.cs b/src/EntityFramework/ModelConfiguration/Conventions/Edm/KeyDiscoveryConvention.cs index ac5bc983b4..9b76bcefe2 100644 --- a/src/EntityFramework/ModelConfiguration/Conventions/Edm/KeyDiscoveryConvention.cs +++ b/src/EntityFramework/ModelConfiguration/Conventions/Edm/KeyDiscoveryConvention.cs @@ -35,7 +35,7 @@ public virtual void Apply(EntityType item, DbModel model) } /// - /// When overriden returns the subset of properties that will be part of the primary key. + /// When overridden returns the subset of properties that will be part of the primary key. /// /// The entity type. /// The primitive types of the entities diff --git a/src/EntityFramework/ModelConfiguration/Mappers/NavigationPropertyMapper.cs b/src/EntityFramework/ModelConfiguration/Mappers/NavigationPropertyMapper.cs index 5de7fbec29..bccb8e2214 100644 --- a/src/EntityFramework/ModelConfiguration/Mappers/NavigationPropertyMapper.cs +++ b/src/EntityFramework/ModelConfiguration/Mappers/NavigationPropertyMapper.cs @@ -9,7 +9,7 @@ namespace System.Data.Entity.ModelConfiguration.Mappers using System.Reflection; // - // Handles mapping from a CLR property to an EDM assocation and nav. prop. + // Handles mapping from a CLR property to an EDM association and nav. prop. // internal sealed class NavigationPropertyMapper { diff --git a/src/EntityFramework/Properties/Resources.cs b/src/EntityFramework/Properties/Resources.cs index efdcc5877b..376a02b7ba 100644 --- a/src/EntityFramework/Properties/Resources.cs +++ b/src/EntityFramework/Properties/Resources.cs @@ -1881,9 +1881,9 @@ internal static string EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed(ob // // A string like "AssociationEnd must not be null." // - internal static string EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull + internal static string EdmModel_Validator_Syntactic_EdmAssociationType_AssociationEndMustNotBeNull { - get { return EntityRes.GetString(EntityRes.EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull); } + get { return EntityRes.GetString(EntityRes.EdmModel_Validator_Syntactic_EdmAssociationType_AssociationEndMustNotBeNull); } } // @@ -1905,9 +1905,9 @@ internal static string EdmModel_Validator_Syntactic_EdmAssociationConstraint_Dep // // A string like "Association must not be null." // - internal static string EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull + internal static string EdmModel_Validator_Syntactic_EdmNavigationProperty_AssociationMustNotBeNull { - get { return EntityRes.GetString(EntityRes.EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull); } + get { return EntityRes.GetString(EntityRes.EdmModel_Validator_Syntactic_EdmNavigationProperty_AssociationMustNotBeNull); } } // @@ -12433,9 +12433,9 @@ internal static string ComposableFunctionImportsReturningEntitiesNotSupported // // A string like "Structural type mappings must not be null or empty for function imports returning non-scalar values." // - internal static string StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues + internal static string StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues { - get { return EntityRes.GetString(EntityRes.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues); } + get { return EntityRes.GetString(EntityRes.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues); } } // @@ -15967,10 +15967,10 @@ internal sealed class EntityRes internal const string EdmModel_Validator_Syntactic_MissingName = "EdmModel_Validator_Syntactic_MissingName"; internal const string EdmModel_Validator_Syntactic_EdmModel_NameIsTooLong = "EdmModel_Validator_Syntactic_EdmModel_NameIsTooLong"; internal const string EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed = "EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed"; - internal const string EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull = "EdmModel_Validator_Syntactic_EdmAssociationType_AssocationEndMustNotBeNull"; + internal const string EdmModel_Validator_Syntactic_EdmAssociationType_AssociationEndMustNotBeNull = "EdmModel_Validator_Syntactic_EdmAssociationType_AssociationEndMustNotBeNull"; internal const string EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentEndMustNotBeNull = "EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentEndMustNotBeNull"; internal const string EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentPropertiesMustNotBeEmpty = "EdmModel_Validator_Syntactic_EdmAssociationConstraint_DependentPropertiesMustNotBeEmpty"; - internal const string EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull = "EdmModel_Validator_Syntactic_EdmNavigationProperty_AssocationMustNotBeNull"; + internal const string EdmModel_Validator_Syntactic_EdmNavigationProperty_AssociationMustNotBeNull = "EdmModel_Validator_Syntactic_EdmNavigationProperty_AssociationMustNotBeNull"; internal const string EdmModel_Validator_Syntactic_EdmNavigationProperty_ResultEndMustNotBeNull = "EdmModel_Validator_Syntactic_EdmNavigationProperty_ResultEndMustNotBeNull"; internal const string EdmModel_Validator_Syntactic_EdmAssociationEnd_EntityTypeMustNotBeNull = "EdmModel_Validator_Syntactic_EdmAssociationEnd_EntityTypeMustNotBeNull"; internal const string EdmModel_Validator_Syntactic_EdmEntitySet_ElementTypeMustNotBeNull = "EdmModel_Validator_Syntactic_EdmEntitySet_ElementTypeMustNotBeNull"; @@ -17286,7 +17286,7 @@ internal sealed class EntityRes internal const string ComposableFunctionOrFunctionImportMustDeclareReturnType = "ComposableFunctionOrFunctionImportMustDeclareReturnType"; internal const string NonComposableFunctionCannotBeMappedAsComposable = "NonComposableFunctionCannotBeMappedAsComposable"; internal const string ComposableFunctionImportsReturningEntitiesNotSupported = "ComposableFunctionImportsReturningEntitiesNotSupported"; - internal const string StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues = "StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues"; + internal const string StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues = "StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues"; internal const string InvalidReturnTypeForComposableFunction = "InvalidReturnTypeForComposableFunction"; internal const string NonComposableFunctionMustNotDeclareReturnType = "NonComposableFunctionMustNotDeclareReturnType"; internal const string CommandTextFunctionsNotComposable = "CommandTextFunctionsNotComposable"; diff --git a/src/EntityFramework/Properties/Resources.resx b/src/EntityFramework/Properties/Resources.resx index ff53755a3f..314e83bf24 100644 --- a/src/EntityFramework/Properties/Resources.resx +++ b/src/EntityFramework/Properties/Resources.resx @@ -954,7 +954,7 @@ The specified name is not allowed: '{0}'. - + AssociationEnd must not be null. @@ -963,7 +963,7 @@ ToProperties must not be empty. - + Association must not be null. @@ -4952,7 +4952,7 @@ Mapping function imports returning entities is not supported. - + Structural type mappings must not be null or empty for function imports returning non-scalar values. diff --git a/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd b/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd index c803c9c8d5..91b80d7195 100644 --- a/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd +++ b/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd index 6cb1a55258..51af1ec39e 100644 --- a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd +++ b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd @@ -345,7 +345,7 @@ - + diff --git a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd index 5f2832bdd9..2837b1e8e6 100644 --- a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd +++ b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd @@ -358,7 +358,7 @@ - + diff --git a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd index ae3b2766b8..bef1d9a5f5 100644 --- a/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd +++ b/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd @@ -350,7 +350,7 @@ - + diff --git a/src/Migrate/CmdLine/CommandArgumentHelp.cs b/src/Migrate/CmdLine/CommandArgumentHelp.cs index b856467b0a..b995995b9a 100644 --- a/src/Migrate/CmdLine/CommandArgumentHelp.cs +++ b/src/Migrate/CmdLine/CommandArgumentHelp.cs @@ -96,14 +96,14 @@ public string GetHelpText(int maxWidth, int margin = 5) #region Methods private static void AppendLines( - StringBuilder sb, int maxParameterWidth, IList firstColum, IList secondColumn) + StringBuilder sb, int maxParameterWidth, IList firstColumn, IList secondColumn) { var format = string.Format("{{0,-{0}}}{{1}}", maxParameterWidth + 1); - for (var i = 0; i < firstColum.Count || i < secondColumn.Count; i++) + for (var i = 0; i < firstColumn.Count || i < secondColumn.Count; i++) { sb.AppendLine( string.Format( - format, i < firstColum.Count ? firstColum[i] : string.Empty, + format, i < firstColumn.Count ? firstColumn[i] : string.Empty, i < secondColumn.Count ? secondColumn[i] : string.Empty)); } } diff --git a/src/Migrate/CmdLine/CommandLine.cs b/src/Migrate/CmdLine/CommandLine.cs index acf94bc61a..9a8309ea04 100644 --- a/src/Migrate/CmdLine/CommandLine.cs +++ b/src/Migrate/CmdLine/CommandLine.cs @@ -39,7 +39,7 @@ internal static class CommandLine // private const string TokenizeExpressionFormat = @"(?{0}i) # Case Sensitive Option -# Capture the switch begin of string or preceeded by whitespace +# Capture the switch begin of string or preceded by whitespace (?\A[{1}]) # Capture the switch name (?[^{2}+-]+) diff --git a/test/EFTools/FunctionalTests/UpdateModelFromDatabaseTests.cs b/test/EFTools/FunctionalTests/UpdateModelFromDatabaseTests.cs index 38336b11c6..792c441e51 100644 --- a/test/EFTools/FunctionalTests/UpdateModelFromDatabaseTests.cs +++ b/test/EFTools/FunctionalTests/UpdateModelFromDatabaseTests.cs @@ -20,10 +20,10 @@ public class UpdateModelFromDatabaseTests : IUseFixture /// /// Fixture that creates a mock package and sets PackageManager.Package /// - /// Pacakge fixture + /// Package fixture /// /// The tests need PackageManager.Package to be set but don't need the - /// package itself. Since it needs to be diposed IUseFixture seems fine. + /// package itself. Since it needs to be disposed IUseFixture seems fine. /// We don't need to set it - xUnit is keeping a reference to it and it /// will dispose it after test execution is completed. /// diff --git a/test/EFTools/InProcTests/UndoRedoTestsRemote.cs b/test/EFTools/InProcTests/UndoRedoTestsRemote.cs index 024a2401d4..59c34660f9 100644 --- a/test/EFTools/InProcTests/UndoRedoTestsRemote.cs +++ b/test/EFTools/InProcTests/UndoRedoTestsRemote.cs @@ -236,7 +236,7 @@ public void Simple_Entity() /// 3. Undo/Redo Creation of another Association /// 4. Undo/Redo Change of Multiplicity /// 5. Undo/Redo Change of Role - /// 6. Undo/Redo Rename of Navigation Property (AssocationSetEnd Roles should get updated) + /// 6. Undo/Redo Rename of Navigation Property (AssociationSetEnd Roles should get updated) /// 7. Undo/Redo Rename of EntitySet (AssociationSetEnds should get updated) /// 8. Undo/Redo Rename of Association /// 9. Undo/Redo Rename of AssociationSet diff --git a/test/EFTools/TestInfrastructure/VS/DteExtensions.cs b/test/EFTools/TestInfrastructure/VS/DteExtensions.cs index 8b082e1ddc..6f33fda179 100644 --- a/test/EFTools/TestInfrastructure/VS/DteExtensions.cs +++ b/test/EFTools/TestInfrastructure/VS/DteExtensions.cs @@ -15,7 +15,7 @@ namespace EFDesignerTestInfrastructure.VS #endregion - #region VS IDE related utitilies + #region VS IDE related utilities /// /// Helper functions relate to winfrom @@ -36,7 +36,7 @@ public enum ProjectLanguage /// public enum ProjectKind { - Libary = 0, + Library = 0, Executable } @@ -91,7 +91,7 @@ private static String GetTemplatePath(this DTE dte, String[] template) path = Path.Combine(path, "{0}"); } - // VCS and VB sku templates are all located in the same folder. Other skus have a language and category heirarchy. + // VCS and VB sku templates are all located in the same folder. Other skus have a language and category hierarchy. if (!skuName.Equals("VCSExpress", StringComparison.InvariantCultureIgnoreCase) && !skuName.Equals("VBExpress", StringComparison.InvariantCultureIgnoreCase)) @@ -117,7 +117,7 @@ private static String GetTemplatePath(this DTE dte, String[] template) public static void ExecuteCommandForOpenDocument(this DTE dte, string fullFilePath, string command) { Debug.Assert(dte != null, "dte must not be null."); - Debug.Assert(!string.IsNullOrWhiteSpace(fullFilePath), "fullFilePath must not be null or emtpy string."); + Debug.Assert(!string.IsNullOrWhiteSpace(fullFilePath), "fullFilePath must not be null or empty string."); var serviceProvider = new ServiceProvider((IServiceProvider)dte); diff --git a/test/EFTools/UnitTests/ConfigurationFileSchemaTests.cs b/test/EFTools/UnitTests/ConfigurationFileSchemaTests.cs index 7b0551bd39..0b3683e6e3 100644 --- a/test/EFTools/UnitTests/ConfigurationFileSchemaTests.cs +++ b/test/EFTools/UnitTests/ConfigurationFileSchemaTests.cs @@ -450,7 +450,7 @@ public void Schema_rejects_context_element_with_empty_type_attribute() } [Fact] - public void Schema_accepts_context_with_databaseInitilizer_child_element() + public void Schema_accepts_context_with_databaseInitializer_child_element() { Validate(""); } @@ -675,7 +675,7 @@ private List ValidateWithExpectedValidationEvents(string co private void Validate(string config, bool allowAllTypesAtTopLevel = true) { // this will throw for warnings while validating without - // handler will not throw for warings. + // handler will not throw for warnings. Validate(config, allowAllTypesAtTopLevel, (o, e) => { throw e.Exception; }); } diff --git a/test/EFTools/UnitTests/EntityDesign/CodeGeneration/CodeGeneratorFactoryTests.cs b/test/EFTools/UnitTests/EntityDesign/CodeGeneration/CodeGeneratorFactoryTests.cs index f43f76b6c4..7aaf2aa5b2 100644 --- a/test/EFTools/UnitTests/EntityDesign/CodeGeneration/CodeGeneratorFactoryTests.cs +++ b/test/EFTools/UnitTests/EntityDesign/CodeGeneration/CodeGeneratorFactoryTests.cs @@ -26,7 +26,7 @@ public void GetContextGenerator_returns_correct_context_generator_for_empty_mode } [Fact] - public void GetContextGenerator_returns_correct_non_customized_context_generator_if_model_not_emtpy() + public void GetContextGenerator_returns_correct_non_customized_context_generator_if_model_not_empty() { var generatorFactory = new CodeGeneratorFactory(Mock.Of()); @@ -37,7 +37,7 @@ public void GetContextGenerator_returns_correct_non_customized_context_generator } [Fact] - public void GetContextGenerator_returns_correct_customized__context_generator_if_model_not_emtpy_CS() + public void GetContextGenerator_returns_correct_customized__context_generator_if_model_not_empty_CS() { var mockDte = SetupMockProjectWithCustomizedTemplate(@"CodeTemplates\EFModelFromDatabase\Context.cs.t4"); @@ -47,7 +47,7 @@ public void GetContextGenerator_returns_correct_customized__context_generator_if } [Fact] - public void GetContextGenerator_returns_correct_customized_context_generator_if_model_not_emtpy_VB() + public void GetContextGenerator_returns_correct_customized_context_generator_if_model_not_empty_VB() { var mockDte = SetupMockProjectWithCustomizedTemplate(@"CodeTemplates\EFModelFromDatabase\Context.vb.t4"); diff --git a/test/EFTools/UnitTests/EntityDesignModel/Entity/ConceptualEntityModelTests.cs b/test/EFTools/UnitTests/EntityDesignModel/Entity/ConceptualEntityModelTests.cs index 23a0a7c88e..55d58b90e7 100644 --- a/test/EFTools/UnitTests/EntityDesignModel/Entity/ConceptualEntityModelTests.cs +++ b/test/EFTools/UnitTests/EntityDesignModel/Entity/ConceptualEntityModelTests.cs @@ -33,16 +33,16 @@ public void XNamespace_returns_root_namespace_if_element_null() var modelManager = new Mock(null, null).Object; var modelProvider = new Mock().Object; - var enityDesignArtifiact = + var entityDesignArtifact = new Mock(modelManager, new Uri("urn:dummy"), modelProvider) { CallBase = true }.Object; - enityDesignArtifiact.SetXObject( + entityDesignArtifact.SetXObject( XDocument.Parse("")); - using (var conceptualModel = new ConceptualEntityModel(enityDesignArtifiact, tmpElement)) + using (var conceptualModel = new ConceptualEntityModel(entityDesignArtifact, tmpElement)) { conceptualModel.SetXObject(null); Assert.Equal("http://schemas.microsoft.com/ado/2009/11/edm", conceptualModel.XNamespace); diff --git a/test/EFTools/UnitTests/EntityDesignModel/Entity/StorageEntityModelTests.cs b/test/EFTools/UnitTests/EntityDesignModel/Entity/StorageEntityModelTests.cs index ce1cf30bbe..da43eb3bac 100644 --- a/test/EFTools/UnitTests/EntityDesignModel/Entity/StorageEntityModelTests.cs +++ b/test/EFTools/UnitTests/EntityDesignModel/Entity/StorageEntityModelTests.cs @@ -54,16 +54,16 @@ public void XNamespace_returns_root_namespace_if_element_null() var modelManager = new Mock(null, null).Object; var modelProvider = new Mock().Object; - var enityDesignArtifiact = + var entityDesignArtifact = new Mock(modelManager, new Uri("urn:dummy"), modelProvider) { CallBase = true }.Object; - enityDesignArtifiact.SetXObject( + entityDesignArtifact.SetXObject( XDocument.Parse("")); - using (var storageModel = new StorageEntityModel(enityDesignArtifiact, tmpElement)) + using (var storageModel = new StorageEntityModel(entityDesignArtifact, tmpElement)) { storageModel.SetXObject(null); Assert.Equal("http://schemas.microsoft.com/ado/2009/11/edm/ssdl", storageModel.XNamespace); diff --git a/test/EFTools/UnitTests/EntityDesignModel/Mapping/MappingModelTests.cs b/test/EFTools/UnitTests/EntityDesignModel/Mapping/MappingModelTests.cs index 0d98b162c9..5252442b2b 100644 --- a/test/EFTools/UnitTests/EntityDesignModel/Mapping/MappingModelTests.cs +++ b/test/EFTools/UnitTests/EntityDesignModel/Mapping/MappingModelTests.cs @@ -33,16 +33,16 @@ public void XNamespace_returns_root_namespace_if_element_null() var modelManager = new Mock(null, null).Object; var modelProvider = new Mock().Object; - var enityDesignArtifiact = + var entityDesignArtifact = new Mock(modelManager, new Uri("urn:dummy"), modelProvider) { CallBase = true }.Object; - enityDesignArtifiact.SetXObject( + entityDesignArtifact.SetXObject( XDocument.Parse("")); - using (var mappingModel = new MappingModel(enityDesignArtifiact, tmpElement)) + using (var mappingModel = new MappingModel(entityDesignArtifact, tmpElement)) { mappingModel.SetXObject(null); Assert.Equal("http://schemas.microsoft.com/ado/2009/11/mapping/cs", mappingModel.XNamespace); diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/LegacyProviderWrapper/LegacyDbProviderManifestWrapperTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/LegacyProviderWrapper/LegacyDbProviderManifestWrapperTests.cs index 9050569828..8def8b02d6 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/LegacyProviderWrapper/LegacyDbProviderManifestWrapperTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/LegacyProviderWrapper/LegacyDbProviderManifestWrapperTests.cs @@ -95,7 +95,7 @@ public void GetStoreTypes_converts_legacy_ProviderIncompatibleException_to_non_l var providerManifestWrapper = new LegacyDbProviderManifestWrapper(mockLegacyManifest.Object); - // need an SSpace type as the arguemnt + // need an SSpace type as the argument var edmType = new LegacyDbProviderManifestWrapper(LegacyProviderManifest).GetStoreTypes().First(); var exception = diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/Metadata/StoreItemCollectionExtensionsTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/Metadata/StoreItemCollectionExtensionsTests.cs index 3c72a8da5a..ae25d94adf 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/Metadata/StoreItemCollectionExtensionsTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/Metadata/StoreItemCollectionExtensionsTests.cs @@ -70,8 +70,8 @@ public void Ssdl_versions_serialized_correctly() foreach (var schemaVersion in SchemaVersions) { var sourceSsdl = string.Format(SsdlTemplate, schemaVersion); - var serializdedSsdl = StoreItemCollectionToString(Utils.CreateStoreItemCollection(sourceSsdl), "Model.Store"); - Assert.True(XNode.DeepEquals(XDocument.Parse(sourceSsdl), XDocument.Parse(serializdedSsdl))); + var serializedSsdl = StoreItemCollectionToString(Utils.CreateStoreItemCollection(sourceSsdl), "Model.Store"); + Assert.True(XNode.DeepEquals(XDocument.Parse(sourceSsdl), XDocument.Parse(serializedSsdl))); } } @@ -94,7 +94,7 @@ public void Custom_schema_name_written_if_provided_and_no_entity_types_in_item_c } [Fact] - public void Schema_name_infered_from_EntityType_win_with_custom_schema_name() + public void Schema_name_inferred_from_EntityType_win_with_custom_schema_name() { var storeItemCollection = Utils.CreateStoreItemCollection(Ssdl); var serializedSsdl = XDocument.Parse(StoreItemCollectionToString(storeItemCollection, "MyOwnSchema")); diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/AssociationSetEndDetailsTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/AssociationSetEndDetailsTests.cs index 36a8164ec7..88aa64414c 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/AssociationSetEndDetailsTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/AssociationSetEndDetailsTests.cs @@ -15,9 +15,9 @@ public void Can_set_get_association_set_end_details() var endMember = AssociationEndMember.Create( "aem1", entity.GetReferenceType(), RelationshipMultiplicity.One, OperationAction.None, null); var associationType = AssociationType.Create("at1", "ns", false, DataSpace.CSpace, endMember, null, null, null); - var assocationSet = AssociationSet.Create("as1", associationType, entitySet, null, null); + var associationSet = AssociationSet.Create("as1", associationType, entitySet, null, null); - var associationSetEnd = assocationSet.AssociationSetEnds[0]; + var associationSetEnd = associationSet.AssociationSetEnds[0]; var associationSetEndDetails = new AssociationSetEndDetails( diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/DbDatabaseMappingBuilderTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/DbDatabaseMappingBuilderTests.cs index f0f91d4f78..bf75e9e725 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/DbDatabaseMappingBuilderTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/DbDatabaseMappingBuilderTests.cs @@ -289,7 +289,7 @@ public static void BuildAssociationSetMappings_creates_valid_association_set_map } [Fact] - public void BuildAssociationSetMappings_builds_conceptual_assocation_set_mapping_for_collapsed_store_entity_sets() + public void BuildAssociationSetMappings_builds_conceptual_association_set_mapping_for_collapsed_store_entity_sets() { #region Setting up many to many relationship in the SSpace Teacher * -- 1 TeacherStudents 1 -- * Teachers diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/OneToOneMappingBuilderTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/OneToOneMappingBuilderTests.cs index eac74f36f8..9b5cf7dce7 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/OneToOneMappingBuilderTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/OneToOneMappingBuilderTests.cs @@ -1194,13 +1194,13 @@ public static void CreateCollapsibleItems_creates_collapsible_item() var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true) + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1234,13 +1234,13 @@ public static void CreateCollapsibleItems_does_not_create_collapsible_item_if_no var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true) + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1272,15 +1272,15 @@ public static void var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "CId", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "CId", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: false), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: false), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, true, "int", isIdentiy: false, isPrimaryKey: false) + "catalog", "schema", "C", "Col1", 1, true, "int", isIdentity: false, isPrimaryKey: false) }; var relationshipDetails = new[] @@ -1310,15 +1310,15 @@ public static void CreateCollapsibleItems_does_not_create_collapsible_item_if_no var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col2", 2, false, "int", isIdentiy: false, isPrimaryKey: false) + "catalog", "schema", "C", "Col2", 2, false, "int", isIdentity: false, isPrimaryKey: false) }; var relationshipDetails = new[] @@ -1348,19 +1348,19 @@ public static void CreateCollapsibleItems_does_not_create_collapsible_item_if_Is var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "A", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col2", 1, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col2", 1, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col2", 2, false, "int", isIdentiy: false, isPrimaryKey: true) + "catalog", "schema", "C", "Col2", 2, false, "int", isIdentity: false, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1408,9 +1408,9 @@ public static void GenerateAssociationSets_from_store_association_sets_creates_e var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true) + "catalog", "schema", "B", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1452,13 +1452,13 @@ public static void GenerateAssociationSets_from_collapsible_items_creates_expect var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true) + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1501,9 +1501,9 @@ public static void GenerateAssociationSets_from_store_association_sets_creates_e var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true) + "catalog", "schema", "B", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1566,13 +1566,13 @@ public static void GenerateAssociationSets_from_collapsible_items_creates_expect var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: true), + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "C", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "C", "Col1", 1, false, "int", isIdentiy: false, isPrimaryKey: true) + "catalog", "schema", "C", "Col1", 1, false, "int", isIdentity: false, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1636,9 +1636,9 @@ public static void GenerateAssociationType_from_store_association_type_creates_n var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true) + "catalog", "schema", "B", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true) }; var relationshipDetails = new[] @@ -1682,11 +1682,11 @@ public static void var tableDetails = new[] { StoreModelBuilderTests.CreateRow( - "catalog", "schema", "A", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "A", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), + "catalog", "schema", "B", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), StoreModelBuilderTests.CreateRow( - "catalog", "schema", "B", "Col1", 0, false, "int", isIdentiy: false, isPrimaryKey: false) + "catalog", "schema", "B", "Col1", 0, false, "int", isIdentity: false, isPrimaryKey: false) }; var relationshipDetails = new[] diff --git a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/StoreModelBuilderTests.cs b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/StoreModelBuilderTests.cs index 0ea5a7ce97..c1bf7656ca 100644 --- a/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/StoreModelBuilderTests.cs +++ b/test/EFTools/UnitTests/EntityDesignerVersioningFacade/ReverseEngineerDb/StoreModelBuilderTests.cs @@ -35,7 +35,7 @@ internal static TableDetailsRow CreateRow( string dataType = null, int? maximumLength = null, int? precision = null, int? dateTimePrecision = null, - int? scale = null, bool? isIdentiy = null, + int? scale = null, bool? isIdentity = null, bool? isServerGenerated = null, bool isPrimaryKey = false) { var tableDetailsRow = (TableDetailsRow)new TableDetailsCollection().NewRow(); @@ -60,7 +60,7 @@ internal static TableDetailsRow CreateRow( setColumnValue(tableDetailsRow, "Precision", precision); setColumnValue(tableDetailsRow, "DateTimePrecision", dateTimePrecision); setColumnValue(tableDetailsRow, "Scale", scale); - setColumnValue(tableDetailsRow, "IsIdentity", isIdentiy); + setColumnValue(tableDetailsRow, "IsIdentity", isIdentity); setColumnValue(tableDetailsRow, "IsServerGenerated", isServerGenerated); setColumnValue(tableDetailsRow, "IsPrimaryKey", isPrimaryKey); @@ -698,7 +698,7 @@ public void CreateProperty_sets_identity() var property = CreateStoreModelBuilder() .CreateProperty( - CreateRow(columnName: "IntColumn", dataType: "int", isIdentiy: true), + CreateRow(columnName: "IntColumn", dataType: "int", isIdentity: true), errors); Assert.NotNull(property); @@ -788,8 +788,8 @@ public void CreateProperties_creates_properties_for_valid_rows_and_exclude_prope [Fact] public void Build_creates_EdmModel_containing_converted_objects() { - var tableDetails = new[] { CreateRow(null, "dbo", "table", "Id", 0, false, "int", isIdentiy: true) }; - var viewDetails = new[] { CreateRow(null, "dbo", "view", "Id", 0, false, "int", isIdentiy: true) }; + var tableDetails = new[] { CreateRow(null, "dbo", "table", "Id", 0, false, "int", isIdentity: true) }; + var viewDetails = new[] { CreateRow(null, "dbo", "view", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new[] { CreateRelationshipDetailsRow("id", "name", 0, false, null, "dbo", "table", "Id", null, "dbo", "view", "Id") }; var functionDetails = new[] { CreateFunctionDetailsRow(functionName: "function", isTvf: true) }; @@ -1216,7 +1216,7 @@ public void } [Fact] - public void CreateEntityType_creates_readonly_entity_if_no_keys_defined_but_keys_can_be_infered() + public void CreateEntityType_creates_readonly_entity_if_no_keys_defined_but_keys_can_be_inferred() { var columns = new List @@ -1254,7 +1254,7 @@ public void CreateEntityType_creates_readonly_entity_if_no_keys_defined_but_keys } [Fact] - public void CreateEntityType_creates_invalid_entity_if_no_keys_defined_and_keys_cannot_be_infered() + public void CreateEntityType_creates_invalid_entity_if_no_keys_defined_and_keys_cannot_be_inferred() { var columns = new List @@ -1291,7 +1291,7 @@ public void CreateEntityType_creates_invalid_entity_if_no_keys_defined_and_keys_ [Fact] public void - CreateEntityType_creates_readonly_entity_if_defined_keys_have_invalid_key_type_but_keys_can_be_infered() + CreateEntityType_creates_readonly_entity_if_defined_keys_have_invalid_key_type_but_keys_can_be_inferred() { var columns = new List @@ -1342,7 +1342,7 @@ public void [Fact] public void - CreateEntityType_creates_invalid_entity_if_defined_keys_have_invalid_key_type_and_keys_cannot_be_infered() + CreateEntityType_creates_invalid_entity_if_defined_keys_have_invalid_key_type_and_keys_cannot_be_inferred() { var columns = new List @@ -1708,7 +1708,7 @@ public void CreateTvfReturnTypes_creates_row_types_for_valid_input_rows() } [Fact] - public void CreateTvfReturnTypes_creates_multiple_row_types_for_multiple_valid_definitons() + public void CreateTvfReturnTypes_creates_multiple_row_types_for_multiple_valid_definitions() { var columns = new List @@ -2361,17 +2361,17 @@ public static void CreateAssociationSets_creates_expected_association_types_and_ var tableDetails = new[] { CreateRow( - "catalog", "schema", "source1", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true, isPrimaryKey: true) + "catalog", "schema", "source1", "Id", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true) , CreateRow( - "catalog", "schema", "source1", "Other", 1, isNullable: false, dataType: "int", isIdentiy: false, + "catalog", "schema", "source1", "Other", 1, isNullable: false, dataType: "int", isIdentity: false, isPrimaryKey: true), - CreateRow("catalog", "schema", "target1", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true), - CreateRow("catalog", "schema", "target1", "Other", 1, isNullable: false, dataType: "int", isIdentiy: false), + CreateRow("catalog", "schema", "target1", "Id", 0, isNullable: false, dataType: "int", isIdentity: true), + CreateRow("catalog", "schema", "target1", "Other", 1, isNullable: false, dataType: "int", isIdentity: false), CreateRow( - "catalog", "schema", "source2", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true, isPrimaryKey: true) + "catalog", "schema", "source2", "Id", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true) , - CreateRow("catalog", "schema", "target2", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true) + CreateRow("catalog", "schema", "target2", "Id", 0, isNullable: false, dataType: "int", isIdentity: true) }; var relationshipDetails = new List @@ -2414,9 +2414,9 @@ public static void CreateAssociationSets_does_not_create_set_for_shared_foreign_ { var tableDetails = new[] { - CreateRow("catalog", "schema", "source1", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "source2", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source1", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "source2", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List @@ -2466,8 +2466,8 @@ public static void TryCreateAssociationSet_creates_valid_association_type_and_se { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List @@ -2522,8 +2522,8 @@ private static void Check_does_not_create_set_if_end_entity_is_missing(bool sour { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var sourceColumn = sourceMissing ? "missing" : "source"; @@ -2576,9 +2576,9 @@ public static void TryCreateAssociationSet_does_not_create_set_if_relationship_c { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentiy: false, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentity: false, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List @@ -2625,8 +2625,8 @@ public static void TryCreateAssociationSet_does_not_create_set_if_relationship_c { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List @@ -2674,10 +2674,10 @@ public static void TryCreateAssociationSet_does_not_create_set_if_fk_is_partiall { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentiy: false, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Other", 1, false, "int", isIdentiy: false, isPrimaryKey: false) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentity: false, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Other", 1, false, "int", isIdentity: false, isPrimaryKey: false) }; var relationshipDetails = new List @@ -2719,7 +2719,7 @@ public static void TryCreateAssociationSet_does_not_create_set_if_fk_is_partiall var error = errors[0]; Assert.Equal(EdmSchemaErrorSeverity.Warning, error.Severity); - Assert.Equal((int)ModelBuilderErrorCode.UnsupportedForeinKeyPattern, error.ErrorCode); + Assert.Equal((int)ModelBuilderErrorCode.UnsupportedForeignKeyPattern, error.ErrorCode); } [Fact] @@ -2727,9 +2727,9 @@ public static void TryCreateAssociationSet_does_not_create_set_if_association_is { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentiy: false, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "source", "Other", 1, false, "int", isIdentity: false, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List @@ -2790,16 +2790,16 @@ private static void Check_two_column_relationship_expected_association_end_multi var tableDetails = new[] { CreateRow( - "catalog", "schema", "source", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true, + "catalog", "schema", "source", "Id", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true), CreateRow( - "catalog", "schema", "source", "Other", 1, isNullable: false, dataType: "int", isIdentiy: false, + "catalog", "schema", "source", "Other", 1, isNullable: false, dataType: "int", isIdentity: false, isPrimaryKey: true), CreateRow( - "catalog", "schema", "target", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true, + "catalog", "schema", "target", "Id", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true), CreateRow( - "catalog", "schema", "target", "Other", 1, isNullable: false, dataType: "int", isIdentiy: false, + "catalog", "schema", "target", "Other", 1, isNullable: false, dataType: "int", isIdentity: false, isPrimaryKey: true) }; @@ -2877,19 +2877,19 @@ private static void Check_two_column_relationship_expected_association_end_multi var tableDetails = new[] { CreateRow( - "catalog", "schema", "source", "Id", 0, isNullable: false, dataType: "int", isIdentiy: true, + "catalog", "schema", "source", "Id", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true), CreateRow( - "catalog", "schema", "source", "Other", 1, isNullable: false, dataType: "int", isIdentiy: false, + "catalog", "schema", "source", "Other", 1, isNullable: false, dataType: "int", isIdentity: false, isPrimaryKey: true), CreateRow( - "catalog", "schema", "target", "TargetId", 0, isNullable: false, dataType: "int", isIdentiy: true, + "catalog", "schema", "target", "TargetId", 0, isNullable: false, dataType: "int", isIdentity: true, isPrimaryKey: true), CreateRow( - "catalog", "schema", "target", "Id", 0, isNullable: column1Nullable, dataType: "int", isIdentiy: true, + "catalog", "schema", "target", "Id", 0, isNullable: column1Nullable, dataType: "int", isIdentity: true, isPrimaryKey: false), CreateRow( - "catalog", "schema", "target", "Other", 1, isNullable: column2Nullable, dataType: "int", isIdentiy: false, + "catalog", "schema", "target", "Other", 1, isNullable: column2Nullable, dataType: "int", isIdentity: false, isPrimaryKey: false) }; @@ -2939,8 +2939,8 @@ private static void Check_cascade_delete_flag_is_reflected_by_delete_behavior( { var tableDetails = new[] { - CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentiy: true, isPrimaryKey: true), - CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentiy: true) + CreateRow("catalog", "schema", "source", "Id", 0, false, "int", isIdentity: true, isPrimaryKey: true), + CreateRow("catalog", "schema", "target", "Id", 0, false, "int", isIdentity: true) }; var relationshipDetails = new List diff --git a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/BasicMappingScenarioTests.cs b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/BasicMappingScenarioTests.cs index 5093ff0896..32bdb4d8de 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/BasicMappingScenarioTests.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/BasicMappingScenarioTests.cs @@ -224,7 +224,7 @@ public void Ignoring_new_property_with_same_name_as_in_mapped_base_class_throws( } [Fact] - public void Ignoring_overriden_mapped_base_class_property_throws() + public void Ignoring_overridden_mapped_base_class_property_throws() { var modelBuilder = new DbModelBuilder(); @@ -4144,7 +4144,7 @@ public class XCrazy : DCrazy [Fact] // Regression for 142318 - public void Can_have_TPH_alone_at_base_of_3_level_heirarchy() + public void Can_have_TPH_alone_at_base_of_3_level_hierarchy() { // E1 -- TPH alone // / | \ diff --git a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/DataAnnotationScenarioTests.cs b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/DataAnnotationScenarioTests.cs index 53488bf5ae..43a6c2c110 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/DataAnnotationScenarioTests.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/DataAnnotationScenarioTests.cs @@ -207,7 +207,7 @@ public void NotMapped_on_base_class_property_ignores_it() } [Fact] - public void NotMapped_on_base_class_property_and_overriden_property_ignores_them() + public void NotMapped_on_base_class_property_and_overridden_property_ignores_them() { using (var baseEntityConfiguration = new DynamicTypeDescriptionConfiguration()) { @@ -278,7 +278,7 @@ public void NotMapped_on_abstract_base_class_property_ignores_it() } [Fact] - public void NotMapped_on_overriden_mapped_base_class_property_throws() + public void NotMapped_on_overridden_mapped_base_class_property_throws() { using (var unitConfiguration = new DynamicTypeDescriptionConfiguration()) { @@ -322,7 +322,7 @@ public void NotMapped_on_unmapped_derived_property_ignores_it() } [Fact] - public void NotMapped_on_unmapped_base_class_property_and_overriden_property_ignores_it() + public void NotMapped_on_unmapped_base_class_property_and_overridden_property_ignores_it() { using (var unitConfiguration = new DynamicTypeDescriptionConfiguration()) { diff --git a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/PropertyConfigurationScenarioTests.cs b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/PropertyConfigurationScenarioTests.cs index c0d8de1c79..e60e7b4e95 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/PropertyConfigurationScenarioTests.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/CodeFirst/PropertyConfigurationScenarioTests.cs @@ -473,7 +473,7 @@ public void Configure_HasColumnName_using_configuration() } [Fact] - public void Configure_HasColumnName_using_configuration_can_be_overriden_using_api() + public void Configure_HasColumnName_using_configuration_can_be_overridden_using_api() { var modelBuilder = new AdventureWorksModelBuilder(); diff --git a/test/EntityFramework/FunctionalTests.Transitional/MetadataMapping/EnumOCMappingTests.cs b/test/EntityFramework/FunctionalTests.Transitional/MetadataMapping/EnumOCMappingTests.cs index f860e008e6..5bc57b686f 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/MetadataMapping/EnumOCMappingTests.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/MetadataMapping/EnumOCMappingTests.cs @@ -28,7 +28,7 @@ public void Verify_simple_enum_mapping_POCO() } [Fact] - public void Complex_type_with_eumm_property_is_mapped_correctly_POCO() + public void Complex_type_with_enum_property_is_mapped_correctly_POCO() { Complex_type_with_enum_property_is_mapped_correctly(true); } @@ -400,10 +400,10 @@ public void Can_map_CSpace_enum_type_with_no_enum_members_NonPOCO() [Fact] public void Cannot_map_if_OSpace_enum_type_member_value_does_not_match_CSpace_enum_type_member_value_NonPOCO() { - var exeception = Assert.Throws( + var exception = Assert.Throws( () => Cannot_map_if_OSpace_enum_type_member_value_does_not_match_CSpace_enum_type_member_value(false)); - exeception.ValidateMessage( + exception.ValidateMessage( "Mapping_Enum_OCMapping_MemberMismatch", "MessageModel.MessageType", "Ground", diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DatabaseTestHelpers.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DatabaseTestHelpers.cs index 472c9b68c0..60b0f1be8f 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DatabaseTestHelpers.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DatabaseTestHelpers.cs @@ -26,7 +26,7 @@ public static bool IsLocalDb(string connectionString) return connectionString.ToLower().Contains(@"(localdb)"); } - public static bool IsIntegratedSecutity(string connectionString) + public static bool IsIntegratedSecurity(string connectionString) { var formattedConnectionString = connectionString.ToLower().Replace(" ", ""); diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DefaultFunctionalTestsConnectionFactory.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DefaultFunctionalTestsConnectionFactory.cs index 1e626eafe2..2c5c61b702 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DefaultFunctionalTestsConnectionFactory.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/DefaultFunctionalTestsConnectionFactory.cs @@ -15,7 +15,7 @@ public class DefaultFunctionalTestsConnectionFactory : IDbConnectionFactory public DbConnection CreateConnection(string nameOrConnectionString) { throw new NotImplementedException( - "This connection factory should never be used because it is overriden in the Loaded event."); + "This connection factory should never be used because it is overridden in the Loaded event."); } } } diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ExtendedSqlAzureExecutionStrategy.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ExtendedSqlAzureExecutionStrategy.cs index 1d89c4bb46..9667f8d299 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ExtendedSqlAzureExecutionStrategy.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ExtendedSqlAzureExecutionStrategy.cs @@ -48,7 +48,7 @@ protected override bool ShouldRetryOn(Exception exception) { switch (err.Number) { - // This exception can be thrown even if the operation completed succesfully, so it's safer to let the application fail. + // This exception can be thrown even if the operation completed successfully, so it's safer to let the application fail. // DBNETLIB Error Code: -2 // Timeout expired. The timeout period elapsed prior to completion of the operation or the server is not responding. The statement has been terminated. case -2: diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/SqlServerMigrationSqlGeneratorWtihCollations.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/SqlServerMigrationSqlGeneratorWtihCollations.cs index 396081588e..3d73c305a6 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/SqlServerMigrationSqlGeneratorWtihCollations.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/SqlServerMigrationSqlGeneratorWtihCollations.cs @@ -131,7 +131,7 @@ protected override void Generate(AlterTableOperation alterTableOperation) if (_tableCollation != null) { - // Need to alter any column that doesn't have explictly set collation + // Need to alter any column that doesn't have explicitly set collation foreach (var column in alterTableOperation.Columns.Where( c => c.ClrType == typeof(string) && !c.Annotations.ContainsKey(CollationAttribute.AnnotationName))) diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/StringResourceVerifier.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/StringResourceVerifier.cs index 57b5d0fa8a..5ea0d1dab7 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/StringResourceVerifier.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/StringResourceVerifier.cs @@ -84,7 +84,7 @@ public void VerifyMatch(string expectedResourceKey, string actualMessage, bool i private static bool IsMatchWithAnyPlaceholderValues(string expectedMessage, string actualMessage, bool isExactMatch) { - // Find the sections of the Exception message seperated by {x} tags + // Find the sections of the Exception message separated by {x} tags var sections = FindMessageSections(expectedMessage); // Check that each section is present in the actual message in correct order diff --git a/test/EntityFramework/FunctionalTests/Objects/LazyLoadingTests.cs b/test/EntityFramework/FunctionalTests/Objects/LazyLoadingTests.cs index 526f0d402e..87db9b5cd8 100644 --- a/test/EntityFramework/FunctionalTests/Objects/LazyLoadingTests.cs +++ b/test/EntityFramework/FunctionalTests/Objects/LazyLoadingTests.cs @@ -213,7 +213,7 @@ public class Other public string Name { get; set; } - public virtual ICollection Childs { get; set; } + public virtual ICollection Children { get; set; } } [Fact] // CodePlex 1142 diff --git a/test/EntityFramework/FunctionalTests/Objects/TransactionsTests.cs b/test/EntityFramework/FunctionalTests/Objects/TransactionsTests.cs index ffbd811cd8..6ba1c7fabb 100644 --- a/test/EntityFramework/FunctionalTests/Objects/TransactionsTests.cs +++ b/test/EntityFramework/FunctionalTests/Objects/TransactionsTests.cs @@ -620,7 +620,7 @@ public void UseTransaction_does_not_cause_or_require_database_initialization() { // this test only works for integrated security, or when password is persisted after connecting // otherwise we can't connect to database during context initialization (password is gone from connection string) - if (DatabaseTestHelpers.IsIntegratedSecutity(connection.ConnectionString) || + if (DatabaseTestHelpers.IsIntegratedSecurity(connection.ConnectionString) || DatabaseTestHelpers.PersistsSecurityInfo(connection.ConnectionString)) { connection.Open(); @@ -1115,7 +1115,7 @@ public void Verify_implicit_transaction_is_not_created_when_using_DbContext_and_ } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1137,7 +1137,7 @@ public void Verify_implicit_transaction_is_not_created_when_using_DbContext_and_ } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1160,7 +1160,7 @@ public void Verify_implicit_transaction_is_not_created_when_using_DbContext_and_ } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1287,7 +1287,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1310,7 +1310,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1335,7 +1335,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1358,7 +1358,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1382,7 +1382,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1445,7 +1445,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1471,7 +1471,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1499,7 +1499,7 @@ public void Verify_implicit_transaction_is_not_created_when_executing_multiple_o } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1525,7 +1525,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_transac } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1551,7 +1551,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_enlists_Transac } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1580,7 +1580,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_creates_ambient } }); - // Transaction not commited. No entities should be saved to the database. + // Transaction not committed. No entities should be saved to the database. Assert.Equal(0, LogEntriesCount()); } @@ -1604,7 +1604,7 @@ public void Verify_implicit_transaction_is_not_created_when_user_starts_DbTransa } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1694,7 +1694,7 @@ public void Verify_using_TransactionScope_with_DbTransaction_results_in_nested_t } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1724,7 +1724,7 @@ public void } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -1811,7 +1811,7 @@ public void Verify_implicit_transaction_created_when_transaction_from_previous_o Assert.Equal(ConnectionState.Open, ctx.Connection.State); } - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); AddLogEntryToDatabase(ctx); @@ -1847,7 +1847,7 @@ public void Verify_no_implicit_transaction_created_when_if_enlisted_in_explicit_ } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); using (var committableTransaction = new CommittableTransaction()) @@ -1858,7 +1858,7 @@ public void Verify_no_implicit_transaction_created_when_if_enlisted_in_explicit_ Assert.Equal(ConnectionState.Open, ctx.Connection.State); } - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); ctx.Connection.Close(); } @@ -1883,7 +1883,7 @@ public void Verify_implicit_transaction_created_when_transaction_from_previous_o } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); ExtendedSqlAzureExecutionStrategy.ExecuteNew( @@ -1923,7 +1923,7 @@ public void Verify_explicit_transaction_cleared_after_disposing() Assert.Equal(1, transactionLogEntry.TransactionCount); } - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, CreateTransactionContext().LogEntries.Count()); AddLogEntryToDatabase(ctx); @@ -1968,7 +1968,7 @@ public void Verify_no_implicit_transaction_created_when_transactions_change_betw } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -2002,7 +2002,7 @@ public void Verify_no_implicit_transaction_created_when_enlisting_in_transaction } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } @@ -2034,7 +2034,7 @@ public void Verify_no_implicit_transaction_created_when_transaction_change_and_c } }); - // "Transaction not commited. No entities should be saved to the database." + // "Transaction not committed. No entities should be saved to the database." Assert.Equal(0, LogEntriesCount()); } diff --git a/test/EntityFramework/FunctionalTests/ProductivityApi/DatabaseInitializationTests.cs b/test/EntityFramework/FunctionalTests/ProductivityApi/DatabaseInitializationTests.cs index 5edc9695b0..9f9fe3100f 100644 --- a/test/EntityFramework/FunctionalTests/ProductivityApi/DatabaseInitializationTests.cs +++ b/test/EntityFramework/FunctionalTests/ProductivityApi/DatabaseInitializationTests.cs @@ -1789,7 +1789,7 @@ public void DropCreateDatabaseIfModelChanges_can_create_tables_for_multiple_cont } [Fact] - public void Model_is_built_and_existance_checked_only_once_when_database_exists_and_contains_metadata() + public void Model_is_built_and_existence_checked_only_once_when_database_exists_and_contains_metadata() { using (var context = new BaseModelContext(SimpleConnection())) { @@ -1823,7 +1823,7 @@ public void Model_is_built_and_existance_checked_only_once_when_database_exists_ } [Fact] - public void Model_is_built_and_existance_checked_only_once_when_database_exists_and_contains_no_metadata() + public void Model_is_built_and_existence_checked_only_once_when_database_exists_and_contains_no_metadata() { using (var context = new BaseModelContext(SimpleConnection())) { @@ -1861,7 +1861,7 @@ FROM INFORMATION_SCHEMA.TABLES } [Fact] - public void Model_is_built_and_existance_checked_only_once_when_database_does_not_exist() + public void Model_is_built_and_existence_checked_only_once_when_database_does_not_exist() { using (var context = new BaseModelContext(SimpleConnection())) { @@ -1891,7 +1891,7 @@ public void Model_is_built_and_existance_checked_only_once_when_database_does_no } [Fact] - public void Model_is_built_and_existance_checked_only_once_when_dropping_and_creating_database() + public void Model_is_built_and_existence_checked_only_once_when_dropping_and_creating_database() { using (var context = new BaseModelContext(SimpleConnection())) { diff --git a/test/EntityFramework/FunctionalTests/ProductivityApi/DbConfigurationTests.cs b/test/EntityFramework/FunctionalTests/ProductivityApi/DbConfigurationTests.cs index c8efe0e327..fb7014f8fb 100644 --- a/test/EntityFramework/FunctionalTests/ProductivityApi/DbConfigurationTests.cs +++ b/test/EntityFramework/FunctionalTests/ProductivityApi/DbConfigurationTests.cs @@ -15,7 +15,7 @@ namespace ProductivityApiTests public class DbConfigurationTests : FunctionalTestBase { [Fact] - public void DefaultConnectionFactory_set_in_config_file_can_be_overriden_before_config_is_locked() + public void DefaultConnectionFactory_set_in_config_file_can_be_overridden_before_config_is_locked() { Assert.IsType(DbConfiguration.DependencyResolver.GetService()); Assert.IsType(FunctionalTestsConfiguration.OriginalConnectionFactories[0]); diff --git a/test/EntityFramework/FunctionalTests/ProductivityApi/DbContextTests.cs b/test/EntityFramework/FunctionalTests/ProductivityApi/DbContextTests.cs index 7f3659d7d8..20d3f4246f 100644 --- a/test/EntityFramework/FunctionalTests/ProductivityApi/DbContextTests.cs +++ b/test/EntityFramework/FunctionalTests/ProductivityApi/DbContextTests.cs @@ -710,7 +710,7 @@ public void SaveChangesAsync_performs_DetectChanges() private void SaveChanges_performs_DetectChanges_implementation(Func saveChanges) { - // NOTE: This is split out into a seperate test from the above test because + // NOTE: This is split out into a separate test from the above test because // it is important no other APIs are called between the modification // and calling SaveChanges due to other APIs calling DetectChanges implicitly @@ -3589,7 +3589,7 @@ public void DbContext_can_be_initialized_without_promotion_to_distributed_transa // this only works for integrated security, or when password is persisted after connecting // otherwise we can't connect to database during context initialization (password is gone from connection string) - if (DatabaseTestHelpers.IsIntegratedSecutity(connectionString) || + if (DatabaseTestHelpers.IsIntegratedSecurity(connectionString) || DatabaseTestHelpers.PersistsSecurityInfo(connectionString)) { @@ -3626,7 +3626,7 @@ public void DbContext_can_be_initialized_without_promotion_to_distributed_transa // this only works for integrated security, or when password is persisted after connecting // otherwise we can't connect to database during context initialization (password is gone from connection string) - if (DatabaseTestHelpers.IsIntegratedSecutity(connectionString) || + if (DatabaseTestHelpers.IsIntegratedSecurity(connectionString) || DatabaseTestHelpers.PersistsSecurityInfo(connectionString)) { using (var connection = new SqlConnection(connectionString)) diff --git a/test/EntityFramework/FunctionalTests/ProductivityApi/DbSetTests.cs b/test/EntityFramework/FunctionalTests/ProductivityApi/DbSetTests.cs index 9ff989fe51..7b46c47f70 100644 --- a/test/EntityFramework/FunctionalTests/ProductivityApi/DbSetTests.cs +++ b/test/EntityFramework/FunctionalTests/ProductivityApi/DbSetTests.cs @@ -552,7 +552,7 @@ public void Add_moves_Detached_FK_graph_to_Added() Assert.Equal(EntityState.Added, GetStateEntry(context, category).State); Assert.Equal(EntityState.Added, GetStateEntry(context, product).State); - // Assert fixup, refernce fixup happens for principal in Added, but not FK fixup. + // Assert fixup, reference fixup happens for principal in Added, but not FK fixup. Assert.Equal(product.Category, context.Categories.Find("Beverages")); Assert.Equal(null, product.CategoryId); } @@ -560,7 +560,7 @@ public void Add_moves_Detached_FK_graph_to_Added() #endregion - #region Conficts at root level for FK graph + #region Conflicts at root level for FK graph [Fact] public void Add_is_a_noop_if_FK_graph_is_already_Added_Principal_and_Dependent_Added() @@ -579,7 +579,7 @@ public void Add_is_a_noop_if_FK_graph_has_Added_Principal_and_Dependent_Unchange } [Fact] - public void Add_is_a_noop_if_FK_graph_is_already_Added_Prinicipal_and_Dependent_Modified() + public void Add_is_a_noop_if_FK_graph_is_already_Added_Principal_and_Dependent_Modified() { Add_moves_root_to_Added_when_FK_graph_root_is_Added_Unchanged_Modified_or_Deleted( EntityState.Added, @@ -587,7 +587,7 @@ public void Add_is_a_noop_if_FK_graph_is_already_Added_Prinicipal_and_Dependent_ } [Fact] - public void Add_is_a_noop_if_FK_graph_is_already_Added_Prinicipal_and_Dependent_Deleted() + public void Add_is_a_noop_if_FK_graph_is_already_Added_Principal_and_Dependent_Deleted() { Add_moves_root_to_Added_when_FK_graph_root_is_Added_Unchanged_Modified_or_Deleted( EntityState.Added, @@ -3232,11 +3232,11 @@ public void DbSet_for_an_entity_set_with_special_characters_can_be_created() { using (var context = new SpecialCharacters()) { - var countriesOrRegions = context.Länder.ToList(); + var countriesOrRegions = context.Länder.ToList(); Assert.Equal(2, countriesOrRegions.Count); - Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "A")); - Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "B")); + Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "A")); + Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "B")); } } @@ -3245,11 +3245,11 @@ public void Find_from_context_works_for_entity_set_with_special_characters() { using (var context = new SpecialCharacters()) { - context.Länder.Load(); + context.Länder.Load(); - var lander = context.Länder.Find(1); + var lander = context.Länder.Find(1); Assert.NotNull(lander); - Assert.Equal("A", lander.Näme); + Assert.Equal("A", lander.Näme); } } @@ -3258,9 +3258,9 @@ public void Find_from_database_works_for_entity_set_with_special_characters() { using (var context = new SpecialCharacters()) { - var lander = context.Länder.Find(1); + var lander = context.Länder.Find(1); Assert.NotNull(lander); - Assert.Equal("A", lander.Näme); + Assert.Equal("A", lander.Näme); } } @@ -3269,11 +3269,11 @@ public void DbSet_Add_works_for_entity_set_with_special_characters() { using (var context = new SpecialCharacters()) { - var lander = context.Länder.Add( - new Länder + var lander = context.Länder.Add( + new Länder { Id = 3, - Näme = "C" + Näme = "C" }); Assert.Equal(EntityState.Added, context.Entry(lander).State); @@ -3285,11 +3285,11 @@ public void DbSet_Attach_works_for_entity_set_with_special_characters() { using (var context = new SpecialCharacters()) { - var lander = context.Länder.Attach( - new Länder + var lander = context.Länder.Attach( + new Länder { Id = 3, - Näme = "C" + Näme = "C" }); Assert.Equal(EntityState.Unchanged, context.Entry(lander).State); @@ -3301,11 +3301,11 @@ public void SqlQuery_works_for_entity_set_with_special_characters() { using (var context = new SpecialCharacters()) { - var countriesOrRegions = context.Länder.SqlQuery("select * from Länder").ToList(); + var countriesOrRegions = context.Länder.SqlQuery("select * from Länder").ToList(); Assert.Equal(2, countriesOrRegions.Count); - Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "A")); - Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "B")); + Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "A")); + Assert.Equal(1, countriesOrRegions.Count(l => l.Näme == "B")); } } @@ -3316,32 +3316,32 @@ public SpecialCharacters() Database.SetInitializer(new SpecialCharactersInitializer()); } - public DbSet Länder { get; set; } + public DbSet Länder { get; set; } } - public class Länder + public class Länder { [DatabaseGenerated(DatabaseGeneratedOption.None)] public int Id { get; set; } - public string Näme { get; set; } + public string Näme { get; set; } } public class SpecialCharactersInitializer : DropCreateDatabaseAlways { protected override void Seed(SpecialCharacters context) { - context.Länder.Add( - new Länder + context.Länder.Add( + new Länder { Id = 1, - Näme = "A" + Näme = "A" }); - context.Länder.Add( - new Länder + context.Länder.Add( + new Länder { Id = 2, - Näme = "B" + Näme = "B" }); } } diff --git a/test/EntityFramework/FunctionalTests/Query/FunctionTests.cs b/test/EntityFramework/FunctionalTests/Query/FunctionTests.cs index 12a97e3887..4276348d9f 100644 --- a/test/EntityFramework/FunctionalTests/Query/FunctionTests.cs +++ b/test/EntityFramework/FunctionalTests/Query/FunctionTests.cs @@ -174,7 +174,7 @@ GROUP BY [UnionAll4].[C1] } [Fact] - public void Inline_aggregate_funtion_MinProductId() + public void Inline_aggregate_function_MinProductId() { var query = @"Function MinProductId(products Collection(ProductModel.Product)) as diff --git a/test/EntityFramework/FunctionalTests/Query/LinqToEntities/IncludeTests.cs b/test/EntityFramework/FunctionalTests/Query/LinqToEntities/IncludeTests.cs index 9f3c959b19..b7f74a0e8f 100644 --- a/test/EntityFramework/FunctionalTests/Query/LinqToEntities/IncludeTests.cs +++ b/test/EntityFramework/FunctionalTests/Query/LinqToEntities/IncludeTests.cs @@ -216,7 +216,7 @@ public class CodePlex1710 : FunctionalTestBase - SELECT VALUE QueryViewStackOverflowRepro.ContextModel.Dependent(g.Id) FROM QueryViewStackOverflowReproContextModelStoreContainer.Dependents AS g + SELECT VALUE QueryViewStackOverflowRepro.ContextModel.Dependent(g.Id) FROM QueryViewStackOverflowReproContextModelStoreContainer.Dependents AS g diff --git a/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsAdvancedPatterns/EF.Utility.CS.ttinclude b/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsAdvancedPatterns/EF.Utility.CS.ttinclude index ac68740dbb..4e830c937b 100644 --- a/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsAdvancedPatterns/EF.Utility.CS.ttinclude +++ b/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsAdvancedPatterns/EF.Utility.CS.ttinclude @@ -376,7 +376,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceAfter(string value) { @@ -385,7 +385,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceBefore(string value) { @@ -394,7 +394,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with append concatenated on the end. + /// otherwise it returns value with append concatenated on the end. /// public string StringAfter(string value, string append) { @@ -408,7 +408,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with prepend concatenated on the front. + /// otherwise it returns value with prepend concatenated on the front. /// public string StringBefore(string prepend, string value) { @@ -471,7 +471,7 @@ public class CodeGenerationTools } /// - /// Retuns as full of a name as possible, if a namespace is provided + /// Returns as full of a name as possible, if a namespace is provided /// the namespace and name are combined with a period, otherwise just /// the name is returned. /// @@ -486,7 +486,7 @@ public class CodeGenerationTools } /// - /// Retuns a literal representing the supplied value. + /// Returns a literal representing the supplied value. /// public string CreateLiteral(object value) { @@ -1774,7 +1774,7 @@ public class CodeRegion } /// - /// Starts the begining of a region + /// Starts the beginning of a region /// public void Begin(string regionName) { @@ -1787,7 +1787,7 @@ public class CodeRegion } /// - /// Start the begining of a region, indented + /// Start the beginning of a region, indented /// the numbers of levels specified /// public void Begin(string regionName, int levelsToIncreaseIndent) @@ -1805,8 +1805,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region. + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region. /// public void End() { @@ -1814,8 +1814,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region, also outdents + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region, also outdents /// the number of levels specified. /// public void End(int levelsToDecrease) @@ -1841,7 +1841,7 @@ public class CodeRegion public int CurrentIndentLevel { get { return _regionIndentLevel; } } /// - /// Get a string of spaces equivelent to the number of indents + /// Get a string of spaces equivalent to the number of indents /// desired. /// public static string GetIndent(int indentLevel) @@ -2260,7 +2260,7 @@ public class DynamicTextTransformation /// /// Creates an instance of the DynamicTextTransformation class around the passed in - /// TextTransformation shapped instance passed in, or if the passed in instance + /// TextTransformation shaped instance passed in, or if the passed in instance /// already is a DynamicTextTransformation, it casts it and sends it back. /// public static DynamicTextTransformation Create(object instance) @@ -2291,17 +2291,17 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + /// Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property /// public StringBuilder GenerationEnvironment { get { return (StringBuilder)_generationEnvironment.GetValue(_instance, null); } } /// - /// Gets the value of the wrapped TextTranformation instance's Errors property + /// Gets the value of the wrapped TextTransformation instance's Errors property /// public System.CodeDom.Compiler.CompilerErrorCollection Errors { get { return (System.CodeDom.Compiler.CompilerErrorCollection)_errors.GetValue(_instance, null); } } /// - /// Calls the wrapped TextTranformation instance's Write method. + /// Calls the wrapped TextTransformation instance's Write method. /// public void Write(string text) { @@ -2309,7 +2309,7 @@ public class DynamicTextTransformation } /// - /// Calls the wrapped TextTranformation instance's WriteLine method. + /// Calls the wrapped TextTransformation instance's WriteLine method. /// public void WriteLine(string text) { @@ -2317,7 +2317,7 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's Host property + /// Gets the value of the wrapped TextTransformation instance's Host property /// if available (shows up when hostspecific is set to true in the template directive) and returns /// the appropriate implementation of IDynamicHost /// @@ -2343,7 +2343,7 @@ public class DynamicTextTransformation /// -/// Reponsible for abstracting the use of Host between times +/// Responsible for abstracting the use of Host between times /// when it is available and not /// public interface IDynamicHost @@ -2370,7 +2370,7 @@ public interface IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost as a dynamic +/// Responsible for implementing the IDynamicHost as a dynamic /// shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface /// rather than type dependent wrapper. We don't use the /// interface type so that the code can be run in preprocessed mode @@ -2385,7 +2385,7 @@ public class DynamicHost : IDynamicHost /// /// Creates an instance of the DynamicHost class around the passed in - /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. /// public DynamicHost(object instance) { @@ -2434,7 +2434,7 @@ public class DynamicHost : IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost when the +/// Responsible for implementing the IDynamicHost when the /// Host property is not available on the TextTemplating type. The Host /// property only exists when the hostspecific attribute of the template /// directive is set to true. @@ -2443,7 +2443,7 @@ public class NullHost : IDynamicHost { /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - /// that simply retuns null. + /// that simply returns null. /// public string ResolveParameterValue(string id, string name, string otherName) { @@ -2452,7 +2452,7 @@ public class NullHost : IDynamicHost /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - /// that simply retuns the path passed in. + /// that simply returns the path passed in. /// public string ResolvePath(string path) { diff --git a/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsMonsterModel/EF.Utility.CS.ttinclude b/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsMonsterModel/EF.Utility.CS.ttinclude index ac68740dbb..4e830c937b 100644 --- a/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsMonsterModel/EF.Utility.CS.ttinclude +++ b/test/EntityFramework/FunctionalTests/TestModels/TemplateModels/CsMonsterModel/EF.Utility.CS.ttinclude @@ -376,7 +376,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceAfter(string value) { @@ -385,7 +385,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with a single space concatenated on the end. + /// otherwise it returns value with a single space concatenated on the end. /// public string SpaceBefore(string value) { @@ -394,7 +394,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with append concatenated on the end. + /// otherwise it returns value with append concatenated on the end. /// public string StringAfter(string value, string append) { @@ -408,7 +408,7 @@ public class CodeGenerationTools /// /// If the value parameter is null or empty an empty string is returned, - /// otherwise it retuns value with prepend concatenated on the front. + /// otherwise it returns value with prepend concatenated on the front. /// public string StringBefore(string prepend, string value) { @@ -471,7 +471,7 @@ public class CodeGenerationTools } /// - /// Retuns as full of a name as possible, if a namespace is provided + /// Returns as full of a name as possible, if a namespace is provided /// the namespace and name are combined with a period, otherwise just /// the name is returned. /// @@ -486,7 +486,7 @@ public class CodeGenerationTools } /// - /// Retuns a literal representing the supplied value. + /// Returns a literal representing the supplied value. /// public string CreateLiteral(object value) { @@ -1774,7 +1774,7 @@ public class CodeRegion } /// - /// Starts the begining of a region + /// Starts the beginning of a region /// public void Begin(string regionName) { @@ -1787,7 +1787,7 @@ public class CodeRegion } /// - /// Start the begining of a region, indented + /// Start the beginning of a region, indented /// the numbers of levels specified /// public void Begin(string regionName, int levelsToIncreaseIndent) @@ -1805,8 +1805,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region. + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region. /// public void End() { @@ -1814,8 +1814,8 @@ public class CodeRegion } /// - /// Ends a region, or totaly removes it if nothing - /// was generted since the begining of the region, also outdents + /// Ends a region, or totally removes it if nothing + /// was generated since the beginning of the region, also outdents /// the number of levels specified. /// public void End(int levelsToDecrease) @@ -1841,7 +1841,7 @@ public class CodeRegion public int CurrentIndentLevel { get { return _regionIndentLevel; } } /// - /// Get a string of spaces equivelent to the number of indents + /// Get a string of spaces equivalent to the number of indents /// desired. /// public static string GetIndent(int indentLevel) @@ -2260,7 +2260,7 @@ public class DynamicTextTransformation /// /// Creates an instance of the DynamicTextTransformation class around the passed in - /// TextTransformation shapped instance passed in, or if the passed in instance + /// TextTransformation shaped instance passed in, or if the passed in instance /// already is a DynamicTextTransformation, it casts it and sends it back. /// public static DynamicTextTransformation Create(object instance) @@ -2291,17 +2291,17 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's GenerationEnvironment property + /// Gets the value of the wrapped TextTransformation instance's GenerationEnvironment property /// public StringBuilder GenerationEnvironment { get { return (StringBuilder)_generationEnvironment.GetValue(_instance, null); } } /// - /// Gets the value of the wrapped TextTranformation instance's Errors property + /// Gets the value of the wrapped TextTransformation instance's Errors property /// public System.CodeDom.Compiler.CompilerErrorCollection Errors { get { return (System.CodeDom.Compiler.CompilerErrorCollection)_errors.GetValue(_instance, null); } } /// - /// Calls the wrapped TextTranformation instance's Write method. + /// Calls the wrapped TextTransformation instance's Write method. /// public void Write(string text) { @@ -2309,7 +2309,7 @@ public class DynamicTextTransformation } /// - /// Calls the wrapped TextTranformation instance's WriteLine method. + /// Calls the wrapped TextTransformation instance's WriteLine method. /// public void WriteLine(string text) { @@ -2317,7 +2317,7 @@ public class DynamicTextTransformation } /// - /// Gets the value of the wrapped TextTranformation instance's Host property + /// Gets the value of the wrapped TextTransformation instance's Host property /// if available (shows up when hostspecific is set to true in the template directive) and returns /// the appropriate implementation of IDynamicHost /// @@ -2343,7 +2343,7 @@ public class DynamicTextTransformation /// -/// Reponsible for abstracting the use of Host between times +/// Responsible for abstracting the use of Host between times /// when it is available and not /// public interface IDynamicHost @@ -2370,7 +2370,7 @@ public interface IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost as a dynamic +/// Responsible for implementing the IDynamicHost as a dynamic /// shape wrapper over the Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost interface /// rather than type dependent wrapper. We don't use the /// interface type so that the code can be run in preprocessed mode @@ -2385,7 +2385,7 @@ public class DynamicHost : IDynamicHost /// /// Creates an instance of the DynamicHost class around the passed in - /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shapped instance passed in. + /// Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost shaped instance passed in. /// public DynamicHost(object instance) { @@ -2434,7 +2434,7 @@ public class DynamicHost : IDynamicHost } /// -/// Reponsible for implementing the IDynamicHost when the +/// Responsible for implementing the IDynamicHost when the /// Host property is not available on the TextTemplating type. The Host /// property only exists when the hostspecific attribute of the template /// directive is set to true. @@ -2443,7 +2443,7 @@ public class NullHost : IDynamicHost { /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolveParameterValue - /// that simply retuns null. + /// that simply returns null. /// public string ResolveParameterValue(string id, string name, string otherName) { @@ -2452,7 +2452,7 @@ public class NullHost : IDynamicHost /// /// An abstraction of the call to Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost ResolvePath - /// that simply retuns the path passed in. + /// that simply returns the path passed in. /// public string ResolvePath(string path) { diff --git a/test/EntityFramework/UnitTests/Core/Mapping/EntityContainerMappingTests.cs b/test/EntityFramework/UnitTests/Core/Mapping/EntityContainerMappingTests.cs index 0ef10a7333..8b8abee630 100644 --- a/test/EntityFramework/UnitTests/Core/Mapping/EntityContainerMappingTests.cs +++ b/test/EntityFramework/UnitTests/Core/Mapping/EntityContainerMappingTests.cs @@ -86,7 +86,7 @@ public void Can_add_and_get_function_import_mapping() var entityContainerMapping = new EntityContainerMapping(new EntityContainer("C", DataSpace.CSpace)); - var composableFuntionMapping = + var composableFunctionMapping = new FunctionImportMappingComposable( new EdmFunction( "f", "model", DataSpace.CSpace, @@ -120,8 +120,8 @@ public void Can_add_and_get_function_import_mapping() null); Assert.Empty(entityContainerMapping.FunctionImportMappings); - entityContainerMapping.AddFunctionImportMapping(composableFuntionMapping); - Assert.Same(composableFuntionMapping, entityContainerMapping.FunctionImportMappings.Single()); + entityContainerMapping.AddFunctionImportMapping(composableFunctionMapping); + Assert.Same(composableFunctionMapping, entityContainerMapping.FunctionImportMappings.Single()); } [Fact] @@ -152,26 +152,26 @@ var associationSetMapping "AS", new AssociationType("AT", "N", false, DataSpace.CSpace)), entitySet); - var functionImporMapping + var functionImportMapping = new FunctionImportMappingFake( new EdmFunction("FI", "N", DataSpace.CSpace), new EdmFunction("TF", "N", DataSpace.SSpace)); containerMapping.AddSetMapping(entitySetMapping); containerMapping.AddSetMapping(associationSetMapping); - containerMapping.AddFunctionImportMapping(functionImporMapping); + containerMapping.AddFunctionImportMapping(functionImportMapping); Assert.False(containerMapping.IsReadOnly); Assert.False(entitySetMapping.IsReadOnly); Assert.False(associationSetMapping.IsReadOnly); - Assert.False(functionImporMapping.IsReadOnly); + Assert.False(functionImportMapping.IsReadOnly); containerMapping.SetReadOnly(); Assert.True(containerMapping.IsReadOnly); Assert.True(entitySetMapping.IsReadOnly); Assert.True(associationSetMapping.IsReadOnly); - Assert.True(functionImporMapping.IsReadOnly); + Assert.True(functionImportMapping.IsReadOnly); } private class FunctionImportMappingFake : FunctionImportMapping diff --git a/test/EntityFramework/UnitTests/Core/Mapping/FunctionImportMappingComposableTests.cs b/test/EntityFramework/UnitTests/Core/Mapping/FunctionImportMappingComposableTests.cs index c76cf5b41d..7498186379 100644 --- a/test/EntityFramework/UnitTests/Core/Mapping/FunctionImportMappingComposableTests.cs +++ b/test/EntityFramework/UnitTests/Core/Mapping/FunctionImportMappingComposableTests.cs @@ -227,7 +227,7 @@ public void Structural_type_mappings_must_be_not_null_if_function_returns_non_sc foreach (var structuralTypeMappings in structualTypeMappingTestValues) Assert.Equal( - Strings.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturingNonScalarValues, + Strings.StructuralTypeMappingsMustNotBeNullForFunctionImportsReturningNonScalarValues, Assert.Throws( () => new FunctionImportMappingComposable( functionImport, diff --git a/test/EntityFramework/UnitTests/Core/Mapping/Update/Internal/EntityAdapterTests.cs b/test/EntityFramework/UnitTests/Core/Mapping/Update/Internal/EntityAdapterTests.cs index b67de66da3..84461e868f 100644 --- a/test/EntityFramework/UnitTests/Core/Mapping/Update/Internal/EntityAdapterTests.cs +++ b/test/EntityFramework/UnitTests/Core/Mapping/Update/Internal/EntityAdapterTests.cs @@ -29,7 +29,7 @@ public void Returns_0_if_no_changes() } [Fact] - public void Returns_number_of_enties_affected() + public void Returns_number_of_entities_affected() { var entityStateManagerMock = new Mock(); entityStateManagerMock.Setup(m => m.HasChanges()).Returns(true); @@ -176,7 +176,7 @@ public void Returns_0_if_no_changes() } [Fact] - public void Returns_number_of_enties_affected() + public void Returns_number_of_entities_affected() { var entityStateManagerMock = new Mock(); entityStateManagerMock.Setup(m => m.HasChanges()).Returns(true); diff --git a/test/EntityFramework/UnitTests/Core/Objects/ObjectContextTests.cs b/test/EntityFramework/UnitTests/Core/Objects/ObjectContextTests.cs index 32d37714c5..a5f6fc3214 100644 --- a/test/EntityFramework/UnitTests/Core/Objects/ObjectContextTests.cs +++ b/test/EntityFramework/UnitTests/Core/Objects/ObjectContextTests.cs @@ -131,7 +131,7 @@ public void Shortcircuits_if_no_state_changes() } [Fact] - public void If_local_transaction_is_necessary_it_gets_created_commited() + public void If_local_transaction_is_necessary_it_gets_created_committed() { If_local_transaction_is_necessary_it_gets_created(transactionNecessary: true); } @@ -906,7 +906,7 @@ public void Executes_in_a_transaction_using_ExecutionStrategy_clears_parameters_ try { // To simulate the retry, we will execute the query twice. - // and we validate that in both ocassions the same exception is received + // and we validate that in both occasions the same exception is received // if parameter were not cleared, the second call would fail with the // sql paramters contained in an another sql collection error. Assert.Equal( @@ -1294,7 +1294,7 @@ public void Executes_in_a_transaction_using_ExecutionStrategy_clears_parameters_ try { // To simulate the retry, we will execute the query twice. - // and we validate that in both ocassions the same exception is received + // and we validate that in both occasions the same exception is received // if parameter were not cleared, the second call would fail with the // sql paramters contained in an another sql collection error. Assert.Equal( @@ -2020,7 +2020,7 @@ public void Shortcircuits_if_no_state_changes() [Fact] - public void If_local_transaction_is_necessary_it_gets_created_commited() + public void If_local_transaction_is_necessary_it_gets_created_committed() { If_local_transaction_is_necessary_it_gets_created(transactionNecessary: true); } @@ -2840,7 +2840,7 @@ public static void Executes_in_a_transaction_using_ExecutionStrategy_clears_para try { // To simulate the retry, we will execute the query twice. - // and we validate that in both ocassions the same exception is received + // and we validate that in both occasions the same exception is received // if parameter were not cleared, the second call would fail with the // sql paramters contained in an another sql collection error. Assert.Equal( @@ -3287,7 +3287,7 @@ public void Executes_in_a_transaction_using_ExecutionStrategy_clears_parameters_ try { // To simulate the retry, we will execute the query twice. - // and we validate that in both ocassions the same exception is received + // and we validate that in both occasions the same exception is received // if parameter were not cleared, the second call would fail with the // sql paramters contained in an another sql collection error. Assert.Equal( diff --git a/test/EntityFramework/UnitTests/DbConfigurationTests.cs b/test/EntityFramework/UnitTests/DbConfigurationTests.cs index 82a53073d2..9cf28d3f89 100644 --- a/test/EntityFramework/UnitTests/DbConfigurationTests.cs +++ b/test/EntityFramework/UnitTests/DbConfigurationTests.cs @@ -417,7 +417,7 @@ public void ConnectionFactory_delegates_to_internal_configuration() } [Fact] - public void ConnectionFactory_set_in_code_can_be_overriden_before_config_is_locked() + public void ConnectionFactory_set_in_code_can_be_overridden_before_config_is_locked() { Assert.IsType(DbConfiguration.DependencyResolver.GetService()); Assert.IsType(FunctionalTestsConfiguration.OriginalConnectionFactories[0]); diff --git a/test/EntityFramework/UnitTests/DbContextTests.cs b/test/EntityFramework/UnitTests/DbContextTests.cs index 4ed32e8330..7e8174f1c0 100644 --- a/test/EntityFramework/UnitTests/DbContextTests.cs +++ b/test/EntityFramework/UnitTests/DbContextTests.cs @@ -235,7 +235,7 @@ public void Constructing_DbContext_with_null_model_using_existingConnection_cons #region Virtual Dispose tests [Fact] - public void Dispose_can_be_overriden_in_a_derived_DbContext() + public void Dispose_can_be_overridden_in_a_derived_DbContext() { var mockContext = new Mock(); mockContext.Protected().Setup("Dispose", true).Verifiable(); @@ -708,8 +708,8 @@ private static bool ExecuteScalarReturnsOne(SqlConnection connection, string com [Fact] public void Can_replace_connection() { - var intializer = new ReplaceConnectionInitializer(); - Database.SetInitializer(intializer); + var initializer = new ReplaceConnectionInitializer(); + Database.SetInitializer(initializer); using (var context = new ReplaceConnectionContext()) { @@ -728,7 +728,7 @@ public void Can_replace_connection() context.Database.Initialize(force: true); Assert.Equal( "NewReplaceConnectionContextDatabase", - intializer.DatabaseNameUsedDuringInitialization); + initializer.DatabaseNameUsedDuringInitialization); } } } @@ -736,8 +736,8 @@ public void Can_replace_connection() [Fact] public void Can_replace_connection_with_different_provider() { - var intializer = new ReplaceConnectionInitializer(); - Database.SetInitializer(intializer); + var initializer = new ReplaceConnectionInitializer(); + Database.SetInitializer(initializer); using (var context = new ReplaceConnectionContext()) { @@ -758,7 +758,7 @@ public void Can_replace_connection_with_different_provider() context.Database.Initialize(force: true); Assert.Equal( "NewReplaceConnectionContextDatabase.sdf", - intializer.DatabaseNameUsedDuringInitialization); + initializer.DatabaseNameUsedDuringInitialization); } } } diff --git a/test/EntityFramework/UnitTests/Infrastructure/DbContextInfoTests.cs b/test/EntityFramework/UnitTests/Infrastructure/DbContextInfoTests.cs index c4fdfd9302..db5f9b88cc 100644 --- a/test/EntityFramework/UnitTests/Infrastructure/DbContextInfoTests.cs +++ b/test/EntityFramework/UnitTests/Infrastructure/DbContextInfoTests.cs @@ -88,7 +88,7 @@ public void DbContextType_should_return_passed_context_type() } [Fact] - public void ContextType_should_return_tyoe_of_passed_context_instance() + public void ContextType_should_return_type_of_passed_context_instance() { var contextInfo = new DbContextInfo(new SimpleContext()); @@ -248,13 +248,13 @@ public void DbContextInfo_should_get_connection_info_from_given_existing_context var mockContext = new Mock>(); mockContext.Setup(m => m.ConnectionStringOrigin).Returns(DbConnectionStringOrigin.UserCode); mockContext.Setup(m => m.ProviderName).Returns("My.Provider"); - mockContext.Setup(m => m.OriginalConnectionString).Returns("Databse=Foo"); + mockContext.Setup(m => m.OriginalConnectionString).Returns("Database=Foo"); mockContext.Setup(m => m.ConnectionStringName).Returns("SomeName"); var contextInfo = new DbContextInfo(mockContext.Object.Owner); Assert.Equal(DbConnectionStringOrigin.UserCode, contextInfo.ConnectionStringOrigin); - Assert.Equal("Databse=Foo", contextInfo.ConnectionString); + Assert.Equal("Database=Foo", contextInfo.ConnectionString); Assert.Equal("SomeName", contextInfo.ConnectionStringName); Assert.Equal("My.Provider", contextInfo.ConnectionProviderName); } @@ -775,9 +775,9 @@ private void CreateInstance_should_attach_on_model_creating_custom_action_and_in Assert.NotNull(objectContext); Assert.Equal(1, calledCount); - using (var contexct = contextInfo.CreateInstance()) + using (var context = contextInfo.CreateInstance()) { - objectContext = ((IObjectContextAdapter)contexct).ObjectContext; + objectContext = ((IObjectContextAdapter)context).ObjectContext; } Assert.NotNull(objectContext); @@ -859,18 +859,18 @@ var contextInfo } [Fact] - public void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overriden_normal_constructor() + public void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overridden_normal_constructor() { - Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overriden(typeof(ContextWithoutDefaultCtor)); + Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overridden(typeof(ContextWithoutDefaultCtor)); } [Fact] - public void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overriden_init_constructor() + public void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overridden_init_constructor() { - Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overriden(typeof(ContextWithoutDefaultCtorWithInit)); + Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overridden(typeof(ContextWithoutDefaultCtorWithInit)); } - private void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overriden(Type contextType) + private void Should_obtain_DefaultConnectionFactory_from_supplied_config_but_this_can_be_overridden(Type contextType) { RunTestWithConnectionFactory( Database.ResetDefaultConnectionFactory, @@ -938,20 +938,20 @@ private void Should_use_use_default_DefaultConnectionFactory_if_supplied_config_ } [Fact] - public void Should_use_connectioin_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present_normal_constructor() + public void Should_use_connection_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present_normal_constructor() { - Should_use_connectioin_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present( + Should_use_connection_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present( typeof(ContextWithoutDefaultCtor)); } [Fact] - public void Should_use_connectioin_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present_init_constructor() + public void Should_use_connection_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present_init_constructor() { - Should_use_connectioin_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present( + Should_use_connection_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present( typeof(ContextWithoutDefaultCtorWithInit)); } - private void Should_use_connectioin_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present(Type contextType) + private void Should_use_connection_string_from_supplied_config_even_if_DefaultConnectionFactory_is_also_present(Type contextType) { RunTestWithConnectionFactory( Database.ResetDefaultConnectionFactory, @@ -1148,18 +1148,18 @@ private void Can_set_hard_coded_connection_from_supplied_config(Type contextType } [Fact] - public void Supplied_config_used_to_load_original_and_overriden_connection_normal_constructor() + public void Supplied_config_used_to_load_original_and_overridden_connection_normal_constructor() { - Supplied_config_used_to_load_original_and_overriden_connection(typeof(ContextWithConnectionNameNotInAppConfigFile)); + Supplied_config_used_to_load_original_and_overridden_connection(typeof(ContextWithConnectionNameNotInAppConfigFile)); } [Fact] - public void Supplied_config_used_to_load_original_and_overriden_connection_init_constructor() + public void Supplied_config_used_to_load_original_and_overridden_connection_init_constructor() { - Supplied_config_used_to_load_original_and_overriden_connection(typeof(ContextWithConnectionNameNotInAppConfigFileWithInit)); + Supplied_config_used_to_load_original_and_overridden_connection(typeof(ContextWithConnectionNameNotInAppConfigFileWithInit)); } - private void Supplied_config_used_to_load_original_and_overriden_connection(Type contextType) + private void Supplied_config_used_to_load_original_and_overridden_connection(Type contextType) { var connection = new DbConnectionInfo("GetMeFromSuppliedConfig"); var contextInfo = new DbContextInfo( @@ -1282,7 +1282,7 @@ private void CreateInstance_should_use_passed_connection_string_even_when_provid } [Fact] // CodePlex 291, 1316 - public void CreateInstance_should_not_cause_database_initializer_to_run_even_if_context_consturctor_would_cause_it() + public void CreateInstance_should_not_cause_database_initializer_to_run_even_if_context_constructor_would_cause_it() { var contextInfo = new DbContextInfo(typeof(InitTestContext)); @@ -1328,7 +1328,7 @@ public void InitializeDatabase(InitTestContext context) } [Fact] - public void Context_type_can_be_assoictaed_with_DbContextInfo_and_then_later_unsuppressed() + public void Context_type_can_be_associated_with_DbContextInfo_and_then_later_unsuppressed() { Assert.Null(DbContextInfo.CurrentInfo); diff --git a/test/EntityFramework/UnitTests/Infrastructure/Transactions/DefaultTransactionHandlerTests.cs b/test/EntityFramework/UnitTests/Infrastructure/Transactions/DefaultTransactionHandlerTests.cs index c5783c9a5e..8ed5215989 100644 --- a/test/EntityFramework/UnitTests/Infrastructure/Transactions/DefaultTransactionHandlerTests.cs +++ b/test/EntityFramework/UnitTests/Infrastructure/Transactions/DefaultTransactionHandlerTests.cs @@ -17,7 +17,7 @@ public void BuildDatabaseInitializationScript_returns_empty() } [Fact] - public void Commited_wraps_exceptions_for_known_transactions() + public void Committed_wraps_exceptions_for_known_transactions() { var context = Core.Objects.MockHelper.CreateMockObjectContext(); var handler = new DefaultTransactionHandler(); diff --git a/test/EntityFramework/UnitTests/Internal/DbSetDiscoveryServiceTests.cs b/test/EntityFramework/UnitTests/Internal/DbSetDiscoveryServiceTests.cs index a21617e8f0..64ed04fe29 100644 --- a/test/EntityFramework/UnitTests/Internal/DbSetDiscoveryServiceTests.cs +++ b/test/EntityFramework/UnitTests/Internal/DbSetDiscoveryServiceTests.cs @@ -422,7 +422,7 @@ private class DerivedDbContextForPropertyOverrideLevel2 : DerivedDbContextForPro } [Fact] - public void DbSetDiscoveryAttribute_on_overriden_property_is_used() + public void DbSetDiscoveryAttribute_on_overridden_property_is_used() { var context = new DerivedDbContextForPropertyOverrideLevel2(); DiscoverAndInitializeSets(context, 1); @@ -462,7 +462,7 @@ private class DerivedDbContextWithInheritanceBLevel2 : DerivedDbContextWithInher } [Fact] - public void DbSetDiscoveryAttribute_on_class_applies_to_properties_overriden_in_that_class() + public void DbSetDiscoveryAttribute_on_class_applies_to_properties_overridden_in_that_class() { var context = new DerivedDbContextWithInheritanceBLevel2(); DiscoverAndInitializeSets(context, 1); diff --git a/test/EntityFramework/UnitTests/Internal/InternalConnectionTests.cs b/test/EntityFramework/UnitTests/Internal/InternalConnectionTests.cs index eb50aa6b36..06b4a2f09f 100644 --- a/test/EntityFramework/UnitTests/Internal/InternalConnectionTests.cs +++ b/test/EntityFramework/UnitTests/Internal/InternalConnectionTests.cs @@ -693,10 +693,10 @@ public void LazyInternalConnection_can_create_connection_from_DbConnectionInfo_f connection.AppConfig = new AppConfig( CreateEmptyConfig().AddConnectionString( - "LazyConnectionTest", "Database=FromOverridenConfig", "System.Data.SqlClient")); + "LazyConnectionTest", "Database=FromOverriddenConfig", "System.Data.SqlClient")); Assert.IsType(connection.Connection); - Assert.Equal("FromOverridenConfig", connection.Connection.Database); + Assert.Equal("FromOverriddenConfig", connection.Connection.Database); Assert.Equal("LazyConnectionTest", connection.ConnectionStringName); Assert.Equal(DbConnectionStringOrigin.DbContextInfo, connection.ConnectionStringOrigin); } diff --git a/test/EntityFramework/UnitTests/Migrations/DbMigrationTests.cs b/test/EntityFramework/UnitTests/Migrations/DbMigrationTests.cs index 9fa598d497..8d49ca8930 100644 --- a/test/EntityFramework/UnitTests/Migrations/DbMigrationTests.cs +++ b/test/EntityFramework/UnitTests/Migrations/DbMigrationTests.cs @@ -922,7 +922,7 @@ public void SqlResource_should_add_sql_operation_from_specific_assembly() } [Fact] - public void Explictly_calling_IDbMigration_should_add_operation() + public void Explicitly_calling_IDbMigration_should_add_operation() { var migration = new TestMigration(); var operation = new Mock(null).Object; diff --git a/test/EntityFramework/UnitTests/Migrations/Utilities/DatabaseCreatorTests.cs b/test/EntityFramework/UnitTests/Migrations/Utilities/DatabaseCreatorTests.cs index 2ccb051d29..6485f61001 100644 --- a/test/EntityFramework/UnitTests/Migrations/Utilities/DatabaseCreatorTests.cs +++ b/test/EntityFramework/UnitTests/Migrations/Utilities/DatabaseCreatorTests.cs @@ -14,7 +14,7 @@ public DatabaseCreatorTests(DatabaseProviderFixture databaseProviderFixture) } [MigrationsTheory] - public void DatabaseCreator_can_create_delete_and_check_for_existance_of_database() + public void DatabaseCreator_can_create_delete_and_check_for_existence_of_database() { DropDatabase(); diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Configuration/Properties/Navigation/ConventionNavigationPropertyConfigurationTests.cs b/test/EntityFramework/UnitTests/ModelConfiguration/Configuration/Properties/Navigation/ConventionNavigationPropertyConfigurationTests.cs index 0d6bd90e0e..12e01dc623 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Configuration/Properties/Navigation/ConventionNavigationPropertyConfigurationTests.cs +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Configuration/Properties/Navigation/ConventionNavigationPropertyConfigurationTests.cs @@ -203,7 +203,7 @@ public void HasInverseNavigationProperty_checks_preconditions() } [Fact] - public void HasInverseNavigationProperty_throws_on_invalid_nagivation_property() + public void HasInverseNavigationProperty_throws_on_invalid_navigation_property() { var navigationProperty = typeof(LightweighEntity).GetDeclaredProperty("ValidNavigationProperty"); var lightweightConfiguration = @@ -219,7 +219,7 @@ public void HasInverseNavigationProperty_throws_on_invalid_nagivation_property() } [Fact] - public void HasInverseNavigationProperty_throws_on_nonmatching_nagivation_property() + public void HasInverseNavigationProperty_throws_on_nonmatching_navigation_property() { var navigationProperty = typeof(LightweighEntity).GetDeclaredProperty("UnrelatedNavigationProperty"); var configuration = new NavigationPropertyConfiguration(navigationProperty); diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.AnnotationSchema.xsd b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.AnnotationSchema.xsd index c803c9c8d5..91b80d7195 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.AnnotationSchema.xsd +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.AnnotationSchema.xsd @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_1.xsd b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_1.xsd index 6cb1a55258..51af1ec39e 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_1.xsd +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_1.xsd @@ -345,7 +345,7 @@ - + diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_2.xsd b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_2.xsd index d6aa6dc0cf..366bd89517 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_2.xsd +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_2.xsd @@ -360,7 +360,7 @@ - + diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_3.xsd b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_3.xsd index 4565554d88..cf38dba134 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_3.xsd +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Edm/Serialization/Xsd/System.Data.Resources.CSMSL_3.xsd @@ -350,7 +350,7 @@ - + diff --git a/test/EntityFramework/UnitTests/ModelConfiguration/Mappers/NavigationPropertyMapperTests.cs b/test/EntityFramework/UnitTests/ModelConfiguration/Mappers/NavigationPropertyMapperTests.cs index a27c754e8b..9b474b78c2 100644 --- a/test/EntityFramework/UnitTests/ModelConfiguration/Mappers/NavigationPropertyMapperTests.cs +++ b/test/EntityFramework/UnitTests/ModelConfiguration/Mappers/NavigationPropertyMapperTests.cs @@ -149,7 +149,7 @@ public class Target1 } [Fact] - public void Map_should_set_clr_property_info_on_assocation_source_end() + public void Map_should_set_clr_property_info_on_association_source_end() { var modelConfiguration = new ModelConfiguration(); var model = new EdmModel(DataSpace.CSpace); diff --git a/tools/VsIdeHostAdapter/TargetAddIn/HostSide/VsIdeHostAdapterRunConfigControl.cs b/tools/VsIdeHostAdapter/TargetAddIn/HostSide/VsIdeHostAdapterRunConfigControl.cs index 495a87a845..d97f85fb1c 100644 --- a/tools/VsIdeHostAdapter/TargetAddIn/HostSide/VsIdeHostAdapterRunConfigControl.cs +++ b/tools/VsIdeHostAdapter/TargetAddIn/HostSide/VsIdeHostAdapterRunConfigControl.cs @@ -15,7 +15,7 @@ namespace Microsoft.VisualStudio.TestTools.HostAdapters.VsIde { /// - /// UI control for my host adapter configuartion. Hosted inside test run config editor. + /// UI control for my host adapter configuration. Hosted inside test run config editor. /// It contains a data grid view where you could define environment variables. /// [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Vs", Justification = "Public class, cannot rename")] @@ -38,7 +38,7 @@ public VsIdeHostAdapterRunConfigControl() /// Initialize the editor to a default state based on given test run. /// /// - /// Obselete. Always null. + /// Obsolete. Always null. void IRunConfigurationEditor.Initialize(System.IServiceProvider serviceProvider, TestRun run) { // Initialize to something like: 7.0, 7.1, 8.0 @@ -76,7 +76,7 @@ void IRunConfigurationEditor.OnCommonDataDirty(object sender, CommonRunConfigura } /// - /// Desciption about this editor is displayed in the help panel of main run config editor. + /// Description about this editor is displayed in the help panel of main run config editor. /// string IRunConfigurationEditor.Description { @@ -98,7 +98,7 @@ string IRunConfigurationEditor.HelpKeyword } /// - /// Verify the data in the editor. Prompt the user when neccessary. + /// Verify the data in the editor. Prompt the user when necessary. /// /// true if the data are correct and don't need correction; otherwise, false. bool IRunConfigurationEditor.VerifyData()