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
8 changes: 4 additions & 4 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"isRoot": true,
"tools": {
"nuke.globaltool": {
"version": "9.0.4",
"version": "10.0.0",
"commands": [
"nuke"
],
"rollForward": false
},
"docfx": {
"version": "2.78.2",
"version": "2.78.4",
"commands": [
"docfx"
],
"rollForward": false
},
"gitversion.tool": {
"version": "5.1.18",
"version": "6.5.0",
"commands": [
"dotnet-gitversion"
],
"rollForward": false
}
}
}
}
2 changes: 1 addition & 1 deletion .nuke/parameters.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "Hexagrams.Nuke.sln"
"Solution": "Hexagrams.Nuke.slnx"
}
26 changes: 1 addition & 25 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1 @@
mode: ContinuousDelivery

assembly-versioning-scheme: MajorMinor
assembly-file-versioning-scheme: MajorMinorPatch

continuous-delivery-fallback-tag: ""
branches:
main:
mode: ContinuousDeployment
tag: "alpha"
increment: Minor
track-merge-target: true
tracks-release-branches: true
is-release-branch: false
prevent-increment-of-merged-branch-version: false
release:
regex: release?[/]
mode: ContinuousDeployment
increment: Patch # not working, when merging a bugfix from master
tag: "beta"
is-release-branch: true
prevent-increment-of-merged-branch-version: true

ignore:
sha: [ ]
workflow: GitHubFlow/v1
118 changes: 0 additions & 118 deletions Hexagrams.Nuke.sln

This file was deleted.

34 changes: 34 additions & 0 deletions Hexagrams.Nuke.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Solution>
<Folder Name="/samples/" />
<Folder Name="/samples/1-basic/">
<Project Path="samples/1-basic/build/_build.csproj" />
</Folder>
<Folder Name="/samples/1-basic/src/">
<Project Path="samples/1-basic/src/App/Hexagrams.Nuke.Samples.Basic.App.csproj" />
</Folder>
<Folder Name="/samples/2-format/">
<Project Path="samples/2-format/build/_build.csproj" />
</Folder>
<Folder Name="/samples/2-format/src/">
<Project Path="samples/2-format/src/App/Hexagrams.Nuke.Samples.Format.App.csproj" />
</Folder>
<Folder Name="/samples/3-test/">
<Project Path="samples/3-test/build/_build.csproj" />
</Folder>
<Folder Name="/samples/3-test/src/">
<Project Path="samples/3-test/src/Library/Hexagrams.Nuke.Samples.Test.Library.csproj" />
</Folder>
<Folder Name="/samples/3-test/tests/" />
<Folder Name="/samples/3-test/tests/Library/">
<Project Path="samples/3-test/tests/Library/Hexagrams.Nuke.Samples.Test.Library.Tests/Hexagrams.Nuke.Samples.Test.Library.Tests.csproj" />
</Folder>
<Folder Name="/src/">
<Project Path="src/Components/Hexagrams.Nuke.Components.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/Components/Hexagrams.Nuke.Components.Tests.csproj" />
</Folder>
<Project Path="build/_build.csproj">
<Build Project="false" />
</Project>
</Solution>
12 changes: 6 additions & 6 deletions build/_build.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -11,13 +11,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageDownload Include="GitVersion.Tool" version="[5.12.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.18]" />
<PackageReference Include="Nuke.Common" Version="10.0.0" />
<PackageDownload Include="GitVersion.Tool" version="[6.5.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.5.0]" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\src\Components\Hexagrams.Nuke.Components.csproj" />
</ItemGroup>

</Project>
</Project>
5 changes: 4 additions & 1 deletion build/_build.csproj.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
Expand All @@ -24,4 +26,5 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"version": "10.0.100",
"rollForward": "latestMinor"
}
}
9 changes: 5 additions & 4 deletions samples/1-basic/build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>
</RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
<NukeScriptDirectory>..</NukeScriptDirectory>
Expand All @@ -16,11 +17,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageReference Include="Nuke.Common" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Hexagrams.Nuke.Components.csproj" />
</ItemGroup>

</Project>
</Project>
Loading
Loading