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
1 change: 0 additions & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
if: ${{ needs.discover.result == 'success' }}
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
with:
dotnet_version: "9.0.x"
branch: ${{ needs.discover.outputs.branch_name }}
secrets: inherit

11 changes: 8 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<!-- Shared package refs -->
<!-- Shared package refs - moved to Directory.Packages.props -->
<ItemGroup>
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />

<!-- SourceLink for GitHub -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down Expand Up @@ -42,4 +42,9 @@
PackagePath="\"
Link="LICENSE" />
</ItemGroup>
<!-- Global project properies -->
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
</Project>
60 changes: 60 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<Project>
<!-- Enable Central Package Management -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<!-- Centralized Package Versions -->
<ItemGroup>
<!-- Build and Development Tools -->
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="FastExpressionCompiler" Version="5.1.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
<!-- Core Libraries -->
<PackageVersion Include="Hyperbee.Collections" Version="2.4.0" />
<PackageVersion Include="Hyperbee.Expressions" Version="1.2.0" />
<PackageVersion Include="Parlot" Version="1.3.6" />
<!-- Microsoft Libraries - Common for both .NET 8 and .NET 9 -->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<!-- NuGet Libraries -->
<PackageVersion Include="NuGet.Configuration" Version="7.0.1" />
<PackageVersion Include="NuGet.DependencyResolver.Core" Version="7.0.1" />
<PackageVersion Include="NuGet.Packaging" Version="7.0.1" />
<PackageVersion Include="NuGet.ProjectModel" Version="7.0.1" />
<PackageVersion Include="NuGet.Protocol" Version="7.0.1" />
<!-- CLI Libraries -->
<PackageVersion Include="Spectre.Console" Version="0.50.0" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.50.0" />
<!-- System Libraries -->
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.1" />
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.1" />
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.1" />
<!-- Testing Libraries -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
</ItemGroup>
<!-- .NET 8 specific package versions - Using 4.13.0 minimum due to Hyperbee.Expressions dependency -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.13.0" />
<PackageVersion Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25177.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.25177.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25177.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.PackageManagement" Version="1.0.0-beta.25177.1" />
</ItemGroup>
<!-- .NET 9 specific package versions -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.14.0" />
<PackageVersion Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25323.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.25323.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25323.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.PackageManagement" Version="1.0.0-beta.25323.1" />
</ItemGroup>
</Project>
105 changes: 0 additions & 105 deletions Hyperbee.XS.sln

This file was deleted.

31 changes: 31 additions & 0 deletions Hyperbee.XS.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="LICENSE" />
<File Path="README.md" />
<File Path="version.json" />
<Project Path="docs/docs.shproj" />
</Folder>
<Folder Name="/Solution Items/.github/" />
<Folder Name="/Solution Items/.github/workflows/">
<File Path=".github/workflows/create_release.yml" />
<File Path=".github/workflows/create_test_report.yml" />
<File Path=".github/workflows/deploy-gh-pages.yml" />
<File Path=".github/workflows/format.yml" />
<File Path=".github/workflows/issue_branch.yml" />
<File Path=".github/workflows/pack_publish.yml" />
<File Path=".github/workflows/run_tests.yml" />
<File Path=".github/workflows/unlist_package.yml" />
</Folder>
<Folder Name="/Solution Tests/">
<Project Path="test/Hyperbee.XS.Benchmark/Hyperbee.XS.Benchmark.csproj" />
<Project Path="test/Hyperbee.XS.Extensions.Tests/Hyperbee.XS.Extensions.Tests.csproj" />
<Project Path="test/Hyperbee.XS.Interactive.Tests/Hyperbee.XS.Interactive.Tests.csproj" />
<Project Path="test/Hyperbee.XS.Tests/Hyperbee.XS.Tests.csproj" />
</Folder>
<Project Path="src/Hyperbee.XS.Cli/Hyperbee.Xs.Cli.csproj" />
<Project Path="src/Hyperbee.XS.Extensions/Hyperbee.Xs.Extensions.csproj" />
<Project Path="src/Hyperbee.XS.Interactive/Hyperbee.Xs.Interactive.csproj" />
<Project Path="src/Hyperbee.XS/Hyperbee.XS.csproj" />
</Solution>
14 changes: 6 additions & 8 deletions src/Hyperbee.XS.Cli/Hyperbee.Xs.Cli.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>true</IsPackable>
<OutputType>Exe</OutputType>
Expand All @@ -29,11 +27,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
<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="FastExpressionCompiler" />
<PackageReference Include="Spectre.Console" />
<PackageReference Include="Spectre.Console.Cli" />
<PackageReference Include="System.Reflection.Metadata" />
<PackageReference Include="System.Reflection.MetadataLoadContext" />
</ItemGroup>

<ItemGroup>
Expand All @@ -43,7 +41,7 @@
<None Include="README.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\Hyperbee.XS.Extensions\Hyperbee.Xs.Extensions.csproj" />
<ProjectReference Include="..\Hyperbee.XS\Hyperbee.XS.csproj" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 5 additions & 7 deletions src/Hyperbee.XS.Extensions/Hyperbee.Xs.Extensions.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>true</IsPackable>

Expand Down Expand Up @@ -41,12 +39,12 @@
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
<None Include="..\..\NOTICES" Pack="true" Visible="false" PackagePath="/" />
<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="Hyperbee.Collections" />
<PackageReference Include="Hyperbee.Expressions" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Parlot" />
<ProjectReference Include="..\Hyperbee.XS\Hyperbee.XS.csproj" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
16 changes: 6 additions & 10 deletions src/Hyperbee.XS.Interactive/Hyperbee.Xs.Interactive.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>true</IsPackable>

Expand All @@ -25,10 +23,10 @@
</PropertyGroup>

<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="Microsoft.DotNet.Interactive" />
<PackageReference Include="System.Reflection.Metadata" />
<PackageReference Include="System.Reflection.MetadataLoadContext" />
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

<ItemGroup>
Expand All @@ -46,17 +44,15 @@
<None Include="README.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\Hyperbee.XS.Extensions\Hyperbee.Xs.Extensions.csproj" />
<ProjectReference Include="..\Hyperbee.XS\Hyperbee.XS.csproj" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.DotNet.Interactive.PackageManagement">
<Version>1.0.0-beta.25177.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.Interactive.PackageManagement" />
</ItemGroup>

</Project>
Loading
Loading