Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ obj/
/packages/
riderModule.iml
/_ReSharper.Caches/
.idea
.idea

*.DotSettings.user
7 changes: 7 additions & 0 deletions Release.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 19 additions & 0 deletions docs/Processes.md
Original file line number Diff line number Diff line change
@@ -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<VERSION>`) 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 `<New Release Version>-SNAPSHOT`

Binary file added docs/images/Gitflow-Workflow-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions oneware-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@
"target": "all"
}
]
},
{
"version": "0.5",
"targets": [
{
"target": "all"
}
]
}
]
}
6 changes: 3 additions & 3 deletions src/OneWare.CologneChip/OneWare.CologneChip.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>0.4</Version>
<Version>0.5</Version>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -15,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OneWare.Essentials" Version="0.11.3" Private="false" ExcludeAssets="runtime;Native" />
<PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.41.4" Private="false" ExcludeAssets="runtime;Native" />
<PackageReference Include="OneWare.Essentials" Version="0.11.4" Private="false" ExcludeAssets="runtime;Native" />
<PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.41.5" Private="false" ExcludeAssets="runtime;Native" />
</ItemGroup>

<Target Name="GenerateCompatibilityFile" AfterTargets="Build">
Expand Down
12 changes: 5 additions & 7 deletions src/OneWare.CologneChip/OneWareCologneChipModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,6 @@ public void OnInitialized(IContainerProvider containerProvider)
containerProvider.Resolve<IProjectExplorerService>().Projects.CollectionChanged += CologneChipSettingsHelper.OnCollectionChanged;
containerProvider.Resolve<IPackageService>().RegisterPackage(CologneChipConstantService.CologneChipPackage);

containerProvider.Resolve<ISettingsService>().RegisterSetting("Tools", "CologneChip",
CologneChipConstantService.CologneChipSettingsIgnoreGuiKey, new CheckBoxSetting("Ignore UI for HardwarePin Mapping", false));

containerProvider.Resolve<ISettingsService>().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));

Expand All @@ -110,7 +103,12 @@ public void OnInitialized(IContainerProvider containerProvider)
ContainerLocator.Container.Resolve<IEnvironmentService>().SetPath("CC_openFPGALoader", openFpgaLoader);
});

containerProvider.Resolve<ISettingsService>().RegisterSetting("Tools", "CologneChip",
CologneChipConstantService.CologneChipSettingsIgnoreGuiKey, new CheckBoxSetting("Ignore UI for HardwarePin Mapping", false));

containerProvider.Resolve<ISettingsService>().RegisterSetting("Tools", "CologneChip",
CologneChipConstantService.CologneChipSettingsIgnoreSynthExitCode, new CheckBoxSetting("Ignore an exit code not equal to 0 after the synthesis", false));



containerProvider.Resolve<IWindowService>().RegisterUiExtension("UniversalFpgaToolBar_CompileMenuExtension",
Expand Down
Loading