Electron.NET icon indicating copy to clipboard operation
Electron.NET copied to clipboard

Published 20 hours ago • verified publisher icon ElectronNET

Merge conflict tag detected in ElectronNET.API\BridgeConnector.cs

Open minyuanchen opened this issue 2 years ago • 1 comments

  • Version:
  • Target: Windows

Steps to Reproduce:

  1. Get the latest code
  2. Run "electronize start" 螢幕截圖 2022-05-11 11 59 47

minyuanchen avatar May 11 '22 04:05 minyuanchen

Also in StartElectronCommand.cs and in BuildCommand.cs

grep '>>>>>' -rn --include *.cs
ElectronNET.API/BridgeConnector.cs:423:>>>>>>> 64e058b0b59a4fbbd6c0ec9de2ee1850a66684c4
ElectronNET.CLI/Commands/StartElectronCommand.cs:125:>>>>>>> 2331ef43b4c2028c57564f3a8c885555c81661d4
ElectronNET.CLI/Commands/BuildCommand.cs:127:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc
ElectronNET.CLI/Commands/BuildCommand.cs:285:>>>>>>> 5338749e4d2b0fcd9c46bad1a61e5c7d7d0f18cc

mz-celldom avatar May 27 '22 02:05 mz-celldom

🎉🚀 New Electron.NET version 23.6.1 released 🚀🎉

With native Electron 23 and .NET 6 support. Your problem should be fixed here. If you continue to have the problem, please let us know. Please note the correct updating of your API & CLI. Info in the README. Have fun!

GregorBiswanger avatar Mar 28 '23 10:03 GregorBiswanger