소스 검색

Some cleanup

flabbet 11 달 전
부모
커밋
1b230425ee

+ 1 - 1
src/Directory.Build.props

@@ -7,7 +7,7 @@
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     </ItemGroup>
     <ItemGroup>
-        <AdditionalFiles Include="../stylecop.json" />
+        <AdditionalFiles Include="$(SolutionDir)/stylecop.json" />
     </ItemGroup>
 
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">

+ 1 - 1
src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller/App.axaml

@@ -12,7 +12,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://PixiEditor.UI.Common/Styles/Colors.axaml"/>
+                <ResourceInclude Source="avares://PixiEditor.UI.Common/Accents/Base.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

+ 0 - 4
src/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller/PixiEditor.UpdateInstaller.csproj

@@ -24,8 +24,4 @@
       <ProjectReference Include="..\..\PixiEditor.UI.Common\PixiEditor.UI.Common.csproj" />
       <ProjectReference Include="..\..\PixiEditor.UpdateModule\PixiEditor.UpdateModule.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Styles\" />
-    </ItemGroup>
 </Project>

+ 1 - 0
src/PixiEditor.sln

@@ -779,6 +779,7 @@ Global
 		{0D3DE5D1-D984-407D-B2A6-7945F011B636}.Steam|x64.Build.0 = Debug|Any CPU
 		{0D3DE5D1-D984-407D-B2A6-7945F011B636}.Steam|ARM64.ActiveCfg = Debug|Any CPU
 		{0D3DE5D1-D984-407D-B2A6-7945F011B636}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{41B40602-2E8C-4B76-9BDB-B9FDE686ACCE}.Debug|x64.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE