Sign assemblies with strong-name

iNKORE-NET · Nov 24, 2023 · fa32eaf · fa32eaf
1 parent 4fd72b9
commit fa32eaf
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 27 deletions.
diff --git a/assets/misc/iNKORE.Pulic.snk b/assets/misc/iNKORE.Pulic.snk
diff --git a/iNKORE.UI.WPF.Modern.sln b/iNKORE.UI.WPF.Modern.sln
@@ -27,6 +27,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iNKORE.UI.WPF.Modern.Sample
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp1", "source\samples\WpfApp1\WpfApp1.csproj", "{DBB698F7-FB37-4514-82C2-DA3C71A4B92F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{445FD5A2-621B-450B-B0AB-4B9A070ECC1E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{A6E3D156-8F7F-4566-9931-DC76009E73FC}"
+	ProjectSection(SolutionItems) = preProject
+		assets\misc\iNKORE.Pulic.snk = assets\misc\iNKORE.Pulic.snk
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fonts", "Fonts", "{1413BB5F-D932-4C64-B7B4-2F253DDE36B2}"
+	ProjectSection(SolutionItems) = preProject
+		assets\fonts\SegoeIcons.ttf = assets\fonts\SegoeIcons.ttf
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -170,6 +182,8 @@ Global
 		{35EF6F6B-3E8C-4A9E-BCD2-16CA5C2C2ADC} = {07337569-6CA9-4BB0-9C8F-962D981CB5F4}
 		{54049F5E-E57B-433E-B316-3C51F25B523D} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{DBB698F7-FB37-4514-82C2-DA3C71A4B92F} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
+		{A6E3D156-8F7F-4566-9931-DC76009E73FC} = {445FD5A2-621B-450B-B0AB-4B9A070ECC1E}
+		{1413BB5F-D932-4C64-B7B4-2F253DDE36B2} = {445FD5A2-621B-450B-B0AB-4B9A070ECC1E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6251E140-0FAA-4DE9-B245-1C5BE188E578}

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Properties/AssemblyInfo.cs b/source/iNKORE.UI.WPF.Modern.Controls/Properties/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Markup;
+using iNKORE.UI.WPF.Modern;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
@@ -17,5 +18,5 @@
 
 //[assembly: InternalsVisibleTo("MUXControlsTestApp")]
 
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Controls")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Controls.Primitives")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Controls")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Controls.Primitives")]
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
@@ -30,12 +30,8 @@
 			Windows.Foundation.PropertyType;
 		</CsWinRTExcludes>
 		<ApplicationIcon>..\..\materials\images\iNKORE.ico</ApplicationIcon>
-		<Authors>NotYoojun.!</Authors>
-		<Company>iNKORE! Studios</Company>
-		<Product>iNKORE.UI.WPF.Modern</Product>
-		<Version />
-		<Title>$(AssemblyName)</Title>
-		<PackageReadmeFile>..\..\README.md</PackageReadmeFile>
+		<SignAssembly>True</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows10.0.18362.0|AnyCPU'">

diff --git a/source/iNKORE.UI.WPF.Modern/Properties/AssemblyInfo.cs b/source/iNKORE.UI.WPF.Modern/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using iNKORE.UI.WPF.Modern;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Markup;
@@ -15,17 +16,17 @@
 
 [assembly: AssemblyTitle("iNKORE.UI.WPF.Modern")]
 
-[assembly: InternalsVisibleTo("iNKORE.UI.WPF.Modern.Controls")]
+[assembly: InternalsVisibleTo("iNKORE.UI.WPF.Modern.Controls, PublicKey=002400000480000094000000060200000024000052534131000400000100010079425c15485b66fccee121200091aa9712fb3044894e6c09e0278eac59e28d966fda1e6084f86fd80c08e946c5e9da07b7f88e82f936df2eb2a5c7e4ea154243502c17bf805002ebd1997873464ff7c8847b1e2aa02d470864d058ea1383ea3e6f8a0f02c4af08093c36beff569cf04a04a73054c0d3e52f6e2b18e1f98412ce")]
 //[assembly: InternalsVisibleTo("iNKORE.UI.WPF.Modern.MahApps")]
-[assembly: InternalsVisibleTo("MUXControlsTestApp")]
+//[assembly: InternalsVisibleTo("MUXControlsTestApp")]
 
-[assembly: XmlnsPrefix("http://schemas.inkore.net/lib/ui/wpf/modern", "modern")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Common")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Common.Converters")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Controls")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Controls.Primitives")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.DesignTime")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Markup")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Media")]
-[assembly: XmlnsDefinition("http://schemas.inkore.net/lib/ui/wpf/modern", "iNKORE.UI.WPF.Modern.Media.Animation")]
+[assembly: XmlnsPrefix(ThemeManager.XmlNamespace, "modern")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Common")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Common.Converters")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Controls")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Controls.Primitives")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.DesignTime")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Markup")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Media")]
+[assembly: XmlnsDefinition(ThemeManager.XmlNamespace, "iNKORE.UI.WPF.Modern.Media.Animation")]
diff --git a/source/iNKORE.UI.WPF.Modern/ThemeManager.cs b/source/iNKORE.UI.WPF.Modern/ThemeManager.cs
@@ -17,6 +17,8 @@ public class ThemeManager : DependencyObject
         internal const string DarkKey = "Dark";
         internal const string HighContrastKey = "HighContrast";
 
+        public const string XmlNamespace = "http://schemas.inkore.net/lib/ui/wpf/modern";
+
         private static readonly Binding _highContrastBinding = new Binding("(SystemParameters.HighContrast)");
         private static readonly RoutedEventArgs _actualThemeChangedEventArgs;
 

diff --git a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
@@ -27,12 +27,8 @@
 			Windows.Foundation.PropertyType;
 		</CsWinRTExcludes>
 		<ApplicationIcon>..\..\materials\images\iNKORE.ico</ApplicationIcon>
-		<Authors>NotYoojun.!</Authors>
-		<Company>iNKORE! Studios</Company>
-		<Product>iNKORE.UI.WPF.Modern</Product>
-		<Version />
-		<Title>$(AssemblyName)</Title>
-		<PackageReadmeFile>..\..\README.md</PackageReadmeFile>
+		<SignAssembly>True</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">