Merge pull request #6 from reagcz/develop

Minor improvements
reagcz · Nov 18, 2022 · 7103402 · 7103402
2 parents dac018a + b19ada9
commit 7103402
Show file tree

Hide file tree

Showing 5 changed files with 353 additions and 8 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -13,7 +13,8 @@ jobs:
 
     env:
       App_Packages_Archive: IdeapadToolkit.zip
-      App_Publish_Directory: bin\Release\net6.0-windows10.0.20348.0\publish\win-x64
+      License_Path: IdeapadToolkit\Properties\PublishProfiles\3RD_PARTY_LICENSES.txt
+      App_Publish_Directory: bin\Release\net6.0-windows\publish\win-x64
       App_Project_Directory: IdeapadToolkit\
       Solution_Path: IdeapadToolkit.sln
       Project_Path: IdeapadToolkit\IdeapadToolkit.csproj
@@ -45,6 +46,10 @@ jobs:
     - name: Build using the publish profile
       run: dotnet publish /p:Configuration=Release /p:PublishProfile=FolderProfile
 
+    # Copy license file to the publish directory
+    - name: Copy license file to the publish directory
+      run: Copy-Item -Path $env:License_Path -Destination $env:App_Project_Directory\$env:App_Publish_Directory\
+
     # Create archive
     - name: Create archive
       run: Compress-Archive -Path $env:App_Project_Directory\$env:App_Publish_Directory\* -DestinationPath $env:App_Project_Directory\$env:App_Publish_Directory\$env:App_Packages_Archive

diff --git a/IdeapadToolkit/IdeapadToolkit.csproj b/IdeapadToolkit/IdeapadToolkit.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>