Merge pull request #10 from irihitech/share-test

Use Share project structure.
irihitech · Apr 4, 2024 · d0035be · d0035be
2 parents 5d28cd7 + 6df06e0
commit d0035be
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 35 deletions.
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -7,8 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
-
-
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="11.0.9" />
         <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />

diff --git a/...Irihi.Avalonia.Shared/Common/PartNames.cs → ...valonia.Shared.Public/Common/PartNames.cs b/...Irihi.Avalonia.Shared/Common/PartNames.cs → ...valonia.Shared.Public/Common/PartNames.cs
@@ -1,6 +1,6 @@
 namespace Irihi.Avalonia.Shared.Common;
 
-public static class PartNames
+public static partial class PartNames
 {
     public const string PART_ContentPresenter = "PART_ContentPresenter";
     public const string PART_HeaderPresenter = "PART_HeaderPresenter";

diff --git a/...i.Avalonia.Shared/Common/PseudoClasses.cs → ...nia.Shared.Public/Common/PseudoClasses.cs b/...i.Avalonia.Shared/Common/PseudoClasses.cs → ...nia.Shared.Public/Common/PseudoClasses.cs
@@ -1,6 +1,6 @@
 namespace Irihi.Avalonia.Shared.Common;
 
-public static class PseudoClasses
+public static partial class PseudoClasses
 {
     public const string PC_Disabled = ":disabled";
     public const string PC_Pointerover = ":pointerover";

diff --git a/...valonia.Shared/Contracts/IClearControl.cs → ....Shared.Public/Contracts/IClearControl.cs b/...valonia.Shared/Contracts/IClearControl.cs → ....Shared.Public/Contracts/IClearControl.cs
diff --git a/...alonia.Shared/Contracts/IDialogContext.cs → ...Shared.Public/Contracts/IDialogContext.cs b/...alonia.Shared/Contracts/IDialogContext.cs → ...Shared.Public/Contracts/IDialogContext.cs
diff --git a/....Shared/Contracts/IInnerContentControl.cs → ....Public/Contracts/IInnerContentControl.cs b/....Shared/Contracts/IInnerContentControl.cs → ....Public/Contracts/IInnerContentControl.cs
diff --git a/....Shared/Contracts/IOuterContentControl.cs → ....Public/Contracts/IOuterContentControl.cs b/....Shared/Contracts/IOuterContentControl.cs → ....Public/Contracts/IOuterContentControl.cs
diff --git a/...ia.Shared/Contracts/IPopupInnerContent.cs → ...ed.Public/Contracts/IPopupInnerContent.cs b/...ia.Shared/Contracts/IPopupInnerContent.cs → ...ed.Public/Contracts/IPopupInnerContent.cs
diff --git a/...ia.Shared/Contracts/IPopupOuterContent.cs → ...ed.Public/Contracts/IPopupOuterContent.cs b/...ia.Shared/Contracts/IPopupOuterContent.cs → ...ed.Public/Contracts/IPopupOuterContent.cs
diff --git a/...ared/Helpers/AvaloniaPropertyExtension.cs → ...blic/Helpers/AvaloniaPropertyExtension.cs b/...ared/Helpers/AvaloniaPropertyExtension.cs → ...blic/Helpers/AvaloniaPropertyExtension.cs
diff --git a/...alonia.Shared/Helpers/BindingExtension.cs → ...Shared.Public/Helpers/BindingExtension.cs b/...alonia.Shared/Helpers/BindingExtension.cs → ...Shared.Public/Helpers/BindingExtension.cs
diff --git a/...nia.Shared/Helpers/ObservableExtension.cs → ...red.Public/Helpers/ObservableExtension.cs b/...nia.Shared/Helpers/ObservableExtension.cs → ...red.Public/Helpers/ObservableExtension.cs
diff --git a/...ia.Shared/Helpers/RoutedEventExtension.cs → ...ed.Public/Helpers/RoutedEventExtension.cs b/...ia.Shared/Helpers/RoutedEventExtension.cs → ...ed.Public/Helpers/RoutedEventExtension.cs
diff --git a/src/Irihi.Avalonia.Shared.Public/Irihi.Avalonia.Shared.Public.projitems b/src/Irihi.Avalonia.Shared.Public/Irihi.Avalonia.Shared.Public.projitems
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>4AFEBE77-61CA-45EB-90E8-933B1A714CC8</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Irihi.Avalonia.Shared.ShareProject</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Common\PartNames.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Common\PseudoClasses.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IClearControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IDialogContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IInnerContentControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IOuterContentControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IPopupInnerContent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Contracts\IPopupOuterContent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AvaloniaPropertyExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\BindingExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ObservableExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\RoutedEventExtension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Reactive\ReadonlyDisposableCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Reactive\ResultDisposable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PureCircle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PureRectangle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PureRing.cs" />
+  </ItemGroup>
+</Project>
diff --git a/src/Irihi.Avalonia.Shared.Public/Irihi.Avalonia.Shared.Public.shproj b/src/Irihi.Avalonia.Shared.Public/Irihi.Avalonia.Shared.Public.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>{F7A8869A-C381-4445-BC80-F87739D6A496}</ProjectGuid>
+        <RootNamespace>Irihi.Avalonia.Shared</RootNamespace>
+    </PropertyGroup>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
+    <Import Project="Irihi.Avalonia.Shared.Public.projitems" Label="Shared"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
+</Project>
diff --git a/.../Reactive/ReadonlyDisposableCollection.cs → .../Reactive/ReadonlyDisposableCollection.cs b/.../Reactive/ReadonlyDisposableCollection.cs → .../Reactive/ReadonlyDisposableCollection.cs
diff --git a/...lonia.Shared/Reactive/ResultDisposable.cs → ...hared.Public/Reactive/ResultDisposable.cs b/...lonia.Shared/Reactive/ResultDisposable.cs → ...hared.Public/Reactive/ResultDisposable.cs
diff --git a/...rihi.Avalonia.Shared/Shapes/PureCircle.cs → ...alonia.Shared.Public/Shapes/PureCircle.cs b/...rihi.Avalonia.Shared/Shapes/PureCircle.cs → ...alonia.Shared.Public/Shapes/PureCircle.cs
diff --git a/...i.Avalonia.Shared/Shapes/PureRectangle.cs → ...nia.Shared.Public/Shapes/PureRectangle.cs b/...i.Avalonia.Shared/Shapes/PureRectangle.cs → ...nia.Shared.Public/Shapes/PureRectangle.cs
diff --git a/src/Irihi.Avalonia.Shared/Shapes/PureRing.cs → ...Avalonia.Shared.Public/Shapes/PureRing.cs b/src/Irihi.Avalonia.Shared/Shapes/PureRing.cs → ...Avalonia.Shared.Public/Shapes/PureRing.cs
diff --git a/src/Irihi.Avalonia.Shared.sln b/src/Irihi.Avalonia.Shared.sln
@@ -1,10 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irihi.Avalonia.Shared", "Irihi.Avalonia.Shared\Irihi.Avalonia.Shared.csproj", "{2C350A8C-4253-45CE-B565-6F4275FC11CD}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34622.214
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irihi.Avalonia.Shared", "Irihi.Avalonia.Shared\Irihi.Avalonia.Shared.csproj", "{2C350A8C-4253-45CE-B565-6F4275FC11CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "..\sample\Sample\Sample.csproj", "{92C8A1A1-21CB-41B4-BAC7-1A7763300D1C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "..\sample\Sample\Sample.csproj", "{92C8A1A1-21CB-41B4-BAC7-1A7763300D1C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irihi.Avalonia.Shared.UnitTest", "..\test\Irihi.Avalonia.Shared.UnitTest\Irihi.Avalonia.Shared.UnitTest.csproj", "{5AD4A73B-4B85-4C56-BAB3-A25D526F0B07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irihi.Avalonia.Shared.UnitTest", "..\test\Irihi.Avalonia.Shared.UnitTest\Irihi.Avalonia.Shared.UnitTest.csproj", "{5AD4A73B-4B85-4C56-BAB3-A25D526F0B07}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Irihi.Avalonia.Shared.Public", "Irihi.Avalonia.Shared.Public\Irihi.Avalonia.Shared.Public.shproj", "{F7A8869A-C381-4445-BC80-F87739D6A496}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +30,11 @@ Global
 		{5AD4A73B-4B85-4C56-BAB3-A25D526F0B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AD4A73B-4B85-4C56-BAB3-A25D526F0B07}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Irihi.Avalonia.Shared.ShareProject\Irihi.Avalonia.Shared.ShareProject.projitems*{2c350a8c-4253-45ce-b565-6f4275fc11cd}*SharedItemsImports = 5
+		Irihi.Avalonia.Shared.ShareProject\Irihi.Avalonia.Shared.ShareProject.projitems*{f7a8869a-c381-4445-bc80-f87739d6a496}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal
diff --git a/src/Irihi.Avalonia.Shared/Attributes/DesignerItemType.cs b/src/Irihi.Avalonia.Shared/Attributes/DesignerItemType.cs
diff --git a/src/Irihi.Avalonia.Shared/Attributes/DesignerItemTypeAttribute.cs b/src/Irihi.Avalonia.Shared/Attributes/DesignerItemTypeAttribute.cs
diff --git a/src/Irihi.Avalonia.Shared/Attributes/InvisibleToDesignerAttribute.cs b/src/Irihi.Avalonia.Shared/Attributes/InvisibleToDesignerAttribute.cs
diff --git a/src/Irihi.Avalonia.Shared/Irihi.Avalonia.Shared.csproj b/src/Irihi.Avalonia.Shared/Irihi.Avalonia.Shared.csproj
@@ -15,13 +15,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <Folder Include="MarkupExtensions\" />
-      <Folder Include="Property\" />
-      <None Include="irihi.png" Pack="true" PackagePath=""/>
+      <None Include="irihi.png" Pack="true" PackagePath="" />
     </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="11.0.0" />
     </ItemGroup>
 
+    <Import Project="..\Irihi.Avalonia.Shared.Public\Irihi.Avalonia.Shared.Public.projitems" Label="Shared" />
+
 </Project>