diff --git a/.gitignore b/.gitignore index c4795db..bb11be8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ obj/ /packages/ riderModule.iml /_ReSharper.Caches/ -.idea \ No newline at end of file +.idea + +*.DotSettings.user \ No newline at end of file diff --git a/Release.md b/Release.md index 18d6c8b..16b2113 100644 --- a/Release.md +++ b/Release.md @@ -1,5 +1,12 @@ # OneWare.CologneChip +## Release 0.5 +- Update Dependencies +- Fix key duplication bug + +## Release 0.4 +- Update Dependencies + ## Release 0.3 - ccf file can be selected from several ccf files in the project - Bugfix for Programmer / EVB selection diff --git a/docs/Processes.md b/docs/Processes.md new file mode 100644 index 0000000..8d8a5ae --- /dev/null +++ b/docs/Processes.md @@ -0,0 +1,19 @@ +# GitFLow +We are using a GitFlow. + +![plot](./images/Gitflow-Workflow-3.png) + +_Picture snatched from [here](https://seibert.group/blog/2014/03/31/git-workflows-der-gitflow-workflow-teil-1/)_ + +# Release +1. **Create a release branch (`release/v`) from `develop`** +2. **Update `Release.md`** and add release notes +3. **Update `oneware-extension.json`** and add a new target version +4. **Set the version in `OneWare.CologneChip.csproj`** to the release version +5. **Commit and push** +6. **Create a merge request (Pull Request) on GitHub** against the `main` branch +7. **Review and merge** the merge request +8. **Publish the release** through GitHub Actions +9. **Merge `main` into `develop`** to synchronize the branches +10. **Set the version in `OneWare.CologneChip.csproj`** in `develop` to `-SNAPSHOT` + diff --git a/docs/images/Gitflow-Workflow-3.png b/docs/images/Gitflow-Workflow-3.png new file mode 100644 index 0000000..1fe2368 Binary files /dev/null and b/docs/images/Gitflow-Workflow-3.png differ diff --git a/oneware-extension.json b/oneware-extension.json index cab3735..13f2bcb 100644 --- a/oneware-extension.json +++ b/oneware-extension.json @@ -59,6 +59,14 @@ "target": "all" } ] + }, + { + "version": "0.5", + "targets": [ + { + "target": "all" + } + ] } ] } diff --git a/src/OneWare.CologneChip/OneWare.CologneChip.csproj b/src/OneWare.CologneChip/OneWare.CologneChip.csproj index 44f815e..2c5d22c 100644 --- a/src/OneWare.CologneChip/OneWare.CologneChip.csproj +++ b/src/OneWare.CologneChip/OneWare.CologneChip.csproj @@ -1,7 +1,7 @@  - 0.4 + 0.5 net9.0 enable enable @@ -15,8 +15,8 @@ - - + + diff --git a/src/OneWare.CologneChip/OneWareCologneChipModule.cs b/src/OneWare.CologneChip/OneWareCologneChipModule.cs index 617eafa..9d9e641 100644 --- a/src/OneWare.CologneChip/OneWareCologneChipModule.cs +++ b/src/OneWare.CologneChip/OneWareCologneChipModule.cs @@ -81,13 +81,6 @@ public void OnInitialized(IContainerProvider containerProvider) containerProvider.Resolve().Projects.CollectionChanged += CologneChipSettingsHelper.OnCollectionChanged; containerProvider.Resolve().RegisterPackage(CologneChipConstantService.CologneChipPackage); - containerProvider.Resolve().RegisterSetting("Tools", "CologneChip", - CologneChipConstantService.CologneChipSettingsIgnoreGuiKey, new CheckBoxSetting("Ignore UI for HardwarePin Mapping", false)); - - containerProvider.Resolve().RegisterSetting("Tools", "CologneChip", - CologneChipConstantService.CologneChipSettingsIgnoreGuiKey, new CheckBoxSetting("Ignore an exit code not equal to 0 after the synthesis", false)); - - settingsService.RegisterSetting("Tools", "CologneChip", CologneChipConstantService.CcPathSetting, new FolderPathSetting("CologneChip Toolchain Path", defaultCologneChipPath, null, null, IsCologneChipPathValid)); @@ -110,7 +103,12 @@ public void OnInitialized(IContainerProvider containerProvider) ContainerLocator.Container.Resolve().SetPath("CC_openFPGALoader", openFpgaLoader); }); + containerProvider.Resolve().RegisterSetting("Tools", "CologneChip", + CologneChipConstantService.CologneChipSettingsIgnoreGuiKey, new CheckBoxSetting("Ignore UI for HardwarePin Mapping", false)); + containerProvider.Resolve().RegisterSetting("Tools", "CologneChip", + CologneChipConstantService.CologneChipSettingsIgnoreSynthExitCode, new CheckBoxSetting("Ignore an exit code not equal to 0 after the synthesis", false)); + containerProvider.Resolve().RegisterUiExtension("UniversalFpgaToolBar_CompileMenuExtension",