Skip to content

Commit 34c7bc5

Browse files
ScrubNScrubN
authored
Upgrade to .NET 10 (#1557)
* Bump from NET 6 to NET 10 * Source generated regex everywhere * Minor new language features * Collection expressions everywhere * Use native OpenFolderDialog * Use native UnixFileMode * Also use native UnixFileMode in CLI * Remove Mono.Posix * Bump nuget packages * Somehow missed these * Address build warnings * TrimMode partial
1 parent ce23949 commit 34c7bc5

Some content is hidden

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

54 files changed

+387
-328
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: 6.0.x
17+
dotnet-version: 10.0.x
1818
- name: Run TwitchDownloaderCLI Tests
1919
run: dotnet test TwitchDownloaderCLI.Tests
2020
- name: Run TwitchDownloaderCore Tests
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup .NET
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: 6.0.x
33+
dotnet-version: 10.0.x
3434
- name: Build Windows GUI
3535
run: dotnet publish TwitchDownloaderWPF -p:PublishProfile=Windows -p:DebugType=Portable
3636

@@ -45,12 +45,12 @@ jobs:
4545
file-name: ffmpeg.zip
4646

4747
- name: Bundle FFmpeg
48-
run: tar xfz ffmpeg.zip --strip-components=1; copy bin/ffmpeg.exe TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64/ffmpeg.exe
48+
run: tar xfz ffmpeg.zip --strip-components=1; copy bin/ffmpeg.exe TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64/ffmpeg.exe
4949

5050
- name: Zip Windows GUI
5151
uses: vimtor/action-zip@v1.2
5252
with:
53-
files: "TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64"
53+
files: "TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64"
5454
dest: TwitchDownloaderGUI-Windows-x64.zip
5555

5656
- name: Upload Windows GUI Artifact Asset
@@ -67,7 +67,7 @@ jobs:
6767
- name: Setup .NET
6868
uses: actions/setup-dotnet@v4
6969
with:
70-
dotnet-version: 6.0.x
70+
dotnet-version: 10.0.x
7171
- name: Build Windows CLI
7272
run: dotnet publish TwitchDownloaderCLI -p:PublishProfile=Windows -p:DebugType=Portable
7373
- name: Build Linux CLI
@@ -82,31 +82,31 @@ jobs:
8282
- name: Zip Windows CLI
8383
uses: vimtor/action-zip@v1.2
8484
with:
85-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/Windows"
85+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/Windows"
8686
dest: TwitchDownloaderCLI-Windows-x64.zip
8787

8888
- name: Zip Linux CLI
8989
uses: vimtor/action-zip@v1.2
9090
with:
91-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/Linux"
91+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/Linux"
9292
dest: TwitchDownloaderCLI-Linux-x64.zip
9393

9494
- name: Zip LinuxAlpine CLI
9595
uses: vimtor/action-zip@v1.2
9696
with:
97-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxAlpine"
97+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxAlpine"
9898
dest: TwitchDownloaderCLI-LinuxAlpine-x64.zip
9999

100100
- name: Zip LinuxArm CLI
101101
uses: vimtor/action-zip@v1.2
102102
with:
103-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxArm"
103+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxArm"
104104
dest: TwitchDownloaderCLI-LinuxArm.zip
105105

106106
- name: Zip LinuxArm64 CLI
107107
uses: vimtor/action-zip@v1.2
108108
with:
109-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxArm64"
109+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxArm64"
110110
dest: TwitchDownloaderCLI-LinuxArm64.zip
111111

112112
- name: Upload Windows CLI Artifact Asset
@@ -147,7 +147,7 @@ jobs:
147147
- name: Setup .NET
148148
uses: actions/setup-dotnet@v4
149149
with:
150-
dotnet-version: 6.0.x
150+
dotnet-version: 10.0.x
151151
- name: Build MacOS CLI
152152
run: dotnet publish TwitchDownloaderCLI -p:PublishProfile=MacOS -p:DebugType=Portable
153153
- name: Build MacOSArm64 CLI
@@ -156,13 +156,13 @@ jobs:
156156
- name: Zip MacOS CLI
157157
uses: vimtor/action-zip@v1.2
158158
with:
159-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/MacOS"
159+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/MacOS"
160160
dest: TwitchDownloaderCLI-MacOS-x64.zip
161161

162162
- name: Zip MacOSArm64 CLI
163163
uses: vimtor/action-zip@v1.2
164164
with:
165-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/MacOSArm64"
165+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/MacOSArm64"
166166
dest: TwitchDownloaderCLI-MacOSArm64.zip
167167

168168
- name: Upload MacOS CLI Artifact Asset

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup .NET
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 6.0.x
46+
dotnet-version: 10.0.x
4747
- name: Build Windows GUI
4848
run: dotnet publish TwitchDownloaderWPF -p:PublishProfile=Windows -p:DebugType=Embedded
4949

@@ -58,12 +58,12 @@ jobs:
5858
file-name: ffmpeg.zip
5959

6060
- name: Bundle FFmpeg
61-
run: tar xfz ffmpeg.zip --strip-components=1; copy bin/ffmpeg.exe TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64/ffmpeg.exe
61+
run: tar xfz ffmpeg.zip --strip-components=1; copy bin/ffmpeg.exe TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64/ffmpeg.exe
6262

6363
- name: Zip Windows GUI Release Asset
6464
uses: vimtor/action-zip@v1.2
6565
with:
66-
files: "TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64"
66+
files: "TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64"
6767
dest: TwitchDownloaderGUI-${{ github.event.inputs.release_tag }}-Windows-x64.zip
6868

6969
- name: Download URL
@@ -96,7 +96,7 @@ jobs:
9696
- name: Setup .NET
9797
uses: actions/setup-dotnet@v4
9898
with:
99-
dotnet-version: 6.0.x
99+
dotnet-version: 10.0.x
100100
- name: Build Windows CLI
101101
run: dotnet publish TwitchDownloaderCLI -p:PublishProfile=Windows -p:DebugType=Embedded
102102
- name: Build Linux CLI
@@ -111,31 +111,31 @@ jobs:
111111
- name: Zip Windows CLI
112112
uses: vimtor/action-zip@v1.2
113113
with:
114-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/Windows"
114+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/Windows"
115115
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-Windows-x64.zip
116116

117117
- name: Zip Linux CLI
118118
uses: vimtor/action-zip@v1.2
119119
with:
120-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/Linux"
120+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/Linux"
121121
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-Linux-x64.zip
122122

123123
- name: Zip LinuxAlpine CLI
124124
uses: vimtor/action-zip@v1.2
125125
with:
126-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxAlpine"
126+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxAlpine"
127127
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-LinuxAlpine-x64.zip
128128

129129
- name: Zip LinuxArm CLI
130130
uses: vimtor/action-zip@v1.2
131131
with:
132-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxArm"
132+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxArm"
133133
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-LinuxArm.zip
134134

135135
- name: Zip LinuxArm64 CLI
136136
uses: vimtor/action-zip@v1.2
137137
with:
138-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/LinuxArm64"
138+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/LinuxArm64"
139139
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-LinuxArm64.zip
140140

141141
- name: Download URL
@@ -207,7 +207,7 @@ jobs:
207207
- name: Setup .NET
208208
uses: actions/setup-dotnet@v4
209209
with:
210-
dotnet-version: 6.0.x
210+
dotnet-version: 10.0.x
211211
- name: Build MacOS CLI
212212
run: dotnet publish TwitchDownloaderCLI -p:PublishProfile=MacOS -p:DebugType=Embedded
213213
- name: Build MacOSArm64 CLI
@@ -216,13 +216,13 @@ jobs:
216216
- name: Zip MacOS CLI
217217
uses: vimtor/action-zip@v1.2
218218
with:
219-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/MacOS"
219+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/MacOS"
220220
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-MacOS-x64.zip
221221

222222
- name: Zip MacOSArm64 CLI
223223
uses: vimtor/action-zip@v1.2
224224
with:
225-
files: "TwitchDownloaderCLI/bin/Release/net6.0/publish/MacOSArm64"
225+
files: "TwitchDownloaderCLI/bin/Release/net10.0/publish/MacOSArm64"
226226
dest: TwitchDownloaderCLI-${{ github.event.inputs.release_tag }}-MacOSArm64.zip
227227

228228
- name: Download URL

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ You can find more example commands in the [CLI README](TwitchDownloaderCLI/READM
198198

199199
## Requirements
200200

201-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
201+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
202202
- About 1GB of disk space
203203

204204
## Build Instructions
@@ -240,13 +240,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
240240
5. a) Navigate to the GUI build folder:
241241

242242
```
243-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
243+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
244244
```
245245

246246
5. b) Navigate to the CLI build folder:
247247

248248
```
249-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
249+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
250250
```
251251

252252
# Third Party Credits

‎README_es.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ chmod +x ffmpeg
161161

162162
## Requisitos
163163

164-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
164+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
165165

166166
## Instrucciones de Compilación
167167

@@ -200,13 +200,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Perfil>
200200
5. a) Navega hasta la carpeta de la compilación de la GUI:
201201

202202
```
203-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
203+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
204204
```
205205

206206
5. b) Navega hasta la carpeta de la compilación de la CLI:
207207

208208
```
209-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
209+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
210210
```
211211

212212
# Licencia

‎README_fr.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Des exemples supplémentaires sont disponibles dans le [README de la CLI](Twitch
189189

190190
## Prérequis
191191

192-
- SDK [.NET 6.0.x](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
192+
- SDK [.NET 10.0.x](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
193193
- Environ 1 Go d’espace disque
194194

195195
## Instructions de compilation
@@ -231,13 +231,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
231231
5. a) Accédez au dossier de build du GUI :
232232

233233
```
234-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
234+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
235235
```
236236

237237
5. b) Accédez au dossier de build de la CLI :
238238

239239
```
240-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
240+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
241241
```
242242

243243
# Crédits tiers

‎README_it.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Puoi trovare altri esempi nel [CLI README](TwitchDownloaderCLI/README.md#example
188188

189189
## Requisiti
190190

191-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
191+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
192192
- Circa 1GB di spazio su disco
193193

194194
## Istruzioni
@@ -230,13 +230,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
230230
5. a) Naviga nella cartella della GUI:
231231

232232
```
233-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
233+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
234234
```
235235

236236
5. b) Naviga nella cartella del CLI:
237237

238238
```
239-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
239+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
240240
```
241241

242242
# Crediti di Terze Parti

‎README_ja.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ chmod +x ffmpeg
187187

188188
## 必要条件
189189

190-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
190+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
191191
- 約1GBのディスク空き容量
192192

193193
## ビルド手順
@@ -229,13 +229,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
229229
5. a) GUIのビルドフォルダに移動する:
230230

231231
```
232-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
232+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
233233
```
234234

235235
1. b) CLIのビルドフォルダに移動する:
236236

237237
```
238-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
238+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
239239
```
240240

241241
# Third Party Credits

‎README_pt-br.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Você pode encontrar mais comandos no [CLI README](TwitchDownloaderCLI/README.md
188188

189189
## Requerimentos
190190

191-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
191+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
192192
- Mais ou menos 1GB de espaço de disco.
193193

194194
## Instruções para construção
@@ -230,13 +230,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
230230
5. a) Navegue para a pasta do GUI:
231231

232232
```
233-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
233+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
234234
```
235235

236236
5. b) Navegue para a pasta do CLI:
237237

238238
```
239-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
239+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
240240
```
241241

242242
# Créditos de terçeiros

‎README_ru.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ chmod +x ffmpeg
186186

187187
## Требования
188188

189-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
189+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
190190
- Примерно 1GB свободного места
191191

192192
## Инструкции сборки
@@ -228,13 +228,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Профили>
228228
5. a) Зайдите в папку с GUI сборкой:
229229

230230
```
231-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
231+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
232232
```
233233

234234
5. b) Зайдите в папку с CLI сборкой:
235235

236236
```
237-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
237+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
238238
```
239239

240240
# Благодарности третьим лицам

‎README_tr.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ chmod +x ffmpeg
157157

158158
## Gereksinimler
159159

160-
- [.NET 6.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
160+
- [.NET 10.0.x SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
161161

162162
## Derleme Talimatları
163163

@@ -196,13 +196,13 @@ dotnet publish TwitchDownloaderCLI -p:PublishProfile=<Profile>
196196
5. a) GUI derleme klasörüne gidin:
197197

198198
```
199-
cd TwitchDownloaderWPF/bin/Release/net6.0-windows/publish/win-x64
199+
cd TwitchDownloaderWPF/bin/Release/net10.0-windows/publish/win-x64
200200
```
201201

202202
5. b) CLI derleme klasörüne gidin:
203203

204204
```
205-
cd TwitchDownloaderCLI/bin/Release/net6.0/publish
205+
cd TwitchDownloaderCLI/bin/Release/net10.0/publish
206206
```
207207

208208
# Lisans

0 commit comments

Comments
 (0)