Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

csproj file upgraded to new format and add .net core 3.1 #2833

Merged
8 commits merged into from
Apr 4, 2020
12 changes: 12 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
4.1.9.3 2020-03-31
- Set default method to chacha20-ietf-poly1305
- Using hash in PAC URL (#2759)
- Rename and translate title of statistics form (#2768)
- Russian translation (#2767)
- Refine Updated Notification logic
- Using NLog (#2783)
- Bug fix: wrong server in tray menu (#2782)
- Deprecate unsafe encryption method (#2757, #2801)
- Bug fix: server config is overwritten by others when moving up/down (#2830)
- Other minor bug fixes and improvements

4.1.9.2 2019-12-25
- Fix i18n issues (#2740, #2741)

Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-csharp/Controller/Service/UpdateChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class UpdateChecker
public string LatestVersionLocalName;
public event EventHandler CheckUpdateCompleted;

public const string Version = "4.1.9.2";
public const string Version = "4.1.9.3";

private class CheckUpdateTimer : System.Timers.Timer
{
Expand Down
7 changes: 5 additions & 2 deletions shadowsocks-csharp/Util/Util.cs
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,11 @@ public static void OpenInBrowser(string url)
// hack because of this: https://github.com/dotnet/corefx/issues/10361
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
url = url.Replace("&", "^&");
Process.Start(new ProcessStartInfo("cmd", $"/c start {url}") { CreateNoWindow = true });
Process.Start(new ProcessStartInfo(url)
{
UseShellExecute = true,
Verb = "open"
});
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
Expand Down
21 changes: 9 additions & 12 deletions shadowsocks-csharp/View/ConfigForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -494,21 +494,18 @@ private void MoveDownButton_Click(object sender, EventArgs e)

private void MoveConfigItem(int step)
{
int index = ServersListBox.SelectedIndex;
Server server = _modifiedConfiguration.configs[index];
object item = ServersListBox.Items[index];
var server = _modifiedConfiguration.configs[_lastSelectedIndex];
var newIndex = _lastSelectedIndex + step;

_modifiedConfiguration.configs.Remove(server);
_modifiedConfiguration.configs.Insert(index + step, server);
_modifiedConfiguration.index += step;
_modifiedConfiguration.configs.RemoveAt(_lastSelectedIndex);
_modifiedConfiguration.configs.Insert(newIndex, server);

ServersListBox.BeginUpdate();
ServersListBox.Enabled = false;
_lastSelectedIndex = index + step;
ServersListBox.Items.Remove(item);
ServersListBox.Items.Insert(index + step, item);
ServersListBox.Enabled = true;
ServersListBox.SelectedIndex = index + step;

LoadServerNameListToUI(_modifiedConfiguration);

_lastSelectedIndex = newIndex;
ServersListBox.SelectedIndex = newIndex;
ServersListBox.EndUpdate();

UpdateButtons();
Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-csharp/View/MenuViewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class MenuViewController
private ToolStripMenuItem disableItem;
private ToolStripMenuItem AutoStartupItem;
private ToolStripMenuItem ShareOverLANItem;
private ToolStripSeparator SeperatorItem;
private ToolStripSeparator SeperatorItem;
private ToolStripMenuItem ConfigItem;
private ToolStripMenuItem ServersItem;
private ToolStripMenuItem globalModeItem;
Expand Down