From 2fb29025c9319383d583da3746a1efac944ef316 Mon Sep 17 00:00:00 2001 From: Muhammad Azeez Date: Thu, 9 Nov 2023 10:00:35 +0300 Subject: [PATCH] fix: nuget packing in release-dotnet-native.yaml (#524) Seems like there are some weird subtle differences between Windows and Linux --- .github/workflows/release-dotnet-native.yaml | 9 ++- dotnet/nuget/Directory.Build.props | 4 ++ .../Extism.runtime.linux-musl-arm64.csproj | 1 - dotnet/nuget/Extism.runtime.win-x64.csproj | 2 +- dotnet/nuget/Nuget.sln | 66 ------------------- 5 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 dotnet/nuget/Nuget.sln diff --git a/.github/workflows/release-dotnet-native.yaml b/.github/workflows/release-dotnet-native.yaml index 83feb76..af8082b 100644 --- a/.github/workflows/release-dotnet-native.yaml +++ b/.github/workflows/release-dotnet-native.yaml @@ -10,7 +10,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - fetch-tags: true + with: + fetch-depth: 0 + filter: tree:0 - name: Setup .NET Core SDK uses: actions/setup-dotnet@v3.0.3 @@ -40,7 +42,10 @@ jobs: mkdir -p dotnet/nuget/runtimes/linux-musl-arm64/native/ tar -xvzf libextism-aarch64-unknown-linux-musl-main.tar.gz -C dotnet/nuget/runtimes/linux-musl-arm64/native/ + - name: Pack NuGet packages + run: | + find ./dotnet/nuget -type f -name "*.csproj" -exec dotnet pack {} -o release-artifacts \; + - name: Publish NuGet packages run: | - dotnet pack .\dotnet\nuget\Nuget.sln -o release-artifacts dotnet nuget push --source https://api.nuget.org/v3/index.json ./release-artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} \ No newline at end of file diff --git a/dotnet/nuget/Directory.Build.props b/dotnet/nuget/Directory.Build.props index 6a06d8d..5f34e02 100644 --- a/dotnet/nuget/Directory.Build.props +++ b/dotnet/nuget/Directory.Build.props @@ -12,6 +12,10 @@ true true false + + true + v + normal diff --git a/dotnet/nuget/Extism.runtime.linux-musl-arm64.csproj b/dotnet/nuget/Extism.runtime.linux-musl-arm64.csproj index eeea5ee..c74258b 100644 --- a/dotnet/nuget/Extism.runtime.linux-musl-arm64.csproj +++ b/dotnet/nuget/Extism.runtime.linux-musl-arm64.csproj @@ -3,7 +3,6 @@ Extism.runtime.linux-musl-arm64 Internal implementation package for Extism to work on Linux Musl ARM64 - true diff --git a/dotnet/nuget/Extism.runtime.win-x64.csproj b/dotnet/nuget/Extism.runtime.win-x64.csproj index 64aab97..f635388 100644 --- a/dotnet/nuget/Extism.runtime.win-x64.csproj +++ b/dotnet/nuget/Extism.runtime.win-x64.csproj @@ -11,5 +11,5 @@ Pack="true" PackagePath="runtimes\win-x64\native\extism.dll" /> - + diff --git a/dotnet/nuget/Nuget.sln b/dotnet/nuget/Nuget.sln deleted file mode 100644 index b489e26..0000000 --- a/dotnet/nuget/Nuget.sln +++ /dev/null @@ -1,66 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.linux-arm64", "Extism.runtime.linux-arm64.csproj", "{F1CF6818-43C4-4CD6-A3AD-748EFC83C21B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.linux-musl-arm64", "Extism.runtime.linux-musl-arm64.csproj", "{2E563F73-9FD5-42B2-9368-12BBF5819148}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.linux-x64", "Extism.runtime.linux-x64.csproj", "{A2E24D65-8AE2-4C09-82CB-5AEBA0539973}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.osx-arm64", "Extism.runtime.osx-arm64.csproj", "{66461A9C-140C-48C1-B658-BE540220460D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.osx-x64", "Extism.runtime.osx-x64.csproj", "{BE23CF82-F668-4166-8579-0FF2B20EA095}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.win-x64", "Extism.runtime.win-x64.csproj", "{639F9EFE-AC2A-43A7-A9BB-EDAEB306455F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extism.runtime.all", "Extism.runtime.all.csproj", "{88DF54A7-845B-409D-93FE-64CF2864FFDE}" - ProjectSection(ProjectDependencies) = postProject - {2E563F73-9FD5-42B2-9368-12BBF5819148} = {2E563F73-9FD5-42B2-9368-12BBF5819148} - {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F} = {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F} - {66461A9C-140C-48C1-B658-BE540220460D} = {66461A9C-140C-48C1-B658-BE540220460D} - {A2E24D65-8AE2-4C09-82CB-5AEBA0539973} = {A2E24D65-8AE2-4C09-82CB-5AEBA0539973} - {BE23CF82-F668-4166-8579-0FF2B20EA095} = {BE23CF82-F668-4166-8579-0FF2B20EA095} - {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B} = {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1CF6818-43C4-4CD6-A3AD-748EFC83C21B}.Release|Any CPU.Build.0 = Release|Any CPU - {2E563F73-9FD5-42B2-9368-12BBF5819148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E563F73-9FD5-42B2-9368-12BBF5819148}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E563F73-9FD5-42B2-9368-12BBF5819148}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E563F73-9FD5-42B2-9368-12BBF5819148}.Release|Any CPU.Build.0 = Release|Any CPU - {A2E24D65-8AE2-4C09-82CB-5AEBA0539973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E24D65-8AE2-4C09-82CB-5AEBA0539973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2E24D65-8AE2-4C09-82CB-5AEBA0539973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2E24D65-8AE2-4C09-82CB-5AEBA0539973}.Release|Any CPU.Build.0 = Release|Any CPU - {66461A9C-140C-48C1-B658-BE540220460D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66461A9C-140C-48C1-B658-BE540220460D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66461A9C-140C-48C1-B658-BE540220460D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66461A9C-140C-48C1-B658-BE540220460D}.Release|Any CPU.Build.0 = Release|Any CPU - {BE23CF82-F668-4166-8579-0FF2B20EA095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE23CF82-F668-4166-8579-0FF2B20EA095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE23CF82-F668-4166-8579-0FF2B20EA095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE23CF82-F668-4166-8579-0FF2B20EA095}.Release|Any CPU.Build.0 = Release|Any CPU - {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {639F9EFE-AC2A-43A7-A9BB-EDAEB306455F}.Release|Any CPU.Build.0 = Release|Any CPU - {88DF54A7-845B-409D-93FE-64CF2864FFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88DF54A7-845B-409D-93FE-64CF2864FFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88DF54A7-845B-409D-93FE-64CF2864FFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88DF54A7-845B-409D-93FE-64CF2864FFDE}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal