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
3 changes: 1 addition & 2 deletions .github/workflows/binaries-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x

dotnet-version: 9.0.x
- name: Publish
run: |
dotnet publish ./Quali.Torque.Cli --self-contained -r osx-x64 -c release -o ./osx-x64 -p:PublishSingleFile=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 9.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Verify commit exists in origin/master
run: |
Expand Down
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>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>

Expand Down
4 changes: 2 additions & 2 deletions Quali.Torque.Cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The version is pinned because of a bug (https://github.com/dotnet/sdk/issues/28971#issuecomment-1309328718)
FROM mcr.microsoft.com/dotnet/sdk:7.0.100-preview.2 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env

LABEL org.opencontainers.image.source="https://github.com/QualiNext/torque-cli"
WORKDIR /Quali.Torque.Cli
Expand All @@ -14,7 +14,7 @@ RUN dotnet publish -c Release -o out
# RUN dotnet publish "./Quali.Torque.Cli/Quali.Torque.Cli.csproj" -c Release -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/runtime:7.0
FROM mcr.microsoft.com/dotnet/runtime:9.0
LABEL org.opencontainers.image.source="https://github.com/QualiNext/torque-cli"
WORKDIR /Quali.Torque.Cli
COPY --from=build-env /Quali.Torque.Cli/out .
Expand Down
12 changes: 6 additions & 6 deletions Quali.Torque.Cli/Quali.Torque.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<PackAsTool>true</PackAsTool>
<ToolCommandName>torque-cli</ToolCommandName>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyName>torque-cli</AssemblyName>
Expand All @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Salaros.ConfigParser" Version="0.3.8" />
Expand Down
Loading