6️⃣ Update to .NET 6

shoklan14 · Nov 20, 2021 · efd8060 · efd8060
1 parent ff3c8e3
commit efd8060
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v2
@@ -28,23 +28,23 @@ jobs:
       # Publish
       - name: Publish framework-dependent
         run: dotnet publish YoutubeDl.Wpf -c Release --no-restore
-      # - name: Publish self-contained for Windows ARM64
-      #   run: dotnet publish YoutubeDl.Wpf -c Release -r win-arm64 --self-contained
+      - name: Publish self-contained for Windows ARM64
+        run: dotnet publish YoutubeDl.Wpf -c Release -r win-arm64 --self-contained
       - name: Publish self-contained for Windows x64
         run: dotnet publish YoutubeDl.Wpf -c Release -r win-x64 --self-contained
       # Upload
-      # - name: Upload artifacts for Windows ARM64
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: youtube-dl-wpf-${{ github.sha }}-windows-arm64
-      #     path: YoutubeDl.Wpf/bin/Release/net5.0-windows10.0.20348.0/win-arm64/publish/
+      - name: Upload artifacts for Windows ARM64
+        uses: actions/upload-artifact@v2
+        with:
+          name: youtube-dl-wpf-${{ github.sha }}-windows-arm64
+          path: YoutubeDl.Wpf/bin/Release/net6.0-windows10.0.22000.0/win-arm64/publish/
       - name: Upload artifacts for Windows x64
         uses: actions/upload-artifact@v2
         with:
           name: youtube-dl-wpf-${{ github.sha }}-windows-x64
-          path: YoutubeDl.Wpf/bin/Release/net5.0-windows10.0.20348.0/win-x64/publish/
+          path: YoutubeDl.Wpf/bin/Release/net6.0-windows10.0.22000.0/win-x64/publish/
       - name: Upload artifacts for Windows framework-dependent
         uses: actions/upload-artifact@v2
         with:
           name: youtube-dl-wpf-${{ github.sha }}-windows
-          path: YoutubeDl.Wpf/bin/Release/net5.0-windows10.0.20348.0/publish/
+          path: YoutubeDl.Wpf/bin/Release/net6.0-windows10.0.22000.0/publish/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   publish_upload:
     name: Publish and upload
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v2
@@ -21,8 +21,8 @@ jobs:
       # Publish
       - name: Publish framework-dependent
         run: dotnet publish YoutubeDl.Wpf -c Release --no-restore
-      # - name: Publish self-contained for Windows ARM64
-      #   run: dotnet publish YoutubeDl.Wpf -c Release -r win-arm64 --self-contained
+      - name: Publish self-contained for Windows ARM64
+        run: dotnet publish YoutubeDl.Wpf -c Release -r win-arm64 --self-contained
       - name: Publish self-contained for Windows x64
         run: dotnet publish YoutubeDl.Wpf -c Release -r win-x64 --self-contained
       # Get version
@@ -33,13 +33,13 @@ jobs:
       # Package
       - name: Package for Windows
         run: |
-          cd YoutubeDl.Wpf/bin/Release/net5.0-windows10.0.20348.0/publish
+          cd YoutubeDl.Wpf/bin/Release/net6.0-windows10.0.22000.0/publish
           7z a -tzip -mx=9 -mfb=128 ../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows.zip .
           7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on ../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows.7z .
-          # cd ../win-arm64/publish
-          # 7z a -tzip -mx=9 -mfb=128 ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-arm64.zip .
-          # 7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-arm64.7z .
-          # cd ../../win-x64/publish
+          cd ../win-arm64/publish
+          7z a -tzip -mx=9 -mfb=128 ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-arm64.zip .
+          7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-arm64.7z .
+          cd ../../win-x64/publish
           cd ../win-x64/publish
           7z a -tzip -mx=9 -mfb=128 ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-x64.zip .
           7z a -t7z -m0=lzma2 -mx=9 -mfb=64 -md=64m -ms=on ../../youtube-dl-wpf-${{ steps.get_version.outputs.VERSION }}-windows-x64.7z .
@@ -48,7 +48,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: YoutubeDl.Wpf/bin/Release/net5.0-windows10.0.20348.0/youtube-dl-wpf-*
+          file: YoutubeDl.Wpf/bin/Release/net6.0-windows10.0.22000.0/youtube-dl-wpf-*
           tag: ${{ github.ref }}
           file_glob: true
           prerelease: true
diff --git a/YoutubeDl.Wpf.Tests/YoutubeDl.Wpf.Tests.csproj b/YoutubeDl.Wpf.Tests/YoutubeDl.Wpf.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

diff --git a/YoutubeDl.Wpf/YoutubeDl.Wpf.csproj b/YoutubeDl.Wpf/YoutubeDl.Wpf.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Product>Cube YouTube Downloader</Product>