Skip to content

Fixes #3784. SelfContained and NativeAot projects should use the local package in the release mode. #3785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Oct 11, 2024
Merged

Fixes #3784. SelfContained and NativeAot projects should use the local package in the release mode. #3785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8d09971
Fixes #3784. SelfContained and NativeAot projects should use the loca…
BDisp Oct 9, 2024
4afe694
Run dotnet restore before build.
BDisp Oct 9, 2024
4288b71
Using local_packages folder for CI.
BDisp Oct 9, 2024
e130bfd
Add build_release_consumer.
BDisp Oct 9, 2024
bd8ff63
Remove build_release_consumer.
BDisp Oct 9, 2024
5db3af9
Fix folder for CI.
BDisp Oct 9, 2024
d77b899
Fix System.Text.Json vulnerability.
BDisp Oct 9, 2024
3361eed
Fix local_packageslocation.
BDisp Oct 9, 2024
f9f3431
Add package sources to the packageSourceMapping tag.
BDisp Oct 9, 2024
0dc3a52
Using the original configuration.
BDisp Oct 9, 2024
88e2ee6
Only add the Terminal.Gui pattern in the LocalPackages.
BDisp Oct 9, 2024
2c01b33
Fix the path folder separator with unit style.
BDisp Oct 9, 2024
820bf44
Using pack instead of build.
BDisp Oct 9, 2024
d3192df
Create LocalPackages Directory
BDisp Oct 9, 2024
ad69b9d
Add local_packages source.
BDisp Oct 9, 2024
5b108a9
Using scripts to build release for NativeAot and SelfContained.
BDisp Oct 10, 2024
0b4227b
Trying to fix path.
BDisp Oct 10, 2024
a57db4e
Again.
BDisp Oct 10, 2024
c12a2cf
Fix the path for the package,
BDisp Oct 10, 2024
214d109
Need to build before pack.
BDisp Oct 10, 2024
29b902b
Needs also build before pack locally.
BDisp Oct 10, 2024
3bcc34b
Fix build path.
BDisp Oct 10, 2024
bc20229
Merge branch 'v2_develop' into v2_3784_selfcontained_nativeaot-local-…
BDisp Oct 10, 2024
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
8 changes: 7 additions & 1 deletion .github/workflows/dotnet-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@ jobs:
dotnet-version: 8.x
dotnet-quality: 'ga'

- name: Build Release
- name: Build Release Terminal.Gui
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

- name: Build Release Solution
run: dotnet build --configuration Release


Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ demo.*
*.tui/

*.dotCover
/local_packages/
2 changes: 1 addition & 1 deletion NativeAot/NativeAot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PackageReference Include="Terminal.Gui" Version="[2.0.0-v2-develop.2189,3)" />
<PackageReference Include="Terminal.Gui" Version="2.0.0" />
<TrimmerRootAssembly Include="Terminal.Gui" />
</ItemGroup>

Expand Down
9 changes: 9 additions & 0 deletions NativeAot/PackTerminalGui.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 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
dotnet restore ./NativeAot.csproj --source ./local_packages

# Step 3: Build NativeAot
dotnet build ./NativeAot.csproj --configuration Release
11 changes: 11 additions & 0 deletions NativeAot/PackTerminalGui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/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
dotnet restore ./NativeAot.csproj --source ./local_packages

# Step 3: Build NativeAot
dotnet build ./NativeAot.csproj --configuration Release
9 changes: 9 additions & 0 deletions SelfContained/PackTerminalGui.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 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
dotnet restore ./SelfContained.csproj --source ./local_packages

# Step 3: Build SelfContained
dotnet build ./SelfContained.csproj --configuration Release
11 changes: 11 additions & 0 deletions SelfContained/PackTerminalGui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/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
dotnet restore ./SelfContained.csproj --source ./local_packages

# Step 3: Build SelfContained
dotnet build ./SelfContained.csproj --configuration Release
2 changes: 1 addition & 1 deletion SelfContained/SelfContained.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PackageReference Include="Terminal.Gui" Version="[2.0.0-pre.1788,3)" />
<PackageReference Include="Terminal.Gui" Version="2.0.0" />
<TrimmerRootAssembly Include="Terminal.Gui" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Terminal.Gui/Terminal.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<!-- Enable Nuget Source Link for github -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="[8,9)" PrivateAssets="all" />
<PackageReference Include="System.IO.Abstractions" Version="[21.0.22,22)" />
<PackageReference Include="System.Text.Json" Version="[8.0.4,9)" />
<PackageReference Include="System.Text.Json" Version="[8.0.5,9)" />
<PackageReference Include="Wcwidth" Version="[2,3)" />
</ItemGroup>
<!-- =================================================================== -->
Expand Down
4 changes: 4 additions & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="LocalPackages" value="./local_packages" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
<packageSource key="LocalPackages">
<package pattern="Terminal.Gui*" />
</packageSource>
</packageSourceMapping>
</configuration>
Loading