diff --git a/Directory.Build.props b/Directory.Build.props
index 78cd56c7b..b1f50e7b1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,6 +18,7 @@
true
net472
Off
+ true
@@ -102,25 +103,10 @@
-
-
+
+
-
- $(PkgTools_MSBuildTasks)
-
-
- $(userprofile)\.nuget\packages\msbuildtasks\1.5.0.235\tools\
-
-
- $(MSBuildExtensionsPath)\MSBuildCommunityTasks\
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Confluence.cs b/GreenshotConfluencePlugin/Confluence.cs
index 3ccfce630..69833cb77 100644
--- a/GreenshotConfluencePlugin/Confluence.cs
+++ b/GreenshotConfluencePlugin/Confluence.cs
@@ -18,15 +18,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+
using System;
using System.Collections.Generic;
using System.Windows.Forms;
-using GreenshotConfluencePlugin;
using GreenshotConfluencePlugin.confluence;
using GreenshotPlugin.Core;
using GreenshotPlugin.IniFile;
-namespace Confluence {
+namespace GreenshotConfluencePlugin {
public class Page {
public Page(RemotePage page) {
Id = page.id;
diff --git a/GreenshotConfluencePlugin/ConfluenceDestination.cs b/GreenshotConfluencePlugin/ConfluenceDestination.cs
index 63bf60f01..7403495e2 100644
--- a/GreenshotConfluencePlugin/ConfluenceDestination.cs
+++ b/GreenshotConfluencePlugin/ConfluenceDestination.cs
@@ -25,7 +25,6 @@ using System.Drawing;
using System.IO;
using System.Threading;
using System.Windows;
-using Confluence;
using GreenshotPlugin.Controls;
using GreenshotPlugin.Core;
using GreenshotPlugin.IniFile;
@@ -129,7 +128,7 @@ namespace GreenshotConfluencePlugin {
bool openPage = (_page == null) && ConfluenceConfig.OpenPageAfterUpload;
string filename = FilenameHelper.GetFilenameWithoutExtensionFromPattern(CoreConfig.OutputFileFilenamePattern, captureDetails);
if (selectedPage == null) {
- ConfluenceUpload confluenceUpload = new ConfluenceUpload(filename);
+ Forms.ConfluenceUpload confluenceUpload = new Forms.ConfluenceUpload(filename);
bool? dialogResult = confluenceUpload.ShowDialog();
if (dialogResult.HasValue && dialogResult.Value) {
selectedPage = confluenceUpload.SelectedPage;
diff --git a/GreenshotConfluencePlugin/ConfluencePlugin.cs b/GreenshotConfluencePlugin/ConfluencePlugin.cs
index 78680f24a..2f5ea3539 100644
--- a/GreenshotConfluencePlugin/ConfluencePlugin.cs
+++ b/GreenshotConfluencePlugin/ConfluencePlugin.cs
@@ -19,14 +19,14 @@
* along with this program. If not, see .
*/
-using Confluence;
using GreenshotPlugin.Core;
using System;
using System.Windows;
+using GreenshotConfluencePlugin.Forms;
+using GreenshotConfluencePlugin.Support;
using GreenshotPlugin.IniFile;
using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Plugin;
-using TranslationByMarkupExtension;
namespace GreenshotConfluencePlugin {
///
diff --git a/GreenshotConfluencePlugin/ConfluenceUtils.cs b/GreenshotConfluencePlugin/ConfluenceUtils.cs
index 7c9e84b00..9b3394cc7 100644
--- a/GreenshotConfluencePlugin/ConfluenceUtils.cs
+++ b/GreenshotConfluencePlugin/ConfluenceUtils.cs
@@ -33,8 +33,8 @@ namespace GreenshotConfluencePlugin {
public class ConfluenceUtils {
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceUtils));
- public static List GetCurrentPages() {
- List pages = new List();
+ public static List GetCurrentPages() {
+ List pages = new List();
Regex pageIdRegex = new Regex(@"pageId=(\d+)");
Regex spacePageRegex = new Regex(@"\/display\/([^\/]+)\/([^#]+)");
foreach(string browserurl in GetBrowserUrls()) {
@@ -50,7 +50,7 @@ namespace GreenshotConfluencePlugin {
long pageId = long.Parse(pageIdMatch[0].Groups[1].Value);
try {
bool pageDouble = false;
- foreach(Confluence.Page page in pages) {
+ foreach(Page page in pages) {
if (page.Id == pageId) {
pageDouble = true;
LOG.DebugFormat("Skipping double page with ID {0}", pageId);
@@ -58,7 +58,7 @@ namespace GreenshotConfluencePlugin {
}
}
if (!pageDouble) {
- Confluence.Page page = ConfluencePlugin.ConfluenceConnector.GetPage(pageId);
+ Page page = ConfluencePlugin.ConfluenceConnector.GetPage(pageId);
LOG.DebugFormat("Adding page {0}", page.Title);
pages.Add(page);
}
@@ -82,7 +82,7 @@ namespace GreenshotConfluencePlugin {
}
try {
bool pageDouble = false;
- foreach(Confluence.Page page in pages) {
+ foreach(Page page in pages) {
if (page.Title.Equals(title)) {
LOG.DebugFormat("Skipping double page with title {0}", title);
pageDouble = true;
@@ -90,7 +90,7 @@ namespace GreenshotConfluencePlugin {
}
}
if (!pageDouble) {
- Confluence.Page page = ConfluencePlugin.ConfluenceConnector.GetPage(space, title);
+ Page page = ConfluencePlugin.ConfluenceConnector.GetPage(space, title);
LOG.DebugFormat("Adding page {0}", page.Title);
pages.Add(page);
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
index b22e55d9b..c6b6b48a6 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
@@ -1,33 +1,33 @@
-
+ xmlns:gsc="clr-namespace:GreenshotPlugin.Core;assembly=GreenshotPlugin"
+ xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+ Title="{support:Translate plugin_settings}" SizeToContent="WidthAndHeight" ResizeMode="NoResize" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
index ca662b316..8545d91a0 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
@@ -21,7 +21,7 @@
using System.Windows;
-namespace GreenshotConfluencePlugin {
+namespace GreenshotConfluencePlugin.Forms {
///
/// Interaction logic for ConfluenceConfigurationForm.xaml
///
diff --git a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml
index 6455e86b5..e9ae3f97b 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml
@@ -1,4 +1,4 @@
-
diff --git a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
index 9d52f49e9..7ce72fd4f 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
@@ -19,10 +19,9 @@
* along with this program. If not, see .
*/
-using Confluence;
using System.Collections.Generic;
-namespace GreenshotConfluencePlugin {
+namespace GreenshotConfluencePlugin.Forms {
///
/// Interaction logic for ConfluencePagePicker.xaml
///
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
index e30f9ab6e..073a437fe 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
@@ -1,8 +1,9 @@
-
+ xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+ Loaded="Page_Loaded">
@@ -16,9 +17,9 @@
-
-
-
+
+
+
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
index 1b5c3877e..e30ed9dc4 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
@@ -25,15 +25,15 @@ using System.Linq;
using System.Windows;
using GreenshotPlugin.IniFile;
-namespace GreenshotConfluencePlugin {
+namespace GreenshotConfluencePlugin.Forms {
public partial class ConfluenceSearch
{
private static readonly ConfluenceConfiguration ConfluenceConfig = IniConfig.GetIniSection();
private readonly ConfluenceUpload _confluenceUpload;
- public IEnumerable Spaces => _confluenceUpload.Spaces;
+ public IEnumerable Spaces => _confluenceUpload.Spaces;
- public ObservableCollection Pages { get; } = new ObservableCollection();
+ public ObservableCollection Pages { get; } = new ObservableCollection();
public ConfluenceSearch(ConfluenceUpload confluenceUpload) {
_confluenceUpload = confluenceUpload;
@@ -56,7 +56,7 @@ namespace GreenshotConfluencePlugin {
private void SelectionChanged() {
if (PageListView.HasItems && PageListView.SelectedItems.Count > 0) {
- _confluenceUpload.SelectedPage = (Confluence.Page)PageListView.SelectedItem;
+ _confluenceUpload.SelectedPage = (Page)PageListView.SelectedItem;
} else {
_confluenceUpload.SelectedPage = null;
}
@@ -86,7 +86,7 @@ namespace GreenshotConfluencePlugin {
SelectionChanged();
}
- private void searchText_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e) {
+ private void SearchText_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e) {
Search.IsEnabled = !string.IsNullOrEmpty(searchText.Text);
}
}
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml
index 97352d47e..4ca2a11ad 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml
@@ -1,8 +1,8 @@
-
+ FontSize="18" FontWeight="Bold" Foreground="#7EFFFFFF" Text="{support:Translate loading}"/>
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
index 78fb2235d..b154ad357 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
@@ -27,10 +27,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Threading;
-using Confluence;
-using Page = Confluence.Page;
-
-namespace GreenshotConfluencePlugin {
+namespace GreenshotConfluencePlugin.Forms {
///
/// Interaction logic for ConfluenceTreePicker.xaml
///
@@ -47,10 +44,10 @@ namespace GreenshotConfluencePlugin {
InitializeComponent();
}
- private void pageTreeViewItem_DoubleClick(object sender, MouseButtonEventArgs eventArgs) {
+ private void PageTreeViewItem_DoubleClick(object sender, MouseButtonEventArgs eventArgs) {
Log.Debug("spaceTreeViewItem_MouseLeftButtonDown is called!");
TreeViewItem clickedItem = eventArgs.Source as TreeViewItem;
- if (!(clickedItem?.Tag is Page page)) {
+ if (clickedItem?.Tag is not Page page) {
return;
}
if (clickedItem.HasItems)
@@ -70,20 +67,20 @@ namespace GreenshotConfluencePlugin {
Tag = childPage
};
clickedItem.Items.Add(pageTreeViewItem);
- pageTreeViewItem.PreviewMouseDoubleClick += pageTreeViewItem_DoubleClick;
- pageTreeViewItem.PreviewMouseLeftButtonDown += pageTreeViewItem_Click;
+ pageTreeViewItem.PreviewMouseDoubleClick += PageTreeViewItem_DoubleClick;
+ pageTreeViewItem.PreviewMouseLeftButtonDown += PageTreeViewItem_Click;
}
ShowBusy.Visibility = Visibility.Collapsed;
}));
}) { Name = "Loading childpages for confluence page " + page.Title }.Start();
}
- private void pageTreeViewItem_Click(object sender, MouseButtonEventArgs eventArgs) {
+ private void PageTreeViewItem_Click(object sender, MouseButtonEventArgs eventArgs) {
Log.Debug("pageTreeViewItem_PreviewMouseDoubleClick is called!");
- if (!(eventArgs.Source is TreeViewItem clickedItem)) {
+ if (eventArgs.Source is not TreeViewItem clickedItem) {
return;
}
- Confluence.Page page = clickedItem.Tag as Confluence.Page;
+ Page page = clickedItem.Tag as Page;
_confluenceUpload.SelectedPage = page;
if (page != null) {
Log.Debug("Page selected: " + page.Title);
@@ -107,14 +104,14 @@ namespace GreenshotConfluencePlugin {
// Get homepage
try {
- Confluence.Page page = _confluenceConnector.GetSpaceHomepage(space);
+ Page page = _confluenceConnector.GetSpaceHomepage(space);
TreeViewItem pageTreeViewItem = new TreeViewItem
{
Header = page.Title,
Tag = page
};
- pageTreeViewItem.PreviewMouseDoubleClick += pageTreeViewItem_DoubleClick;
- pageTreeViewItem.PreviewMouseLeftButtonDown += pageTreeViewItem_Click;
+ pageTreeViewItem.PreviewMouseDoubleClick += PageTreeViewItem_DoubleClick;
+ pageTreeViewItem.PreviewMouseLeftButtonDown += PageTreeViewItem_Click;
spaceTreeViewItem.Items.Add(pageTreeViewItem);
ConfluenceTreeView.Items.Add(spaceTreeViewItem);
} catch (Exception ex) {
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
index aa97142a6..f6ec6f13a 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
@@ -1,17 +1,17 @@
-
+ xmlns:support="clr-namespace:GreenshotConfluencePlugin.Support"
+ Title="{support:Translate upload_menu_item}" Height="640" Width="500" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
-
+
-
+
-
+
@@ -23,12 +23,12 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
index 76c82b2df..86c5ff4e4 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
@@ -18,23 +18,23 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows;
-using System.Windows.Controls;
-namespace GreenshotConfluencePlugin {
+namespace GreenshotConfluencePlugin.Forms {
///
/// Interaction logic for ConfluenceUpload.xaml
///
public partial class ConfluenceUpload : Window {
- private Page _pickerPage;
- public Page PickerPage {
+ private System.Windows.Controls.Page _pickerPage;
+ public System.Windows.Controls.Page PickerPage {
get {
if (_pickerPage == null) {
- List pages = ConfluenceUtils.GetCurrentPages();
+ List pages = ConfluenceUtils.GetCurrentPages();
if (pages != null && pages.Count > 0) {
_pickerPage = new ConfluencePagePicker(this, pages);
}
@@ -43,21 +43,19 @@ namespace GreenshotConfluencePlugin {
}
}
- private Page _searchPage;
- public Page SearchPage {
+ private System.Windows.Controls.Page _searchPage;
+ public System.Windows.Controls.Page SearchPage {
get { return _searchPage ??= new ConfluenceSearch(this); }
}
- private Page _browsePage;
- public Page BrowsePage {
+ private System.Windows.Controls.Page _browsePage;
+ public System.Windows.Controls.Page BrowsePage {
get { return _browsePage ??= new ConfluenceTreePicker(this); }
}
- private Confluence.Page _selectedPage;
- public Confluence.Page SelectedPage {
- get {
- return _selectedPage;
- }
+ private Page _selectedPage;
+ public Page SelectedPage {
+ get => _selectedPage;
set {
_selectedPage = value;
Upload.IsEnabled = _selectedPage != null;
@@ -75,8 +73,8 @@ namespace GreenshotConfluencePlugin {
}
private static DateTime _lastLoad = DateTime.Now;
- private static IList _spaces;
- public IList Spaces {
+ private static IList _spaces;
+ public IList Spaces {
get {
UpdateSpaces();
while (_spaces == null) {
diff --git a/GreenshotConfluencePlugin/Forms/ListViewColumnSorter.cs b/GreenshotConfluencePlugin/Forms/ListViewColumnSorter.cs
index fa3d4e027..85b380840 100644
--- a/GreenshotConfluencePlugin/Forms/ListViewColumnSorter.cs
+++ b/GreenshotConfluencePlugin/Forms/ListViewColumnSorter.cs
@@ -18,92 +18,96 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+
using System.Collections;
using System.Windows.Forms;
-///
-/// This class is an implementation of the 'IComparer' interface.
-///
-public class ListViewColumnSorter : IComparer {
+namespace GreenshotConfluencePlugin.Forms
+{
///
- /// Specifies the column to be sorted
+ /// This class is an implementation of the 'IComparer' interface.
///
- private int _columnToSort;
- ///
- /// Specifies the order in which to sort (i.e. 'Ascending').
- ///
- private SortOrder _orderOfSort;
- ///
- /// Case insensitive comparer object
- ///
- private readonly CaseInsensitiveComparer _objectCompare;
+ public class ListViewColumnSorter : IComparer {
+ ///
+ /// Specifies the column to be sorted
+ ///
+ private int _columnToSort;
+ ///
+ /// Specifies the order in which to sort (i.e. 'Ascending').
+ ///
+ private SortOrder _orderOfSort;
+ ///
+ /// Case insensitive comparer object
+ ///
+ private readonly CaseInsensitiveComparer _objectCompare;
- ///
- /// Class constructor. Initializes various elements
- ///
- public ListViewColumnSorter() {
- // Initialize the column to '0'
- _columnToSort = 0;
+ ///
+ /// Class constructor. Initializes various elements
+ ///
+ public ListViewColumnSorter() {
+ // Initialize the column to '0'
+ _columnToSort = 0;
- // Initialize the sort order to 'none'
- _orderOfSort = SortOrder.None;
+ // Initialize the sort order to 'none'
+ _orderOfSort = SortOrder.None;
+
+ // Initialize the CaseInsensitiveComparer object
+ _objectCompare = new CaseInsensitiveComparer();
+ }
+
+ ///
+ /// This method is inherited from the IComparer interface. It compares the two objects passed using a case insensitive comparison.
+ ///
+ /// First object to be compared
+ /// Second object to be compared
+ /// The result of the comparison. "0" if equal, negative if 'x' is less than 'y' and positive if 'x' is greater than 'y'
+ public int Compare(object x, object y) {
+ int compareResult;
+ ListViewItem listviewX, listviewY;
+
+ // Cast the objects to be compared to ListViewItem objects
+ listviewX = (ListViewItem)x;
+ listviewY = (ListViewItem)y;
+
+ // Compare the two items
+ compareResult = _objectCompare.Compare(listviewX.SubItems[_columnToSort].Text, listviewY.SubItems[_columnToSort].Text);
+
+ // Calculate correct return value based on object comparison
+ if (_orderOfSort == SortOrder.Ascending) {
+ // Ascending sort is selected, return normal result of compare operation
+ return compareResult;
+ } else if (_orderOfSort == SortOrder.Descending) {
+ // Descending sort is selected, return negative result of compare operation
+ return (-compareResult);
+ } else {
+ // Return '0' to indicate they are equal
+ return 0;
+ }
+ }
+
+ ///
+ /// Gets or sets the number of the column to which to apply the sorting operation (Defaults to '0').
+ ///
+ public int SortColumn {
+ set {
+ _columnToSort = value;
+ }
+ get {
+ return _columnToSort;
+ }
+ }
+
+ ///
+ /// Gets or sets the order of sorting to apply (for example, 'Ascending' or 'Descending').
+ ///
+ public SortOrder Order {
+ set {
+ _orderOfSort = value;
+ }
+ get {
+ return _orderOfSort;
+ }
+ }
- // Initialize the CaseInsensitiveComparer object
- _objectCompare = new CaseInsensitiveComparer();
}
-
- ///
- /// This method is inherited from the IComparer interface. It compares the two objects passed using a case insensitive comparison.
- ///
- /// First object to be compared
- /// Second object to be compared
- /// The result of the comparison. "0" if equal, negative if 'x' is less than 'y' and positive if 'x' is greater than 'y'
- public int Compare(object x, object y) {
- int compareResult;
- ListViewItem listviewX, listviewY;
-
- // Cast the objects to be compared to ListViewItem objects
- listviewX = (ListViewItem)x;
- listviewY = (ListViewItem)y;
-
- // Compare the two items
- compareResult = _objectCompare.Compare(listviewX.SubItems[_columnToSort].Text, listviewY.SubItems[_columnToSort].Text);
-
- // Calculate correct return value based on object comparison
- if (_orderOfSort == SortOrder.Ascending) {
- // Ascending sort is selected, return normal result of compare operation
- return compareResult;
- } else if (_orderOfSort == SortOrder.Descending) {
- // Descending sort is selected, return negative result of compare operation
- return (-compareResult);
- } else {
- // Return '0' to indicate they are equal
- return 0;
- }
- }
-
- ///
- /// Gets or sets the number of the column to which to apply the sorting operation (Defaults to '0').
- ///
- public int SortColumn {
- set {
- _columnToSort = value;
- }
- get {
- return _columnToSort;
- }
- }
-
- ///
- /// Gets or sets the order of sorting to apply (for example, 'Ascending' or 'Descending').
- ///
- public SortOrder Order {
- set {
- _orderOfSort = value;
- }
- get {
- return _orderOfSort;
- }
- }
-
}
diff --git a/GreenshotConfluencePlugin/Support/ITranslationProvider.cs b/GreenshotConfluencePlugin/Support/ITranslationProvider.cs
index 79efd538c..02180f036 100644
--- a/GreenshotConfluencePlugin/Support/ITranslationProvider.cs
+++ b/GreenshotConfluencePlugin/Support/ITranslationProvider.cs
@@ -1,4 +1,4 @@
-namespace TranslationByMarkupExtension {
+namespace GreenshotConfluencePlugin.Support {
public interface ITranslationProvider {
///
/// Translates the specified key.
diff --git a/GreenshotConfluencePlugin/Support/LanguageChangedEventManager.cs b/GreenshotConfluencePlugin/Support/LanguageChangedEventManager.cs
index 8fe9289d3..c9fb55704 100644
--- a/GreenshotConfluencePlugin/Support/LanguageChangedEventManager.cs
+++ b/GreenshotConfluencePlugin/Support/LanguageChangedEventManager.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows;
-namespace TranslationByMarkupExtension
+namespace GreenshotConfluencePlugin.Support
{
public class LanguageChangedEventManager : WeakEventManager
{
diff --git a/GreenshotConfluencePlugin/Support/LanguageXMLTranslationProvider.cs b/GreenshotConfluencePlugin/Support/LanguageXMLTranslationProvider.cs
index 3b23c0d58..23dbc4fc1 100644
--- a/GreenshotConfluencePlugin/Support/LanguageXMLTranslationProvider.cs
+++ b/GreenshotConfluencePlugin/Support/LanguageXMLTranslationProvider.cs
@@ -1,6 +1,6 @@
using GreenshotPlugin.Core;
-namespace TranslationByMarkupExtension {
+namespace GreenshotConfluencePlugin.Support {
///
///
///
diff --git a/GreenshotConfluencePlugin/Support/TranslateExtension.cs b/GreenshotConfluencePlugin/Support/TranslateExtension.cs
index c581efc77..3730e7baa 100644
--- a/GreenshotConfluencePlugin/Support/TranslateExtension.cs
+++ b/GreenshotConfluencePlugin/Support/TranslateExtension.cs
@@ -2,7 +2,7 @@
using System.Windows.Data;
using System.Windows.Markup;
-namespace TranslationByMarkupExtension
+namespace GreenshotConfluencePlugin.Support
{
///
/// The Translate Markup extension returns a binding to a TranslationData
diff --git a/GreenshotConfluencePlugin/Support/TranslationData.cs b/GreenshotConfluencePlugin/Support/TranslationData.cs
index e659a0be3..0b6371505 100644
--- a/GreenshotConfluencePlugin/Support/TranslationData.cs
+++ b/GreenshotConfluencePlugin/Support/TranslationData.cs
@@ -2,7 +2,7 @@
using System.ComponentModel;
using System.Windows;
-namespace TranslationByMarkupExtension {
+namespace GreenshotConfluencePlugin.Support {
public class TranslationData : IWeakEventListener, INotifyPropertyChanged {
private readonly string _key;
diff --git a/GreenshotConfluencePlugin/Support/TranslationManager.cs b/GreenshotConfluencePlugin/Support/TranslationManager.cs
index d11d36cd5..241cce868 100644
--- a/GreenshotConfluencePlugin/Support/TranslationManager.cs
+++ b/GreenshotConfluencePlugin/Support/TranslationManager.cs
@@ -1,6 +1,6 @@
using System;
-namespace TranslationByMarkupExtension {
+namespace GreenshotConfluencePlugin.Support {
public class TranslationManager {
private static TranslationManager _translationManager;
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 329355afa..5043dd397 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,10 +30,6 @@ stages:
steps:
- task: NuGetToolInstaller@1
- - powershell: |
- choco install msbuild.communitytasks
- displayName: 'Installing MSBuild community tasks'
-
- task: NuGetCommand@2
displayName: NuGet restore
inputs: