refactor

MahApps · Nov 7, 2024 · 33f3d7f · 33f3d7f
1 parent e90dba1
commit 33f3d7f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 25 deletions.
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
@@ -19,6 +19,7 @@
         <PackageIcon>logo_small.png</PackageIcon>
         <PackageTags>Avalonia;AvaloniaUI;Windows;UI;Modern;ModernUI;Material;XAML;Library;.NET;C#;Icon</PackageTags>
         <PackageReleaseNotes>https://github.com/MahApps/IconPacks.Avalonia/releases</PackageReleaseNotes>
+
         <RepositoryUrl>https://github.com/MahApps/IconPacks.Avalonia.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>

diff --git a/build/SourceLink.props b/build/SourceLink.props
@@ -14,7 +14,7 @@
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(APPVEYOR)' == 'true'">
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,12 +7,9 @@
         <LangVersion>latest</LangVersion>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
 
-        <!--<Nullable>enable</Nullable>-->
         <Nullable>disable</Nullable>
 
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
-
-        <!-- <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio> -->
     </PropertyGroup>
 
     <PropertyGroup>
@@ -21,10 +18,6 @@
         <NoError>$(NoError);CS1591</NoError>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
-    </PropertyGroup>
-
     <Import Project="..\build\SignAssembly.props" />
     <Import Project="..\build\SourceLink.props" />
     <Import Project="..\build\SharedVersion.props" />

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -3,10 +3,8 @@
     <PropertyGroup>
         <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
     </PropertyGroup>
-
     <ItemGroup>
         <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
-        <EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
     </ItemGroup>
 
 </Project>
diff --git a/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia.BoxIcons/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-using Avalonia.Metadata;
+using Avalonia.Metadata;
 
 [assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]
-
-[assembly: ComVisible(false)]
+[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]
diff --git a/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia.Core/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-using Avalonia.Metadata;
+using Avalonia.Metadata;
 
 [assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Attributes")]
-
-[assembly: ComVisible(false)]
+[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Attributes")]
diff --git a/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs b/src/IconPacks.Avalonia/Properties/AssemblyInfo.cs
@@ -1,9 +1,6 @@
-using System.Runtime.InteropServices;
-using Avalonia.Metadata;
+using Avalonia.Metadata;
 
 [assembly: XmlnsPrefix("urn:iconpacks-avalonia", "iconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks")]
 [assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia")]
-[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]
-
-[assembly: ComVisible(false)]
+[assembly: XmlnsDefinition("urn:iconpacks-avalonia", "IconPacks.Avalonia.Converter")]