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
2 changes: 1 addition & 1 deletion .github/workflows/on-push-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.305
dotnet-version: 10.0.100

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-push-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.305
dotnet-version: 10.0.100

- name: Build & Publish
run: make publish-all config=Release version=${{ env.BUILD_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.305
dotnet-version: 10.0.100

- name: Download Github Release artifacts
uses: robinraju/release-downloader@v1.11
Expand Down
9 changes: 3 additions & 6 deletions src/Directory.Build.props → Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<PropertyGroup>
<Deterministic>true</Deterministic>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<TargetFramework>net10.0</TargetFramework>
<!-- <Deterministic>true</Deterministic> -->
<!-- <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> -->
<IsPackable>false</IsPackable>
<VSTestLogger>trx</VSTestLogger>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
Expand All @@ -12,8 +13,4 @@
<AssemblyVersion>$(Version)</AssemblyVersion>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ current_dir = $(shell pwd)
#

build:
dotnet build -c $(config) terrabuild.sln
dotnet build -c $(config) terrabuild.slnx

test:
dotnet test terrabuild.sln
dotnet test terrabuild.slnx

parser:
dotnet build -c $(config) /p:DefineConstants="GENERATE_PARSER"
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

versions = {
dotnet_sdk: "9.0.305" # https://mcr.microsoft.com/artifact/mar/dotnet/sdk/tags
dotnet_sdk: "10.0.100" # https://mcr.microsoft.com/artifact/mar/dotnet/sdk/tags
}
}

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.305"
"version": "10.0.100"
}
}
5 changes: 2 additions & 3 deletions src/Terrabuild.Common.Tests/Terrabuild.Common.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<!-- <EnableNUnitRunner>true</EnableNUnitRunner> -->
<!-- <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport> -->
Expand All @@ -21,8 +20,8 @@
<ItemGroup>
<PackageReference Include="FsUnit" Version="7.1.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
184 changes: 0 additions & 184 deletions src/Terrabuild.Common.Tests/packages.lock.json

This file was deleted.

3 changes: 1 addition & 2 deletions src/Terrabuild.Common/Terrabuild.Common.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -21,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0" />
<PackageReference Include="FSharp.SystemTextJson" Version="1.4.36" />
</ItemGroup>

Expand Down
41 changes: 0 additions & 41 deletions src/Terrabuild.Common/packages.lock.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<!-- <EnableNUnitRunner>true</EnableNUnitRunner> -->
<!-- <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport> -->
Expand All @@ -15,8 +14,8 @@
<ItemGroup>
<PackageReference Include="FsUnit" Version="7.1.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading