From 7c01ec01898d81d43c3e102b2301ead1d1952ea4 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Thu, 26 Jun 2025 21:14:50 -0700 Subject: [PATCH 1/6] Chore: Update Deps --- .../IntelliTect.TestTools.Console.Tests.csproj | Bin 778 -> 1546 bytes .../IntelliTect.TestTools.Console.csproj | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj b/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj index bcbcb716ba912927a2e75c28848b7ff73302290b..a33dee7fd6d4c15a3a1e5c7e5ef7c01de25a6d9c 100644 GIT binary patch literal 1546 zcmcIkO;5s55S+7#|DoY-kziDkT4IbE4kD4l$xBlTL7|YgDE@hMb|1AMT0mk*zu4J* zv-4)($Gd|%<``oH3oi%}Bf$_8M7Tf+71%iD(_$n-!2f%UMi^*xh7^4q5p_yT9WD-W z00%8rnc#^z0TCA3%zD<0J7xzOO^E0-YNLs3czhaEX;H;uURG(Uyi&a3R&!^VE};za z9>Qj-caKQPaanoJr-L$njtgJOH#I!?tUq8ziW|Q9)Fs3#na1SrvTuo;t0q!&6MnV2 zQKd(QqDpg7-9>|SQ&t}FH)KttnyqgMBOceEFqUxLE51d1lkbqr#zQz8 zOtGRlzM;&<1-iG`M?iIa)$M_N`n+OZ;+K%hN`C?Q&gg=0qYJW*az9w;YQ_f=`|K0D)xItOxW(3TM1oBAbjV z79ko_2uVp69PXZ-2{uC!d<|#=RyzyjXbZe({Szr>RJB_HKDl}WU&gIV4JeF*+S)$r z@!~N2%ZkmKAaD{{^M_vmig&$lf08TFo#t(zMn;*AkPN Nk#(v~K8mET{00=&{3QSY diff --git a/IntelliTect.TestTools.Console/IntelliTect.TestTools.Console.csproj b/IntelliTect.TestTools.Console/IntelliTect.TestTools.Console.csproj index 9a83da9..c31509f 100644 --- a/IntelliTect.TestTools.Console/IntelliTect.TestTools.Console.csproj +++ b/IntelliTect.TestTools.Console/IntelliTect.TestTools.Console.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -26,6 +26,6 @@ - + From 612d31709913d087aed2b88831278f48d26bfb62 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Thu, 26 Jun 2025 21:20:09 -0700 Subject: [PATCH 2/6] Update --- .github/workflows/build-and-test.yml | 4 +--- ...IntelliTect.TestTools.Console.Tests.csproj | Bin 1546 -> 1546 bytes IntelliTect.TestTools.Console.sln | 1 + global.json | 6 ++++++ 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 25ae520..39cd3b5 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -23,9 +23,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 3.1.x - 6.x + global-json-file: global.json - name: Restore dependencies run: dotnet restore - name: Build diff --git a/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj b/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj index a33dee7fd6d4c15a3a1e5c7e5ef7c01de25a6d9c..b3623dfebb6704d6bad8790bda1169dc9b8fe8b9 100644 GIT binary patch delta 14 VcmeC;>EhX7!pLa3*_81r3jiNa1P%ZI delta 14 VcmeC;>EhX7!pLZ`*_81r3jiNU1PuTH diff --git a/IntelliTect.TestTools.Console.sln b/IntelliTect.TestTools.Console.sln index f898a0d..8045910 100644 --- a/IntelliTect.TestTools.Console.sln +++ b/IntelliTect.TestTools.Console.sln @@ -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 diff --git a/global.json b/global.json new file mode 100644 index 0000000..f15a959 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "9.0.100", + "rollForward": "latestMinor" + } +} \ No newline at end of file From ae28fbc68ab0c300860924bd7dc2bdbbfc220e2a Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Thu, 26 Jun 2025 21:25:35 -0700 Subject: [PATCH 3/6] Update --- IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs b/IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs index 164a670..b697b73 100644 --- a/IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs +++ b/IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using System.Threading.Tasks; namespace IntelliTect.TestTools.Console.Tests; @@ -196,7 +196,10 @@ public void ExecuteProcess_PingLocalhost_Success() else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { expected = $@"PING *(* (::1)) 56 data bytes -64 bytes from * (::1): icmp_seq=1 ttl=64 time=* ms*"; +64 bytes from * (::1): icmp_seq=1 ttl=64 time=* ms* +*--- localhost ping statistics ---* +* packets transmitted, * received, *% packet loss, time *ms +rtt min/avg/max/mdev = */*/*/* ms*"; } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { From ce39a4ac08b168f0a5b8264cfab3a719d981e5f0 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Sat, 20 Sep 2025 09:38:37 -0700 Subject: [PATCH 4/6] Update IntelliTect.TestTools.Console.Tests.csproj --- ...IntelliTect.TestTools.Console.Tests.csproj | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj b/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj index e69de29..b764e6c 100644 --- a/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj +++ b/IntelliTect.TestTools.Console.Tests/IntelliTect.TestTools.Console.Tests.csproj @@ -0,0 +1,22 @@ + + + + net9.0 + + IntelliTect.TestTools.Console.Tests + + + + + + + + + + + + + + + + From 88ddafd6756132237a89c861e055b06392c68e2c Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Sat, 20 Sep 2025 09:39:49 -0700 Subject: [PATCH 5/6] Simplify .NET setup action by removing version input --- .github/actions/setup-dotnet-build/action.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/actions/setup-dotnet-build/action.yml b/.github/actions/setup-dotnet-build/action.yml index 552f186..af1ce73 100644 --- a/.github/actions/setup-dotnet-build/action.yml +++ b/.github/actions/setup-dotnet-build/action.yml @@ -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 @@ -21,7 +16,6 @@ runs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ inputs.dotnet-version }} - name: Restore dependencies run: dotnet restore From 9cc271c8810e077f99d94a31faa9e2a908c83570 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Sat, 20 Sep 2025 09:40:51 -0700 Subject: [PATCH 6/6] Add global JSON file support to setup-dotnet action --- .github/actions/setup-dotnet-build/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-dotnet-build/action.yml b/.github/actions/setup-dotnet-build/action.yml index af1ce73..4112dd9 100644 --- a/.github/actions/setup-dotnet-build/action.yml +++ b/.github/actions/setup-dotnet-build/action.yml @@ -16,6 +16,7 @@ runs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: + global-json-file: global.json - name: Restore dependencies run: dotnet restore