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
7 changes: 1 addition & 6 deletions .github/actions/setup-dotnet-build/action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: 'Setup .NET and Build'
description: 'Sets up .NET environment, restores dependencies, and builds the project'
inputs:
dotnet-version:
description: '.NET versions to install'
required: false
default: |
9.x
configuration:
description: 'Build configuration'
required: false
Expand All @@ -21,7 +16,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ inputs.dotnet-version }}
global-json-file: global.json

- name: Restore dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace IntelliTect.TestTools.Console.Tests;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<ProductName>IntelliTect.TestTools.Console.Tests</ProductName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
Expand All @@ -19,4 +19,4 @@
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
</ItemGroup>

</Project>
</Project>
1 change: 1 addition & 0 deletions IntelliTect.TestTools.Console.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
.github\workflows\deploy.yml = .github\workflows\deploy.yml
Directory.Build.props = Directory.Build.props
global.json = global.json
EndProjectSection
EndProject
Global
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand Down Expand Up @@ -26,6 +26,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.CodeDom" Version="8.0.0" />
<PackageReference Include="System.CodeDom" Version="9.0.6" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"rollForward": "latestMinor"
}
}
Loading