diff --git a/BUILD.ps1 b/BUILD.ps1 index 196c6dec..5b9db8db 100644 --- a/BUILD.ps1 +++ b/BUILD.ps1 @@ -16,19 +16,17 @@ function Build-NetFrameworkx64 $outdir = "$net_baseoutput\x64" - msbuild -v:m -m -t:Build /p:Configuration="Release" /p:Platform="x64" /p:TargetFramework=net48 /p:Runtimeidentifier=win-x64 /restore + msbuild -v:n -m:1 /p:Configuration="Release" ` + /p:Platform="x64" ` + /p:TargetFramework=net48 ` + /p:Runtimeidentifier=win-x64 ` + /restore if ($LASTEXITCODE) { cd $mainDir ; exit $LASTEXITCODE } - Write-Host 'Build x64 Completed, start copy bin, mode, i18n file' - Remove-Item -Recurse -Force "$net_baseoutput\x64\Release\win-x64\bin\tap-driver" - Copy-Item -Recurse "$mainDir\binaries\*" "$net_baseoutput\x64\Release\win-x64\bin" - Copy-Item -Recurse "$mainDir\modes\mode\*" "$net_baseoutput\x64\Release\win-x64\mode" - Copy-Item -Recurse "$mainDir\translations\i18n\*" "$net_baseoutput\x64\Release\win-x64\i18n" - Write-Host 'Build done' } -cd $mainDir\Netch +cd $mainDir Build-NetFrameworkx64 cd $mainDir diff --git a/Netch.sln b/Netch.sln index 2c32b0a9..a1792b61 100644 --- a/Netch.sln +++ b/Netch.sln @@ -25,6 +25,8 @@ Global {A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.Build.0 = Release|x64 {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Debug|x64.ActiveCfg = Debug|x64 {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Debug|x64.Build.0 = Debug|x64 + {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Release|x64.ActiveCfg = Release|x64 + {828318A8-9B90-4A5F-BD6B-E632CC9D8933}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Netch/Controllers/Interface/Instance.cs b/Netch/Controllers/Interface/Instance.cs index 1321f595..6398c130 100644 --- a/Netch/Controllers/Interface/Instance.cs +++ b/Netch/Controllers/Interface/Instance.cs @@ -169,6 +169,7 @@ namespace Netch.Controllers { SaveBufferTimer.Enabled = false; } + SaveBufferTimerEvent(null,null); State = State.Stopped; } diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index 44f9c09b..2b16f0f7 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -187,8 +187,9 @@ namespace Netch.Forms foreach (var x in result) x.Group = item.Remark; Global.Settings.Server.AddRange(result); - NotifyTip(i18N.TranslateFormat("Update {1} server(s) from {0}", item.Remark, result.Count)); } + + NotifyTip(i18N.TranslateFormat("Update {1} server(s) from {0}", item.Remark, result?.Count ?? 0)); } } catch (WebException e) diff --git a/Netch/Netch.csproj b/Netch/Netch.csproj index e2466d5a..e6946e0e 100644 --- a/Netch/Netch.csproj +++ b/Netch/Netch.csproj @@ -107,6 +107,6 @@ - +