diff --git a/.github/workflows/retry-test-jobs.yml b/.github/workflows/retry-test-jobs.yml index 1fd0342c..4078b70b 100644 --- a/.github/workflows/retry-test-jobs.yml +++ b/.github/workflows/retry-test-jobs.yml @@ -27,7 +27,7 @@ jobs: run: | echo "Inspecting jobs of workflow run $RUN_ID in $REPO" - jobs_json="$(gh api repos/$REPO/actions/runs/$RUN_ID/jobs)" + jobs_json="$(gh api -R $REPO repos/$REPO/actions/runs/$RUN_ID/jobs)" echo "Jobs and conclusions:" echo "$jobs_json" | jq '.jobs[] | {name: .name, conclusion: .conclusion}' @@ -44,7 +44,7 @@ jobs: if [ "$failed_matrix_jobs" -gt 0 ]; then echo "Detected failing Integration Tests jobs – re-running failed jobs for this run." - gh run rerun "$RUN_ID" --failed + gh run rerun -R $REPO "$RUN_ID" --failed else echo "Only non-matrix jobs (like Test Results) failed – not auto-rerunning." fi diff --git a/Changelog.md b/Changelog.md index 2859e7b5..b9df15c7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,9 @@ +# 0.3.1 + +## ElectronNET.Core + +- Fixed issue transforming the project ID (#989, #990) @softworkz + # 0.3.0 ## ElectronNET.Core diff --git a/docs/Core/Migration-Checks.md b/docs/Core/Migration-Checks.md index 4464e6b9..cda0ba71 100644 --- a/docs/Core/Migration-Checks.md +++ b/docs/Core/Migration-Checks.md @@ -41,7 +41,7 @@ A `package.json` file **is allowed** in the `ElectronHostHook` folder if you're ```xml - my-electron-app + my-electron-app My Electron App 1.0.0 My awesome Electron.NET application diff --git a/docs/GettingStarted/Console-App.md b/docs/GettingStarted/Console-App.md index 1659e392..bb59d64d 100644 --- a/docs/GettingStarted/Console-App.md +++ b/docs/GettingStarted/Console-App.md @@ -54,7 +54,7 @@ Add the Electron.NET configuration to your `.csproj` file: - + ``` diff --git a/docs/Using/Configuration.md b/docs/Using/Configuration.md index 8685a155..63761a9e 100644 --- a/docs/Using/Configuration.md +++ b/docs/Using/Configuration.md @@ -25,7 +25,7 @@ These are the current default values when you don't make any changes: true - $(MSBuildProjectName.Replace(".", "-").ToLower()) + $(MSBuildProjectName.Replace(".", "-").ToLower()) electron-builder.json $(MSBuildProjectName) @@ -38,15 +38,15 @@ Since electron builder still expects a `package.json` file to exist, ElectronNET ```json { - "name": "$(PackageId)", + "name": "$(ElectronPackageId)", "productName": "$(ElectronTitle)", "build": { - "appId": "$(PackageId)", + "appId": "$(ElectronPackageId)", "linux": { "desktop": { "entry": { "Name": "$(Title)" } }, - "executableName": "$(PackageId)" + "executableName": "$(ElectronPackageId)" }, "deb": { "desktop": { diff --git a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj index caf726c6..5c48a427 100644 --- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj +++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj @@ -70,7 +70,7 @@ - + diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj index 65a7cbb5..8a615e57 100644 --- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj +++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj @@ -76,8 +76,8 @@ - - + + diff --git a/src/ElectronNET/build/ElectronNET.Core.props b/src/ElectronNET/build/ElectronNET.Core.props index 29d2c913..361661ac 100644 --- a/src/ElectronNET/build/ElectronNET.Core.props +++ b/src/ElectronNET/build/ElectronNET.Core.props @@ -9,7 +9,7 @@ - $(MSBuildProjectName.Replace(".", "-").ToLower()) + $(MSBuildProjectName.Replace(".", "-").ToLower()) electron-builder.json $(MSBuildProjectName) diff --git a/src/ElectronNET/build/ElectronNET.Core.targets b/src/ElectronNET/build/ElectronNET.Core.targets index 39da417a..9385fa54 100644 --- a/src/ElectronNET/build/ElectronNET.Core.targets +++ b/src/ElectronNET/build/ElectronNET.Core.targets @@ -4,7 +4,7 @@ win $(Title) - $(PackageId) + $(ElectronPackageId) diff --git a/src/ElectronNET/build/ElectronNET.LateImport.targets b/src/ElectronNET/build/ElectronNET.LateImport.targets index d82dcbd8..8e37a107 100644 --- a/src/ElectronNET/build/ElectronNET.LateImport.targets +++ b/src/ElectronNET/build/ElectronNET.LateImport.targets @@ -124,7 +124,7 @@ - + @@ -452,7 +452,7 @@ - $(ElectronPaParams) -c.appId "$(PackageId)" + $(ElectronPaParams) -c.appId "$(ElectronPackageId)" $(ElectronPaParams) -c.buildVersion "$(Version)" $(ElectronPaParams) -c.copyright "$(Copyright)" $(ElectronPaParams) -c.extraResources "bin/**/*" diff --git a/src/ElectronNET/build/ElectronNETRules.Project.xaml b/src/ElectronNET/build/ElectronNETRules.Project.xaml index 62fcb820..5354bc42 100644 --- a/src/ElectronNET/build/ElectronNETRules.Project.xaml +++ b/src/ElectronNET/build/ElectronNETRules.Project.xaml @@ -479,7 +479,7 @@ Description="The version of the app, following the major.minor.patch pattern. Version numbers may include a pre-release suffix." Category="AppInfo" /> - diff --git a/src/ElectronNET/build/package.template.json b/src/ElectronNET/build/package.template.json index 156fab27..41837302 100644 --- a/src/ElectronNET/build/package.template.json +++ b/src/ElectronNET/build/package.template.json @@ -1,13 +1,13 @@ { - "name": "$(PackageId)", + "name": "$(ElectronPackageId)", "productName": "$(ElectronTitle)", "build": { - "appId": "$(PackageId)", + "appId": "$(ElectronPackageId)", "linux": { "desktop": { "entry": { "Name": "$(Title)" } }, - "executableName": "$(PackageId)" + "executableName": "$(ElectronPackageId)" }, "deb": { "desktop": { diff --git a/src/common.props b/src/common.props index 9026afa7..047dfb8a 100644 --- a/src/common.props +++ b/src/common.props @@ -1,6 +1,6 @@ - 0.3.0 + 0.3.1 ElectronNET.Core Gregor Biswanger, Florian Rappl, softworkz Electron.NET