Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<!--
Push the target package to nuget
-->
<Target Name="PushPackage" AfterTargets="Pack"
Condition="'$(PushAfterPack)'=='true' AND '$(IsPackable)'=='true'">
<Target Name="PushPackage" AfterTargets="Pack" Condition="'$(PushAfterPack)'=='true' AND '$(IsPackable)'=='true'">
<Exec Command="dotnet nuget push $(SolutionDir)output/$(PackageId).$(PackageVersion).nupkg $(PackageSourceParam) $(PackageApiKeyParam)"></Exec>
</Target>

Expand All @@ -12,23 +11,20 @@
https://github.com/NuGet/NuGet.Client/blob/4.3.0.4202/src/NuGet.Core/NuGet.Build.Tasks.Pack.Library/Pack.targets
Must run before target "GenerateNuspec" ("Pack") for the version to be applied as expected
-->
<Target Name="SetPackageVersion" BeforeTargets="GenerateNuspec"
Condition="'$(IsPackable)'=='true'">
<Target Name="SetPackageVersion" BeforeTargets="GenerateNuspec" Condition="'$(IsPackable)'=='true'">
<PropertyGroup>
<PackageVersion Condition="'$(VersionSuffix)'==''">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(VersionSuffix)'!=''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
</PropertyGroup>
</Target>

<Target Name="SetPackageSource" BeforeTargets="GenerateNuspec"
Condition="'$(PushAfterPack)'=='true'">
<Target Name="SetPackageSource" BeforeTargets="GenerateNuspec" Condition="'$(PushAfterPack)'=='true'">
<PropertyGroup>
<PackageSourceParam Condition="'$(PackageSource)'!=''">--source $(PackageSource)</PackageSourceParam>
</PropertyGroup>
</Target>

<Target Name="SetPackageApiKey" BeforeTargets="GenerateNuspec"
Condition="'$(PushAfterPack)'=='true'">
<Target Name="SetPackageApiKey" BeforeTargets="GenerateNuspec" Condition="'$(PushAfterPack)'=='true'">
<PropertyGroup>
<PackageApiKeyParam Condition="'$(PackageApiKey)'!=''">--api-key $(PackageApiKey)</PackageApiKeyParam>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Hyperbee.XS.Cli/Hyperbee.Xs.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
<PackageReference Include="Spectre.Console" Version="0.50.0" />
<PackageReference Include="Spectre.Console.Cli" Version="0.50.0" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.4" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.4" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.7" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Hyperbee.XS.Extensions/Hyperbee.Xs.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<None Include="README.md" Pack="true" PackagePath="\" />
<PackageReference Include="Hyperbee.Collections" Version="2.4.0" />
<PackageReference Include="Hyperbee.Expressions" Version="1.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageReference Include="Parlot" Version="1.3.6" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageReference Include="Parlot" Version="1.4.0" />
<ProjectReference Include="..\Hyperbee.XS\Hyperbee.XS.csproj" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/Hyperbee.XS.Interactive/Hyperbee.Xs.Interactive.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25177.1" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.4" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.4" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.7" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/Hyperbee.XS/Hyperbee.XS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
<None Include="..\..\NOTICES" Pack="true" Visible="false" PackagePath="/" />
<PackageReference Include="Hyperbee.Collections" Version="2.4.0" />
<PackageReference Include="Hyperbee.Expressions" Version="1.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageReference Include="NuGet.Configuration" Version="6.13.2" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.13.2" />
<PackageReference Include="NuGet.Packaging" Version="6.13.2" />
<PackageReference Include="NuGet.ProjectModel" Version="6.13.2" />
<PackageReference Include="NuGet.Protocol" Version="6.13.2" />
<PackageReference Include="Parlot" Version="1.3.6" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageReference Include="NuGet.Configuration" Version="6.14.0" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.14.0" />
<PackageReference Include="NuGet.Packaging" Version="6.14.0" />
<PackageReference Include="NuGet.ProjectModel" Version="6.14.0" />
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
<PackageReference Include="Parlot" Version="1.4.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions test/Hyperbee.XS.Benchmark/Hyperbee.XS.Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Hyperbee.XS.Tests/Hyperbee.XS.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
<PackageReference Include="Hyperbee.Expressions" Version="1.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
Expand Down
Loading