Skip to content

Move to .net 6 #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 20, 2022
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
3 changes: 2 additions & 1 deletion .build/.build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeTelemetryVersion>1</NukeTelemetryVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions .build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public partial class Solution : NukeBuild,
IGenerateCodeCoverageReport,
IGenerateCodeCoverageSummary,
IGenerateCodeCoverageBadges,
IHaveConfiguration<Configuration>,
ICanLint
IHaveConfiguration<Configuration>
{
/// <summary>
/// Support plugins are available for:
Expand Down
73 changes: 36 additions & 37 deletions .build/Solution.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
InvokeTargets = new[] { nameof(Default) },
NonEntryTargets = new[] {
nameof(ICIEnvironment.CIEnvironment),
nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports),
nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura),
nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges),
nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report),
nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary),
nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports),
nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura),
nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges),
nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport),
nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary),
nameof(Default)
},
ExcludedTargets = new[]
Expand All @@ -26,20 +26,24 @@
}
)]
[GitHubActionsSteps(
"ci", GitHubActionsImage.MacOsLatest, GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest,
"ci",
GitHubActionsImage.MacOsLatest,
GitHubActionsImage.WindowsLatest,
GitHubActionsImage.UbuntuLatest,
AutoGenerate = false,
On = new[] { GitHubActionsTrigger.Push },
OnPushTags = new[] { "v*" },
OnPushBranches = new[] { "master", "next" },
OnPullRequestBranches = new[] { "master", "next" },
OnPushBranches = new[] { "master", "main", "next" },
OnPullRequestBranches = new[] { "master", "main", "next" },
InvokedTargets = new[] { nameof(Default) },
NonEntryTargets = new[] {
NonEntryTargets = new[]
{
nameof(ICIEnvironment.CIEnvironment),
nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports),
nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura),
nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges),
nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report),
nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary),
nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports),
nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura),
nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges),
nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport),
nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary),
nameof(Default)
},
ExcludedTargets = new[] { nameof(ICanClean.Clean), nameof(ICanRestoreWithDotNetCore.DotnetToolRestore) },
Expand All @@ -48,27 +52,40 @@
[PrintBuildVersion]
[PrintCIEnvironment]
[UploadLogs]
[TitleEvents]
public partial class Solution
{
public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGitHubActionsConfiguration configuration)
{
var buildJob = configuration.Jobs.First(z => z.Name == "Build");
var buildJob = configuration.Jobs.OfType<RocketSurgeonsGithubActionsJob>().First(z => z.Name == "Build");
buildJob.FailFast = false;
var checkoutStep = buildJob.Steps.OfType<CheckoutStep>().Single();
// For fetch all
checkoutStep.FetchDepth = 0;
buildJob.Environment["NUGET_PACKAGES"] = "${{ github.workspace }}/.nuget/packages";
buildJob.Steps.InsertRange(
buildJob.Steps.IndexOf(checkoutStep) + 1, new BaseGitHubActionsStep[] {
new RunStep("Fetch all history for all tags and branches") {
Run = "git fetch --prune"
},
new SetupDotNetStep("Use .NET Core 2.1 SDK") {
DotNetVersion = "2.1.x"
new UsingStep("NuGet Cache")
{
Uses = "actions/cache@v2",
With =
{
["path"] = "${{ github.workspace }}/.nuget/packages",
// keep in mind using central package versioning here
["key"] =
"${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Build.targets', '**/Directory.Build.props', '**/*.csproj') }}",
["restore-keys"] = @"|
${{ runner.os }}-nuget-"
}
},
new SetupDotNetStep("Use .NET Core 3.1 SDK") {
DotNetVersion = "3.1.x"
},
new SetupDotNetStep("Use .NET Core 5.0 SDK") {
DotNetVersion = "5.0.x"
new SetupDotNetStep("Use .NET Core 6.0 SDK") {
DotNetVersion = "6.0.x"
},
}
);
Expand Down Expand Up @@ -115,24 +132,6 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
}
);


/*

- publish: "${{ parameters.Artifacts }}/logs/"
displayName: Publish Logs
artifact: "Logs${{ parameters.Postfix }}"
condition: always()

- publish: ${{ parameters.Coverage }}
displayName: Publish Coverage
artifact: "Coverage${{ parameters.Postfix }}"
condition: always()

- publish: "${{ parameters.Artifacts }}/nuget/"
displayName: Publish NuGet Artifacts
artifact: "NuGet${{ parameters.Postfix }}"
condition: always()
*/
return configuration;
}
}
98 changes: 52 additions & 46 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,54 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.1.0",
"commands": [
"dotnet-cake"
]
},
"gitversion.tool": {
"version": "5.7.0",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.8.12",
"commands": [
"reportgenerator"
]
},
"codecov.tool": {
"version": "1.13.0",
"commands": [
"codecov"
]
},
"nuke.globaltool": {
"version": "5.3.0",
"commands": [
"nuke"
]
},
"nukeeper": {
"version": "0.34.0",
"commands": [
"nukeeper"
]
},
"jetbrains.resharper.globaltools": {
"version": "2021.2.1",
"commands": [
"jb"
]
"version": 1,
"isRoot": true,
"tools": {
"dotnet-outdated": {
"version": "2.11.0",
"commands": [
"dotnet-outdated"
]
},
"gitversion.tool": {
"version": "5.8.2",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.0.4",
"commands": [
"reportgenerator"
]
},
"nuke.globaltool": {
"version": "6.0.1",
"commands": [
"nuke"
]
},
"codecov.tool": {
"version": "1.13.0",
"commands": [
"codecov"
]
},
"jetbrains.resharper.globaltools": {
"version": "2021.3.3",
"commands": [
"jb"
]
},
"dotnet-format": {
"version": "5.1.250801",
"commands": [
"dotnet-format"
]
},
"nukeeper": {
"version": "0.35.0",
"commands": [
"nukeeper"
]
}
}
}
}
}
Loading