Skip to content

Commit 810f18c

Browse files
futrimefutrime
committed
Merge branch 'main' into feat/gui
2 parents 978196d + dbe3fbf commit 810f18c

File tree

103 files changed

+197
-151
lines changed

Some content is hidden

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

103 files changed

+197
-151
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ root = true
66

77
#### Core EditorConfig Options ####
88

9-
indent_style = space
9+
# Indentation and spacing
1010
indent_size = 4
11+
indent_style = space
1112
tab_width = 4
12-
end_of_line = lf
13-
charset = utf-8
14-
trim_trailing_whitespace = true
15-
insert_final_newline = true
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
1617

1718
#### .NET Coding Conventions ####
1819

‎.gitattributes‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,12 @@
102102
# Auto detect text files and perform LF normalization
103103
* text=auto
104104

105-
*.cs text diff=csharp eol=lf
105+
*.cs text diff=csharp
106106
*.cshtml text diff=html
107107
*.csx text diff=csharp
108108
*.sln text eol=crlf
109109
*.csproj text eol=crlf
110+
111+
112+
113+
*.cs text diff=csharp eol=crlf

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updates:
88
- package-ecosystem: "github-actions"
99
directory: "/"
1010
schedule:
11-
interval: "daily"
11+
interval: "monthly"
1212
- package-ecosystem: "nuget"
1313
directories:
1414
- Golang.Org.X.Mod
@@ -20,4 +20,4 @@ updates:
2020
- Lip.Migration
2121
- Lip.Migration.Tests
2222
schedule:
23-
interval: "daily"
23+
interval: "monthly"

‎.github/workflows/build.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,23 @@ jobs:
142142
contents: read
143143
strategy:
144144
matrix:
145+
runtime:
146+
- arm64
147+
- x64
148+
self-contained:
149+
- true
150+
- false
145151
include:
146152
- runtime: arm64
147153
runs-on: windows-latest
148154
- runtime: x64
149155
runs-on: windows-latest
156+
- self-contained: true
157+
sc-flag: -self-contained
158+
ds-flag: -p:DefineConstants="DisableDotNetCheck"
159+
- self-contained: false
160+
sc-flag: ''
161+
ds-flag: ''
150162
runs-on: ${{ matrix.runs-on }}
151163
steps:
152164
- uses: actions/checkout@v4
@@ -157,18 +169,19 @@ jobs:
157169

158170
- uses: actions/download-artifact@v4
159171
with:
160-
name: ${{ github.event.repository.name }}-Lip.CLI-win-${{ matrix.runtime }}-${{ github.sha }}
172+
name: ${{ github.event.repository.name }}-Lip.CLI-win-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ github.sha }}
161173
path: bin/
162174

163175
- run: >
164176
dotnet build Lip.Installer
165177
--configuration Release
166178
--output bin-installer
167-
--p:Platform=${{ matrix.runtime }}
179+
-p:Platform=${{ matrix.runtime }}
180+
${{ matrix.ds-flag }}
168181
169182
- uses: actions/upload-artifact@v4
170183
with:
171-
name: ${{ github.event.repository.name }}-Lip.Installer-win-${{ matrix.runtime }}-${{ github.sha }}
184+
name: ${{ github.event.repository.name }}-Lip.Installer-win-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ github.sha }}
172185
path: bin-installer/
173186

174187
check-style:

‎.github/workflows/release.yml‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# sudo apt install -y clang llvm binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu zlib1g-dev:arm64
6565

6666
- id: get-version
67-
uses: frabert/replace-string-action@v2
67+
uses: frabert/replace-string-action@9c9aeb483eab07adb9d0be75b5212cc0bcef0d4b # v2
6868
with:
6969
pattern: "^v"
7070
string: ${{ github.event.release.tag_name }}
@@ -90,11 +90,23 @@ jobs:
9090
contents: read
9191
strategy:
9292
matrix:
93+
runtime:
94+
- arm64
95+
- x64
96+
self-contained:
97+
- true
98+
- false
9399
include:
94100
- runtime: arm64
95101
runs-on: windows-latest
96102
- runtime: x64
97103
runs-on: windows-latest
104+
- self-contained: true
105+
sc-flag: -self-contained
106+
ds-flag: -p:DefineConstants="DisableDotNetCheck"
107+
- self-contained: false
108+
sc-flag: ''
109+
ds-flag: ''
98110
runs-on: ${{ matrix.runs-on }}
99111
steps:
100112
- uses: actions/checkout@v4
@@ -104,38 +116,35 @@ jobs:
104116
dotnet-version: ${{ env.DOTNET_VERSION }}
105117

106118
- id: get-version
107-
uses: frabert/replace-string-action@v2
119+
uses: frabert/replace-string-action@9c9aeb483eab07adb9d0be75b5212cc0bcef0d4b # v2
108120
with:
109121
pattern: "^v"
110122
string: ${{ github.event.release.tag_name }}
111123
replace-with: ""
112124

113125
# Prevent versions like 1.1.1-rc.1
114-
- name: Modify version of installer
115-
run: |
126+
- run: |
116127
$inputString = "${{ steps.get-version.outputs.replaced }}"
117128
if ($inputString -match "^(.*?)-") { $result = $matches[1] } else { $result = $inputString }
118129
(Get-Content Package.wxs) -replace '0\.0\.0\.0', "$result.0" | Set-Content Package.wxs
119130
shell: pwsh
120131
working-directory: Lip.Installer
121132
122-
- name: Download cli artifact
123-
uses: actions/download-artifact@v4
133+
- uses: actions/download-artifact@v4
124134
with:
125-
name: ${{ github.event.repository.name }}-Lip.CLI-win-${{ matrix.runtime }}-${{ github.sha }}
135+
name: ${{ github.event.repository.name }}-Lip.CLI-win-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ github.sha }}
126136
path: bin/
127137

128-
- name: Build installer
129-
run: >
138+
- run: >
130139
dotnet build Lip.Installer
131140
--configuration Release
132141
--output bin-installer
133-
--p:Platform=${{ matrix.runtime }}
142+
-p:Platform=${{ matrix.runtime }}
143+
${{ matrix.ds-flag }}
134144
135-
- name: Upload installer
136-
uses: actions/upload-artifact@v4
145+
- uses: actions/upload-artifact@v4
137146
with:
138-
name: ${{ github.event.repository.name }}-Lip.Installer-win-${{ matrix.runtime }}-${{ github.sha }}
147+
name: ${{ github.event.repository.name }}-Lip.Installer-win-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ github.sha }}
139148
path: bin-installer/
140149

141150
update-release-notes:
@@ -146,9 +155,9 @@ jobs:
146155
- uses: actions/checkout@v4
147156

148157
- id: extract-release-notes
149-
uses: ffurrer2/extract-release-notes@v2
158+
uses: ffurrer2/extract-release-notes@9989ccec43d726ef05aa1cd7b2854fb96b6df6ab # v2
150159

151-
- uses: softprops/action-gh-release@v2
160+
- uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
152161
with:
153162
body: ${{ steps.extract-release-notes.outputs.release_notes }}
154163

@@ -188,7 +197,7 @@ jobs:
188197
tar -czvf ../${{ github.event.repository.name }}-${{ matrix.sub-name }}-${{ matrix.runtime }}${{ matrix.sc-flag }}.tar.gz *
189198
working-directory: artifact
190199
191-
- uses: softprops/action-gh-release@v2
200+
- uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
192201
with:
193202
files: |
194203
${{ github.event.repository.name }}-${{ matrix.sub-name }}-${{ matrix.runtime }}${{ matrix.sc-flag }}.tar.gz
@@ -231,7 +240,7 @@ jobs:
231240
zip -r ../${{ github.event.repository.name }}-${{ matrix.sub-name }}-${{ matrix.runtime }}${{ matrix.sc-flag }}.zip *
232241
working-directory: artifact
233242
234-
- uses: softprops/action-gh-release@v2
243+
- uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
235244
with:
236245
files: |
237246
${{ github.event.repository.name }}-${{ matrix.sub-name }}-${{ matrix.runtime }}${{ matrix.sc-flag }}.zip
@@ -249,18 +258,21 @@ jobs:
249258
runtime:
250259
- win-arm64
251260
- win-x64
261+
sc-flag:
262+
- ''
263+
- -self-contained
252264
steps:
253265
- uses: actions/checkout@v4
254266

255267
- uses: actions/download-artifact@v4
256268
with:
257-
name: ${{ github.event.repository.name }}-Lip.Installer-${{ matrix.runtime }}-${{ github.sha }}
269+
name: ${{ github.event.repository.name }}-Lip.Installer-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ github.sha }}
258270
path: artifact-installer/
259271

260272
- run: |
261-
mv artifact-installer/${{ matrix.lang }}/Lip.Installer.msi artifact-installer/${{ github.event.repository.name }}-cli-${{ matrix.runtime }}-${{ matrix.lang }}.msi
273+
mv artifact-installer/${{ matrix.lang }}/Lip.Installer.msi artifact-installer/${{ github.event.repository.name }}-cli-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ matrix.lang }}.msi
262274
263-
- uses: softprops/action-gh-release@v2
275+
- uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
264276
with:
265277
files: |
266-
artifact-installer/${{ github.event.repository.name }}-cli-${{ matrix.runtime }}-${{ matrix.lang }}.msi
278+
artifact-installer/${{ github.event.repository.name }}-cli-${{ matrix.runtime }}${{ matrix.sc-flag }}-${{ matrix.lang }}.msi

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.31.0] - 2025-03-23
9+
10+
### Added
11+
12+
- Set second-pick default GitHub proxy to https://github.levimc.org
13+
14+
## [0.30.2] - 2025-03-21
15+
16+
### Added
17+
18+
- Self-contained installer
19+
820
## [0.30.1] - 2025-03-19
921

1022
### Added
@@ -613,6 +625,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
613625
[#157]: https://github.com/futrime/lip/issues/157
614626
[#218]: https://github.com/futrime/lip/issues/218
615627

628+
[0.31.0]: https://github.com/futrime/lip/compare/v0.30.2...v0.31.0
629+
[0.30.2]: https://github.com/futrime/lip/compare/v0.30.1...v0.30.2
616630
[0.30.1]: https://github.com/futrime/lip/compare/v0.30.0...v0.30.1
617631
[0.30.0]: https://github.com/futrime/lip/compare/v0.29.0...v0.30.0
618632
[0.29.0]: https://github.com/futrime/lip/compare/v0.28.3...v0.29.0

‎Golang.Org.X.Mod.Tests/Golang.Org.X.Mod.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="6.0.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="xunit" Version="2.9.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
11+
<PackageReference Include="coverlet.collector" Version="6.0.4" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎Golang.Org.X.Mod.Tests/ModuleTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@ public void SplitPathVersion_MoreValidPaths_ReturnsExpectedOutput(string path, b
199199
// Assert.
200200
Assert.Equal(path, pathPrefix + version);
201201
}
202-
}
202+
}

‎Golang.Org.X.Mod.Tests/SemverTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ public void Canonical_ValidInput_ReturnsExpectedOutput(string input, string outp
7070
// Assert.
7171
Assert.Equal(output, canonical);
7272
}
73-
}
73+
}

‎Golang.Org.X.Mod/Module.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,4 +501,4 @@ public static (string, string, bool) SplitGopkgIn(string path)
501501
}
502502
return (prefix, pathMajor, true);
503503
}
504-
}
504+
}

0 commit comments

Comments
 (0)