diff --git a/.github/workflows/flutterci.yml b/.github/workflows/flutterci.yml index f126822..c602ea5 100644 --- a/.github/workflows/flutterci.yml +++ b/.github/workflows/flutterci.yml @@ -81,12 +81,10 @@ jobs: draft: true prerelease: false files: | - build/installer/ArgonInstaller-windows-x86_64-setup.exe - scripts/ArgonInstaller-windows-x86_64-setup.exe - scripts/ArgonInstaller-windows-x86_64-setup.exe.exe - build/argoninstaller.*.nupkg - scripts/Output/ArgonInstaller-windows-x86_64-setup.exe.exe - scripts/Output/ArgonInstaller-windows-x86_64-setup.exe + build/installer/*-setup.exe + build/*-setup.exe + scripts/*-setup.exe + scripts/Output/*-setup.exe ArgonInstaller-windows-x86_64.zip token: ${{ secrets.GITHUB_TOKEN }} diff --git a/pubspec.lock b/pubspec.lock index 2f3b3cf..f83dbc4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -120,20 +120,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" - cli_dialog: - dependency: transitive - description: - name: cli_dialog - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.0" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" clock: dependency: transitive description: @@ -176,13 +162,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" - dart_console: - dependency: transitive - description: - name: dart_console - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" dart_style: dependency: transitive description: @@ -277,10 +256,12 @@ packages: fluent_ui: dependency: "direct main" description: - name: fluent_ui - url: "https://pub.dartlang.org" - source: hosted - version: "3.9.1" + path: "." + ref: HEAD + resolved-ref: "99282610c6660da08030ec2550464b9de069563d" + url: "https://github.com/bdlukaa/fluent_ui.git" + source: git + version: "3.9.2" flutter: dependency: "direct main" description: flutter @@ -300,6 +281,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.4" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_markdown: dependency: "direct main" description: @@ -492,13 +478,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" - msix: - dependency: "direct dev" - description: - name: msix - url: "https://pub.dartlang.org" - source: hosted - version: "3.3.2" nested: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8540b5c..1ef9769 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: flutter_native_splash: ^2.0.5 url_launcher: ^6.0.20 url_strategy: ^0.2.0 - # bitsdojo_window: ^0.1.1+1 window_manager: ^0.2.0 shared_preferences: ^2.0.8 flutter_svg: ^1.0.3 @@ -31,7 +30,8 @@ dependencies: file_selector_macos: file_selector_windows: file_selector: ^0.8.3 - fluent_ui: ^3.9.1 + fluent_ui: + git: https://github.com/bdlukaa/fluent_ui.git dev_dependencies: build_runner: ^2.0.0 @@ -39,15 +39,6 @@ dev_dependencies: dependency_validator: ^3.0.0 isar_generator: 2.2.1 flutter_lints: ^1.0.0 - msix: ^3.3.1 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -msix_config: - identity_name: pro.tricked.argoninstaller - install_certificate: false - capabilities: internetClient flutter_native_splash: color: '#42a5f5' diff --git a/scripts/windows-setup-creator.iss b/scripts/windows-setup-creator.iss index 57bb132..266940e 100644 --- a/scripts/windows-setup-creator.iss +++ b/scripts/windows-setup-creator.iss @@ -27,7 +27,7 @@ DisableProgramGroupPage=yes ; Remove the following line to run in administrative install mode (install for all users.) PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog -OutputBaseFilename=ArgonInstaller-windows-x86_64-setup +OutputBaseFilename=argoninstaller-windows-x86_64-setup Compression=lzma SolidCompression=yes WizardStyle=modern diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..b2b1fad Binary files /dev/null and b/windows/runner/resources/app_icon.ico differ