Skip to content

Commit

Permalink
Feature/nuget packages update (MarimerLLC#4083)
Browse files Browse the repository at this point in the history
* Update version.json with new schema and version

- Added `$schema` property for versioning schema definition.
- Updated `version` to "4.6-Beta" indicating the upcoming beta release.
- Introduced `publicReleaseRefSpec` to specify branches for public releases.

* Update version details for release prep

- Updated the version number in `version.json` from `4.6-Beta` to `4.6.3-Beta2`.
- Changed `publicReleaseRefSpec` in `version.json` to target `^refs/heads/main$` specifically, refining the branch reference for public releases.

* Centralize package settings with props file

Introduced a new `Directory.Package.props` file to centralize common package settings across multiple CSLA .NET projects, enhancing consistency and streamlining the build and packaging process. Updated project files to import this centralized configuration, adding and modifying project metadata to improve package descriptiveness and discoverability. Enabled package generation and documentation file creation upon build. Updated the solution file to reflect project GUID changes and include the new props file, also documenting the minimum required Visual Studio version for development.

* Update fetch-depth in ci.yaml for full history

This commit modifies the `ci.yaml` file by adding a `with` block under the `actions/checkout@v4` step, setting the `fetch-depth` parameter to `0`. This change ensures that the checkout action fetches all history for all branches and tags, facilitating tasks that require a complete git history, such as generating a comprehensive changelog.
  • Loading branch information
luizfbicalho authored Jul 6, 2024
1 parent d670d36 commit 2d0845d
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install .NET Core
uses: actions/setup-dotnet@v4
Expand Down
3 changes: 3 additions & 0 deletions Source/Csla.AspNetCore/Csla.AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
Expand All @@ -11,6 +12,8 @@
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Nullable>enable</Nullable>
<Title>CSLA .NET AspNetCore</Title>
<PackageTags>CSLA;AspNetCore;Razor</PackageTags>
</PropertyGroup>

<Import Project="..\Csla.Web.Mvc.Shared\Csla.Web.Mvc.Shared.projitems" Label="Shared" />
Expand Down
6 changes: 6 additions & 0 deletions Source/Csla.Blazor.WebAssembly/Csla.Blazor.WebAssembly.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
Expand All @@ -8,6 +9,11 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<Title>CSLA .NET Blazor WebAssembly</Title>
<PackageTags>CSLA;Blazor;aspnetcore;WebAssembly;wasm</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<DefineConstants>TRACE;BLAZOR</DefineConstants>
Expand Down
6 changes: 6 additions & 0 deletions Source/Csla.Blazor/Csla.Blazor.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
Expand All @@ -9,6 +10,11 @@
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Title>CSLA .NET Blazor</Title>
<PackageTags>CSLA;Blazor;aspnetcore</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<DefineConstants>TRACE;BLAZOR</DefineConstants>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions Source/Csla.Channels.Grpc/Csla.Channels.Grpc.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
Expand All @@ -7,8 +8,8 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Title>CSLA .NET gRPC data portal channel</Title>
<PackageTags>CSLA;gRPC</PackageTags>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
5 changes: 3 additions & 2 deletions Source/Csla.Channels.RabbitMq/Csla.Channels.RabbitMq.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
Expand All @@ -7,9 +8,9 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Nullable>enable</Nullable>
<Title>CSLA .NET RabbitMQ data portal channel</Title>
<PackageTags>CSLA;RabbitMQ</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Source/Csla.Data.SqlClient.Fx/Csla.Data.SqlClient.Fx.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -9,9 +10,9 @@
<AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Nullable>enable</Nullable>
<Title>CSLA .NET System.Data.SqlClient</Title>
<PackageTags>CSLA;SqlClient;Sql Server</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
5 changes: 3 additions & 2 deletions Source/Csla.Data.SqlClient/Csla.Data.SqlClient.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -7,9 +8,9 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Nullable>enable</Nullable>
<Title>CSLA .NET Microsoft.Data.SqlClient</Title>
<PackageTags>CSLA;SqlClient;Sql Server</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
3 changes: 3 additions & 0 deletions Source/Csla.Web.Mvc5.Net4.6/Csla.Web.Mvc5-Net4.6.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFramework>net462</TargetFramework>
Expand All @@ -11,6 +12,8 @@
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Nullable>enable</Nullable>
<Title>CSLA .NET ASP.NET MVC 5</Title>
<PackageTags>CSLA;ASP.NET;MVC</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions Source/Csla.Web/Csla.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFramework>net462</TargetFramework>
Expand All @@ -10,6 +11,8 @@
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<Title>CSLA .NET ASP.NET</Title>
<PackageTags>CSLA;ASP.NET;Web Forms</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions Source/Csla.Windows/Csla.Windows.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
Expand All @@ -11,6 +12,8 @@
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Title>CSLA .NET Windows Forms</Title>
<PackageTags>CSLA;WinForms;Windows Forms</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Source/Csla.Xaml.Wpf/Csla.Xaml.Wpf.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
Expand All @@ -11,8 +12,9 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Csla\CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>

<Title>CSLA .NET WPF</Title>
<PackageTags>CSLA;WPF;XAML</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Source/Csla/Csla.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Directory.Package.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462;net472;net48;net8.0</TargetFrameworks>
<PackageId>Csla</PackageId>
<Product>CSLA .NET Core</Product>
<Description>CSLA .NET provides a home for your business logic. It is an application development framework that reduces the cost of building and maintaining applications. The framework enables developers to build an object-oriented business layer for their application that encapsulates all business, authorization and validation logic for the application.</Description>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<Title>CSLA .NET Core</Title>
<PackageTags>CSLA;Business;Rules</PackageTags>
<DelaySign>false</DelaySign>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
<BaseOutputPath>..\..\Bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
Expand Down
36 changes: 36 additions & 0 deletions Source/Directory.Package.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project>


<!-- Common Package Settings -->
<PropertyGroup>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
<RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Company>Marimer LLC</Company>
<Product>CSLA .NET</Product>
<Copyright>Copyright © 2002-$([System.DateTime]::Now.ToString('yyyy')) Marimer LLC</Copyright>
<Authors>Marimer LLC</Authors>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageIcon>images\csla.png</PackageIcon>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<NeutralLanguage>en-US</NeutralLanguage>
<DefaultLanguage>en-US</DefaultLanguage>

<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(IsPackable)'=='true' AND '$(PackageIcon)'!=''">
<None Include="$(MSBuildThisFileDirectory)..\Source\readme.md" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)..\Support\Logos\csla.png" Link="csla.png" Pack="true" PackagePath="\images\csla.png" Visible="false" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion Source/csla.test.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
..\.github\workflows\ci.yaml = ..\.github\workflows\ci.yaml
Directory.Build.props = Directory.Build.props
Directory.package.props = Directory.package.props
readme.md = readme.md
..\releasenotes.md = ..\releasenotes.md
EndProjectSection
Expand Down Expand Up @@ -60,7 +61,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphMergerTest.Business",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphMergerTest.BusinessTests", "GraphMergerTest\GraphMergerTest.BusinessTests\GraphMergerTest.BusinessTests.csproj", "{FE652EBA-94E7-4BB2-99C8-18B0382E0D9A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Blazor.WebAssembly.Tests", "Csla.Blazor.WebAssembly.Tests\Csla.Blazor.WebAssembly.Tests.csproj", "{430DDCF1-1570-4193-9B1E-774303F6FC34}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csla.Blazor.WebAssembly.Tests", "Csla.Blazor.WebAssembly.Tests\Csla.Blazor.WebAssembly.Tests.csproj", "{430DDCF1-1570-4193-9B1E-774303F6FC34}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
5 changes: 5 additions & 0 deletions Source/version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "4.6.3-Beta2",
"publicReleaseRefSpec": [ "^refs/heads/main$" ]
}

0 comments on commit 2d0845d

Please sign in to comment.