Merge pull request #49 from AndrewKeepCoding/feat/publish-richtextblo…

…ck-extensions Publish RichTextBlock extensions
AndrewKeepCoding · Feb 16, 2024 · b27b54c · b27b54c
2 parents b164f94 + 7acb7bc
commit b27b54c
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 10 deletions.
diff --git a/AK.Toolkit.sln b/AK.Toolkit.sln
@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{0DFB7268-1E7E-460F-A670-8336E61A13A4}"
 	ProjectSection(SolutionItems) = preProject
 		Assets\auto-complete-textbox-screenshot.png = Assets\auto-complete-textbox-screenshot.png
+		Assets\richtextblock-extensions-screenshot.png = Assets\richtextblock-extensions-screenshot.png
 		Assets\scrollbar-extensions-annotations-screenshot.png = Assets\scrollbar-extensions-annotations-screenshot.png
 	EndProjectSection
 EndProject
@@ -37,9 +38,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AK.Toolkit.WinUI3.TextBlock
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AK.Toolkit.WinUI3.TextBlockExSampleApp", "Samples\AK.Toolkit.WinUI3.TextBlockExSampleApp\AK.Toolkit.WinUI3.TextBlockExSampleApp.csproj", "{B2459114-5D81-48A4-8166-0B893CA00EC1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AK.Toolkit.WinUI3.RichTextBlockExtensions", "WinUI3\AK.Toolkit.WinUI3.RichTextBlockExtensions\AK.Toolkit.WinUI3.RichTextBlockExtensions.csproj", "{70BC2116-5863-4F79-95A4-19176CCF3F6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AK.Toolkit.WinUI3.RichTextBlockExtensions", "WinUI3\AK.Toolkit.WinUI3.RichTextBlockExtensions\AK.Toolkit.WinUI3.RichTextBlockExtensions.csproj", "{70BC2116-5863-4F79-95A4-19176CCF3F6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp", "Samples\AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp\AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp.csproj", "{DCDA10E1-12BB-4437-AADE-1BA1D79F1E00}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp", "Samples\AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp\AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp.csproj", "{DCDA10E1-12BB-4437-AADE-1BA1D79F1E00}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Assets/richtextblock-extensions-screenshot.png b/Assets/richtextblock-extensions-screenshot.png
diff --git a/README.md b/README.md
@@ -4,6 +4,22 @@ The AK.Toolkit will be a collection of controls, helpers, etc... stuff that I ne
 
 ## 🔵 WinUI 3
 
+### 📜 RichTextBlockExtensions
+
+Extensions that make it easier to highlight `RichTextBlock`.
+
+```xaml
+<Button>
+    <RichTextBlock
+        toolkit:RichTextBlockExtensions.HighlightingText="{x:Bind HighlightingText, Mode=OneWay}"
+        toolkit:RichTextBlockExtensions.Text="Button"
+        IsHitTestVisible="False" />
+</Button>
+```
+
+![ScrollBar Extensions Annotations Screenshot](Assets/richtextblock-extensions-screenshot.png)
+
+
 ### 💻 AutoCompleteTextBox
 
 [🎬 YouTube](https://youtu.be/G17jbGSXLnk)

diff --git a/...ichTextBlockExtensionsSampleApp/AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp.csproj b/...ichTextBlockExtensionsSampleApp/AK.Toolkit.WinUI3.RichTextBlockExtensionsSampleApp.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AK.Toolkit.WinUI3.RichTextBlockExtensions" Version="1.0.0" />
     <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
@@ -43,9 +44,6 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\WinUI3\AK.Toolkit.WinUI3.RichTextBlockExtensions\AK.Toolkit.WinUI3.RichTextBlockExtensions.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Page Update="SubPage.xaml">
       <Generator>MSBuild:Compile</Generator>

diff --git a/...K.Toolkit.WinUI3.RichTextBlockExtensions/AK.Toolkit.WinUI3.RichTextBlockExtensions.csproj b/...K.Toolkit.WinUI3.RichTextBlockExtensions/AK.Toolkit.WinUI3.RichTextBlockExtensions.csproj
@@ -1,14 +1,43 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFrameworks>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>AK.Toolkit.WinUI3.RichTextBlockExtensions</RootNamespace>
+    <RootNamespace>AK.Toolkit.WinUI3</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Title>AK.Toolkit.WinUI3.RichTextBlockExtensions</Title>
+    <Description>
+      Extensions to the built-in RichTextBlock:
+      - Text highlighting
+    </Description>
+    <Version>1.0.0</Version>
+    <PackageTags>winui3;winappsdk;extensions;richtextblock</PackageTags>
+    <PackageProjectUrl>https://github.com/AndrewKeepCoding/AK.Toolkit</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/AndrewKeepCoding/AK.Toolkit</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageId>AK.Toolkit.WinUI3.RichTextBlockExtensions</PackageId>
+    <Product>AK.Toolkit.WinUI3.RichTextBlockExtensions</Product>
+    <Copyright>Copyright (c) Andrew KeepCoding 2024</Copyright>
+    <Authors>Andrew KeepCoding</Authors>
+    <PackageReadMeFile>README.md</PackageReadMeFile>
+    <PackageIcon>winui.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\winui.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 </Project>