Merge branch 'main' into develop

Stillpoint-Software · Dec 10, 2024 · 69a925d · 69a925d
2 parents ad62d98 + 837bace
commit 69a925d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,6 +8,7 @@ on:
 env:
   BRANCH_NAME: ${{ github.event.release.target_commitish }}
   SOLUTION_NAME: ${{ vars.SOLUTION_NAME }}
+  PROJECT_NAME: ${{ vars.PROJECT_NAME }}
   DOTNET_VERSION: '9.0.x'
   NUGET_SOURCE: 'https://api.nuget.org/v3/index.json'
   BUILD_CONFIGURATION: ''
@@ -80,4 +81,4 @@ jobs:
       run: dotnet test --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} ${{ env.SOLUTION_NAME }}
 
     - name: Pack and Push
-      run: dotnet pack --no-build --configuration ${{ env.BUILD_CONFIGURATION }} -p:PackageOutputPath=../../output --version-suffix "${{ env.VERSION_SUFFIX }}" -p:PackageSource='${{ env.NUGET_SOURCE }}' -p:PushAfterPack=true -p:PackageApiKey='${{ secrets.NUGET_API_KEY }}'
+      run: dotnet pack --no-build --configuration ${{ env.BUILD_CONFIGURATION }} -p:PackageId=${{ env.PROJECT_NAME }} -p:PackageOutputPath=../../output --version-suffix "${{ env.VERSION_SUFFIX }}" -p:PackageSource='${{ env.NUGET_SOURCE }}' -p:PushAfterPack=true -p:PackageApiKey='${{ secrets.NUGET_API_KEY }}'
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -4,7 +4,7 @@
     -->
 	<Target Name="PushPackage" AfterTargets="Pack" 
 	        Condition="'$(PushAfterPack)'=='true' AND '$(IsPackable)'=='true'">
-		<Exec Command="dotnet nuget push $(SolutionDir)output/$(TargetName).$(PackageVersion).nupkg $(PackageSourceParam) $(PackageApiKeyParam)"></Exec>
+		<Exec Command="dotnet nuget push $(SolutionDir)output/$(PackageId).$(PackageVersion).nupkg $(PackageSourceParam) $(PackageApiKeyParam)"></Exec>
 	</Target>
 
 	<!--

diff --git a/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj b/test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
-    <PackageReference Include="JsonPatch.Net" Version="3.2.2" />
+    <PackageReference Include="JsonPatch.Net" Version="3.2.3" />
     <PackageReference Include="JsonPath.Net" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />