diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml new file mode 100644 index 0000000..8a18eff --- /dev/null +++ b/.github/workflows/build-and-release.yml @@ -0,0 +1,34 @@ +name: Build and Release + +on: + push: + tags: [ "v*.*.*" ] + +jobs: + build-and-release: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + + - name: Restore NuGet Packages + run: nuget restore FreeControl.sln + + - name: Build + run: | + msbuild FreeControl.sln /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath="../output" + $filePath = "./output/Freecontrol.exe" + $sha256Hash = (Get-FileHash -Algorithm SHA256 -Path $filePath).Hash + $sha256Hash > "./output/SHA256 $sha256Hash" + + - uses: softprops/action-gh-release@v2 + with: + files: | + ./output/FreeControl.exe + ./output/SHA256* + name: ${{ github.ref_name }} + draft: true \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..6c3f681 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,24 @@ +name: Test + +on: + push: + branches: [dev] + pull_request: + branches: [master] + +jobs: + test-build: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + + - name: Restore NuGet Packages + run: nuget restore FreeControl.sln + + - name: Build + run: msbuild FreeControl.sln /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath="output" diff --git a/FreeControl/Main.Designer.cs b/FreeControl/Main.Designer.cs index 1423696..7339870 100644 --- a/FreeControl/Main.Designer.cs +++ b/FreeControl/Main.Designer.cs @@ -569,6 +569,7 @@ private void InitializeComponent() // // Main // + this.AcceptButton = this.btnStart; this.AllowShowTitle = false; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); diff --git a/FreeControl/Main.cs b/FreeControl/Main.cs index afa9342..fb0c016 100644 --- a/FreeControl/Main.cs +++ b/FreeControl/Main.cs @@ -409,7 +409,10 @@ private void StartButtonClick(object sender, EventArgs e) // 设置标题 StartParameters.Add($"--window-title \"{Info.ScrcpyTitle}\""); // 设置断开后锁定屏幕 - StartParameters.Add("--power-off-on-close"); + if (_Setting.PowerOffOnClose) + { + StartParameters.Add("--power-off-on-close"); + } StartParameters.Add(_Setting.CustomArgs); if (_Setting.AudioEnabled == false) StartParameters.Add(_Setting.GetDesc("AudioEnabled"));// 不转发音频 diff --git a/FreeControl/Main.resx b/FreeControl/Main.resx index 516b892..ea051bd 100644 --- a/FreeControl/Main.resx +++ b/FreeControl/Main.resx @@ -151,7 +151,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - GgAAAk1TRnQBSQFMAgEBBAEAAXABAwFwAQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 + GgAAAk1TRnQBSQFMAgEBBAEAAXgBAwF4AQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 AwABPAMAAQEBAAEgBQABgAFw/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AJ4AAzgBXQMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/ @@ -232,7 +232,7 @@ AXgDvwH/AzcBWggABAEDAgEDMAAEAQMCAQMIAAMHAQkDXgHtA2oB+QMPARQYAANNAZIDXgH7AxoB/wNE AXgDAgEDLAADEQEWA14B0gMaAf8DWgHpAyIBMSQAA00BkgNfAfsDvwH/A0QBeAMCAQMsAAMRARYDXgHS A78B/wNjAekDIgExHAADXQHOAxoB/wMbASYDUQGfAxoB/wMaAf8DWgHHAyUBNiAAAwMBBANJAYcDGgH/ - AxoB/wNdAc8DKQE+A1ABnAN0Af4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA + AxoB/wNdAc8DKQE+A1ABnAN1Af4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA AwMBBANJAYcDvwH/A78B/wNdAc8DKQE+A1EBnAOAAf4DMQFNIAADHgEqA10B3wMaAf8DWwHQAxgBICQA AzkBXgNJAfYDGgH/A1UBrzAAAx4BKgNdAd8DvwH/A18B0AMYASAkAAM5AV4DYgH2A78B/wNVAa8kAAMc AScDSQH2AxoB/wMaAf8DXwHaA10ByQNgAfMDGgH/AxwBJxwAA10B3AMaAf8DYQHrA1sBzQNeAfsDGgH/ diff --git a/FreeControl/Resources/en.FreeControl.resources.dll b/FreeControl/Resources/en.FreeControl.resources.dll index 7b04f03..9dab7f8 100644 Binary files a/FreeControl/Resources/en.FreeControl.resources.dll and b/FreeControl/Resources/en.FreeControl.resources.dll differ