From cb7bc6698be1a9181f137f668947db5317a1707b Mon Sep 17 00:00:00 2001 From: Brian Beversdorf Date: Tue, 18 Jul 2023 16:31:37 -0500 Subject: [PATCH 1/7] SL-6373 - Update for MAUI --- .../Float.HttpServer.Tests.csproj | 25 +++++++++++++------ Float.HttpServer/Float.HttpServer.csproj | 10 ++++++-- Float.HttpServer/LocalHttpServer.cs | 3 +++ global.json | 5 ---- 4 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 global.json diff --git a/Float.HttpServer.Tests/Float.HttpServer.Tests.csproj b/Float.HttpServer.Tests/Float.HttpServer.Tests.csproj index 95c8619..ec04b5b 100644 --- a/Float.HttpServer.Tests/Float.HttpServer.Tests.csproj +++ b/Float.HttpServer.Tests/Float.HttpServer.Tests.csproj @@ -1,22 +1,31 @@ - net6.0 + netcoreapp3.1;net6.0;net7.0 false - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + diff --git a/Float.HttpServer/Float.HttpServer.csproj b/Float.HttpServer/Float.HttpServer.csproj index beda40b..1b1a8cc 100644 --- a/Float.HttpServer/Float.HttpServer.csproj +++ b/Float.HttpServer/Float.HttpServer.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2;netstandard2.1;net6.0;net7.0 Float.HttpServer Float ..\ @@ -27,6 +27,12 @@ MIT readme.md + + 11.0 + + + 11.0 + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -34,6 +40,6 @@ - + diff --git a/Float.HttpServer/LocalHttpServer.cs b/Float.HttpServer/LocalHttpServer.cs index 7c9945e..dc926fe 100644 --- a/Float.HttpServer/LocalHttpServer.cs +++ b/Float.HttpServer/LocalHttpServer.cs @@ -227,7 +227,10 @@ protected virtual void Dispose(bool disposing) { Stop(); listener.Close(); + cancellationTokenSource.Dispose(); serverThread = null; + startEvent.Dispose(); + stopEvent.Dispose(); } disposed = true; diff --git a/global.json b/global.json deleted file mode 100644 index 7f5066a..0000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "6" - } -} From ca5509dd44ecaf37974296ceb886d9ce0cf066c6 Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Tue, 18 Jul 2023 16:32:27 -0500 Subject: [PATCH 2/7] Update test.yml --- .github/workflows/test.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1559cfa..4b326d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,16 +10,24 @@ jobs: test: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: | + 3.1.x + 6.0.x + 7.0.x - name: Restore dependencies run: dotnet restore - name: Build - run: dotnet build --no-restore + run: dotnet build --configuration Release --no-restore - name: Test - run: dotnet test --no-build --verbosity normal + run: dotnet test --configuration Release --no-build --verbosity normal --logger:"trx;" + - name: Publish Test Results + uses: EnricoMi/publish-unit-test-result-action@v2 + if: always() + with: + files: | + **/TestResults/*.trx From 16d66d5904252b7a50a852d438ed846b0916b3aa Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Tue, 18 Jul 2023 16:42:38 -0500 Subject: [PATCH 3/7] Update test.yml --- .github/workflows/test.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b326d2..ebcfa3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,27 +7,6 @@ on: branches: [ main ] jobs: - test: - - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: | - 3.1.x - 6.0.x - 7.0.x - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build --configuration Release --no-restore - - name: Test - run: dotnet test --configuration Release --no-build --verbosity normal --logger:"trx;" - - name: Publish Test Results - uses: EnricoMi/publish-unit-test-result-action@v2 - if: always() - with: - files: | - **/TestResults/*.trx + float-http-server: + uses: gowithfloat/github-workflows/.github/workflows/dotnot_test.yml@main + secrets: inherit From 0290a3ecf2e010f9d02d2f696b15806bdbb1ff73 Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Tue, 18 Jul 2023 16:44:50 -0500 Subject: [PATCH 4/7] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebcfa3e..02a287a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,5 +8,5 @@ on: jobs: float-http-server: - uses: gowithfloat/github-workflows/.github/workflows/dotnot_test.yml@main + uses: gowithfloat/github-workflows/.github/workflows/dotnet_test.yml@main secrets: inherit From a7326e2b1a32f5309738352cfe6d83525bfa5cb7 Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Tue, 18 Jul 2023 16:52:14 -0500 Subject: [PATCH 5/7] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02a287a..c9e894a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,5 +8,5 @@ on: jobs: float-http-server: - uses: gowithfloat/github-workflows/.github/workflows/dotnet_test.yml@main + uses: gowithfloat/Float.FileDownloader/.github/workflows/test.yml@main secrets: inherit From 59c58f0ee66383e210c2f6e3b4c864cf6296bf55 Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Tue, 18 Jul 2023 16:54:15 -0500 Subject: [PATCH 6/7] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9e894a..ab91acf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,5 +8,5 @@ on: jobs: float-http-server: - uses: gowithfloat/Float.FileDownloader/.github/workflows/test.yml@main + uses: gowithfloat/Float.FileDownloader/.github/workflows/test.yml@maui-ready secrets: inherit From 8c20a17e3e816738b55c2476074f42eabd2e7bfc Mon Sep 17 00:00:00 2001 From: bbeversdorf Date: Wed, 19 Jul 2023 08:38:35 -0500 Subject: [PATCH 7/7] Update test.yml --- .github/workflows/test.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab91acf..26b91df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,27 @@ on: branches: [ main ] jobs: - float-http-server: - uses: gowithfloat/Float.FileDownloader/.github/workflows/test.yml@maui-ready - secrets: inherit + test: + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + 6.0.x + 7.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --configuration Release --no-build --verbosity normal --logger:"trx;" + - name: Publish Test Results + uses: EnricoMi/publish-unit-test-result-action@v2 + if: always() + with: + files: | + **/TestResults/*.trx