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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:
with:
fetch-depth: 0 # all

- name: Setup NET 8.0
- name: Setup .NET 10
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- name: Test NET 8
- name: Test .NET 10
run: ./build.sh -target Test

- name: Linux unit test report
Expand All @@ -63,10 +63,10 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 8
- name: Setup .NET 10
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x

- name: Append OCTOVERSION_CurrentBranch with -nightly-<timestamp> (for scheduled)
if: github.event_name == 'schedule'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ using(var newFileStream = new FileStream(newFilePath2, FileMode.Create, FileAcce

## Development
You need:
- VSCode or Visual Studio 15.3 to compile the solution
- .NET Core 2.0 SDK (https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-x64.exe)
- VSCode, Visual Studio or Rider to compile the solution
- .NET 10 SDK (https://dotnet.microsoft.com/download/dotnet/10.0)

Run `Build.cmd` to build, test and package the project.

Expand Down
2 changes: 1 addition & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Build : NukeBuild
[Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable " + CiBranchNameEnvVariable + ".", Name = CiBranchNameEnvVariable)]
string BranchName { get; set; }

[OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net8.0")]
[OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net10.0")]
public OctoVersionInfo OctoVersionInfo;

[Parameter("Test filter expression", Name = "where")] readonly string TestFilter = string.Empty;
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

<ItemGroup>
<PackageDownload Include="Octopus.OctoVersion.Tool" Version="[1.0.9]" />
<PackageDownload Include="Octopus.OctoVersion.Tool" Version="[1.1.79]" />
</ItemGroup>

</Project>
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.100",
"version": "10.0.100",
"rollForward": "latestFeature"
}
}
4 changes: 2 additions & 2 deletions source/Octodiff.Benchmarks/Octodiff.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions source/Octodiff.Tests/Octodiff.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
</PropertyGroup>

<PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
<TargetFrameworks>net8.0;net462</TargetFrameworks>
<TargetFrameworks>net10.0;net462</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Octodiff\Octodiff.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="NUnit" Version="5.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="6.3.0" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net462'">
Expand All @@ -39,7 +39,7 @@
<Reference Include="System" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="System.IO.Packaging" Version="9.0.1" />
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
<PackageReference Include="System.IO.Packaging" Version="10.0.12" />
</ItemGroup>
</Project>
Loading