Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project>
<PropertyGroup>
<!-- Pre-1.0: keep version honest in UI and assembly metadata -->
<Version>0.1.0</Version>
<PropertyGroup>
<!-- Pre-1.0: keep version honest in UI and assembly metadata -->
<Version>0.1.0</Version>
<AssemblyVersion>0.1.0.0</AssemblyVersion>
<FileVersion>0.1.0.0</FileVersion>
<InformationalVersion>0.1.0</InformationalVersion>

<!-- Null Safety: Enable across all projects -->
<Nullable>enable</Nullable>

<!-- Analysis Settings -->
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<DefaultItemExcludes>$(DefaultItemExcludes);**\artifacts\**</DefaultItemExcludes>
<!-- Analysis Settings -->
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
<DefaultItemExcludes>$(DefaultItemExcludes);**\artifacts\**</DefaultItemExcludes>

<!--
Note: Null warnings (CS8600-CS8609) are enabled but NOT treated as errors.
Expand Down
104 changes: 52 additions & 52 deletions WindowsOptimizer.App/WindowsOptimizer.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<!-- Quantum Optimizations -->
<!-- NOTE: ReadyToRun publish can fail on duplicate simple-name inputs (e.g., Dia2Lib.dll). -->
<PublishReadyToRun>false</PublishReadyToRun>
<!-- Publishing settings: keep distribution deterministic and only used by publish step -->
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>false</SelfContained>
<IncludeNativeLibrariesForSelfExtract>false</IncludeNativeLibrariesForSelfExtract>
<!-- Ensure build outputs are produced to bin/ during development.
Distribution packaging must use the scripts/publish_release.ps1 script which writes to /publish_final/. -->
<!-- Publishing settings: keep distribution deterministic and only used by publish step -->
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>false</SelfContained>
<IncludeNativeLibrariesForSelfExtract>false</IncludeNativeLibrariesForSelfExtract>
<!-- Ensure build outputs are produced to bin/ during development.
Distribution packaging must use the scripts/publish_release.ps1 script which writes to /publish_final/. -->
</PropertyGroup>

<ItemGroup>
Expand All @@ -26,28 +26,28 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.6" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
<PackageReference Include="TaskScheduler" Version="2.11.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
<PackageReference Include="TaskScheduler" Version="2.12.2" />
</ItemGroup>

<ItemGroup>
<Resource Include="Resources\tray-icon.ico" Condition="Exists('Resources\tray-icon.ico')" />
<Resource Include="Resources\Icons\**\*.png" />
<Resource Include="Assets\Icons\**\*.png" />
<Resource Include="Resources\Fonts\*.ttf" />
<!-- Hardware DB JSONs are large generated artifacts. They are copied only when present; prefer rule-based matching in source.
These files are allowed to be removed during cleanup. -->
<Content Include="Assets\HardwareDb\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Fonts\*-OFL.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\tray-icon.ico" Condition="Exists('Resources\tray-icon.ico')" />
<Resource Include="Resources\Icons\**\*.png" />
<Resource Include="Assets\Icons\**\*.png" />
<Resource Include="Resources\Fonts\*.ttf" />
<!-- Hardware DB JSONs are large generated artifacts. They are copied only when present; prefer rule-based matching in source.
These files are allowed to be removed during cleanup. -->
<Content Include="Assets\HardwareDb\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Fonts\*-OFL.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\\WindowsOptimizer.Core\\WindowsOptimizer.Core.csproj" />
Expand All @@ -57,38 +57,38 @@
<ProjectReference Include="..\\WindowsOptimizer.Plugins.DevTools\\WindowsOptimizer.Plugins.DevTools.csproj" ReferenceOutputAssembly="false" />
</ItemGroup>

<Target Name="CopyElevatedHostAfterBuild" AfterTargets="Build" Condition="'$(DesignTimeBuild)' != 'true'">
<PropertyGroup>
<ElevatedHostRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ElevatedHostRid>
<ElevatedHostRid Condition="'$(ElevatedHostRid)' == ''">win-x64</ElevatedHostRid>

<ElevatedHostRootOutputDir>$(MSBuildProjectDirectory)\\..\\WindowsOptimizer.ElevatedHost\\bin\\$(Configuration)\\$(TargetFramework)\\</ElevatedHostRootOutputDir>
<ElevatedHostRidOutputDir>$(ElevatedHostRootOutputDir)$(ElevatedHostRid)\\</ElevatedHostRidOutputDir>
<ElevatedHostOutputDir Condition="Exists('$(ElevatedHostRidOutputDir)')">$(ElevatedHostRidOutputDir)</ElevatedHostOutputDir>
<ElevatedHostOutputDir Condition="'$(ElevatedHostOutputDir)' == ''">$(ElevatedHostRootOutputDir)</ElevatedHostOutputDir>
<ElevatedHostDestinationDir>$(TargetDir)ElevatedHost\\</ElevatedHostDestinationDir>
</PropertyGroup>
<ItemGroup>
<ElevatedHostFilesAfterBuild Include="$(ElevatedHostOutputDir)**\\*.*" />
</ItemGroup>
<Target Name="CopyElevatedHostAfterBuild" AfterTargets="Build" Condition="'$(DesignTimeBuild)' != 'true'">
<PropertyGroup>
<ElevatedHostRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ElevatedHostRid>
<ElevatedHostRid Condition="'$(ElevatedHostRid)' == ''">win-x64</ElevatedHostRid>
<ElevatedHostRootOutputDir>$(MSBuildProjectDirectory)\\..\\WindowsOptimizer.ElevatedHost\\bin\\$(Configuration)\\$(TargetFramework)\\</ElevatedHostRootOutputDir>
<ElevatedHostRidOutputDir>$(ElevatedHostRootOutputDir)$(ElevatedHostRid)\\</ElevatedHostRidOutputDir>
<ElevatedHostOutputDir Condition="Exists('$(ElevatedHostRidOutputDir)')">$(ElevatedHostRidOutputDir)</ElevatedHostOutputDir>
<ElevatedHostOutputDir Condition="'$(ElevatedHostOutputDir)' == ''">$(ElevatedHostRootOutputDir)</ElevatedHostOutputDir>
<ElevatedHostDestinationDir>$(TargetDir)ElevatedHost\\</ElevatedHostDestinationDir>
</PropertyGroup>
<ItemGroup>
<ElevatedHostFilesAfterBuild Include="$(ElevatedHostOutputDir)**\\*.*" />
</ItemGroup>

<Copy SourceFiles="@(ElevatedHostFilesAfterBuild)" DestinationFiles="@(ElevatedHostFilesAfterBuild->'$(ElevatedHostDestinationDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>

<Target Name="CopyElevatedHostAfterPublish" AfterTargets="Publish" Condition="'$(DesignTimeBuild)' != 'true'">
<PropertyGroup>
<ElevatedHostRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ElevatedHostRid>
<ElevatedHostRid Condition="'$(ElevatedHostRid)' == ''">win-x64</ElevatedHostRid>

<ElevatedHostRootOutputDir>$(MSBuildProjectDirectory)\\..\\WindowsOptimizer.ElevatedHost\\bin\\$(Configuration)\\$(TargetFramework)\\</ElevatedHostRootOutputDir>
<ElevatedHostRidOutputDir>$(ElevatedHostRootOutputDir)$(ElevatedHostRid)\\</ElevatedHostRidOutputDir>
<ElevatedHostOutputDir Condition="Exists('$(ElevatedHostRidOutputDir)')">$(ElevatedHostRidOutputDir)</ElevatedHostOutputDir>
<ElevatedHostOutputDir Condition="'$(ElevatedHostOutputDir)' == ''">$(ElevatedHostRootOutputDir)</ElevatedHostOutputDir>
<ElevatedHostDestinationDir>$(PublishDir)ElevatedHost\\</ElevatedHostDestinationDir>
</PropertyGroup>
<ItemGroup>
<ElevatedHostFilesAfterPublish Include="$(ElevatedHostOutputDir)**\\*.*" />
</ItemGroup>
<Target Name="CopyElevatedHostAfterPublish" AfterTargets="Publish" Condition="'$(DesignTimeBuild)' != 'true'">
<PropertyGroup>
<ElevatedHostRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ElevatedHostRid>
<ElevatedHostRid Condition="'$(ElevatedHostRid)' == ''">win-x64</ElevatedHostRid>
<ElevatedHostRootOutputDir>$(MSBuildProjectDirectory)\\..\\WindowsOptimizer.ElevatedHost\\bin\\$(Configuration)\\$(TargetFramework)\\</ElevatedHostRootOutputDir>
<ElevatedHostRidOutputDir>$(ElevatedHostRootOutputDir)$(ElevatedHostRid)\\</ElevatedHostRidOutputDir>
<ElevatedHostOutputDir Condition="Exists('$(ElevatedHostRidOutputDir)')">$(ElevatedHostRidOutputDir)</ElevatedHostOutputDir>
<ElevatedHostOutputDir Condition="'$(ElevatedHostOutputDir)' == ''">$(ElevatedHostRootOutputDir)</ElevatedHostOutputDir>
<ElevatedHostDestinationDir>$(PublishDir)ElevatedHost\\</ElevatedHostDestinationDir>
</PropertyGroup>
<ItemGroup>
<ElevatedHostFilesAfterPublish Include="$(ElevatedHostOutputDir)**\\*.*" />
</ItemGroup>

<Copy SourceFiles="@(ElevatedHostFilesAfterPublish)" DestinationFiles="@(ElevatedHostFilesAfterPublish->'$(ElevatedHostDestinationDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion WindowsOptimizer.CLI/WindowsOptimizer.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine" Version="2.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion WindowsOptimizer.Core/WindowsOptimizer.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLua" Version="1.7.6" />
<PackageReference Include="NLua" Version="1.7.8" />
<PackageReference Include="pythonnet" Version="3.0.5" />
</ItemGroup>

Expand Down
24 changes: 12 additions & 12 deletions WindowsOptimizer.ElevatedHost/WindowsOptimizer.ElevatedHost.csproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<!-- ElevatedHost must be a framework-dependent executable so it can be
referenced by the main App project. Removed runtime/publish-specific
properties (SelfContained/RuntimeIdentifier/etc.) to avoid
NETSDK1151 errors. -->
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- ElevatedHost must be a framework-dependent executable so it can be
referenced by the main App project. Removed runtime/publish-specific
properties (SelfContained/RuntimeIdentifier/etc.) to avoid
NETSDK1151 errors. -->
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\\WindowsOptimizer.Infrastructure\\WindowsOptimizer.Infrastructure.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@

<ItemGroup>
<ProjectReference Include="..\\WindowsOptimizer.Core\\WindowsOptimizer.Core.csproj" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.5" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.7" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.24" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.30" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Management" Version="10.0.2" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.3" />
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NLua" Version="1.7.8" />
<EmbeddedResource Include="Hardware\\hardware-seed.json" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLua" Version="1.7.8" />
<ProjectReference Include="..\WindowsOptimizer.Core\WindowsOptimizer.Core.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion WindowsOptimizer.Tests/WindowsOptimizer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading