diff options
6 files changed, 8 insertions, 29 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs index fb960e7c81..4529a91554 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs @@ -174,31 +174,12 @@ namespace MonoDevelop.Deployment } } - // Temporary hack in place to build with GAC'd SharpZipLib on Windows - static void SetAsciiTranslate (TarArchive archive) - { -#if WIN32 - archive.SetAsciiTranslation (false); -#else - archive.AsciiTranslate = false; -#endif - } - - static void CloseArchive (TarArchive archive) - { -#if WIN32 - archive?.CloseArchive (); -#else - archive?.Close (); -#endif - } - static void CreateTarArchive (ProgressMonitor mon, string folder, Stream outStream) { TarArchive archive = null; try { archive = TarArchive.CreateOutputTarArchive (outStream); - SetAsciiTranslate (archive); + archive.AsciiTranslate = false; archive.RootPath = folder; archive.ProgressMessageEvent += delegate (TarArchive ac, TarEntry e, string message) { if (message != null) @@ -229,7 +210,7 @@ namespace MonoDevelop.Deployment tarOut.Finish (); } } finally { - CloseArchive (archive); + archive?.Close (); } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs index 19f71f9a1e..6af63e47b2 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -112,7 +112,6 @@ namespace MonoDevelop.SourceEditor.QuickTasks readonly QuickTaskStrip parentStrip; protected readonly Adjustment vadjustment; TextViewMargin textViewMargin; - int caretLine = -1; public Mono.TextEditor.MonoTextEditor TextEditor { get; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarginMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarginMarker.cs index cd0a28b473..a225c0befc 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarginMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarginMarker.cs @@ -21,7 +21,6 @@ namespace MonoDevelop.SourceEditor public IDocumentLine Line => base.LineSegment; public event EventHandler ShowPopup; - public event EventHandler CancelPopup; public SmartTagSeverity SmartTagSeverity { get; set; } diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs index 62b40b80b6..ba03343c15 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs @@ -403,11 +403,11 @@ namespace MonoDevelop.UnitTesting [Serializable] public class TestRecordCollection: CollectionBase { - public new TestRecord this [int n] { + public TestRecord this [int n] { get { return (TestRecord) ((IList)this) [n]; } } - public new TestRecord this [string name] { + public TestRecord this [string name] { get { for (int n=0; n<List.Count; n++) if (((TestRecord)List [n]).Name == name) @@ -425,7 +425,7 @@ namespace MonoDevelop.UnitTesting [Serializable] public class UnitTestResultCollection: CollectionBase { - public new UnitTestResult this [int n] { + public UnitTestResult this [int n] { get { return (UnitTestResult) ((IList)this) [n]; } } diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonSaveFileDialog.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonSaveFileDialog.cs index 27e6ef5482..a2b707afe7 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonSaveFileDialog.cs +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonSaveFileDialog.cs @@ -153,7 +153,7 @@ namespace Microsoft.WindowsAPICodePack.Dialogs // The string we pass to PSGetPropertyDescriptionListFromString must
// start with "prop:", followed a list of canonical names for each
// property that is to collected.
- if (propertyList != null && propertyList.Length > 0 && propertyList[0] != null)
+ if (propertyList != null && propertyList.Length > 0)
{
StringBuilder sb = new StringBuilder("prop:");
foreach (PropertyKey key in propertyList)
diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/ShellObjectWatcher/ShellObjectNotificationEventArgs.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/ShellObjectWatcher/ShellObjectNotificationEventArgs.cs index b607fb0e67..d24a41ece0 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/ShellObjectWatcher/ShellObjectNotificationEventArgs.cs +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/ShellObjectWatcher/ShellObjectNotificationEventArgs.cs @@ -1,9 +1,9 @@ -using System;
+using System;
namespace Microsoft.WindowsAPICodePack.Shell
{
/// <summary>
- /// Base class for the Event Args for change notifications raised by <typeparamref name="ShellObjectWatcher"/>.
+ /// Base class for the Event Args for change notifications raised by <see cref="ShellObjectWatcher"/>.
/// </summary>
public class ShellObjectNotificationEventArgs : EventArgs
{
|