Skip to content

Commit ff0a301

Browse files
Merge branch 'main' into bmichaelis/updateDeps
2 parents ae28fbc + 159ae9f commit ff0a301

5 files changed

Lines changed: 73 additions & 13 deletions

File tree

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: 'Setup .NET and Build'
2+
description: 'Sets up .NET environment, restores dependencies, and builds the project'
3+
inputs:
4+
dotnet-version:
5+
description: '.NET versions to install'
6+
required: false
7+
default: |
8+
9.x
9+
configuration:
10+
description: 'Build configuration'
11+
required: false
12+
default: 'Release'
13+
build-args:
14+
description: 'Additional build arguments'
15+
required: false
16+
default: '-p:ContinuousIntegrationBuild=True --no-restore'
17+
18+
runs:
19+
using: 'composite'
20+
steps:
21+
- name: Setup .NET
22+
uses: actions/setup-dotnet@v4
23+
with:
24+
dotnet-version: ${{ inputs.dotnet-version }}
25+
26+
- name: Restore dependencies
27+
run: dotnet restore
28+
shell: pwsh
29+
30+
- name: Build
31+
run: dotnet build --configuration ${{ inputs.configuration }} ${{ inputs.build-args }}
32+
shell: pwsh

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@ jobs:
2020
os: [ubuntu-latest, windows-latest, macOS-latest]
2121
steps:
2222
- uses: actions/checkout@v4
23-
- name: Setup .NET
24-
uses: actions/setup-dotnet@v4
25-
with:
26-
global-json-file: global.json
27-
- name: Restore dependencies
28-
run: dotnet restore
29-
- name: Build
30-
run: dotnet build -p:ContinuousIntegrationBuild=True --no-restore --configuration Release
23+
- name: Setup .NET and Build
24+
uses: ./.github/actions/setup-dotnet-build
3125
- name: Test
3226
run: dotnet test --no-build --configuration Release --verbosity normal
3327

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Copilot Setup Steps
2+
3+
on:
4+
push:
5+
paths:
6+
- '.github/workflows/copilot-setup-steps.yml'
7+
pull_request:
8+
paths:
9+
- '.github/workflows/copilot-setup-steps.yml'
10+
workflow_dispatch:
11+
12+
defaults:
13+
run:
14+
shell: pwsh
15+
16+
jobs:
17+
copilot-setup-steps:
18+
name: copilot-setup-steps
19+
runs-on: ubuntu-latest
20+
21+
permissions:
22+
contents: read
23+
24+
steps:
25+
- name: Checkout code
26+
uses: actions/checkout@v5
27+
28+
- name: Setup .NET and Build
29+
uses: ./.github/actions/setup-dotnet-build
30+
with:
31+
configuration: 'Debug'
32+
33+
- name: Setup Copilot environment
34+
run: |
35+
echo "Setting up Copilot-specific environment variables..."
36+
echo "COPILOT_SETUP_COMPLETE=true" >> $env:GITHUB_ENV
37+
echo "Copilot environment setup completed"

IntelliTect.TestTools.Console.Tests/ConsoleAssertTests.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,8 @@ public void ExecuteProcess_PingLocalhost_Success()
195195
}
196196
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
197197
{
198-
expected = $@"PING *(* (::1)) 56 data bytes
199-
64 bytes from * (::1): icmp_seq=1 ttl=64 time=* ms*
200-
*--- localhost ping statistics ---*
201-
* packets transmitted, * received, *% packet loss, time *ms
202-
rtt min/avg/max/mdev = */*/*/* ms*";
198+
expected = $@"PING *(::1) 56 data bytes
199+
64 bytes from * (::1): icmp_seq=1 ttl=64 time=* ms*";
203200
}
204201
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
205202
{
Binary file not shown.

0 commit comments

Comments
 (0)