Skip to content

Commit 7cfe32f

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #142 from Stillpoint-Software/develop
Develop
2 parents 3239da2 + d2bb2ff commit 7cfe32f

File tree

5 files changed

+18
-35
lines changed

5 files changed

+18
-35
lines changed

‎Directory.Build.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2525
<PackageIcon>icon.png</PackageIcon>
2626
<PackageReleaseNotes>https://github.com/Stillpoint-Software/Hyperbee.Expressions/releases/latest</PackageReleaseNotes>
27-
<RepositoryUrl>https://github.com/Stillpoint-Software/Hyperbee.Expressions</RepositoryUrl>
27+
<RepositoryUrl>https://github.com/Stillpoint-Software/hyperbee.expressions</RepositoryUrl>
2828
<RepositoryType>git</RepositoryType>
29-
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Expressions</PackageProjectUrl>
29+
<PackageProjectUrl>https://github.com/Stillpoint-Software/hyperbee.expressions</PackageProjectUrl>
3030
</PropertyGroup>
3131

32-
<!-- Pull README & LICENSE into the package root -->
33-
<ItemGroup Condition="'$(IsPackable)' == 'true'">
32+
<ItemGroup Condition="'$(IsPackable)' == 'true' AND '$(MSBuildProjectName)' != 'Hyperbee.Expressions.Compiler'">
3433
<None Include="$(MSBuildThisFileDirectory)README.md"
3534
Pack="true"
3635
PackagePath=""
3736
Link="README.md" />
38-
37+
</ItemGroup>
38+
<ItemGroup Condition="'$(IsPackable)' == 'true'">
3939
<None Include="$(MSBuildThisFileDirectory)LICENSE"
4040
Pack="true"
4141
PackagePath=""
@@ -46,6 +46,7 @@
4646
PackagePath=""
4747
Link="icon.png" />
4848
</ItemGroup>
49+
4950
<!-- Global project properties - .NET 10 LTS First Strategy -->
5051
<PropertyGroup>
5152
<ImplicitUsings>enable</ImplicitUsings>

‎src/Hyperbee.Expressions.Compiler/Hyperbee.Expressions.Compiler.csproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,22 @@
99
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
<PackageTags>expression-tree;expressions;compiler;il;emit</PackageTags>
1111
<PackageIcon>icon.png</PackageIcon>
12+
<IsPackable>true</IsPackable>
1213
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.expressions/</PackageProjectUrl>
1314
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1415
<Copyright>Stillpoint Software, Inc.</Copyright>
1516
<Title>Hyperbee Expressions Compiler</Title>
1617
<Description>High-performance IR-based expression compiler for .NET.</Description>
17-
<RepositoryUrl>https://github.com/Stillpoint-Software/Hyperbee.Expressions</RepositoryUrl>
18+
<RepositoryUrl>https://github.com/Stillpoint-Software/hyperbee.expressions</RepositoryUrl>
1819
<RepositoryType>git</RepositoryType>
1920
<PackageReleaseNotes>https://github.com/Stillpoint-Software/Hyperbee.Expressions/releases/latest</PackageReleaseNotes>
2021
</PropertyGroup>
2122

22-
2323
<ItemGroup>
24-
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
25-
<None Include="..\..\LICENSE">
26-
<Pack>True</Pack>
27-
<PackagePath>\</PackagePath>
28-
</None>
29-
<None Include="README.md">
30-
<Pack>True</Pack>
31-
<PackagePath>\</PackagePath>
32-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33-
</None>
24+
<None Include="README.md"
25+
Pack="true"
26+
PackagePath=""
27+
Link="README.md" />
3428
</ItemGroup>
3529

3630
<ItemGroup>

‎src/Hyperbee.Expressions.Lab/Hyperbee.Expressions.Lab.csproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77
<PackageId>Hyperbee.Expressions.Lab</PackageId>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
99
<PackageTags>expression-tree;expressions;lab;samples</PackageTags>
10-
<PackageIcon>icon.png</PackageIcon>
1110
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.expressions/</PackageProjectUrl>
12-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1311
<Copyright>Stillpoint Software, Inc.</Copyright>
1412
<Title>Hyperbee Expressions (lab)</Title>
1513
<Description>Sample Extentions for .NET Expression Trees.</Description>
16-
<RepositoryUrl>https://github.com/Stillpoint-Software/Hyperbee.Expressions</RepositoryUrl>
17-
<RepositoryType>git</RepositoryType>
18-
<PackageReleaseNotes>https://github.com/Stillpoint-Software/Hyperbee.Expressions/releases/latest</PackageReleaseNotes>
1914
</PropertyGroup>
2015

2116
<PropertyGroup>
2217
<DefineConstants>$(DefineConstants);FAST_COMPILER</DefineConstants>
2318
</PropertyGroup>
2419

20+
<ItemGroup>
21+
<None Remove="C:\Developer\Stillpoint\hyperbee.expressions\assets\icon.png" />
22+
</ItemGroup>
23+
2524
<ItemGroup>
2625
<None Update="$(MSBuildProjectName).csproj.DotSettings" Visible="false" />
2726
</ItemGroup>
@@ -36,9 +35,6 @@
3635
</ItemGroup>
3736

3837
<ItemGroup>
39-
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
40-
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
41-
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
4238
<PackageReference Include="Hyperbee.Collections" />
4339
<PackageReference Include="Hyperbee.Json" />
4440
<PackageReference Include="Microsoft.CodeAnalysis.Common" />

‎src/Hyperbee.Expressions/Hyperbee.Expressions.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@
77
<PackageId>Hyperbee.Expressions</PackageId>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
99
<PackageTags>expression-tree;expressions;async;await;expression-extension</PackageTags>
10-
<PackageIcon>icon.png</PackageIcon>
11-
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.expressions/</PackageProjectUrl>
12-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
10+
<IsPackable>true</IsPackable>
1311
<Copyright>Stillpoint Software, Inc.</Copyright>
1412
<Title>Hyperbee Expressions</Title>
1513
<Description>Async and Await for .NET Expression Trees.</Description>
16-
<RepositoryUrl>https://github.com/Stillpoint-Software/Hyperbee.Expressions</RepositoryUrl>
17-
<RepositoryType>git</RepositoryType>
18-
<PackageReleaseNotes>https://github.com/Stillpoint-Software/Hyperbee.Expressions/releases/latest</PackageReleaseNotes>
1914
</PropertyGroup>
2015

2116
<PropertyGroup>
@@ -36,9 +31,6 @@
3631
</ItemGroup>
3732

3833
<ItemGroup>
39-
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
40-
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
41-
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
4234
<PackageReference Include="Hyperbee.Collections" />
4335
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
4436
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.4.5",
3+
"version": "1.4.6",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/hotfix$",

0 commit comments

Comments
 (0)