Skip to content

Commit

Permalink
Use last full release of gitversion to avoid bug where nugetversion i…
Browse files Browse the repository at this point in the history
…s null
  • Loading branch information
nloum committed Feb 4, 2024
1 parent fb9203d commit a1a448a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
Expand Down
2 changes: 1 addition & 1 deletion InfisicalDotNet.Tests/InfisicalDotNet.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
4 changes: 2 additions & 2 deletions InfisicalDotNet/InfisicalDotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageReadmeFile>readme.md</PackageReadmeFile>
Expand All @@ -17,6 +17,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
</ItemGroup>
</Project>
12 changes: 2 additions & 10 deletions build/Build.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Versioning;
using System.Text.Json;
using Nuke.Common;
using Nuke.Common.CI;
using Nuke.Common.CI.GitHubActions;
using Nuke.Common.Execution;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
using Nuke.Common.Tooling;
Expand All @@ -16,9 +11,7 @@
using Nuke.Common.Tools.ReportGenerator;
using Nuke.Common.Utilities.Collections;
using Serilog;
using static Nuke.Common.EnvironmentInfo;
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.IO.PathConstruction;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;

Expand All @@ -39,7 +32,7 @@ class Build : NukeBuild

[Solution]
readonly Solution Solution;
[GitVersion(Framework = "net7.0")]
[GitVersion(Framework = "net8.0")]
GitVersion GitVersion;

AbsolutePath SourceDirectory => RootDirectory / "src";
Expand Down Expand Up @@ -141,7 +134,6 @@ class Build : NukeBuild

Target Pack => _ => _
.DependsOn(Compile)
//.Requires(() => Configuration == Configuration.Release)
.Executes(() =>
{
DotNetPack(s => s
Expand All @@ -150,7 +142,7 @@ class Build : NukeBuild
.SetProject(Solution)
.SetConfiguration(Configuration)
.SetOutputDirectory(ArtifactsDirectory)
.SetVersion(GitVersion.NuGetVersionV2)
.SetVersion(GitVersion.NuGetVersion)
.SetIncludeSymbols(true)
.SetSymbolPackageFormat(DotNetSymbolPackageFormat.snupkg)
);
Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageDownload Include="GitVersion.Tool" Version="[6.0.0-beta.3]" />
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.1.26]" />
</ItemGroup>

Expand Down

0 comments on commit a1a448a

Please sign in to comment.