Skip to content

Commit 6bb1a41

Browse files
chcgdonho
authored andcommitted
Add all relevant artifacts to upload & update nuget package
Close #56, close #58, close #59
1 parent 6913334 commit 6bb1a41

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

.github/workflows/CI_build.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ jobs:
77

88
runs-on: windows-latest
99
strategy:
10-
max-parallel: 6
1110
matrix:
1211
build_platform: [x64, Win32, ARM64]
13-
12+
1413
steps:
1514
- name: Checkout repo
1615
uses: actions/checkout@v4
@@ -25,22 +24,34 @@ jobs:
2524
working-directory: .
2625
run: nuget restore NppShell.sln
2726

28-
- name: MSBuild of plugin dll
27+
- name: MSBuild of dll and msix
2928
working-directory: .
3029
run: |
3130
msbuild NppShell.sln /m /p:configuration="Debug" /p:platform="${{ matrix.build_platform }}"
3231
msbuild NppShell.sln /m /p:configuration="Release" /p:platform="${{ matrix.build_platform }}"
3332
33+
- name: Archive artifacts for win32
34+
if: matrix.build_platform == 'Win32'
35+
uses: actions/upload-artifact@v4
36+
with:
37+
name: artifacts_win32
38+
path: |
39+
Release\NppShell.x86.dll
40+
3441
- name: Archive artifacts for x64
3542
if: matrix.build_platform == 'x64'
36-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
3744
with:
38-
name: plugin_dll_x64
39-
path: ${{ matrix.build_platform }}\Release\NppShell.msix
45+
name: artifacts_x64
46+
path: |
47+
${{ matrix.build_platform }}\Release\NppShell.x64.dll
48+
${{ matrix.build_platform }}\Release\NppShell.msix
4049
4150
- name: Archive artifacts for ARM64
4251
if: matrix.build_platform == 'ARM64'
43-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
4453
with:
45-
name: plugin_dll_arm64
46-
path: ${{ matrix.build_platform }}\Release\NppShell.msix
54+
name: artifacts_arm64
55+
path: |
56+
${{ matrix.build_platform }}\Release\NppShell.arm64.dll
57+
${{ matrix.build_platform }}\Release\NppShell.msix

NppShell.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,14 @@
312312
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
313313
<ImportGroup Label="ExtensionTargets">
314314
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
315-
<Import Project="packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
315+
<Import Project="packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
316316
</ImportGroup>
317317
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
318318
<PropertyGroup>
319319
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
320320
</PropertyGroup>
321321
<Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
322322
<Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
323-
<Error Condition="!Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
323+
<Error Condition="!Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
324324
</Target>
325325
</Project>

packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
4-
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231028.1" targetFramework="native" />
4+
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)