Added Avalonia projects to foundation package; moved NuGet recipes into a subdirectory (they'll gain a few entries soon because I need to split things up and remove WinForms from the 'foundation' part, so at least 5 libraries soon)

This commit is contained in:
Markus Ewald 2025-07-05 14:35:35 +02:00
parent c3b5c942f3
commit 39a5eefb97
10 changed files with 78 additions and 56 deletions

10
.gitmodules vendored
View File

@ -18,3 +18,13 @@
url = ../../nuclex-shared-dotnet/Nuclex.Windows.Forms.DependencyInjection.git url = ../../nuclex-shared-dotnet/Nuclex.Windows.Forms.DependencyInjection.git
branch = main branch = main
update = rebase update = rebase
[submodule "Nuclex.Avalonia"]
path = Nuclex.Avalonia
url = ../../nuclex-shared-dotnet/Nuclex.Avalonia.git
branch = main
update = rebase
[submodule "Nuclex.Avalonia.DependencyInjection"]
path = Nuclex.Avalonia.DependencyInjection
url = ../../nuclex-shared-dotnet/Nuclex.Avalonia.DependencyInjection.git
branch = main
update = rebase

1
Nuclex.Avalonia Submodule

@ -0,0 +1 @@
Subproject commit 26a33a30d296ddf962047a5497e67ca9536c6ae3

@ -0,0 +1 @@
Subproject commit 061c6e99064712c0517a469c56a3689088d854b3

View File

@ -1,55 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Nuclex.Foundation</id>
<version>1.2.0</version>
<title>Nuclex Foundation Libraries</title>
<authors>Markus Ewald</authors>
<owners></owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<readme>ReadMe.md</readme>
<projectUrl>https://github.com/orgs/nuclex-shared-dotnet/repositories</projectUrl>
<description>Set of basic libraries offering tools for MVVM-based UIs, storage of settings, license keys, collections and observer/subscriber pattern helpers</description>
<language>en-US</language>
<tags>mvvm,util</tags>
<icon>nuclex-logo.png</icon>
<repository type="git" url="https://github.com/nuclex-shared-dotnet/Nuclex.Support.git" commit="5fb433ad983e58725e0d25faa8968a75b3dfd178" />
<dependencies>
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETFramework4.6.2" />
<group targetFramework="net8.0-windows7.0" />
</dependencies>
<frameworkReferences>
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETFramework4.6.2" />
<group targetFramework="net8.0-windows7.0">
<frameworkReference name="Microsoft.WindowsDesktop.App.WindowsForms" />
</group>
</frameworkReferences>
</metadata>
<files>
<file src="ReadMe.md" target="ReadMe.md" />
<file src="nuclex-logo.png" target="nuclex-logo.png" />
<!-- Feature set for .NET Standard 2.0 (available to ,NET versions from 4.6 onwards) -->
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/netstandard2.0" />
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/netstandard2.0" />
<!-- Feature set for .NET Framework 4.6.2 (with Windows.Forms) -->
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/net462" />
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/net462" />
<file src="Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.dll" target="lib/net462" />
<file src="Nuclex.Windows.Forms\bin\$Configuration$\net462\Nuclex.Windows.Forms.xml" target="lib/net462" />
<!-- Feature set for .NET 8.0 on Windows (with Windows.Forms) -->
<!-- Btw, '-windows7.0' means Windows Seven, the one between Vista and 8, not the internal Windows release number -->
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/net8.0-windows7.0" />
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/net8.0-windows7.0" />
<file src="Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.dll" target="lib/net8.0-windows7.0" />
<file src="Nuclex.Windows.Forms\bin\$Configuration$\net8.0-windows\Nuclex.Windows.Forms.xml" target="lib/net8.0-windows7.0" />
</files>
</package>

@ -1 +1 @@
Subproject commit c75a70e62924a9ee8c9ee416fafb2ce08b9d4dee Subproject commit 81f9a0acb4fe97d2be327408b94d361bc833d2a8

View File

@ -11,6 +11,12 @@
}, },
{ {
"path": "Nuclex.Windows.Forms.DependencyInjection" "path": "Nuclex.Windows.Forms.DependencyInjection"
},
{
"path": "Nuclex.Avalonia"
},
{
"path": "Nuclex.Avalonia.DependencyInjection"
} }
] ]
} }

View File

@ -17,6 +17,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests",
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclex.Windows.Forms.DependencyInjection (net-4.6)(net-8.0)", "Nuclex.Windows.Forms.DependencyInjection\Nuclex.Windows.Forms.DependencyInjection (net-4.6)(net-8.0).csproj", "{3D7D6CA0-A130-FD54-B772-B4B48847E682}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclex.Windows.Forms.DependencyInjection (net-4.6)(net-8.0)", "Nuclex.Windows.Forms.DependencyInjection\Nuclex.Windows.Forms.DependencyInjection (net-4.6)(net-8.0).csproj", "{3D7D6CA0-A130-FD54-B772-B4B48847E682}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclex.Avalonia (netstandard-2.0)", "Nuclex.Avalonia\Nuclex.Avalonia (netstandard-2.0).csproj", "{266B86EA-B837-C155-ED94-21D00158BF93}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclex.Avalonia.Tests (netstandard-2.0)", "Nuclex.Avalonia\Nuclex.Avalonia.Tests (netstandard-2.0).csproj", "{70A05064-32AC-8C72-18A3-F923C60EBB69}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclex.Avalonia.DependencyInjection (net-4.6)(net-8.0)", "Nuclex.Avalonia.DependencyInjection\Nuclex.Avalonia.DependencyInjection (net-4.6)(net-8.0).csproj", "{6C3C6003-9871-FAFE-056F-17B4C8FAC278}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -47,6 +53,18 @@ Global
{3D7D6CA0-A130-FD54-B772-B4B48847E682}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D7D6CA0-A130-FD54-B772-B4B48847E682}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D7D6CA0-A130-FD54-B772-B4B48847E682}.Release|Any CPU.ActiveCfg = Release|Any CPU {3D7D6CA0-A130-FD54-B772-B4B48847E682}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D7D6CA0-A130-FD54-B772-B4B48847E682}.Release|Any CPU.Build.0 = Release|Any CPU {3D7D6CA0-A130-FD54-B772-B4B48847E682}.Release|Any CPU.Build.0 = Release|Any CPU
{266B86EA-B837-C155-ED94-21D00158BF93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{266B86EA-B837-C155-ED94-21D00158BF93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{266B86EA-B837-C155-ED94-21D00158BF93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{266B86EA-B837-C155-ED94-21D00158BF93}.Release|Any CPU.Build.0 = Release|Any CPU
{70A05064-32AC-8C72-18A3-F923C60EBB69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70A05064-32AC-8C72-18A3-F923C60EBB69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70A05064-32AC-8C72-18A3-F923C60EBB69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70A05064-32AC-8C72-18A3-F923C60EBB69}.Release|Any CPU.Build.0 = Release|Any CPU
{6C3C6003-9871-FAFE-056F-17B4C8FAC278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C3C6003-9871-FAFE-056F-17B4C8FAC278}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C3C6003-9871-FAFE-056F-17B4C8FAC278}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C3C6003-9871-FAFE-056F-17B4C8FAC278}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -54,6 +72,7 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{E48CDA21-683B-4A92-AABC-769FD3E1294C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {E48CDA21-683B-4A92-AABC-769FD3E1294C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{259458D9-BC98-46F1-96B1-E1B4F352C9A2} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {259458D9-BC98-46F1-96B1-E1B4F352C9A2} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{70A05064-32AC-8C72-18A3-F923C60EBB69} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A3074EBD-0D8A-4423-AB98-2DD650BDD132} SolutionGuid = {A3074EBD-0D8A-4423-AB98-2DD650BDD132}

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Nuclex.Foundation</id>
<version>1.3.0</version>
<title>Nuclex Foundation Libraries</title>
<authors>Markus Ewald</authors>
<owners></owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<readme>ReadMe.md</readme>
<projectUrl>https://github.com/orgs/nuclex-shared-dotnet/repositories</projectUrl>
<description>Set of basic libraries offering tools for MVVM-based UIs, storage of settings, license keys, collections and observer/subscriber pattern helpers</description>
<language>en-US</language>
<tags>mvvm,util</tags>
<icon>nuclex-logo.png</icon>
<repository
type="git"
url="https://github.com/nuclex-shared-dotnet/Nuclex.Support.git"
commit="5fb433ad983e58725e0d25faa8968a75b3dfd178"
/>
<dependencies>
<group targetFramework=".NETStandard2.0" />
</dependencies>
<frameworkReferences>
<group targetFramework=".NETStandard2.0" />
</frameworkReferences>
</metadata>
<files>
<file src="ReadMe.md" target="ReadMe.md" />
<file src="nuclex-logo.png" target="nuclex-logo.png" />
<!-- Feature set for .NET Standard 2.0 (available to ,NET versions from 4.6 onwards) -->
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.dll" target="lib/netstandard2.0" />
<file src="Nuclex.Support\bin\$Configuration$\netstandard2.0\Nuclex.Support.xml" target="lib/netstandard2.0" />
</files>
</package>