Skip to content

Commit 7bc9677

Browse files
rabbitismrabbitism
authored
Merge pull request #618 from irihitech/various
Simplify Packages and CI files
2 parents f3a19f7 + 9b70613 commit 7bc9677

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+404
-433
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ jobs:
2424
- name: Publish .NET Project
2525
run: dotnet publish $PROJECT_PATH -c Release --nologo
2626

27-
- name: Change base-tag in index.html
28-
run: sed -i 's#<base href="/" />#<base href="/Semi.Avalonia/" />#g' $OUTPUT_PATH/index.html
29-
3027
- name: copy index.html to 404.html
3128
run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
3229

‎.github/workflows/pack-nightly.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,29 @@ jobs:
4545
4646
- name: Pack Semi.Avalonia
4747
if: ${{ github.event.inputs.Semi_Avalonia == 'true' }}
48-
run: dotnet pack ./src/Semi.Avalonia -o ./nugets /p:Version=${{ env.VERSION }}
48+
run: dotnet pack src/Semi.Avalonia -o nugets /p:Version=${{ env.VERSION }}
4949

5050
- name: Pack Semi.Avalonia.ColorPicker
5151
if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }}
52-
run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets /p:Version=${{ env.VERSION }}
52+
run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets /p:Version=${{ env.VERSION }}
5353

5454
- name: Pack Semi.Avalonia.DataGrid
5555
if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }}
56-
run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets /p:Version=${{ env.VERSION }}
56+
run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets /p:Version=${{ env.VERSION }}
5757

5858
- name: Pack Semi.Avalonia.TreeDataGrid
5959
if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }}
60-
run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets /p:Version=${{ env.VERSION }}
60+
run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets /p:Version=${{ env.VERSION }}
6161

6262
- name: Add NuGet Source
6363
run: dotnet nuget add source ${{ secrets.IRIHI_NUGET_NIGHTLY_FEED }} -n irihi.tech -u ${{ secrets.IRIHI_NUGET_USERNAME }} -p ${{ secrets.IRIHI_NUGET_PASSWORD }} --store-password-in-clear-text
6464

6565
- name: Publish Nightly Package
66-
run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate
66+
run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate
6767

6868
- name: Upload a Build Artifact
6969
uses: actions/upload-artifact@v4.3.1
7070
with:
7171
name: nugets
72-
path: ./nugets
72+
path: nugets
7373
if: always()

‎.github/workflows/pack.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@ jobs:
3434

3535
- name: Pack Semi.Avalonia
3636
if: ${{ github.event.inputs.Semi_Avalonia == 'true' }}
37-
run: dotnet pack ./src/Semi.Avalonia -o ./nugets
37+
run: dotnet pack src/Semi.Avalonia -o nugets
3838

3939
- name: Pack Semi.Avalonia.ColorPicker
4040
if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }}
41-
run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets
41+
run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets
4242

4343
- name: Pack Semi.Avalonia.DataGrid
4444
if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }}
45-
run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets
45+
run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets
4646

4747
- name: Pack Semi.Avalonia.TreeDataGrid
4848
if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }}
49-
run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets
49+
run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets
5050

5151
- name: Publish NuGet package
52-
run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
52+
run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
5353

5454
- name: Upload a Build Artifact
5555
uses: actions/upload-artifact@v4.3.1
5656
with:
5757
name: nugets
58-
path: ./nugets
58+
path: nugets
5959
if: always()

‎.github/workflows/publish.yml‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,23 @@ on:
1313
- 'linux'
1414
- 'android'
1515
- 'all'
16-
include_aot:
17-
description: 'Include Windows AOT packaging'
16+
win64:
17+
description: 'Windows x64'
1818
required: true
1919
default: true
2020
type: boolean
21-
include_drm:
22-
description: 'Include Linux DRM packaging'
21+
win64_aot:
22+
description: 'Windows x64 AOT'
23+
required: true
24+
default: true
25+
type: boolean
26+
linux64:
27+
description: 'Linux x64 AOT'
28+
required: true
29+
default: true
30+
type: boolean
31+
linux64_drm:
32+
description: 'Linux x64 DRM'
2333
required: true
2434
default: true
2535
type: boolean
@@ -36,34 +46,36 @@ jobs:
3646
run: mkdir upload
3747

3848
- name: Publish win-x64
39-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64
49+
if: ${{ github.event.inputs.win64 == 'true' }}
50+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
4051

4152
- name: Zip win-x64
53+
if: ${{ github.event.inputs.win64 == 'true' }}
4254
run: |
43-
$files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
44-
Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
55+
$files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb
56+
Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
4557
4658
- name: Enable Native AOT in .csproj
47-
if: ${{ github.event.inputs.include_aot == 'true' }}
59+
if: ${{ github.event.inputs.win64_aot == 'true' }}
4860
run: |
4961
sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
5062
sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
5163
5264
- name: Publish win-x64 AOT
53-
if: ${{ github.event.inputs.include_aot == 'true' }}
54-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot
65+
if: ${{ github.event.inputs.win64_aot == 'true' }}
66+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64-aot
5567

5668
- name: Zip win-x64 AOT
57-
if: ${{ github.event.inputs.include_aot == 'true' }}
69+
if: ${{ github.event.inputs.win64_aot == 'true' }}
5870
run: |
59-
$files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
60-
Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
71+
$files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb
72+
Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
6173
6274
- name: Upload a Build Artifact
6375
uses: actions/upload-artifact@v4.3.1
6476
with:
6577
name: windows
66-
path: ./upload
78+
path: upload
6779

6880
linux:
6981
if: ${{ github.event.inputs.platform == 'linux' || github.event.inputs.platform == 'all' }}
@@ -76,24 +88,26 @@ jobs:
7688
run: mkdir upload
7789

7890
- name: Publish linux-x64
79-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64
91+
if: ${{ github.event.inputs.linux64 == 'true' }}
92+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
8093

8194
- name: Zip linux-x64
82-
run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"
95+
if: ${{ github.event.inputs.linux64 == 'true' }}
96+
run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb"
8397

8498
- name: Publish linux-x64 DRM
85-
if: ${{ github.event.inputs.include_drm == 'true' }}
86-
run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm
99+
if: ${{ github.event.inputs.linux64_drm == 'true' }}
100+
run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
87101

88102
- name: Zip linux-x64 DRM
89-
if: ${{ github.event.inputs.include_drm == 'true' }}
90-
run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"
103+
if: ${{ github.event.inputs.linux64_drm == 'true' }}
104+
run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb"
91105

92106
- name: Upload a Build Artifact
93107
uses: actions/upload-artifact@v4.3.1
94108
with:
95109
name: linux
96-
path: ./upload
110+
path: upload
97111

98112
android:
99113
if: ${{ github.event.inputs.platform == 'android' || github.event.inputs.platform == 'all' }}
@@ -103,16 +117,16 @@ jobs:
103117
uses: actions/checkout@v4.1.1
104118

105119
- name: CD Android
106-
run: cd ./demo/Semi.Avalonia.Demo.Android
120+
run: cd demo/Semi.Avalonia.Demo.Android
107121

108122
- name: Restore Dependencies
109123
run: dotnet restore
110124

111125
- name: Publish Android
112-
run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64
126+
run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64
113127

114128
- name: Upload a Build Artifact
115129
uses: actions/upload-artifact@v4.3.1
116130
with:
117131
name: android
118-
path: ./publish/*Signed.apk
132+
path: publish/*Signed.apk

‎.github/workflows/release-tag.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Pack Semi.Avalonia
18-
run: dotnet pack ./src/Semi.Avalonia -o ./nugets
18+
run: dotnet pack src/Semi.Avalonia -o nugets
1919

2020
- name: Pack Semi.Avalonia.ColorPicker
21-
run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets
21+
run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets
2222

2323
- name: Upload a Build Artifact
2424
uses: actions/upload-artifact@v4
2525
with:
2626
name: nugets
27-
path: ./nugets
27+
path: nugets
2828

2929
publish-windows:
3030
runs-on: windows-latest
@@ -36,31 +36,31 @@ jobs:
3636
run: mkdir upload
3737

3838
- name: Publish win-x64
39-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64
39+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
4040

4141
- name: Zip win-x64
4242
run: |
43-
$files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
44-
Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
43+
$files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb
44+
Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
4545
4646
- name: Enable Native AOT in .csproj
4747
run: |
4848
sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
4949
sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
5050
5151
- name: Publish win-x64 AOT
52-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot
52+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64-aot
5353

5454
- name: Zip win-x64 AOT
5555
run: |
56-
$files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
57-
Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
56+
$files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb
57+
Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
5858
5959
- name: Upload a Build Artifact
6060
uses: actions/upload-artifact@v4
6161
with:
6262
name: windows
63-
path: ./upload
63+
path: upload
6464

6565
publish-linux:
6666
runs-on: ubuntu-latest
@@ -72,22 +72,22 @@ jobs:
7272
run: mkdir upload
7373

7474
- name: Publish linux-x64
75-
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64
75+
run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
7676

7777
- name: Zip linux-x64
78-
run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"
78+
run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb"
7979

8080
- name: Publish linux-x64 DRM
81-
run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm
81+
run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
8282

8383
- name: Zip linux-x64 DRM
84-
run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"
84+
run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb"
8585

8686
- name: Upload a Build Artifact
8787
uses: actions/upload-artifact@v4
8888
with:
8989
name: linux
90-
path: ./upload
90+
path: upload
9191

9292
publish-android:
9393
runs-on: windows-latest
@@ -96,19 +96,19 @@ jobs:
9696
uses: actions/checkout@v4
9797

9898
- name: CD Android
99-
run: cd ./demo/Semi.Avalonia.Demo.Android
99+
run: cd demo/Semi.Avalonia.Demo.Android
100100

101101
- name: Restore Dependencies
102102
run: dotnet restore
103103

104104
- name: Publish Android
105-
run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64
105+
run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64
106106

107107
- name: Upload a Build Artifact
108108
uses: actions/upload-artifact@v4
109109
with:
110110
name: android
111-
path: ./publish/*Signed.apk
111+
path: publish/*Signed.apk
112112

113113
draft-release:
114114
needs: [ pack, publish-windows, publish-linux, publish-android ]

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 iriHi Technology
3+
Copyright (c) 2022 IRIHI Technology
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/Semi.Avalonia.DataGrid/irihi.png renamed to irihi.png

File renamed without changes.

‎src/Package.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<None Include="irihi.png" Pack="true" PackagePath=""/>
17+
<None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
18+
<None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
1819
</ItemGroup>
1920
</Project>

‎src/Semi.Avalonia.ColorPicker/Controls/_index.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
xmlns="https://github.com/avaloniaui"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
55
<ResourceDictionary.MergedDictionaries>
6-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml" />
7-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml" />
8-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml" />
9-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml" />
10-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorView.axaml" />
6+
<ResourceInclude Source="ColorPicker.axaml" />
7+
<ResourceInclude Source="ColorPreviewer.axaml" />
8+
<ResourceInclude Source="ColorSlider.axaml" />
9+
<ResourceInclude Source="ColorSpectrum.axaml" />
10+
<ResourceInclude Source="ColorView.axaml" />
1111
</ResourceDictionary.MergedDictionaries>
1212
</ResourceDictionary>

‎src/Semi.Avalonia.ColorPicker/Index.axaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<Styles.Resources>
33
<ResourceDictionary>
44
<ResourceDictionary.ThemeDictionaries>
5-
<ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.ColorPicker/Light.axaml" />
6-
<ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.ColorPicker/Dark.axaml" />
5+
<ResourceInclude x:Key="Default" Source="Light.axaml" />
6+
<ResourceInclude x:Key="Dark" Source="Dark.axaml" />
77
</ResourceDictionary.ThemeDictionaries>
88
<ResourceDictionary.MergedDictionaries>
9-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/_index.axaml" />
10-
<ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Shared.axaml" />
9+
<ResourceInclude Source="Controls/_index.axaml" />
10+
<ResourceInclude Source="Shared.axaml" />
1111
</ResourceDictionary.MergedDictionaries>
1212
</ResourceDictionary>
1313
</Styles.Resources>

0 commit comments

Comments
 (0)