clean up package references, GuiCS is internal assembly instead of nu…

…get package
jinek · Dec 5, 2024 · 31611eb · 31611eb
1 parent 034d2d2
commit 31611eb
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 41 deletions.
diff --git a/.github/workflows/PublishIncrementalNuget.yml b/.github/workflows/PublishIncrementalNuget.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: dotnet pack 
         run: |
-          dotnet pack --no-build src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0
+          dotnet pack src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0
 
       - name: Publish NuGet and symbols
         id: nuget-push

diff --git a/.github/workflows/PublishNuget.yml b/.github/workflows/PublishNuget.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: dotnet pack 
         run: |
-          dotnet pack --no-build src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0
+          dotnet pack src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0
 
       - name: Publish NuGet and symbols
         id: nuget-push

diff --git a/foo.cmd b/foo.cmd
@@ -0,0 +1,2 @@
+erase /q packages\*.*
+dotnet pack src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0
diff --git a/src/Consolonia.Core/README.md b/src/Consolonia.Core/README.md
@@ -1,14 +1,9 @@
 # Consolonia UI
-
 TUI (Text User Interface) (GUI Framework) implementation for [Avalonia UI](https://github.com/AvaloniaUI)
 
 Supports XAML, data bindings, animation, styling and the rest from Avalonia.
 
-> Project is in proof of concept state and is looking for collaboration.
-
 ## Showcase (click picture to see video)
 [![datagridpic](https://user-images.githubusercontent.com/10516222/141980173-4eb4057a-6996-45bf-83f6-931316c98d88.png)](https://youtu.be/ttgZmbruk3Y)
 
-Example of usage: https://github.com/jinek/ToolUI
-
-Solution contains one more readme file with coding information.
+This package is the core Consolonia support.
diff --git a/src/Consolonia.Designer/Consolonia.Designer.csproj b/src/Consolonia.Designer/Consolonia.Designer.csproj
@@ -11,8 +11,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
-      <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
+        <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
+        <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Consolonia.Designer/README.md b/src/Consolonia.Designer/README.md
@@ -1,14 +1,9 @@
 # Consolonia UI
-
 TUI (Text User Interface) (GUI Framework) implementation for [Avalonia UI](https://github.com/AvaloniaUI)
 
 Supports XAML, data bindings, animation, styling and the rest from Avalonia.
 
-> Project is in proof of concept state and is looking for collaboration.
-
 ## Showcase (click picture to see video)
 [![datagridpic](https://user-images.githubusercontent.com/10516222/141980173-4eb4057a-6996-45bf-83f6-931316c98d88.png)](https://youtu.be/ttgZmbruk3Y)
 
-Example of usage: https://github.com/jinek/ToolUI
-
-Solution contains one more readme file with coding information.
+This package is the Consolonia support for design time previews.
diff --git a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
@@ -5,11 +5,7 @@
     <WarningsAsErrors>false</WarningsAsErrors>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>false</EnableNETAnalyzers>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../../Icon.png" Pack="True" PackagePath="\" />
-    <None Include="readme.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
 
 </Project>
diff --git a/src/Consolonia.GuiCS/readme.md b/src/Consolonia.GuiCS/readme.md
diff --git a/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj b/src/Consolonia.PlatformSupport/Consolonia.PlatformSupport.csproj
@@ -3,12 +3,31 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
-        <ProjectReference Include="..\Consolonia.GuiCS\Consolonia.GuiCS.csproj" />        
+        <ProjectReference Include="..\Consolonia.GuiCS\Consolonia.GuiCS.csproj" PrivateAssets="All"  >
+            <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+            <IncludeAssets>Consolonia.GuiCS.dll</IncludeAssets>
+        </ProjectReference>
     </ItemGroup>
 
     <ItemGroup>
         <None Include="../../Icon.png" Pack="True" PackagePath="\" />
         <None Include="readme.md" Pack="true" PackagePath="\" />
     </ItemGroup>
+
+    <!-- 
+    see https://josef.codes/dotnet-pack-include-referenced-projects/ for information on how 
+    this is including Consolonia.GuiCS.dll as an asset and  not a package references
+    -->
+    <PropertyGroup>
+        <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+    </PropertyGroup>
 
+    <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+        <ItemGroup>
+            <!-- Filter out unnecessary files -->
+            <_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
+            <!-- Add file to package with consideration of sub folder. If empty, the root folder is chosen. -->
+            <BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)"/>
+        </ItemGroup>
+    </Target>
 </Project>
diff --git a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
@@ -3,11 +3,11 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
+        <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Tools/Consolonia.PreviewHost/Consolonia.PreviewHost.csproj b/src/Tools/Consolonia.PreviewHost/Consolonia.PreviewHost.csproj
@@ -24,9 +24,6 @@
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Consolonia.Core" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Consolonia.PlatformSupport" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Consolonia.Themes.TurboVision" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     </ItemGroup>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		erase /q packages\.
		dotnet pack src/Consolonia.sln -c Release -o packages --include-symbols --property WarningLevel=0