From 8d0997194fed5bd5cea0b0a507bf901cc5ff92db Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 16:09:11 +0100 Subject: [PATCH 01/22] Fixes #3784. SelfContained and NativeAot projects should use the local package in the release mode. --- NativeAot/NativeAot.csproj | 2 +- SelfContained/SelfContained.csproj | 2 +- nuget.config | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NativeAot/NativeAot.csproj b/NativeAot/NativeAot.csproj index 20721a952..4f5238a9d 100644 --- a/NativeAot/NativeAot.csproj +++ b/NativeAot/NativeAot.csproj @@ -15,7 +15,7 @@ - + diff --git a/SelfContained/SelfContained.csproj b/SelfContained/SelfContained.csproj index af651e3ca..46800e09c 100644 --- a/SelfContained/SelfContained.csproj +++ b/SelfContained/SelfContained.csproj @@ -18,7 +18,7 @@ - + diff --git a/nuget.config b/nuget.config index 808d98ba0..4b9464b11 100644 --- a/nuget.config +++ b/nuget.config @@ -9,6 +9,7 @@ + From 4afe694617d03fc08c01853223cbeaaef1053aaa Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 16:46:35 +0100 Subject: [PATCH 02/22] Run dotnet restore before build. --- .github/workflows/dotnet-core.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 5779ed9da..9de338960 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,6 +90,9 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' + - name: Restore dependencies + run: dotnet restore + - name: Build Release run: dotnet build --configuration Release From 4288b71153500ba8c80a2543c3b6fe3f129a686c Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 17:38:50 +0100 Subject: [PATCH 03/22] Using local_packages folder for CI. --- .github/workflows/dotnet-core.yml | 13 ++++++++----- nuget.config | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 9de338960..bdb919401 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -78,8 +78,8 @@ jobs: build_release: - # Ensure that RELEASE builds are not broken runs-on: ubuntu-latest + steps: - name: Checkout code uses: actions/checkout@v4 @@ -90,11 +90,14 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Restore dependencies - run: dotnet restore + - name: Build local NuGet package + run: dotnet pack --configuration Release -o ./local_packages - - name: Build Release - run: dotnet build --configuration Release + - name: Upload package artifact + uses: actions/upload-artifact@v4 + with: + name: local_nuget_package + path: ./local_packages/*.nupkg # Note: this step is currently not writing to the gist for some reason diff --git a/nuget.config b/nuget.config index 4b9464b11..662f878bc 100644 --- a/nuget.config +++ b/nuget.config @@ -10,6 +10,7 @@ + From e130bfdb755258bd455148986d815d8a163b994f Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 17:52:47 +0100 Subject: [PATCH 04/22] Add build_release_consumer. --- .github/workflows/dotnet-core.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index bdb919401..91a21717f 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -99,6 +99,32 @@ jobs: name: local_nuget_package path: ./local_packages/*.nupkg + build_release_consumer: + runs-on: ubuntu-latest + needs: build_release + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.x + dotnet-quality: 'ga' + + - name: Download package artifact + uses: actions/download-artifact@v4 + with: + name: local_nuget_package + path: ./local_packages + + - name: Restore dependencies using downloaded package + run: dotnet restore --configfile nuget.config + + - name: Build Release + run: dotnet build --configuration Release + # Note: this step is currently not writing to the gist for some reason # - name: Create Test Coverage Badge From bd8ff63553953174857095480cf1670b24b65121 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 18:13:39 +0100 Subject: [PATCH 05/22] Remove build_release_consumer. --- .github/workflows/dotnet-core.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 91a21717f..bdb919401 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -99,32 +99,6 @@ jobs: name: local_nuget_package path: ./local_packages/*.nupkg - build_release_consumer: - runs-on: ubuntu-latest - needs: build_release - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup .NET Core - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.x - dotnet-quality: 'ga' - - - name: Download package artifact - uses: actions/download-artifact@v4 - with: - name: local_nuget_package - path: ./local_packages - - - name: Restore dependencies using downloaded package - run: dotnet restore --configfile nuget.config - - - name: Build Release - run: dotnet build --configuration Release - # Note: this step is currently not writing to the gist for some reason # - name: Create Test Coverage Badge From 5db3af9f4c04bf70a92aa18ace64d90b5721090b Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 18:14:27 +0100 Subject: [PATCH 06/22] Fix folder for CI. --- nuget.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget.config b/nuget.config index 662f878bc..e8149ff29 100644 --- a/nuget.config +++ b/nuget.config @@ -10,7 +10,7 @@ - + From d77b899db92b0fdd746f11f68144de8ad0e0fce5 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 13:38:34 +0100 Subject: [PATCH 07/22] Fix System.Text.Json vulnerability. --- Terminal.Gui/Terminal.Gui.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 3a4dcc680..b11044a16 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -60,7 +60,7 @@ - + From 3361eed0d31960fa297f475f5fee84e1f492317b Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 19:24:40 +0100 Subject: [PATCH 08/22] Fix local_packageslocation. --- .github/workflows/dotnet-core.yml | 2 +- nuget.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index bdb919401..888b0af07 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -78,8 +78,8 @@ jobs: build_release: + # Ensure that RELEASE builds are not broken runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/nuget.config b/nuget.config index e8149ff29..493629954 100644 --- a/nuget.config +++ b/nuget.config @@ -10,7 +10,7 @@ - + From f9f3431118bb81b23f0752756e48cb00ffe23b6d Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 21:16:47 +0100 Subject: [PATCH 09/22] Add package sources to the packageSourceMapping tag. --- .github/workflows/dotnet-core.yml | 2 +- nuget.config | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 888b0af07..d80b10014 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -78,7 +78,7 @@ jobs: build_release: - # Ensure that RELEASE builds are not broken + # Ensure that RELEASE builds are not broken runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/nuget.config b/nuget.config index 493629954..595bec2d5 100644 --- a/nuget.config +++ b/nuget.config @@ -16,5 +16,11 @@ + + + + + + From 0dc3a523c908e0a111147c976bcfcaa4a66190cf Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 21:21:32 +0100 Subject: [PATCH 10/22] Using the original configuration. --- .github/workflows/dotnet-core.yml | 10 ++-------- nuget.config | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index d80b10014..5779ed9da 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,14 +90,8 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Build local NuGet package - run: dotnet pack --configuration Release -o ./local_packages - - - name: Upload package artifact - uses: actions/upload-artifact@v4 - with: - name: local_nuget_package - path: ./local_packages/*.nupkg + - name: Build Release + run: dotnet build --configuration Release # Note: this step is currently not writing to the gist for some reason diff --git a/nuget.config b/nuget.config index 595bec2d5..429b5c8cc 100644 --- a/nuget.config +++ b/nuget.config @@ -10,7 +10,6 @@ - From 88e2ee6c56091bfb5dd7a902af93c08ee26b7216 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 21:38:37 +0100 Subject: [PATCH 11/22] Only add the Terminal.Gui pattern in the LocalPackages. --- nuget.config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nuget.config b/nuget.config index 429b5c8cc..929032399 100644 --- a/nuget.config +++ b/nuget.config @@ -16,10 +16,7 @@ - - - - + From 2c01b33eb2c52c2e82ab153e495ebaef321bd850 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 21:47:32 +0100 Subject: [PATCH 12/22] Fix the path folder separator with unit style. --- nuget.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget.config b/nuget.config index 929032399..b33906572 100644 --- a/nuget.config +++ b/nuget.config @@ -9,7 +9,7 @@ - + From 820bf44e99cd7f7deb10b00135817f9f351ad66f Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 21:58:22 +0100 Subject: [PATCH 13/22] Using pack instead of build. --- .github/workflows/dotnet-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 5779ed9da..0b9c14fc3 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,8 +90,8 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Build Release - run: dotnet build --configuration Release + - name: Pack Releae + run: dotnet pack --configuration Release --output ./bin/Release # Note: this step is currently not writing to the gist for some reason From d3192df5c2b4e4d5dac11380fb4722ea0e641656 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 22:10:46 +0100 Subject: [PATCH 14/22] Create LocalPackages Directory --- .github/workflows/dotnet-core.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 0b9c14fc3..466427894 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,8 +90,17 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Pack Releae - run: dotnet pack --configuration Release --output ./bin/Release + - name: Create LocalPackages Directory + run: mkdir -p LocalPackages + + - name: Pack Release + run: dotnet pack --configuration Release --output ./LocalPackages + + - name: Restore dependencies + run: dotnet restore --source ./LocalPackages + + - name: Build Release + run: dotnet build --configuration Release # Note: this step is currently not writing to the gist for some reason From ad69b9db4d9f27ee241a3ad2ce173d5488a58339 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 9 Oct 2024 22:19:56 +0100 Subject: [PATCH 15/22] Add local_packages source. --- .github/workflows/dotnet-core.yml | 8 ++++---- nuget.config | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 466427894..a3c1357bb 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,14 +90,14 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Create LocalPackages Directory - run: mkdir -p LocalPackages + - name: Create local_packages Directory + run: mkdir -p local_packages - name: Pack Release - run: dotnet pack --configuration Release --output ./LocalPackages + run: dotnet pack --configuration Release --output ./local_packages - name: Restore dependencies - run: dotnet restore --source ./LocalPackages + run: dotnet restore --source ./local_packages - name: Build Release run: dotnet build --configuration Release diff --git a/nuget.config b/nuget.config index b33906572..94b44b5ff 100644 --- a/nuget.config +++ b/nuget.config @@ -10,13 +10,17 @@ + - + + + + From 5b108a92611202ba407e70e172d5f37cb6a5361c Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 22:32:37 +0100 Subject: [PATCH 16/22] Using scripts to build release for NativeAot and SelfContained. --- .github/workflows/dotnet-core.yml | 8 +------- .gitignore | 1 + NativeAot/PackTerminalGui.ps1 | 8 ++++++++ NativeAot/PackTerminalGui.sh | 10 ++++++++++ SelfContained/PackTerminalGui.ps1 | 8 ++++++++ SelfContained/PackTerminalGui.sh | 10 ++++++++++ nuget.config | 8 ++------ 7 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 NativeAot/PackTerminalGui.ps1 create mode 100644 NativeAot/PackTerminalGui.sh create mode 100644 SelfContained/PackTerminalGui.ps1 create mode 100644 SelfContained/PackTerminalGui.sh diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a3c1357bb..98a05efc4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,14 +90,8 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' - - name: Create local_packages Directory - run: mkdir -p local_packages - - name: Pack Release - run: dotnet pack --configuration Release --output ./local_packages - - - name: Restore dependencies - run: dotnet restore --source ./local_packages + run: dotnet pack ./Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages - name: Build Release run: dotnet build --configuration Release diff --git a/.gitignore b/.gitignore index cca1f4801..1a111a2ca 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ demo.* *.tui/ *.dotCover +/local_packages/ diff --git a/NativeAot/PackTerminalGui.ps1 b/NativeAot/PackTerminalGui.ps1 new file mode 100644 index 000000000..b690c1436 --- /dev/null +++ b/NativeAot/PackTerminalGui.ps1 @@ -0,0 +1,8 @@ +# Step 1: Build and pack Terminal.Gui +dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages + +# Step 2: Restore NativeAot with the new package +dotnet restore ./NativeAot.csproj --source ./local_packages + +# Step 3: Build NativeAot +dotnet build ./NativeAot.csproj --configuration Release diff --git a/NativeAot/PackTerminalGui.sh b/NativeAot/PackTerminalGui.sh new file mode 100644 index 000000000..657f50e5d --- /dev/null +++ b/NativeAot/PackTerminalGui.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Step 1: Build and pack Terminal.Gui +dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages + +# Step 2: Restore NativeAot with the new package +dotnet restore ./NativeAot.csproj --source ./local_packages + +# Step 3: Build NativeAot +dotnet build ./NativeAot.csproj --configuration Release diff --git a/SelfContained/PackTerminalGui.ps1 b/SelfContained/PackTerminalGui.ps1 new file mode 100644 index 000000000..bf99bf2eb --- /dev/null +++ b/SelfContained/PackTerminalGui.ps1 @@ -0,0 +1,8 @@ +# Step 1: Build and pack Terminal.Gui +dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages + +# Step 2: Restore SelfContained with the new package +dotnet restore ./SelfContained.csproj --source ./local_packages + +# Step 3: Build SelfContained +dotnet build ./SelfContained.csproj --configuration Release diff --git a/SelfContained/PackTerminalGui.sh b/SelfContained/PackTerminalGui.sh new file mode 100644 index 000000000..3edaf152a --- /dev/null +++ b/SelfContained/PackTerminalGui.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Step 1: Build and pack Terminal.Gui +dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages + +# Step 2: Restore SelfContained with the new package +dotnet restore ./SelfContained.csproj --source ./local_packages + +# Step 3: Build SelfContained +dotnet build ./SelfContained.csproj --configuration Release diff --git a/nuget.config b/nuget.config index 94b44b5ff..c5478a199 100644 --- a/nuget.config +++ b/nuget.config @@ -9,18 +9,14 @@ - - + - - - - + From 0b4227b29b18fab8bcf419a978effb75bb6a1d70 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 22:42:13 +0100 Subject: [PATCH 17/22] Trying to fix path. --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 98a05efc4..791ff1ee4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -91,7 +91,7 @@ jobs: dotnet-quality: 'ga' - name: Pack Release - run: dotnet pack ./Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages + run: dotnet pack ./Terminal.Gui.csproj --configuration Release --output ./local_packages - name: Build Release run: dotnet build --configuration Release From a57db4e4ea94041162305adbe2bb822f6c27ec1c Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 22:44:48 +0100 Subject: [PATCH 18/22] Again. --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 791ff1ee4..4f315bbbd 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -91,7 +91,7 @@ jobs: dotnet-quality: 'ga' - name: Pack Release - run: dotnet pack ./Terminal.Gui.csproj --configuration Release --output ./local_packages + run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages - name: Build Release run: dotnet build --configuration Release From c12a2cfb3331ed41346703c6e942ab127f268cc8 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 22:50:43 +0100 Subject: [PATCH 19/22] Fix the path for the package, --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 4f315bbbd..6766fc9a4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -91,7 +91,7 @@ jobs: dotnet-quality: 'ga' - name: Pack Release - run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages + run: cd Terminal.Gui && dotnet pack --configuration Release --output ./local_packages - name: Build Release run: dotnet build --configuration Release From 214d1097f49589081be68f48393924fbb3eb304f Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 22:56:43 +0100 Subject: [PATCH 20/22] Need to build before pack. --- .github/workflows/dotnet-core.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 6766fc9a4..c05917362 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -90,8 +90,11 @@ jobs: dotnet-version: 8.x dotnet-quality: 'ga' + - name: Build Release Terminal.Gui + run: cd Terminal.Gui && dotnet build --configuration Release + - name: Pack Release - run: cd Terminal.Gui && dotnet pack --configuration Release --output ./local_packages + run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages - name: Build Release run: dotnet build --configuration Release From 29b902ba83a17345df8bfd0859ed8135d8da5c01 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 23:25:38 +0100 Subject: [PATCH 21/22] Needs also build before pack locally. --- .github/workflows/dotnet-core.yml | 6 +++--- NativeAot/PackTerminalGui.ps1 | 1 + NativeAot/PackTerminalGui.sh | 1 + SelfContained/PackTerminalGui.ps1 | 1 + SelfContained/PackTerminalGui.sh | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index c05917362..c53f63f3e 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -91,12 +91,12 @@ jobs: dotnet-quality: 'ga' - name: Build Release Terminal.Gui - run: cd Terminal.Gui && dotnet build --configuration Release + run: dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release - - name: Pack Release + - name: Pack Release Terminal.Gui run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages - - name: Build Release + - name: Build Release Solution run: dotnet build --configuration Release diff --git a/NativeAot/PackTerminalGui.ps1 b/NativeAot/PackTerminalGui.ps1 index b690c1436..ea6bff054 100644 --- a/NativeAot/PackTerminalGui.ps1 +++ b/NativeAot/PackTerminalGui.ps1 @@ -1,4 +1,5 @@ # Step 1: Build and pack Terminal.Gui +dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages # Step 2: Restore NativeAot with the new package diff --git a/NativeAot/PackTerminalGui.sh b/NativeAot/PackTerminalGui.sh index 657f50e5d..ab0cc7e17 100644 --- a/NativeAot/PackTerminalGui.sh +++ b/NativeAot/PackTerminalGui.sh @@ -1,6 +1,7 @@ #!/bin/bash # Step 1: Build and pack Terminal.Gui +dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages # Step 2: Restore NativeAot with the new package diff --git a/SelfContained/PackTerminalGui.ps1 b/SelfContained/PackTerminalGui.ps1 index bf99bf2eb..6e5cd4192 100644 --- a/SelfContained/PackTerminalGui.ps1 +++ b/SelfContained/PackTerminalGui.ps1 @@ -1,4 +1,5 @@ # Step 1: Build and pack Terminal.Gui +dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages # Step 2: Restore SelfContained with the new package diff --git a/SelfContained/PackTerminalGui.sh b/SelfContained/PackTerminalGui.sh index 3edaf152a..d2cba3e87 100644 --- a/SelfContained/PackTerminalGui.sh +++ b/SelfContained/PackTerminalGui.sh @@ -1,6 +1,7 @@ #!/bin/bash # Step 1: Build and pack Terminal.Gui +dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release dotnet pack ../Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ../local_packages # Step 2: Restore SelfContained with the new package From 3bcc34bda0f40c1e753aef04b8234ce21f512903 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 10 Oct 2024 23:30:01 +0100 Subject: [PATCH 22/22] Fix build path. --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index c53f63f3e..d22eefcfb 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -91,7 +91,7 @@ jobs: dotnet-quality: 'ga' - name: Build Release Terminal.Gui - run: dotnet build ../Terminal.Gui/Terminal.Gui.csproj --configuration Release + run: dotnet build Terminal.Gui/Terminal.Gui.csproj --configuration Release - name: Pack Release Terminal.Gui run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages