From d0d89dee7c1c45a1929bf4fae2042ac7bb39d378 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 13:19:43 +0200 Subject: [PATCH 1/7] Changed "Quick actions" to "snippets" --- lib/i18n/de.json | 10 +++++----- lib/i18n/en.json | 10 +++++----- lib/i18n/pt.json | 10 +++++----- lib/i18n/zh_CN.json | 10 +++++----- lib/i18n/zh_tw.json | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/i18n/de.json b/lib/i18n/de.json index 7bcf588..9692357 100644 --- a/lib/i18n/de.json +++ b/lib/i18n/de.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Startverzeichnispfad", "wsldefaultuser-text": "(Optional) Zu verwendender WSL-Standardbenutzer", "emptyfieldsfordefault-text": "(leeren Sie die Felder, um die Standardwerte zu verwenden)", - "runquickaction-text": "Schnellaktion ausführen", + "runquickaction-text": "Codeausschnitte ausführen", "upload-text": "Hochladen", "startstopserving-text": "Bereitstellung im Netzwerk starten/beenden", "startedserving-text": "Bereitstellung von %s im Netzwerk", @@ -90,15 +90,15 @@ "yesoverride-text": "Ja, synchronisieren (überschreiben)", "settingname-text": "Name der Einstellung", "yourcodehere-text": "Ihr Code hier", - "addquickaction-text": "Eine schnelle Aktion hinzufügen", - "addquickactioninfo-text": "Fügen Sie eine Schnelleinstellung hinzu und Sie werden sie hier sehen.", + "addquickaction-text": "Einen Codeausschnitt hinzufügen", + "addquickactioninfo-text": "Fügen Sie einen Codeausschnitt hinzu und Sie werden ihn hier sehen.", "newversion-text": "Neue Version verfügbar!", "downloadnow-text": "Jetzt Ansehen", "orcheck-text": "oder zum", "windowsstore-text": "Windows Store", "homepage-text": "Home", "about-text": "Über diese App", - "managequickactions-text": "Schnellaktionen verwalten", + "managequickactions-text": "Codeausschnitte", "addinstance-text": "Eine Instanz hinzufügen", "editwslconfig-text": ".wslconfig direkt bearbeiten", "stopwsl-text": "WSL stoppen", @@ -124,7 +124,7 @@ "addcommunityactions-text": "Community Actions hinzufügen", "done-text": "Fertig", "search-text": "Suche", - "shareyourquickaction-text": "Teilen Sie Ihre Schnellaktionen", + "shareyourquickaction-text": "Teilen Sie Ihre Codeausschnitte", "wslsettings-text": "WSL-Einstellungen", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/en.json b/lib/i18n/en.json index 56fcb6c..5304b73 100644 --- a/lib/i18n/en.json +++ b/lib/i18n/en.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Start directory path", "wsldefaultuser-text": "(Optional) WSL default user to use", "emptyfieldsfordefault-text": "(empty the fields for default or if your WSL version does not support it)", - "runquickaction-text": "Run Quick Action", + "runquickaction-text": "Run a snippet", "upload-text": "Upload", "startstopserving-text": "Start/Stop serving on network", "startedserving-text": "Serving %s on network", @@ -90,15 +90,15 @@ "yesoverride-text": "Yes, sync (override)", "settingname-text": "Name of setting", "yourcodehere-text": "Your code here", - "addquickaction-text": "Add a Quick Action", - "addquickactioninfo-text": "Add a quick setting and you will see it here.", + "addquickaction-text": "Add a snippet", + "addquickactioninfo-text": "Add a snippet and you will see it here.", "newversion-text": "A new version available", "downloadnow-text": "Download now", "orcheck-text": "or check the", "windowsstore-text": "Windows Store", "homepage-text": "Home", "about-text": "About this app", - "managequickactions-text": "Manage Quick Actions", + "managequickactions-text": "Snippets", "addinstance-text": "Add an Instance", "editwslconfig-text": "Edit .wslconfig directly", "stopwsl-text": "Stop WSL", @@ -123,7 +123,7 @@ "documentation-text": "Documentation", "addcommunityactions-text": "Add Community Actions", "search-text": "Search", - "shareyourquickaction-text": "Share your Quick Action", + "shareyourquickaction-text": "Share your snippets", "wslsettings-text": "WSL Settings", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/pt.json b/lib/i18n/pt.json index a43d37c..6632507 100644 --- a/lib/i18n/pt.json +++ b/lib/i18n/pt.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "Caminho de diretório inicial", "wsldefaultuser-text": "(Opcional) Usuário padrão do WSL a ser usado", "emptyfieldsfordefault-text": "(esvazie os campos por padrão ou se sua versão do WSL não for compatível)", - "runquickaction-text": "Executar ação rápida", + "runquickaction-text": "Executar snippet", "upload-text": "Carregar", "startstopserving-text": "Iniciar/parar a veiculação na rede", "startedserving-text": "Servindo %s na rede", @@ -90,15 +90,15 @@ "yesoverride-text": "Sim, sincronizar (substituir)", "settingname-text": "Nome da configuração", "yourcodehere-text": "Seu código aqui", - "addquickaction-text": "Adicionar uma ação rápida", - "addquickactioninfo-text": "Adicione uma configuração rápida e você a verá aqui.", + "addquickaction-text": "Adicionar um snippet", + "addquickactioninfo-text": "Adicione um snippet e você o verá aqui.", "newversion-text": "Uma nova versão disponível", "downloadnow-text": "Baixar agora", "orcheck-text": "ou verifique a", "windowsstore-text": "Loja do Windows", "homepage-text": "Casa", "about-text": "Sobre este aplicativo", - "managequickactions-text": "Gerenciar ações rápidas", + "managequickactions-text": "Snippet", "addinstance-text": "Adicionar uma instância", "editwslconfig-text": "Editar .wslconfig diretamente", "stopwsl-text": "Parar WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "Adicionar ações da comunidade", "done-text": "Feito", "search-text": "Procurar", - "shareyourquickaction-text": "Compartilhe sua ação rápida", + "shareyourquickaction-text": "Compartilhe seus snippets", "wslsettings-text": "Configurações do WSL", "boot-text": "Boot", "automount-text": "Automount", diff --git a/lib/i18n/zh_CN.json b/lib/i18n/zh_CN.json index 5436f74..15d8be6 100644 --- a/lib/i18n/zh_CN.json +++ b/lib/i18n/zh_CN.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "起始目录路径", "wsldefaultuser-text": "（可选）要使用的 WSL 默认用户", "emptyfieldsfordefault-text": "（如果您的 WSL 版本不支持，请清空默认字段）", - "runquickaction-text": "运行快速操作", + "runquickaction-text": "运行片段", "upload-text": "上传", "startstopserving-text": "开始/停止在网络上提供服务", "startedserving-text": "正在网络上为 %s 提供服务", @@ -90,15 +90,15 @@ "yesoverride-text": "是的，同步（覆盖）", "settingname-text": "设置名称", "yourcodehere-text": "填入你的代码", - "addquickaction-text": "添加快速操作", - "addquickactioninfo-text": "添加快速设置，您将在此处看到它。", + "addquickaction-text": "添加片段", + "addquickactioninfo-text": "添加片段，您将在此处看到它。", "newversion-text": "有新版本可用", "downloadnow-text": "现在下载", "orcheck-text": "或检查", "windowsstore-text": "Windows 商店", "homepage-text": "主界面", "about-text": "关于此软件", - "managequickactions-text": "管理快速操作", + "managequickactions-text": "管理片段", "addinstance-text": "添加实例", "editwslconfig-text": "直接编辑 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "添加社区快速操作", "done-text": "完成", "search-text": "搜索", - "shareyourquickaction-text": "分享你的快速操作", + "shareyourquickaction-text": "分享你的片段", "wslsettings-text": "WSL 设置", "boot-text": "启动", "automount-text": "自动挂载", diff --git a/lib/i18n/zh_tw.json b/lib/i18n/zh_tw.json index 015e0ec..866f5c2 100644 --- a/lib/i18n/zh_tw.json +++ b/lib/i18n/zh_tw.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "開始位置", "wsldefaultuser-text": "(選用) 要使用的 WSL 預設使用者帳戶", "emptyfieldsfordefault-text": "(如果您的 WSL 版本不支援，請清空預設字串)", - "runquickaction-text": "執行捷徑", + "runquickaction-text": "執行片段", "upload-text": "上傳", "startstopserving-text": "開始/停止在網路上提供服務", "startedserving-text": "正在網路上為 %s 提供服務", @@ -90,15 +90,15 @@ "yesoverride-text": "繼續同步 (覆蓋)", "settingname-text": "設定名稱", "yourcodehere-text": "輸入你的代碼", - "addquickaction-text": "新增捷徑", - "addquickactioninfo-text": "新增快速捷徑，您會在此處看到它。", + "addquickaction-text": "新增片段", + "addquickactioninfo-text": "新增片段並在此處檢視", "newversion-text": "有可用的更新", "downloadnow-text": "立即下載", "orcheck-text": "或檢查", "windowsstore-text": "Microsoft Store", "homepage-text": "主畫面", "about-text": "關於此軟體", - "managequickactions-text": "管理捷徑", + "managequickactions-text": "管理片段", "addinstance-text": "新增安裝實體", "editwslconfig-text": "直接編輯 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "新增社群捷徑", "done-text": "完成", "search-text": "搜尋", - "shareyourquickaction-text": "分享您的捷徑", + "shareyourquickaction-text": "分享你的片段", "wslsettings-text": "WSL 設定", "boot-text": "啟動", "automount-text": "自動掛載", From 72842560c5b2833a3c0e099562bfae1975fbd027 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:15 +0200 Subject: [PATCH 2/7] Changed Community Actions to Snippets --- lib/i18n/de.json | 2 +- lib/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/i18n/de.json b/lib/i18n/de.json index 9692357..601be11 100644 --- a/lib/i18n/de.json +++ b/lib/i18n/de.json @@ -121,7 +121,7 @@ "nestedvirtinfo-text": "Boolescher Wert zum Ein- oder Ausschalten der verschachtelten Virtualisierung, sodass andere verschachtelte VMs in WSL 2 ausgeführt werden können. Nur für Windows 11 verfügbar.", "vmidleinfo-text": "Die Anzahl der Millisekunden, die eine VM im Leerlauf ist, bevor sie heruntergefahren wird. Nur verfügbar für Windows 11.", "documentation-text": "Dokumentation", - "addcommunityactions-text": "Community Actions hinzufügen", + "addcommunityactions-text": "Community Codeausschnitte hinzufügen", "done-text": "Fertig", "search-text": "Suche", "shareyourquickaction-text": "Teilen Sie Ihre Codeausschnitte", diff --git a/lib/i18n/en.json b/lib/i18n/en.json index 5304b73..805e3f5 100644 --- a/lib/i18n/en.json +++ b/lib/i18n/en.json @@ -121,7 +121,7 @@ "nestedvirtinfo-text": "Boolean to turn on or off nested virtualization, enabling other nested VMs to run inside WSL 2. Only available for Windows 11.", "vmidleinfo-text": "The number of milliseconds that a VM is idle, before it is shut down. Only available for Windows 11.", "documentation-text": "Documentation", - "addcommunityactions-text": "Add Community Actions", + "addcommunityactions-text": "Add Community snippets", "search-text": "Search", "shareyourquickaction-text": "Share your snippets", "wslsettings-text": "WSL Settings", From dde9b2e57b26145d104813f6fea563e8dcf3dc36 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:44 +0200 Subject: [PATCH 3/7] Version bump --- lib/components/constants.dart | 2 +- pubspec.lock | 40 ++++++++++++++--------------------- pubspec.yaml | 2 +- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/components/constants.dart b/lib/components/constants.dart index 414fcee..6fbee77 100644 --- a/lib/components/constants.dart +++ b/lib/components/constants.dart @@ -2,7 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart'; const String title = 'WSL Distro Manager by Bostrot'; -const String currentVersion = "1.8.2"; +const String currentVersion = "1.8.4"; const String windowsStoreUrl = "https://www.microsoft.com/store/" "productId/9NWS9K95NMJB"; const String defaultPath = 'C:\\WSL2-Distros'; diff --git a/pubspec.lock b/pubspec.lock index 86bb768..d0d2243 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.0" clock: dependency: transitive description: @@ -149,18 +149,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013 - url: "https://pub.dev" - source: hosted - version: "5.2.6" - file_utils: - dependency: transitive - description: - name: file_utils - sha256: d1e64389a22649095c8405c9e177272caf05139255931c9ff30d53b5c9bcaa34 + sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "5.3.2" fluent_ui: dependency: "direct main" description: @@ -249,10 +241,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: feab99a20fd248c658c923ba98f4449ca6e575c3dee9fdf07146f4f33482c6bc + sha256: d687b6129476c92bd75244b8dfc1bb56f9a287ab3d51cdf0baf570afeb923c51 url: "https://pub.dev" source: hosted - version: "6.5.5" + version: "8.0.3" http: dependency: "direct main" description: @@ -385,10 +377,10 @@ packages: dependency: "direct dev" description: name: msix - sha256: "68679afc7d7117467250363dea4fb62db7520a23a9490bf4b65794655235a1d5" + sha256: bf151b9a1648985e7604672ade54c8df693566099d0731e318548c47d54676e6 url: "https://pub.dev" source: hosted - version: "3.9.1" + version: "3.14.2" nested: dependency: transitive description: @@ -409,10 +401,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: cbff87676c352d97116af6dbea05aa28c4d65eb0f6d5677a520c11a69ca9a24d + sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.2" package_info_plus_platform_interface: dependency: transitive description: @@ -449,10 +441,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.7" petitparser: dependency: transitive description: @@ -654,10 +646,10 @@ packages: dependency: "direct main" description: name: system_info2 - sha256: af2f948e3f31a3367a049932a8ad59faf0063ecf836a020d975b9f41566d8bc9 + sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" system_theme: dependency: "direct main" description: @@ -782,10 +774,10 @@ packages: dependency: transitive description: name: win32 - sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "5.0.3" window_manager: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 58fcbdf..eaaef28 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: wsl2distromanager description: A GUI to quickly manage your WSL instances. publish_to: 'none' -version: 1.8.4 # Current version +version: 1.8.5 # Current version environment: sdk: '>=2.17.0 <3.0.0' From 7bc0d8abb3e50f25be362dd2db6d28598b5f2217 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Jun 2023 14:15:55 +0200 Subject: [PATCH 4/7] Version bump --- lib/components/constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/constants.dart b/lib/components/constants.dart index 6fbee77..b04919f 100644 --- a/lib/components/constants.dart +++ b/lib/components/constants.dart @@ -2,7 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart'; const String title = 'WSL Distro Manager by Bostrot'; -const String currentVersion = "1.8.4"; +const String currentVersion = "1.8.5"; const String windowsStoreUrl = "https://www.microsoft.com/store/" "productId/9NWS9K95NMJB"; const String defaultPath = 'C:\\WSL2-Distros'; From b848e594a5c593ca8d5bfee3c70dc5c8973b05b3 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 13 Aug 2023 09:56:36 +0200 Subject: [PATCH 5/7] Changed snippet to code snippet --- lib/i18n/zh_CN.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/i18n/zh_CN.json b/lib/i18n/zh_CN.json index 15d8be6..15c1b6e 100644 --- a/lib/i18n/zh_CN.json +++ b/lib/i18n/zh_CN.json @@ -77,7 +77,7 @@ "startdirectorypath-text": "起始目录路径", "wsldefaultuser-text": "（可选）要使用的 WSL 默认用户", "emptyfieldsfordefault-text": "（如果您的 WSL 版本不支持，请清空默认字段）", - "runquickaction-text": "运行片段", + "runquickaction-text": "运行代码片段", "upload-text": "上传", "startstopserving-text": "开始/停止在网络上提供服务", "startedserving-text": "正在网络上为 %s 提供服务", @@ -90,15 +90,15 @@ "yesoverride-text": "是的，同步（覆盖）", "settingname-text": "设置名称", "yourcodehere-text": "填入你的代码", - "addquickaction-text": "添加片段", - "addquickactioninfo-text": "添加片段，您将在此处看到它。", + "addquickaction-text": "添加代码片段", + "addquickactioninfo-text": "添加代码片段，您将在此处看到它。", "newversion-text": "有新版本可用", "downloadnow-text": "现在下载", "orcheck-text": "或检查", "windowsstore-text": "Windows 商店", "homepage-text": "主界面", "about-text": "关于此软件", - "managequickactions-text": "管理片段", + "managequickactions-text": "管理代码片段", "addinstance-text": "添加实例", "editwslconfig-text": "直接编辑 .wslconfig", "stopwsl-text": "停止 WSL", @@ -124,7 +124,7 @@ "addcommunityactions-text": "添加社区快速操作", "done-text": "完成", "search-text": "搜索", - "shareyourquickaction-text": "分享你的片段", + "shareyourquickaction-text": "分享你的代码片段", "wslsettings-text": "WSL 设置", "boot-text": "启动", "automount-text": "自动挂载", From 1c0f795b1d0dbc22021bde985e98db49d66c48c7 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 15 Aug 2023 21:34:07 +0200 Subject: [PATCH 6/7] Added store publish workflow --- .github/workflows/publisher.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/publisher.yml diff --git a/.github/workflows/publisher.yml b/.github/workflows/publisher.yml new file mode 100644 index 0000000..69d164f --- /dev/null +++ b/.github/workflows/publisher.yml @@ -0,0 +1,33 @@ +name: Publish to Microsoft Store + +on: + workflow_dispatch: + push: + tags: + - '*' + +jobs: + # Publish to Microsoft Store + publish: + runs-on: ubuntu-latest + needs: build + steps: + # Download release asset + - id: download-release-asset + name: Download release asset + uses: dsaltares/fetch-gh-release-asset@master + with: + version: tags/${{ env.RELEASE }} + file: wsl2-distro-manager-v${{ env.RELEASE }}.msix + target: release.msix + token: ${{ secrets.DEPLOY_TOKEN }} + + # Publish to Microsoft Store + - uses: isaacrlevin/windows-store-action + name: Publish to Store + with: + tenant-id: ${{ secrets.AZURE_AD_TENANT_ID }} + client-id: ${{ secrets.AZURE_AD_APPLICATION_CLIENT_ID }} + client-secret: ${{ secrets.AZURE_AD_APPLICATION_SECRET }} + app-id: ${{ secrets.STORE_APP_ID }} + package-path: release.msix \ No newline at end of file From a95c368dae4717e80358cea78c262fa374767ab4 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 15 Aug 2023 21:37:05 +0200 Subject: [PATCH 7/7] Fixed publisher.yml --- .github/workflows/publisher.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publisher.yml b/.github/workflows/publisher.yml index 69d164f..d8ea14c 100644 --- a/.github/workflows/publisher.yml +++ b/.github/workflows/publisher.yml @@ -10,7 +10,6 @@ jobs: # Publish to Microsoft Store publish: runs-on: ubuntu-latest - needs: build steps: # Download release asset - id: download-release-asset @@ -23,7 +22,7 @@ jobs: token: ${{ secrets.DEPLOY_TOKEN }} # Publish to Microsoft Store - - uses: isaacrlevin/windows-store-action + - uses: isaacrlevin/windows-store-action@1.0 name: Publish to Store with: tenant-id: ${{ secrets.AZURE_AD_TENANT_ID }}